diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-09 12:23:30 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-09 12:32:13 -0600 |
| commit | 5ac8b126e96bae1be77725f9638a0e01c56b0767 (patch) | |
| tree | aba880b7a3a645cf8497895e3ac08911440fabd3 /data/maps/MtPyre_5F | |
| parent | e4d65addf40ad017919bbaa92d08720d76ef332e (diff) | |
Document Mt Pyre scripts
Diffstat (limited to 'data/maps/MtPyre_5F')
| -rw-r--r-- | data/maps/MtPyre_5F/map.json | 2 | ||||
| -rw-r--r-- | data/maps/MtPyre_5F/scripts.inc | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index edd3544ca..1f814bda8 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MtPyre_5F_EventScript_231BC9", + "script": "MtPyre_5F_EventScript_Atsushi", "flag": "0" }, { diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index cbd3b3afa..f27370d7c 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -1,21 +1,23 @@ MtPyre_5F_MapScripts:: @ 8231C6D .byte 0 -MtPyre_4F_EventScript_231C6E:: @ 8231C6E - trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB - msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE +@ Seems like the scripts for the 4F and 5F were swapped + +MtPyre_4F_EventScript_Tasha:: @ 8231C6E + trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_TashaIntro, MtPyre_4F_Text_TashaDefeat + msgbox MtPyre_4F_Text_TashaPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_4F_Text_231C85: @ 8231C85 +MtPyre_4F_Text_TashaIntro: @ 8231C85 .string "I love all things horrifying…\n" .string "It's like a disease…\p" .string "When I'm here…\n" .string "I shiver with fear…$" -MtPyre_4F_Text_231CDB: @ 8231CDB +MtPyre_4F_Text_TashaDefeat: @ 8231CDB .string "Losing, I dislike…$" -MtPyre_4F_Text_231CEE: @ 8231CEE +MtPyre_4F_Text_TashaPostBattle: @ 8231CEE .string "I want to see dreadful things…\n" .string "I can't leave…\p" .string "Stay…\n" |