oh my god plague thank you for figuring this out this took me like 2 months to get working properly
This commit is contained in:
Martha Schilling 2023-11-23 20:30:00 +00:00
parent 013dc271fb
commit 3e811d4ed1
2 changed files with 4 additions and 17 deletions

View file

@ -610,6 +610,7 @@ SaffronCityCitizens:
db HS_SAFFRON_CITY_B db HS_SAFFRON_CITY_B
db HS_SAFFRON_CITY_C db HS_SAFFRON_CITY_C
db HS_SAFFRON_CITY_F db HS_SAFFRON_CITY_F
db HS_SILPH_CO_1F_RECEPTIONIST
db -1 ; end db -1 ; end
SaffronCityRockets: SaffronCityRockets:

View file

@ -1,12 +1,5 @@
SilphCo1F_Script: SilphCo1F_Script:
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ret z
CheckAndSetEvent EVENT_SILPH_CO_RECEPTIONIST_AT_DESK
ret nz
ld a, HS_SILPH_CO_1F_RECEPTIONIST
ld [wMissableObjectIndex], a
predef_jump ShowObject
ld hl, SilphCo1F_ScriptPointers ld hl, SilphCo1F_ScriptPointers
ld a, [wSilphCo1FCurScript] ld a, [wSilphCo1FCurScript]
jp CallFunctionInTable jp CallFunctionInTable
@ -16,9 +9,6 @@ SilphCo1F_ScriptPointers:
dw SilphCo1FScript1 dw SilphCo1FScript1
SilphCo1FScript0: SilphCo1FScript0:
call SilphCo1FScript_CheckForLetter
SilphCo1FScript_CheckForLetter:
ld b, SILPHLETTER ld b, SILPHLETTER
call IsItemInBag call IsItemInBag
ret nz ret nz
@ -35,20 +25,16 @@ SilphCo1FScript_CheckForLetter:
call DisplayTextID call DisplayTextID
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
call SilphCo1FScript_ForceDown
ld a, $1
ld [wSilphCo1FCurScript], a
ret
SilphCo1FScript_ForceDown:
call StartSimulatingJoypadStates
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, D_DOWN ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates
xor a xor a
ld [wSpritePlayerStateData1FacingDirection], a ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $1
ld [wSilphCo1FCurScript], a
ret ret
SilphCo1FScript1: SilphCo1FScript1: