more back door edits

This commit is contained in:
MementoMartha 2022-10-01 13:03:53 +01:00
parent a10c48a514
commit 830c3c3b1d
8 changed files with 10 additions and 53 deletions

View file

@ -69,6 +69,7 @@ RocketHideout1ArrowTilePlayerMovement:
map_coord_movement 15, 10, RocketHideout1ArrowMovement11
map_coord_movement 12, 11, RocketHideout1ArrowMovement12
map_coord_movement 14, 11, RocketHideout1ArrowMovement13
map_coord_movement 14, 5, RocketHideout1ArrowMovement14
db -1 ; end
RocketHideout1ArrowMovement1:
@ -125,6 +126,10 @@ RocketHideout1ArrowMovement12:
RocketHideout1ArrowMovement13:
db D_UP, 3
db -1 ; end
RocketHideout1ArrowMovement14:
db D_RIGHT, 4
db -1 ; end
RocketHideout1Script4:
ld a, [wSimulatedJoypadStatesIndex]

View file

@ -12,7 +12,6 @@ ViridianCity_ScriptPointers:
ViridianCityScript0:
call ViridianCityScript_1900b
call ViridianCityScript_backdoor
jp ViridianCityScript_1903d
ViridianCityScript_1900b:
@ -114,31 +113,6 @@ ViridianCityScript3:
ld [wViridianCityCurScript], a
ret
ViridianCityScript_backdoor:
CheckEvent EVENT_VIRIDIAN_GYM_OPEN
ret nz
ld a, [wObtainedBadges]
cp ~(1 << BIT_EARTHBADGE)
jr nz, .gym_closed
SetEvent EVENT_VIRIDIAN_GYM_OPEN
ret
.gym_closed
ld a, [wYCoord]
cp 3
ret nz
ld a, [wXCoord]
cp 29
ret nz
ld a, $10
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ldh [hJoyHeld], a
call ViridianCityScript_backdoor2
ld a, $3
ld [wViridianCityCurScript], a
ret
ViridianCityScript_190cf:
call StartSimulatingJoypadStates
ld a, $1
@ -150,17 +124,6 @@ ViridianCityScript_190cf:
ld [wJoyIgnore], a
ret
ViridianCityScript_backdoor2:
call StartSimulatingJoypadStates
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
xor a
ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
ret
ViridianCity_TextPointers:
dw ViridianCityText1
dw ViridianCityText2
@ -177,7 +140,6 @@ ViridianCity_TextPointers:
dw ViridianCityText13
dw ViridianCityText14
dw ViridianCityText15
dw ViridianCityText16
ViridianCityText1:
text_far _ViridianCityText1
@ -364,6 +326,3 @@ ViridianCityText14:
text_far _ViridianCityText14
text_end
ViridianCityText16:
text_far _ViridianCityText16
text_end