diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 02:52:56 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 02:52:56 -0500 |
| commit | d4f32c10a832899d4a28e658d1d48356ec4fa29e (patch) | |
| tree | a641fc9d0bafd3a2eab4660bb925c5100696aa01 /data/maps/SSAnne_B1F_Room2 | |
| parent | c2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff) | |
Document SS Anne scripts
Diffstat (limited to 'data/maps/SSAnne_B1F_Room2')
| -rw-r--r-- | data/maps/SSAnne_B1F_Room2/map.json | 2 | ||||
| -rw-r--r-- | data/maps/SSAnne_B1F_Room2/scripts.inc | 6 | ||||
| -rw-r--r-- | data/maps/SSAnne_B1F_Room2/text.inc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 462ce7098..31c7d6eb7 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_B1F_Room2_EventScript_160D77", + "script": "SSAnne_B1F_Room2_EventScript_Huey", "flag": "0" }, { diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index db9f37fe3..011950863 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 .byte 0 -SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 - trainerbattle_single TRAINER_SAILOR_HUEY, Text_174239, Text_17425C - msgbox gUnknown_8174272, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room2_EventScript_Huey:: @ 8160D77 + trainerbattle_single TRAINER_SAILOR_HUEY, SSAnne_B1F_Room2_Text_HueyIntro, SSAnne_B1F_Room2_Text_HueyDefeat + msgbox SSAnne_B1F_Room2_Text_HueyPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room2/text.inc b/data/maps/SSAnne_B1F_Room2/text.inc index df94d6351..852bf55b1 100644 --- a/data/maps/SSAnne_B1F_Room2/text.inc +++ b/data/maps/SSAnne_B1F_Room2/text.inc @@ -1,10 +1,10 @@ -Text_174239:: @ 8174239 +SSAnne_B1F_Room2_Text_HueyIntro:: @ 8174239 .string "Even us sailors have POKéMON, too!$" -Text_17425C:: @ 817425C +SSAnne_B1F_Room2_Text_HueyDefeat:: @ 817425C .string "Okay, you're not bad.$" -gUnknown_8174272:: @ 8174272 +SSAnne_B1F_Room2_Text_HueyPostBattle:: @ 8174272 .string "We caught all our POKéMON while\n" .string "we were out at sea.$" |