diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-16 12:05:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 12:05:13 -0500 |
| commit | b6899a0de1d64b97bcbaa4239b1d87ced98d005a (patch) | |
| tree | 9389dc862bd7d9943f053406b1e54ace8f9f946d /data/maps/RocketHideout_B3F | |
| parent | 4e07002d13c97f90cb8885298c0db2c331dc2b07 (diff) | |
| parent | f637ade6b3ad2434a3bb3b39b23c77ab3651b02d (diff) | |
Merge pull request #245 from GriffinRichards/doc-rockets
Document Team Rocket scripts
Diffstat (limited to 'data/maps/RocketHideout_B3F')
| -rw-r--r-- | data/maps/RocketHideout_B3F/map.json | 4 | ||||
| -rw-r--r-- | data/maps/RocketHideout_B3F/scripts.inc | 12 | ||||
| -rw-r--r-- | data/maps/RocketHideout_B3F/text.inc | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index be88faebf..a4c1a7c72 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RocketHideout_B3F_EventScript_1612D1", + "script": "RocketHideout_B3F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RocketHideout_B3F_EventScript_1612BA", + "script": "RocketHideout_B3F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index d6a57ab77..ab1fd6bb3 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -1,12 +1,12 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 .byte 0 -RocketHideout_B3F_EventScript_1612BA:: @ 81612BA - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A - msgbox gUnknown_817515B, MSGBOX_AUTOCLOSE +RocketHideout_B3F_EventScript_Grunt1:: @ 81612BA + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat + msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE - msgbox gUnknown_81751E0, MSGBOX_AUTOCLOSE +RocketHideout_B3F_EventScript_Grunt2:: @ 81612D1 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat + msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B3F/text.inc b/data/maps/RocketHideout_B3F/text.inc index deedfce38..12a9c5a7e 100644 --- a/data/maps/RocketHideout_B3F/text.inc +++ b/data/maps/RocketHideout_B3F/text.inc @@ -1,25 +1,25 @@ -Text_17511A:: @ 817511A +RocketHideout_B3F_Text_Grunt1Intro:: @ 817511A .string "Stop meddling in TEAM ROCKET's\n" .string "affairs or else!$" -Text_17514A:: @ 817514A +RocketHideout_B3F_Text_Grunt1Defeat:: @ 817514A .string "Oof!\n" .string "Taken down!$" -gUnknown_817515B:: @ 817515B +RocketHideout_B3F_Text_Grunt1PostBattle:: @ 817515B .string "SILPH SCOPE?\n" .string "Oh, that machine the BOSS stole.\p" .string "It's here somewhere.$" -Text_17519E:: @ 817519E +RocketHideout_B3F_Text_Grunt2Intro:: @ 817519E .string "We got word from upstairs that you\n" .string "were coming!$" -Text_1751CE:: @ 81751CE +RocketHideout_B3F_Text_Grunt2Defeat:: @ 81751CE .string "What?\n" .string "I lost? No!$" -gUnknown_81751E0:: @ 81751E0 +RocketHideout_B3F_Text_Grunt2PostBattle:: @ 81751E0 .string "Go ahead and go!\p" .string "But you can't run the elevator\n" .string "without the LIFT KEY.$" |