diff options
| -rw-r--r-- | data/maps/MtMoon_1F/map.json | 18 | ||||
| -rw-r--r-- | data/maps/MtMoon_1F/scripts.inc | 46 | ||||
| -rw-r--r-- | data/maps/MtMoon_1F/text.inc | 49 | ||||
| -rw-r--r-- | data/maps/MtMoon_B2F/map.json | 16 | ||||
| -rw-r--r-- | data/maps/MtMoon_B2F/scripts.inc | 106 | ||||
| -rw-r--r-- | data/maps/MtMoon_B2F/text.inc | 48 | ||||
| -rw-r--r-- | data/scripts/fame_checker.inc | 4 |
7 files changed, 145 insertions, 142 deletions
diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index e32b5f379..b12af5aae 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_1F_EventScript_16063C", + "script": "MtMoon_1F_EventScript_Iris", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_1F_EventScript_160681", + "script": "MtMoon_1F_EventScript_Robby", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_1F_EventScript_160653", + "script": "MtMoon_1F_EventScript_Jovan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_1F_EventScript_160625", + "script": "MtMoon_1F_EventScript_Miriam", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_1F_EventScript_16066A", + "script": "MtMoon_1F_EventScript_Kent", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_1F_EventScript_16060E", + "script": "MtMoon_1F_EventScript_Josh", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "MtMoon_1F_EventScript_1605F7", + "script": "MtMoon_1F_EventScript_Macros", "flag": "0" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1ACE03", + "script": "MtMoon_1F_EventScript_BaldingMan", "flag": "0" } ], @@ -233,7 +233,7 @@ "x": 19, "y": 26, "elevation": 0, - "script": "MtMoon_1F_EventScript_1605EE" + "script": "MtMoon_1F_EventScript_ZubatSign" } ] } diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 4c80943d1..2ddfef089 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -6,41 +6,41 @@ MtMoon_1F_OnTransition:: @ 81605EA setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F end -MtMoon_1F_EventScript_1605EE:: @ 81605EE - msgbox gUnknown_8172AE0, MSGBOX_SIGN +MtMoon_1F_EventScript_ZubatSign:: @ 81605EE + msgbox MtMoon_1F_Text_ZubatIsABloodsucker, MSGBOX_SIGN end -MtMoon_1F_EventScript_1605F7:: @ 81605F7 - trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB - msgbox gUnknown_81727DF, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Macros:: @ 81605F7 + trainerbattle_single TRAINER_HIKER_MARCOS, MtMoon_1F_Text_MarcosIntro, MtMoon_1F_Text_MarcosDefeat + msgbox MtMoon_1F_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_16060E:: @ 816060E - trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844 - msgbox gUnknown_8172863, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Josh:: @ 816060E + trainerbattle_single TRAINER_YOUNGSTER_JOSH, MtMoon_1F_Text_JoshIntro, MtMoon_1F_Text_JoshDefeat + msgbox MtMoon_1F_Text_JoshPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_160625:: @ 8160625 - trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3 - msgbox gUnknown_81728D2, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Miriam:: @ 8160625 + trainerbattle_single TRAINER_LASS_MIRIAM, MtMoon_1F_Text_MiriamIntro, MtMoon_1F_Text_MiriamDefeat + msgbox MtMoon_1F_Text_MiriamPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_16063C:: @ 816063C - trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4 - msgbox gUnknown_81729AC, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Iris:: @ 816063C + trainerbattle_single TRAINER_LASS_IRIS, MtMoon_1F_Text_IrisIntro, MtMoon_1F_Text_IrisDefeat + msgbox MtMoon_1F_Text_IrisPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_160653:: @ 8160653 - trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927 - msgbox gUnknown_817293C, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Jovan:: @ 8160653 + trainerbattle_single TRAINER_SUPER_NERD_JOVAN, MtMoon_1F_Text_JovanIntro, MtMoon_1F_Text_JovanDefeat + msgbox MtMoon_1F_Text_JovanPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_16066A:: @ 816066A - trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A - msgbox gUnknown_8172A26, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Kent:: @ 816066A + trainerbattle_single TRAINER_BUG_CATCHER_KENT, MtMoon_1F_Text_KentIntro, MtMoon_1F_Text_KentDefeat + msgbox MtMoon_1F_Text_KentPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_160681:: @ 8160681 - trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F - msgbox gUnknown_8172A97, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Robby:: @ 8160681 + trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, MtMoon_1F_Text_RobbyIntro, MtMoon_1F_Text_RobbyDefeat + msgbox MtMoon_1F_Text_RobbyPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_1F/text.inc b/data/maps/MtMoon_1F/text.inc index 86028da5c..249c9dd50 100644 --- a/data/maps/MtMoon_1F/text.inc +++ b/data/maps/MtMoon_1F/text.inc @@ -1,87 +1,92 @@ -Text_17279D:: @ 817279D +MtMoon_1F_Text_MarcosIntro:: @ 817279D .string "WHOA!\n" .string "You shocked me!\l" .string "…Oh, you're just a kid!$" -Text_1727CB:: @ 81727CB +MtMoon_1F_Text_MarcosDefeat:: @ 81727CB .string "Wow!\n" .string "Shocked again!$" -gUnknown_81727DF:: @ 81727DF +MtMoon_1F_Text_MarcosPostBattle:: @ 81727DF .string "Kids like you shouldn't be\n" .string "wandering around here in the dark.$" -Text_17281D:: @ 817281D +MtMoon_1F_Text_JoshIntro:: @ 817281D .string "Did you come to explore the cave,\n" .string "too?$" -Text_172844:: @ 8172844 +MtMoon_1F_Text_JoshDefeat:: @ 8172844 .string "Losing stinks!\n" .string "It's so uncool.$" -gUnknown_8172863:: @ 8172863 +MtMoon_1F_Text_JoshPostBattle:: @ 8172863 .string "I came all the way down here to\n" .string "show off to girls.$" -Text_172896:: @ 8172896 +MtMoon_1F_Text_MiriamIntro:: @ 8172896 .string "Wow! It's way bigger in here than\n" .string "I thought!$" -Text_1728C3:: @ 81728C3 +MtMoon_1F_Text_MiriamDefeat:: @ 81728C3 .string "Oh!\n" .string "I lost it!$" -gUnknown_81728D2:: @ 81728D2 +MtMoon_1F_Text_MiriamPostBattle:: @ 81728D2 .string "How do you get out of here?\n" .string "It's so big, I may get lost.$" -Text_17290B:: @ 817290B +MtMoon_1F_Text_JovanIntro:: @ 817290B .string "What!\n" .string "Don't sneak up on me!$" -Text_172927:: @ 8172927 +MtMoon_1F_Text_JovanDefeat:: @ 8172927 .string "My POKéMON won't do!$" -gUnknown_817293C:: @ 817293C +MtMoon_1F_Text_JovanPostBattle:: @ 817293C .string "I have to find stronger POKéMON.\n" .string "Where might they be?$" -Text_172972:: @ 8172972 +MtMoon_1F_Text_IrisIntro:: @ 8172972 .string "What?\n" .string "I'm waiting for my friends to find\l" .string "me here.$" -Text_1729A4:: @ 81729A4 +MtMoon_1F_Text_IrisDefeat:: @ 81729A4 .string "I lost?$" -gUnknown_81729AC:: @ 81729AC +MtMoon_1F_Text_IrisPostBattle:: @ 81729AC .string "I came because I heard there are\n" .string "some very rare fossils here.$" -Text_1729EA:: @ 81729EA +MtMoon_1F_Text_KentIntro:: @ 81729EA .string "Suspicious men are in the cave.\n" .string "What about you?$" -Text_172A1A:: @ 8172A1A +MtMoon_1F_Text_KentDefeat:: @ 8172A1A .string "You got me!$" -gUnknown_8172A26:: @ 8172A26 +MtMoon_1F_Text_KentPostBattle:: @ 8172A26 .string "I saw them!\n" .string "I'm sure they're from TEAM ROCKET!$" -Text_172A55:: @ 8172A55 +MtMoon_1F_Text_RobbyIntro:: @ 8172A55 .string "You need to go through this cave\n" .string "to get to CERULEAN CITY.$" -Text_172A8F:: @ 8172A8F +MtMoon_1F_Text_RobbyDefeat:: @ 8172A8F .string "I lost.$" -gUnknown_8172A97:: @ 8172A97 +MtMoon_1F_Text_RobbyPostBattle:: @ 8172A97 .string "ZUBAT is tough!\n" .string "But if you can catch one, you'll\l" .string "be able to count on it.$" -gUnknown_8172AE0:: @ 8172AE0 +MtMoon_1F_Text_ZubatIsABloodsucker:: @ 8172AE0 .string "Beware!\n" .string "ZUBAT is a bloodsucker!$" +MtMoon_1F_Text_BrockHelpsExcavateFossils:: @ 8172B00 + .string "Hi, I'm excavating for fossils here\n" + .string "under MT. MOON.\p" + .string "Sometimes, BROCK of PEWTER GYM\n" + .string "lends me a hand.$" diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index ac65802cb..f3c51828c 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_16071B", + "script": "MtMoon_B2F_EventScript_DomeFossil", "flag": "FLAG_HIDE_DOME_FOSSIL" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_16077F", + "script": "MtMoon_B2F_EventScript_HelixFossil", "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1606C2", + "script": "MtMoon_B2F_EventScript_Miguel", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "MtMoon_B2F_EventScript_160829", + "script": "MtMoon_B2F_EventScript_Grunt4", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_B2F_EventScript_1607E4", + "script": "MtMoon_B2F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_B2F_EventScript_160812", + "script": "MtMoon_B2F_EventScript_Grunt3", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_B2F_EventScript_1607FB", + "script": "MtMoon_B2F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_MT_MOON_B2F", "var_value": 0, - "script": "MtMoon_B2F_EventScript_1606B0" + "script": "MtMoon_B2F_EventScript_MiguelTrigger" } ], "bg_events": [ diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 71c458c12..515242568 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -1,138 +1,142 @@ +.equ LOCALID_DOME_FOSSIL, 1 +.equ LOCALID_HELIX_FOSSIL, 2 +.equ LOCALID_MIGUEL, 3 + MtMoon_B2F_MapScripts:: @ 8160699 map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition .byte 0 MtMoon_B2F_OnTransition:: @ 816069F - call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9 + call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_ShowFossils end -EventScript_1606A9:: @ 81606A9 +MtMoon_B2F_EventScript_ShowFossils:: @ 81606A9 clearflag FLAG_HIDE_DOME_FOSSIL clearflag FLAG_HIDE_HELIX_FOSSIL return -MtMoon_B2F_EventScript_1606B0:: @ 81606B0 +MtMoon_B2F_EventScript_MiguelTrigger:: @ 81606B0 lockall - applymovement 3, Movement_WalkInPlaceFastestRight + applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFastestRight waitmovement 0 - call EventScript_1606DD + call MtMoon_B2F_EventScript_BattleMiguel releaseall end -MtMoon_B2F_EventScript_1606C2:: @ 81606C2 +MtMoon_B2F_EventScript_Miguel:: @ 81606C2 lock faceplayer - goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707 - goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, EventScript_160711 - call EventScript_1606DD + goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_MiguelFossilPicked + goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_EventScript_MiguelGoPickFossil + call MtMoon_B2F_EventScript_BattleMiguel release end -EventScript_1606DD:: @ 81606DD +MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD textcolor 0 - message Text_172B64 + message MtMoon_B2F_Text_MiguelIntro waitmessage playbgm MUS_EXEYE, 0 waitbuttonpress - setvar VAR_LAST_TALKED, 3 - trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99 + setvar VAR_LAST_TALKED, LOCALID_MIGUEL + trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_Text_MiguelDefeat setvar VAR_MAP_SCENE_MT_MOON_B2F, 1 - msgbox gUnknown_8172BAB + msgbox MtMoon_B2F_Text_WellEachTakeAFossil return -EventScript_160707:: @ 8160707 - msgbox gUnknown_8172BFB +MtMoon_B2F_EventScript_MiguelFossilPicked:: @ 8160707 + msgbox MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils release end -EventScript_160711:: @ 8160711 - msgbox gUnknown_8172BAB +MtMoon_B2F_EventScript_MiguelGoPickFossil:: @ 8160711 + msgbox MtMoon_B2F_Text_WellEachTakeAFossil release end -MtMoon_B2F_EventScript_16071B:: @ 816071B +MtMoon_B2F_EventScript_DomeFossil:: @ 816071B lock faceplayer - msgbox gUnknown_8172E77, MSGBOX_YESNO + msgbox MtMoon_B2F_Text_YouWantDomeFossil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1607DE - removeobject 1 - giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 + goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil + removeobject LOCALID_DOME_FOSSIL + giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 - applymovement 3, Movement_16077A + applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil waitmovement 0 - moveobjectoffscreen 3 + moveobjectoffscreen LOCALID_MIGUEL textcolor 0 playfanfare MUS_FAN5 - message Text_172BD6 + message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare - removeobject 2 + removeobject LOCALID_HELIX_FOSSIL setflag FLAG_GOT_DOME_FOSSIL setflag FLAG_GOT_FOSSIL_FROM_MT_MOON release end -Movement_16077A:: @ 816077A +MtMoon_B2F_Movement_MiguelToHelixFossil:: @ 816077A walk_right walk_up walk_up walk_up step_end -MtMoon_B2F_EventScript_16077F:: @ 816077F +MtMoon_B2F_EventScript_HelixFossil:: @ 816077F lock faceplayer - msgbox gUnknown_8172E94, MSGBOX_YESNO + msgbox MtMoon_B2F_Text_YouWantHelixFossil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1607DE - removeobject 2 - giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 + goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil + removeobject LOCALID_HELIX_FOSSIL + giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 - applymovement 3, Movement_1607E0 + applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil waitmovement 0 - moveobjectoffscreen 3 + moveobjectoffscreen LOCALID_MIGUEL textcolor 0 playfanfare MUS_FAN5 - message Text_172BD6 + message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare - removeobject 1 + removeobject LOCALID_DOME_FOSSIL setflag FLAG_GOT_HELIX_FOSSIL setflag FLAG_GOT_FOSSIL_FROM_MT_MOON release end -EventScript_1607DE:: @ 81607DE +MtMoon_B2F_EventScript_DontTakeFossil:: @ 81607DE release end -Movement_1607E0:: @ 81607E0 +MtMoon_B2F_Movement_MiguelToDomeFossil:: @ 81607E0 walk_up walk_up walk_up step_end -MtMoon_B2F_EventScript_1607E4:: @ 81607E4 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8 - msgbox gUnknown_8172CCB, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt1:: @ 81607E4 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, MtMoon_B2F_Text_Grunt1Intro, MtMoon_B2F_Text_Grunt1Defeat + msgbox MtMoon_B2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_1607FB:: @ 81607FB - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46 - msgbox gUnknown_8172D51, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt2:: @ 81607FB + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, MtMoon_B2F_Text_Grunt2Intro, MtMoon_B2F_Text_Grunt2Defeat + msgbox MtMoon_B2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_160812:: @ 8160812 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF - msgbox gUnknown_8172DC1, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt3:: @ 8160812 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, MtMoon_B2F_Text_Grunt3Intro, MtMoon_B2F_Text_Grunt3Defeat + msgbox MtMoon_B2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_160829:: @ 8160829 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E - msgbox gUnknown_8172E4B, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt4:: @ 8160829 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, MtMoon_B2F_Text_Grunt4Intro, MtMoon_B2F_Text_Grunt4Defeat + msgbox MtMoon_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_B2F/text.inc b/data/maps/MtMoon_B2F/text.inc index 2f27312db..fd4b564f0 100644 --- a/data/maps/MtMoon_B2F/text.inc +++ b/data/maps/MtMoon_B2F/text.inc @@ -1,90 +1,84 @@ -Text_172B00:: @ 8172B00 - .string "Hi, I'm excavating for fossils here\n" - .string "under MT. MOON.\p" - .string "Sometimes, BROCK of PEWTER GYM\n" - .string "lends me a hand.$" - -Text_172B64:: @ 8172B64 +MtMoon_B2F_Text_MiguelIntro:: @ 8172B64 .string "Hey, stop!\p" .string "I found these fossils!\n" .string "They're both mine!$" -Text_172B99:: @ 8172B99 +MtMoon_B2F_Text_MiguelDefeat:: @ 8172B99 .string "Okay!\n" .string "I'll share!$" -gUnknown_8172BAB:: @ 8172BAB +MtMoon_B2F_Text_WellEachTakeAFossil:: @ 8172BAB .string "We'll each take a fossil!\n" .string "No being greedy!$" -Text_172BD6:: @ 8172BD6 +MtMoon_B2F_Text_ThenThisFossilIsMine:: @ 8172BD6 .string "All right.\n" .string "Then this fossil is mine!$" -gUnknown_8172BFB:: @ 8172BFB +MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils:: @ 8172BFB .string "Far away, on CINNABAR ISLAND,\n" .string "there's a POKéMON LAB.\p" .string "They do research on regenerating\n" .string "fossils.$" -Text_172C5A:: @ 8172C5A +MtMoon_B2F_Text_Grunt1Intro:: @ 8172C5A .string "We, TEAM ROCKET, shall find the\n" .string "fossils!\p" .string "Reviving POKéMON from them will\n" .string "earn us huge riches!$" -Text_172CB8:: @ 8172CB8 +MtMoon_B2F_Text_Grunt1Defeat:: @ 8172CB8 .string "Urgh!\n" .string "Now I'm mad!$" -gUnknown_8172CCB:: @ 8172CCB +MtMoon_B2F_Text_Grunt1PostBattle:: @ 8172CCB .string "You made me mad!\n" .string "TEAM ROCKET will blacklist you!$" -Text_172CFC:: @ 8172CFC +MtMoon_B2F_Text_Grunt2Intro:: @ 8172CFC .string "We, TEAM ROCKET, are POKéMON\n" .string "gangsters!\l" .string "We strike fear with our strength!$" -Text_172D46:: @ 8172D46 +MtMoon_B2F_Text_Grunt2Defeat:: @ 8172D46 .string "I blew it!$" -gUnknown_8172D51:: @ 8172D51 +MtMoon_B2F_Text_Grunt2PostBattle:: @ 8172D51 .string "Darn it all!\n" .string "My associates won't stand for this!$" -Text_172D82:: @ 8172D82 +MtMoon_B2F_Text_Grunt3Intro:: @ 8172D82 .string "We're pulling a big job here!\n" .string "Get lost, kid!$" -Text_172DAF:: @ 8172DAF +MtMoon_B2F_Text_Grunt3Defeat:: @ 8172DAF .string "So, you are good…$" -gUnknown_8172DC1:: @ 8172DC1 +MtMoon_B2F_Text_Grunt3PostBattle:: @ 8172DC1 .string "If you find a fossil, give it to me\n" .string "and scram!$" -Text_172DF0:: @ 8172DF0 +MtMoon_B2F_Text_Grunt4Intro:: @ 8172DF0 .string "Little kids shouldn't be messing\n" .string "around with grown-ups!\p" .string "It could be bad news!$" -Text_172E3E:: @ 8172E3E +MtMoon_B2F_Text_Grunt4Defeat:: @ 8172E3E .string "I'm steamed!$" -gUnknown_8172E4B:: @ 8172E4B +MtMoon_B2F_Text_Grunt4PostBattle:: @ 8172E4B .string "POKéMON lived here long before\n" .string "people came.$" -gUnknown_8172E77:: @ 8172E77 +MtMoon_B2F_Text_YouWantDomeFossil:: @ 8172E77 .string "Do you want the DOME FOSSIL?$" -gUnknown_8172E94:: @ 8172E94 +MtMoon_B2F_Text_YouWantHelixFossil:: @ 8172E94 .string "Do you want the HELIX FOSSIL?$" -gUnknown_8172EB2:: @ 8172EB2 +MtMoon_B2F_Text_ObtainedHelixFossil:: @ 8172EB2 .string "Obtained the HELIX FOSSIL!$" -gUnknown_8172ECD:: @ 8172ECD +MtMoon_B2F_Text_ObtainedDomeFossil:: @ 8172ECD .string "Obtained the DOME FOSSIL!$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 6fe5607dd..a7726f3e6 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -43,11 +43,11 @@ Route4_EventScript_1ACDEA:: @ 81ACDEA release end -MtMoon_1F_EventScript_1ACE03:: @ 81ACE03 +MtMoon_1F_EventScript_BaldingMan:: @ 81ACE03 lock faceplayer famechecker FAMECHECKER_BROCK, 4 - msgbox Text_172B00 + msgbox MtMoon_1F_Text_BrockHelpsExcavateFossils release end |