From 2c81593537e7881e399274ed59d55095e68a649a Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Sat, 1 Oct 2022 13:15:58 +0100 Subject: [PATCH] more fixes --- data/maps/objects/RocketHideoutB1F.asm | 2 +- scripts/RocketHideoutB1F.asm | 4 ++-- text/RocketHideoutB1F.asm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 9d782981..de9617df 100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -2,7 +2,7 @@ RocketHideoutB1F_Object: db $2e ; border block def_warp_events - warp_event 5, 4, VIRIDIAN_GYM, 4 + warp_event 5, 4, VIRIDIAN_GYM, 2 warp_event 17, 4, VIRIDIAN_CITY, 6 def_bg_events diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm index 60734946..96fc8e2a 100644 --- a/scripts/RocketHideoutB1F.asm +++ b/scripts/RocketHideoutB1F.asm @@ -148,9 +148,9 @@ RocketHideoutB1F_TextPointers: dw RocketHideout1Text2 dw RocketHideout1Text3 dw RocketHideout1Text4 - dw RocketHideout1Text5 dw PickUpItemText dw PickUpItemText + dw RocketHideout1Text7 RocketHideout1TrainerHeaders: def_trainers @@ -182,7 +182,7 @@ RocketHideout1Text4: text_far _RocketHideout1Text4 text_end -RocketHideout1Text5: +RocketHideout1Text7: text_asm ld hl, RocketHideout1TrainerHeader0 call TalkToTrainer diff --git a/text/RocketHideoutB1F.asm b/text/RocketHideoutB1F.asm index 1b4829fa..6eccbf4b 100644 --- a/text/RocketHideoutB1F.asm +++ b/text/RocketHideoutB1F.asm @@ -33,7 +33,7 @@ _RocketHideout1Text1:: cont "KANTO." para "However, with" - cont "enough force," + line "enough force," cont "RHYDON can evolve" cont "successfully."