diff options
Diffstat (limited to 'data/maps/Route12')
| -rw-r--r-- | data/maps/Route12/map.json | 4 | ||||
| -rw-r--r-- | data/maps/Route12/scripts.inc | 36 | ||||
| -rw-r--r-- | data/maps/Route12/text.inc | 4 |
3 files changed, 21 insertions, 23 deletions
diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index cfc684de8..75c992abe 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -156,7 +156,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1BE7B0", + "script": "Route12_EventScript_ItemTM48", "flag": "FLAG_HIDE_ROUTE12_TM48" }, { @@ -169,7 +169,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1BE7BD", + "script": "Route12_EventScript_ItemIron", "flag": "FLAG_HIDE_ROUTE12_IRON" }, { diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 446d9047d..80a037a65 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -1,10 +1,9 @@ Route12_MapScripts:: @ 8168000 - map_script 5, Route12_MapScript1_168006 + map_script MAP_SCRIPT_ON_RESUME, Route12_OnResume .byte 0 -Route12_MapScript1_168006:: @ 8168006 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_168010 +Route12_OnResume:: @ 8168006 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_168010 end EventScript_168010:: @ 8168010 @@ -14,16 +13,15 @@ EventScript_168010:: @ 8168010 Route12_EventScript_168014:: @ 8168014 lock faceplayer - checkflag FLAG_GOT_POKE_FLUTE - goto_if FALSE, EventScript_168099 + goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_168099 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16808D - call EventScript_1A924B + compare VAR_RESULT, NO + goto_if_eq EventScript_16808D + call EventScript_AwakenSnorlax setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse playmoncry SPECIES_SNORLAX, 2 @@ -35,12 +33,12 @@ Route12_EventScript_168014:: @ 8168014 dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16808F - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_16808F - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_16808F + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq EventScript_16808F + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq EventScript_16808F + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq EventScript_16808F release end @@ -59,9 +57,9 @@ EventScript_168099:: @ 8168099 end Route12_EventScript_1680A3:: @ 81680A3 - msgbox gUnknown_8185797, 3 + msgbox gUnknown_8185797, MSGBOX_SIGN end Route12_EventScript_1680AC:: @ 81680AC - msgbox gUnknown_81857B3, 3 + msgbox gUnknown_81857B3, MSGBOX_SIGN end diff --git a/data/maps/Route12/text.inc b/data/maps/Route12/text.inc index bf82fcf59..bd23a00ae 100644 --- a/data/maps/Route12/text.inc +++ b/data/maps/Route12/text.inc @@ -2,7 +2,7 @@ gUnknown_8185317:: @ 8185317 .string "A POKéMON is sprawled out in\n" .string "a deep and comfortable slumber.$" -Text_185354:: @ 8185354 +Text_SnorlaxWokeUp:: @ 8185354 .string "SNORLAX woke up!\p" .string "It attacked in a grumpy rage!$" @@ -14,7 +14,7 @@ gUnknown_8185383:: @ 8185383 gUnknown_81853CC:: @ 81853CC .string "Want to use the POKé FLUTE?$" -Text_1853E8:: @ 81853E8 +Text_PlayedPokeFlute:: @ 81853E8 .string "{PLAYER} played the POKé FLUTE.$" Text_185402:: @ 8185402 |