From 830c3c3b1d57b9006fc81d3bdcba8dd7933dbb43 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Sat, 1 Oct 2022 13:03:53 +0100 Subject: [PATCH] more back door edits --- data/maps/objects/RocketHideoutB1F.asm | 3 +- data/maps/objects/ViridianCity.asm | 2 +- data/maps/objects/ViridianGym.asm | 1 - maps/RocketHideoutB1F.blk | 2 +- maps/ViridianGym.blk | 2 +- scripts/RocketHideoutB1F.asm | 5 ++++ scripts/ViridianCity.asm | 41 -------------------------- text/ViridianCity.asm | 7 ----- 8 files changed, 10 insertions(+), 53 deletions(-) diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 8f1a6928..9d782981 100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -3,6 +3,7 @@ RocketHideoutB1F_Object: def_warp_events warp_event 5, 4, VIRIDIAN_GYM, 4 + warp_event 17, 4, VIRIDIAN_CITY, 6 def_bg_events @@ -13,6 +14,6 @@ RocketHideoutB1F_Object: object_event 8, 16, SPRITE_PAPER, STAY, RIGHT, 4 object_event 17, 22, SPRITE_POKE_BALL, STAY, NONE, 5, TM_EARTHQUAKE object_event 7, 22, SPRITE_POKE_BALL, STAY, NONE, 6, PROTECTOR - object_event 6, 6, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 8 + object_event 6, 17, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 8 def_warps_to ROCKET_HIDEOUT_B1F diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index de1c351e..bd0ef9af 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -7,7 +7,7 @@ ViridianCity_Object: warp_event 21, 15, VIRIDIAN_SCHOOL_HOUSE, 1 warp_event 21, 9, VIRIDIAN_NICKNAME_HOUSE, 1 warp_event 32, 7, VIRIDIAN_GYM, 1 - warp_event 29, 3, VIRIDIAN_GYM, 3 + warp_event 32, 3, ROCKET_HIDEOUT_B1F, 2 def_bg_events bg_event 17, 17, 8 ; ViridianCityText8 diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index 21ed7802..da085f20 100644 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -4,7 +4,6 @@ ViridianGym_Object: def_warp_events warp_event 16, 17, LAST_MAP, 5 ; front door warp_event 17, 17, LAST_MAP, 5 ; front door - warp_event 1, 0, LAST_MAP, 6 ; back door warp_event 4, 2, ROCKET_HIDEOUT_B1F, 1 ; stairs diff --git a/maps/RocketHideoutB1F.blk b/maps/RocketHideoutB1F.blk index 9f983964..adcceb52 100644 --- a/maps/RocketHideoutB1F.blk +++ b/maps/RocketHideoutB1F.blk @@ -1 +1 @@ -............@AAAAAAAB..DoF..@*+B ..D F GF..D F ''F..D F 59..D F'..HwEJ55..DF555..D,^F*+AAB..DGGqF..CS F..HIIJIIIIJ. \ No newline at end of file +............@AABAA@AB..DoF&nF..@*+B 55..D F GF..D F ''F..D F 59..D F'..HwEJ55..DF555..D,^F*+AAB..DGGqF..CS F..HIIJIIIIJ. \ No newline at end of file diff --git a/maps/ViridianGym.blk b/maps/ViridianGym.blk index ea4a538b..d6fbf394 100644 --- a/maps/ViridianGym.blk +++ b/maps/ViridianGym.blk @@ -1 +1 @@ -KII_]KMp[qWFF^\KUUKqLRFFFPHH[L@KMLaDKQ`G,XHHHZbCEWFFFY21@AB \ No newline at end of file +III_]KMp[qWFF^\KUUKqLRFFFPHH[L@KMLaDKQ`G,XHHHZbCEWFFFY21@AB \ No newline at end of file diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm index b878b889..60734946 100644 --- a/scripts/RocketHideoutB1F.asm +++ b/scripts/RocketHideoutB1F.asm @@ -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] diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index d294468f..0a7baf7e 100644 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -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 diff --git a/text/ViridianCity.asm b/text/ViridianCity.asm index b692b352..8ee81348 100644 --- a/text/ViridianCity.asm +++ b/text/ViridianCity.asm @@ -179,10 +179,3 @@ _ViridianCityText14:: text "The GYM's doors" line "are locked..." done - -_ViridianCityText16:: - text "The GYM has a" - line "back door?!" - - para "It's locked..." - done