diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index b83a585e..8f1a6928 100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -13,5 +13,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 def_warps_to ROCKET_HIDEOUT_B1F diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index eb12fa9e..eb78486f 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -554,7 +554,8 @@ RocketData: ; Game Corner db 20, RATICATE, ZUBAT, 0 ; Rocket Hideout B1F - db 21, DROWZEE, MACHOP, 0 + db 42, HYPNO, WEEZING, ARBOK, 0 +; Rocket Hideout B1F - all now unused db 21, RATICATE, RATICATE, 0 db 20, GRIMER, KOFFING, KOFFING, 0 db 19, RATTATA, RATICATE, RATICATE, RATTATA, 0 diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm index b832b9c1..b878b889 100644 --- a/scripts/RocketHideoutB1F.asm +++ b/scripts/RocketHideoutB1F.asm @@ -1,4 +1,4 @@ -RocketHideoutB1F_Script: ;all trainer references are commented out. +RocketHideoutB1F_Script: ;call RocketHideout1Script_44be0 call EnableAutoTextBoxDrawing ld hl, RocketHideout1TrainerHeaders @@ -32,9 +32,9 @@ RocketHideoutB1F_Script: ;all trainer references are commented out. RocketHideoutB1F_ScriptPointers: dw RocketHideout1Script0 - dw RocketHideout1Script4 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle + dw RocketHideout1Script4 RocketHideout1Script0: ld a, [wYCoord] @@ -76,6 +76,7 @@ RocketHideout1ArrowMovement1: db -1 ; end RocketHideout1ArrowMovement2: + db D_UP, 9 db D_LEFT, 4 db -1 ; end @@ -88,14 +89,18 @@ RocketHideout1ArrowMovement4: db -1 ; end RocketHideout1ArrowMovement5: + db D_RIGHT, 3 + db D_DOWN, 2 db D_RIGHT, 2 db -1 ; end RocketHideout1ArrowMovement7: + db D_RIGHT, 3 db D_DOWN, 2 db -1 ; end RocketHideout1ArrowMovement8: + db D_UP, 1 db D_RIGHT, 2 db -1 ; end @@ -104,7 +109,7 @@ RocketHideout1ArrowMovement9: db -1 ; end RocketHideout1ArrowMovement10: - db D_RIGHT, 2 + db D_RIGHT, 5 db -1 ; end RocketHideout1ArrowMovement11: @@ -112,11 +117,13 @@ RocketHideout1ArrowMovement11: db -1 ; end RocketHideout1ArrowMovement12: + db D_UP, 1 + db D_RIGHT, 2 db D_UP, 2 db -1 ; end RocketHideout1ArrowMovement13: - db D_UP, 2 + db D_UP, 3 db -1 ; end RocketHideout1Script4: @@ -136,13 +143,14 @@ RocketHideoutB1F_TextPointers: dw RocketHideout1Text2 dw RocketHideout1Text3 dw RocketHideout1Text4 + dw RocketHideout1Text5 dw PickUpItemText dw PickUpItemText RocketHideout1TrainerHeaders: def_trainers -;RocketHideout1TrainerHeader0: -; trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideout1BattleText2, RocketHideout1EndBattleText2, RocketHideout1AfterBattleTxt2 +RocketHideout1TrainerHeader0: + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideout1BattleText2, RocketHideout1EndBattleText2, RocketHideout1AfterBattleTxt2 ;RocketHideout1TrainerHeader1: ; trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1, 2, RocketHideout1BattleText3, RocketHideout1EndBattleText3, RocketHideout1AfterBattleTxt3 ;RocketHideout1TrainerHeader2: @@ -167,4 +175,22 @@ RocketHideout1Text3: RocketHideout1Text4: text_far _RocketHideout1Text4 + text_end + +RocketHideout1Text5: + text_asm + ld hl, RocketHideout1TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout1BattleText2: + text_far _RocketHideout1BattleText2 + text_end + +RocketHideout1EndBattleText2: + text_far _RocketHideout1EndBattleText2 + text_end + +RocketHideout1AfterBattleTxt2: + text_far _RocketHideout1AfterBattleTxt2 text_end \ No newline at end of file diff --git a/text/RocketHideoutB1F.asm b/text/RocketHideoutB1F.asm index 88b42fe2..1b4829fa 100644 --- a/text/RocketHideoutB1F.asm +++ b/text/RocketHideoutB1F.asm @@ -80,9 +80,12 @@ _RocketHideout1Text3:: cont "the floor..." para "PROTECTOR: ¥3,000" + para "GUARD SPEC: ¥4,200" + para "DEVELOPMENT OF" line "TM26: ¥15,000" + para "Business: ¥100,000" para "It keeps going..." @@ -99,4 +102,25 @@ _RocketHideout1Text4:: para "1977?!" - done \ No newline at end of file + done + +_RocketHideout1BattleText2:: + text "Hey! Intruders" + line "aren't welcome in" + cont "the BOSS's room!" + + para "I'm his last" + line "line of defence!" + done + +_RocketHideout1EndBattleText2:: + text "Oww!" + line "Beaten!" + prompt + +_RocketHideout1AfterBattleTxt2:: + text "What?! Are you" + line "serious? TEAM" + cont "ROCKET is" + cont "disbanding?" + done