diff options
Diffstat (limited to 'data/maps')
517 files changed, 8232 insertions, 8646 deletions
diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/BattleColosseum2P/map.json index a4da32612..aebc124e1 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/BattleColosseum2P/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_00", - "name": "UnknownMap_00_00", - "layout": "LAYOUT_UNKNOWN_MAP_00_00", + "id": "MAP_BATTLE_COLOSSEUM_2P", + "name": "BattleColosseum2P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_2P", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_00_EventScript_1BB9AF", + "script": "BattleColosseum2P_EventScript_Attendant", "flag": "0" } ], @@ -49,18 +49,18 @@ "x": 3, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_00_EventScript_1BB8C3" + "script": "BattleColosseum2P_EventScript_PlayerSpot0" }, { "type": "trigger", "x": 10, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_00_EventScript_1BB8CF" + "script": "BattleColosseum2P_EventScript_PlayerSpot1" } ], "bg_events": [] diff --git a/data/maps/BattleColosseum2P/scripts.inc b/data/maps/BattleColosseum2P/scripts.inc new file mode 100644 index 000000000..59a5b3754 --- /dev/null +++ b/data/maps/BattleColosseum2P/scripts.inc @@ -0,0 +1,2 @@ +BattleColosseum2P_MapScripts:: @ 8160478 + .byte 0 diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/BattleColosseum4P/map.json index 2f9141fe6..d385ca315 100644 --- a/data/maps/UnknownMap_00_03/map.json +++ b/data/maps/BattleColosseum4P/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_03", - "name": "UnknownMap_00_03", - "layout": "LAYOUT_UNKNOWN_MAP_00_03", + "id": "MAP_BATTLE_COLOSSEUM_4P", + "name": "BattleColosseum4P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_4P", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -49,36 +49,36 @@ "x": 3, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB8DB" + "script": "BattleColosseum4P_EventScript_PlayerSpot0" }, { "type": "trigger", "x": 3, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB915" + "script": "BattleColosseum4P_EventScript_PlayerSpot2" }, { "type": "trigger", "x": 10, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB8F8" + "script": "BattleColosseum4P_EventScript_PlayerSpot1" }, { "type": "trigger", "x": 10, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB932" + "script": "BattleColosseum4P_EventScript_PlayerSpot3" } ], "bg_events": [] diff --git a/data/maps/BattleColosseum4P/scripts.inc b/data/maps/BattleColosseum4P/scripts.inc new file mode 100644 index 000000000..918c093d0 --- /dev/null +++ b/data/maps/BattleColosseum4P/scripts.inc @@ -0,0 +1,2 @@ +BattleColosseum4P_MapScripts:: @ 816047B + .byte 0 diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 563f45333..a00613e92 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BirthIsland_Exterior_EventScript_165271", + "script": "BirthIsland_Exterior_EventScript_Triangle", "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" }, { diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 0d7c001ee..2b13d4440 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,77 +1,73 @@ BirthIsland_Exterior_MapScripts:: @ 8165203 - map_script 3, BirthIsland_Exterior_MapScript1_165217 - map_script 5, BirthIsland_Exterior_MapScript2_165253 - map_script 7, BirthIsland_Exterior_MapScript3_165213 + map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition + map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_OnReturnToField .byte 0 -BirthIsland_Exterior_MapScript3_165213:: @ 8165213 +BirthIsland_Exterior_OnReturnToField:: @ 8165213 special Special_SetDeoxysTriangleObjectPal end -BirthIsland_Exterior_MapScript1_165217:: @ 8165217 +BirthIsland_Exterior_OnTransition:: @ 8165217 setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 setvar VAR_DEOXYS_INTERACTION_NUM, 0 - checkflag FLAG_FOUGHT_DEOXYS - call_if TRUE, EventScript_16523C - checkflag FLAG_FOUGHT_DEOXYS - call_if FALSE, EventScript_165243 + call_if_set FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle + call_if_unset FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle end -EventScript_16523C:: @ 816523C +BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle:: @ 816523C setflag FLAG_HIDE_DEOXYS setflag FLAG_HIDE_BIRTH_ISLAND_METEORITE return -EventScript_165243:: @ 8165243 - checkflag FLAG_DEOXYS_FLEW_AWAY - goto_if TRUE, EventScript_1A77A9 +BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle:: @ 8165243 + goto_if_set FLAG_DEOXYS_FLEW_AWAY, EventScript_Return clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE clearflag FLAG_SYS_DEOXYS_AWAKENED return -BirthIsland_Exterior_MapScript2_165253:: @ 8165253 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_16525D +BirthIsland_Exterior_OnResume:: @ 8165253 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, BirthIsland_Exterior_EventScript_TryRemoveDeoxys end -EventScript_16525D:: @ 816525D +BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + compare VAR_RESULT, B_OUTCOME_CAUGHT + goto_if_ne EventScript_Return removeobject 2 return -BirthIsland_Exterior_EventScript_165271:: @ 8165271 +BirthIsland_Exterior_EventScript_Triangle:: @ 8165271 lock faceplayer 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 - special Special_DeoxysSound + special DoDeoxysRockInteraction waitstate switch VAR_RESULT - case 0, EventScript_1652BA - case 1, EventScript_1652BC - case 2, EventScript_1652C0 - case 3, EventScript_1652BE + case 0, BirthIsland_Exterior_EventScript_NotSolved1 + case 1, BirthIsland_Exterior_EventScript_NotSolved2 + case 2, BirthIsland_Exterior_EventScript_Deoxys + case 3, BirthIsland_Exterior_EventScript_NotSolved3 end -EventScript_1652BA:: @ 81652BA +BirthIsland_Exterior_EventScript_NotSolved1:: @ 81652BA release end -EventScript_1652BC:: @ 81652BC +BirthIsland_Exterior_EventScript_NotSolved2:: @ 81652BC release end -EventScript_1652BE:: @ 81652BE +BirthIsland_Exterior_EventScript_NotSolved3:: @ 81652BE release end -EventScript_1652C0:: @ 81652C0 +BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0 addobject 2 waitse setfieldeffectarg 0, 1 @@ -80,7 +76,7 @@ EventScript_1652C0:: @ 81652C0 dofieldeffect 68 playbgm MUS_DEOEYE, 0 waitfieldeffect 68 - applymovement 2, Movement_165353 + applymovement 2, Movement_DeoxysApproach waitmovement 0 waitse playmoncry SPECIES_DEOXYS, 2 @@ -88,41 +84,41 @@ EventScript_1652C0:: @ 81652C0 waitmoncry setvar VAR_LAST_TALKED, 2 setvar VAR_0x8004, SPECIES_DEOXYS - setvar VAR_0x8005, 30 - setvar VAR_0x8006, 0 + setvar VAR_0x8005, 30 @ Level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE special Special_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16533A - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_165348 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_165348 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys setflag FLAG_FOUGHT_DEOXYS release end -EventScript_16533A:: @ 816533A +BirthIsland_Exterior_EventScript_DefeatedDeoxys:: @ 816533A setflag FLAG_DEOXYS_FLEW_AWAY setvar VAR_0x8004, SPECIES_DEOXYS - goto EventScript_1A9236 + goto EventScript_MonFlewAway end -EventScript_165348:: @ 8165348 +BirthIsland_Exterior_EventScript_RanFromDeoxys:: @ 8165348 setvar VAR_0x8004, SPECIES_DEOXYS - goto EventScript_1A9236 + goto EventScript_MonFlewAway end -Movement_165353:: @ 8165353 - step_down - step_down - step_down - step_down - step_down - step_down - step_down +Movement_DeoxysApproach: @ 8165353 + walk_slowest_down + walk_slowest_down + walk_slowest_down + walk_slowest_down + walk_slowest_down + walk_slowest_down + walk_slowest_down step_end diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index f8c4be078..0feaa5fe5 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "BirthIsland_Harbor_EventScript_1653E7", + "script": "BirthIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 6df635f1a..0d7cdf80b 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -1,15 +1,15 @@ BirthIsland_Harbor_MapScripts:: @ 81653E6 .byte 0 -BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 +BirthIsland_Harbor_EventScript_Sailor:: @ 81653E7 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE switch VAR_RESULT - case 0, EventScript_1A91D5 - case 1, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 0, EventScript_SailToVermilionCity + case 1, EventScript_CancelSail + case 127, EventScript_CancelSail end diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index d60b4da02..efca328f8 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CBF", + "script": "CeladonCity_EventScript_SoftboiledTutor", "flag": "0" }, { @@ -203,7 +203,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_1BEBC0", + "script": "CeladonCity_EventScript_ItemEther", "flag": "FLAG_HIDE_CELADON_CITY_ETHER" }, { diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index b5e32115f..b27d12178 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -1,13 +1,13 @@ CeladonCity_MapScripts:: @ 8166C8F - map_script 3, CeladonCity_MapScript1_166C95 + map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition .byte 0 -CeladonCity_MapScript1_166C95:: @ 8166C95 +CeladonCity_OnTransition:: @ 8166C95 setworldmapflag FLAG_WORLD_MAP_CELADON_CITY end CeladonCity_EventScript_166C99:: @ 8166C99 - msgbox gUnknown_817FEC3, 2 + msgbox gUnknown_817FEC3, MSGBOX_NPC end CeladonCity_EventScript_166CA2:: @ 8166CA2 @@ -17,15 +17,15 @@ CeladonCity_EventScript_166CA2:: @ 8166CA2 end CeladonCity_EventScript_166CAD:: @ 8166CAD - msgbox gUnknown_817FF4A, 2 + msgbox gUnknown_817FF4A, MSGBOX_NPC end CeladonCity_EventScript_166CB6:: @ 8166CB6 - msgbox gUnknown_817FFC5, 2 + msgbox gUnknown_817FFC5, MSGBOX_NPC end -CeladonCity_EventScript_166CBF:: @ 8166CBF - goto EventScript_1C4A86 +CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF + goto EventScript_SoftboiledTutor end CeladonCity_EventScript_166CC5:: @ 8166CC5 @@ -33,7 +33,7 @@ CeladonCity_EventScript_166CC5:: @ 8166CC5 faceplayer msgbox gUnknown_818001B closemessage - applymovement 2, Movement_1A75E5 + applymovement 2, Movement_FaceOriginalDirection waitmovement 0 release end @@ -46,33 +46,33 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC msgbox gUnknown_8180075 closemessage waitmoncry - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end CeladonCity_EventScript_166CFA:: @ 8166CFA - msgbox gUnknown_81800C2, 2 + msgbox gUnknown_81800C2, MSGBOX_NPC end CeladonCity_EventScript_166D03:: @ 8166D03 - msgbox gUnknown_818008C, 2 + msgbox gUnknown_818008C, MSGBOX_NPC end CeladonCity_EventScript_166D0C:: @ 8166D0C - msgbox gUnknown_8180300, 2 + msgbox gUnknown_8180300, MSGBOX_NPC end CeladonCity_EventScript_166D15:: @ 8166D15 - msgbox gUnknown_81804E1, 2 + msgbox gUnknown_81804E1, MSGBOX_NPC end CeladonCity_EventScript_166D1E:: @ 8166D1E - msgbox gUnknown_81800E1, 3 + msgbox gUnknown_81800E1, MSGBOX_SIGN end CeladonCity_EventScript_166D27:: @ 8166D27 - msgbox gUnknown_818017A, 3 + msgbox gUnknown_818017A, MSGBOX_SIGN end CeladonCity_EventScript_166D30:: @ 8166D30 @@ -83,21 +83,21 @@ CeladonCity_EventScript_166D30:: @ 8166D30 end CeladonCity_EventScript_166D48:: @ 8166D48 - msgbox gUnknown_81801E5, 3 + msgbox gUnknown_81801E5, MSGBOX_SIGN end CeladonCity_EventScript_166D51:: @ 8166D51 - msgbox gUnknown_81801F5, 3 + msgbox gUnknown_81801F5, MSGBOX_SIGN end CeladonCity_EventScript_166D5A:: @ 8166D5A - msgbox gUnknown_8180224, 3 + msgbox gUnknown_8180224, MSGBOX_SIGN end CeladonCity_EventScript_166D63:: @ 8166D63 - msgbox gUnknown_81802A4, 3 + msgbox gUnknown_81802A4, MSGBOX_SIGN end CeladonCity_EventScript_166D6C:: @ 8166D6C - msgbox gUnknown_81802CF, 3 + msgbox gUnknown_81802CF, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc index f10516c9d..40f489e3c 100644 --- a/data/maps/CeladonCity/text.inc +++ b/data/maps/CeladonCity/text.inc @@ -83,7 +83,7 @@ gUnknown_8180300:: @ 8180300 .string "But it was boiling hot!\n" .string "Gotta cool it to drink it.$" -Text_180388:: @ 8180388 +Text_SoftboiledTeach:: @ 8180388 .string "Hello, there!\p" .string "I've seen you about, but I never\n" .string "had a chance to chat.\p" @@ -92,16 +92,16 @@ Text_180388:: @ 8180388 .string "I'd like to celebrate by teaching\n" .string "you the move SOFTBOILED.$" -Text_18043F:: @ 818043F +Text_SoftboiledDeclined:: @ 818043F .string "I'll always be keeping an eye out\n" .string "for you.\p" .string "I hope we can chat again.$" -Text_180484:: @ 8180484 +Text_SoftboiledWhichMon:: @ 8180484 .string "So, who's the POKéMON that gets\n" .string "the chance to learn SOFTBOILED?$" -Text_1804C4:: @ 81804C4 +Text_SoftboiledTaught:: @ 81804C4 .string "I wish you the best of luck!$" gUnknown_81804E1:: @ 81804E1 diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index fe1da2c67..41912748b 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -4,17 +4,14 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 lock faceplayer - checkflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF - goto_if TRUE, EventScript_16C36A - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_16C374 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16C36A + goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, EventScript_16C36A + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16C374 + goto_if_set FLAG_GOT_TEA, EventScript_16C36A msgbox gUnknown_81960C9 setflag FLAG_GOT_TEA giveitem ITEM_TEA - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull msgbox gUnknown_8196109 release end @@ -62,5 +59,5 @@ CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4 end CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7 - msgbox gUnknown_8196287, 3 + msgbox gUnknown_8196287, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc index cab71a823..53c0a90c0 100644 --- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc @@ -2,5 +2,5 @@ CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 .byte 0 CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1 - msgbox gUnknown_81962A7, 3 + msgbox gUnknown_81962A7, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 258846f29..dfa1836f0 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -2,23 +2,23 @@ CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA .byte 0 CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB - msgbox gUnknown_81962BF, 2 + msgbox gUnknown_81962BF, MSGBOX_NPC end CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4 - msgbox gUnknown_81962D7, 2 + msgbox gUnknown_81962D7, MSGBOX_NPC end CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED - msgbox gUnknown_81962FB, 2 + msgbox gUnknown_81962FB, MSGBOX_NPC end CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 lock faceplayer specialvar VAR_RESULT, HasAllKantoMons - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16C412 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16C412 msgbox gUnknown_8196356 release end @@ -32,25 +32,25 @@ EventScript_16C418:: @ 816C418 waitmessage delay 60 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 Special_ShowDiploma waitstate release end CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435 - msgbox gUnknown_81964A8, 3 + msgbox gUnknown_81964A8, MSGBOX_SIGN end CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E - msgbox gUnknown_819640C, 3 + msgbox gUnknown_819640C, MSGBOX_SIGN end CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447 - msgbox gUnknown_819644B, 3 + msgbox gUnknown_819644B, MSGBOX_SIGN end CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450 - msgbox gUnknown_8196478, 3 + msgbox gUnknown_8196478, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc index a074d5778..59631d86c 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc @@ -2,5 +2,5 @@ CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 .byte 0 CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A - msgbox gUnknown_81964C4, 3 + msgbox gUnknown_81964C4, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index a18215910..4e9d2b7ae 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -2,20 +2,20 @@ CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 .byte 0 CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 - msgbox gUnknown_81964D7, 2 + msgbox gUnknown_81964D7, MSGBOX_NPC end CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D lock faceplayer - setvar VAR_0x4001, SPECIES_EEVEE - givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C4A6 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16C4DA - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + setvar VAR_TEMP_1, SPECIES_EEVEE + givemon SPECIES_EEVEE, 25, ITEM_NONE + compare VAR_RESULT, 0 + goto_if_eq EventScript_16C4A6 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16C4DA + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A927C release end @@ -27,8 +27,8 @@ EventScript_16C4A6:: @ 816C4A6 waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C514 + compare VAR_RESULT, NO + goto_if_eq EventScript_16C514 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16C514 @@ -42,8 +42,8 @@ EventScript_16C4DA:: @ 816C4DA waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C509 + compare VAR_RESULT, NO + goto_if_eq EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 end @@ -59,7 +59,7 @@ EventScript_16C514:: @ 816C514 end CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519 - msgbox gUnknown_81967E3, 3 + msgbox gUnknown_81967E3, MSGBOX_SIGN end CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc index 593bf0016..4e5bcc05e 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc @@ -2,13 +2,13 @@ CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 .byte 0 CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9 - msgbox gUnknown_81954DD, 2 + msgbox gUnknown_81954DD, MSGBOX_NPC end CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2 - msgbox gUnknown_8195537, 3 + msgbox gUnknown_8195537, MSGBOX_SIGN end CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB - msgbox gUnknown_81955B3, 3 + msgbox gUnknown_81955B3, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 0627bf3a0..3289f08b3 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -2,27 +2,27 @@ CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 .byte 0 CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5 - msgbox gUnknown_81955C7, 2 + msgbox gUnknown_81955C7, MSGBOX_NPC end CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE - msgbox gUnknown_819560F, 2 + msgbox gUnknown_819560F, MSGBOX_NPC end CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 - msgbox gUnknown_8195638, 3 + msgbox gUnknown_8195638, MSGBOX_SIGN end CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16BB38 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -43,14 +43,14 @@ Items_16BB38:: @ 816BB38 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16BB74 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index c1cc95ac4..9288edf21 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB85", + "script": "CeladonCity_DepartmentStore_3F_EventScript_CounterTutor", "flag": "0" }, { diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc index 0ce4515d2..f4faca037 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -1,50 +1,50 @@ CeladonCity_DepartmentStore_3F_MapScripts:: @ 816BB84 .byte 0 -CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85 - goto EventScript_1C4C26 +CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85 + goto EventScript_CounterTutor end CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B - msgbox gUnknown_81956E9, 2 + msgbox gUnknown_81956E9, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94 - msgbox gUnknown_8195769, 2 + msgbox gUnknown_8195769, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D - msgbox gUnknown_81957B0, 2 + msgbox gUnknown_81957B0, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6 - msgbox gUnknown_8195823, 2 + msgbox gUnknown_8195823, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF - msgbox gUnknown_8195863, 3 + msgbox gUnknown_8195863, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8 - msgbox gUnknown_8195875, 3 + msgbox gUnknown_8195875, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1 - msgbox gUnknown_8195897, 3 + msgbox gUnknown_8195897, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA - msgbox gUnknown_81958B8, 3 + msgbox gUnknown_81958B8, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3 - msgbox gUnknown_81958D8, 3 + msgbox gUnknown_81958D8, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC - msgbox gUnknown_81958F6, 3 + msgbox gUnknown_81958F6, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5 - msgbox gUnknown_8195907, 3 + msgbox gUnknown_8195907, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 84f290500..233bfefc9 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -2,27 +2,27 @@ CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE .byte 0 CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF - msgbox gUnknown_8195A68, 2 + msgbox gUnknown_8195A68, MSGBOX_NPC end CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8 - msgbox gUnknown_8195AC9, 2 + msgbox gUnknown_8195AC9, MSGBOX_NPC end CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 - msgbox gUnknown_8195B5B, 3 + msgbox gUnknown_8195B5B, MSGBOX_SIGN end CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16BC30 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc index efe6c5835..426cc2c82 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc @@ -1,4 +1,4 @@ -Text_195928:: @ 8195928 +Text_CounterTeach:: @ 8195928 .string "Oh, hi!\n" .string "I finally finished POKéMON.\p" .string "Not done yet? How about I teach\n" @@ -8,15 +8,15 @@ Text_195928:: @ 8195928 .string "Not like the one I'm leaning on,\n" .string "mind you!$" -Text_1959CC:: @ 81959CC +Text_CounterDeclined:: @ 81959CC .string "You're not interested? Come see\n" .string "me if you change your mind.$" -Text_195A08:: @ 8195A08 +Text_CounterWhichMon:: @ 8195A08 .string "Which POKéMON should I teach\n" .string "COUNTER to?$" -Text_195A31:: @ 8195A31 +Text_CounterTaught:: @ 8195A31 .string "Are you using that COUNTER move\n" .string "I taught your POKéMON?$" diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 66bc95b26..5163273c5 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -2,27 +2,27 @@ CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 .byte 0 CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41 - msgbox gUnknown_8195BBA, 2 + msgbox gUnknown_8195BBA, MSGBOX_NPC end CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A - msgbox gUnknown_8195CA0, 2 + msgbox gUnknown_8195CA0, MSGBOX_NPC end CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 - msgbox gUnknown_8195D14, 3 + msgbox gUnknown_8195D14, MSGBOX_SIGN end CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16BC84 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -41,14 +41,14 @@ Items_16BC84:: @ 816BC84 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16BCBC - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 3fcd14e8a..14198db2f 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -4,11 +4,10 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 lockall setvar VAR_0x8004, 3 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow - message Text_1A535C + message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 3 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos @@ -61,8 +60,8 @@ EventScript_16C1F3:: @ 816C1F3 EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 4 - goto_if eq, EventScript_16C30E + compare VAR_ELEVATOR_FLOOR, 4 + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 4 goto EventScript_16C30E @@ -71,8 +70,8 @@ EventScript_16C246:: @ 816C246 EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 5 - goto_if eq, EventScript_16C30E + compare VAR_ELEVATOR_FLOOR, 5 + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 5 goto EventScript_16C30E @@ -81,8 +80,8 @@ EventScript_16C26E:: @ 816C26E EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 6 - goto_if eq, EventScript_16C30E + compare VAR_ELEVATOR_FLOOR, 6 + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 6 goto EventScript_16C30E @@ -91,8 +90,8 @@ EventScript_16C296:: @ 816C296 EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 7 - goto_if eq, EventScript_16C30E + compare VAR_ELEVATOR_FLOOR, 7 + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 7 goto EventScript_16C30E @@ -101,8 +100,8 @@ EventScript_16C2BE:: @ 816C2BE EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 8 - goto_if eq, EventScript_16C30E + compare VAR_ELEVATOR_FLOOR, 8 + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 8 goto EventScript_16C30E diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index da6ec9c0b..1b3a35399 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -3,51 +3,51 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD 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 lock faceplayer call EventScript_16BCF6 - compare_var_to_value VAR_0x4001, 0 - goto_if eq, EventScript_16C00E + compare VAR_TEMP_1, 0 + goto_if_eq EventScript_16C00E goto EventScript_16BD3E end EventScript_16BCF6:: @ 816BCF6 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16BD2C + compare VAR_RESULT, TRUE + call_if_eq EventScript_16BD2C checkitem ITEM_SODA_POP, 1 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16BD32 + compare VAR_RESULT, TRUE + call_if_eq EventScript_16BD32 checkitem ITEM_LEMONADE, 1 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16BD38 + compare VAR_RESULT, TRUE + call_if_eq EventScript_16BD38 return EventScript_16BD2C:: @ 816BD2C - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 return EventScript_16BD32:: @ 816BD32 - addvar VAR_0x4001, 2 + addvar VAR_TEMP_1, 2 return EventScript_16BD38:: @ 816BD38 - addvar VAR_0x4001, 4 + addvar VAR_TEMP_1, 4 return EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C00C + compare VAR_RESULT, NO + goto_if_eq EventScript_16C00C textcolor 3 message Text_195D5F waitmessage textcolor 1 - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, EventScript_16BDAE case 2, EventScript_16BDDA case 3, EventScript_16BE06 @@ -121,8 +121,7 @@ EventScript_16BED7:: @ 816BED7 EventScript_16BF19:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 - checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195D75 goto EventScript_16BF7C end @@ -130,8 +129,7 @@ EventScript_16BF19:: @ 816BF19 EventScript_16BF3A:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 - checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195E33 goto EventScript_16BF7C end @@ -139,8 +137,7 @@ EventScript_16BF3A:: @ 816BF3A EventScript_16BF5B:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 - checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195EBF goto EventScript_16BF7C end @@ -150,22 +147,22 @@ EventScript_16BF7C:: @ 816BF7C getitemname 1, VAR_0x8009 removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C002 - additem VAR_0x8009, 1 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16C002 + additem VAR_0x8009 textcolor 3 playfanfare MUS_FANFA1 - message Text_195DAD + message Text_ReceivedItemFromLittleGirl waitmessage waitfanfare - giveitem VAR_0x8009, 1, 8 + putitemaway VAR_0x8009 call EventScript_1A6675 - compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER - call_if eq, EventScript_16BFDE - compare_var_to_value VAR_0x8008, ITEM_SODA_POP - call_if eq, EventScript_16BFEA - compare_var_to_value VAR_0x8008, ITEM_LEMONADE - call_if eq, EventScript_16BFF6 + compare VAR_0x8008, ITEM_FRESH_WATER + call_if_eq EventScript_16BFDE + compare VAR_0x8008, ITEM_SODA_POP + call_if_eq EventScript_16BFEA + compare VAR_0x8008, ITEM_LEMONADE + call_if_eq EventScript_16BFF6 release end @@ -204,11 +201,11 @@ EventScript_16C018:: @ 816C018 end CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022 - msgbox gUnknown_8195F98, 2 + msgbox gUnknown_8195F98, MSGBOX_NPC end CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B - msgbox gUnknown_8196017, 3 + msgbox gUnknown_8196017, MSGBOX_SIGN end CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 @@ -221,8 +218,8 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 EventScript_16C045:: @ 816C045 multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE - copyvar VAR_0x4001, VAR_RESULT - switch VAR_0x4001 + copyvar VAR_TEMP_1, VAR_RESULT + switch VAR_TEMP_1 case 0, EventScript_16C083 case 1, EventScript_16C094 case 2, EventScript_16C0A5 @@ -231,19 +228,19 @@ EventScript_16C045:: @ 816C045 end EventScript_16C083:: @ 816C083 - setvar VAR_0x4000, ITEM_FRESH_WATER + setvar VAR_TEMP_0, ITEM_FRESH_WATER checkmoney 200, 0 goto EventScript_16C0CB end EventScript_16C094:: @ 816C094 - setvar VAR_0x4000, ITEM_SODA_POP + setvar VAR_TEMP_0, ITEM_SODA_POP checkmoney 300, 0 goto EventScript_16C0CB end EventScript_16C0A5:: @ 816C0A5 - setvar VAR_0x4000, ITEM_LEMONADE + setvar VAR_TEMP_0, ITEM_LEMONADE checkmoney 350, 0 goto EventScript_16C0CB end @@ -261,22 +258,22 @@ EventScript_16C0C4:: @ 816C0C4 return EventScript_16C0CB:: @ 816C0CB - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C131 - checkitemspace VAR_0x4000, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C13F - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16C0B6 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16C0BD - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16C0C4 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16C131 + checkitemspace VAR_TEMP_0, 1 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16C13F + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16C0B6 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16C0BD + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16C0C4 updatemoneybox 0, 0, 0 - getitemname 0, VAR_0x4000 + getitemname 0, VAR_TEMP_0 playse SE_JIHANKI msgbox gUnknown_8196076 - additem VAR_0x4000, 1 + additem VAR_TEMP_0 goto EventScript_16C125 end diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc index a03cfedaf..65b9a3162 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc @@ -12,7 +12,7 @@ gUnknown_8195D75:: @ 8195D75 .string "Thank you!\n" .string "You can have this from me!$" -Text_195DAD:: @ 8195DAD +Text_ReceivedItemFromLittleGirl:: @ 8195DAD .string "{PLAYER} received a {STR_VAR_2}\n" .string "from the little girl.$" diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 65aa9a529..bcd05a1b9 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -1,10 +1,9 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 - map_script 1, CeladonCity_GameCorner_MapScript1_16C64C + map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad .byte 0 -CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C - checkflag FLAG_OPENED_ROCKET_HIDEOUT - call_if FALSE, EventScript_16C656 +CeladonCity_GameCorner_OnLoad:: @ 816C64C + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16C656 end EventScript_16C656:: @ 816C656 @@ -16,13 +15,13 @@ EventScript_16C656:: @ 816C656 return CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 - msgbox gUnknown_8196940, 2 + msgbox gUnknown_8196940, MSGBOX_NPC end CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 @@ -39,33 +38,32 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D end EventScript_16C6E6:: @ 816C6E6 - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C790 - compare_var_to_value VAR_0x8009, 0 - goto_if eq, EventScript_16C734 - compare_var_to_value VAR_0x8009, 1 - goto_if eq, EventScript_16C706 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C790 + compare VAR_0x8009, 0 + goto_if_eq EventScript_16C734 + compare VAR_0x8009, 1 + goto_if_eq EventScript_16C706 end EventScript_16C706:: @ 816C706 - checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9500 - goto_if ge, EventScript_16C79E + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9500 + goto_if_ge EventScript_16C79E checkmoney 10000, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C7AC + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16C7AC givecoins 500 takemoney 10000, 0 goto EventScript_16C762 end EventScript_16C734:: @ 816C734 - checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9950 - goto_if ge, EventScript_16C79E + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9950 + goto_if_ge EventScript_16C79E checkmoney 1000, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C7AC + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16C7AC givecoins 50 takemoney 1000, 0 goto EventScript_16C762 @@ -114,7 +112,7 @@ CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA EventScript_16C7CA:: @ 816C7CA closemessage - applymovement VAR_LAST_TALKED, Movement_1A75E5 + applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection waitmovement 0 release end @@ -129,14 +127,12 @@ CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 lock faceplayer - checkflag FLAG_GOT_10_COINS_FROM_GAMBLER - goto_if TRUE, EventScript_16C849 + goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, EventScript_16C849 msgbox gUnknown_8196AF3 - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C839 - checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9990 - goto_if ge, EventScript_16C82B + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9990 + goto_if_ge EventScript_16C82B givecoins 10 textcolor 3 msgbox gUnknown_8196B0D @@ -165,8 +161,7 @@ EventScript_16C849:: @ 816C849 CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 lock faceplayer - checkflag FLAG_DEFEATED_ERIKA - goto_if TRUE, EventScript_16C870 + goto_if_set FLAG_DEFEATED_ERIKA, EventScript_16C870 msgbox gUnknown_8196BAD goto EventScript_16C7CA end @@ -193,14 +188,12 @@ CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E lock faceplayer - checkflag FLAG_GOT_20_COINS_FROM_GAMBLER - goto_if TRUE, EventScript_16C8F0 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, EventScript_16C8F0 msgbox gUnknown_8196D2B - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C839 - checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9980 - goto_if ge, EventScript_16C8E2 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9980 + goto_if_ge EventScript_16C8E2 givecoins 20 textcolor 3 msgbox gUnknown_8196D47 @@ -223,14 +216,12 @@ EventScript_16C8F0:: @ 816C8F0 CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE lock faceplayer - checkflag FLAG_GOT_20_COINS_FROM_GAMBLER_2 - goto_if TRUE, EventScript_16C950 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, EventScript_16C950 msgbox gUnknown_8196DB7 - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C839 - checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9980 - goto_if ge, EventScript_16C942 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9980 + goto_if_ge EventScript_16C942 givecoins 20 textcolor 3 msgbox gUnknown_8196DF8 @@ -261,11 +252,10 @@ EventScript_16C96A:: @ 816C96A end EventScript_16C96C:: @ 816C96C - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CAA0 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C96A + compare VAR_RESULT, NO + goto_if_eq EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 @@ -410,8 +400,7 @@ EventScript_16CAA0:: @ 816CAA0 CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA lockall msgbox gUnknown_8196EDC - checkflag FLAG_OPENED_ROCKET_HIDEOUT - call_if FALSE, EventScript_16CABE + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16CABE releaseall end @@ -427,17 +416,17 @@ EventScript_16CABE:: @ 816CABE return CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10 - msgbox gUnknown_8196E9B, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10 + msgbox gUnknown_8196E9B, MSGBOX_AUTOCLOSE end EventScript_16CB10:: @ 816CB10 msgbox gUnknown_8196E9B closemessage - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_16CB34 - compare_var_to_value VAR_FACING, 3 - call_if ne, EventScript_16CB3F + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_16CB34 + compare VAR_FACING, DIR_WEST + call_if_ne EventScript_16CB3F removeobject 11 release end @@ -453,33 +442,33 @@ EventScript_16CB3F:: @ 816CB3F return Movement_16CB4A:: @ 816CB4A - step_10 - step_13 - step_13 - step_11 - step_13 - step_13 - step_13 - step_13 + walk_down + walk_right + walk_right + walk_up + walk_right + walk_right + walk_right + walk_right step_end Movement_16CB53:: @ 816CB53 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A - msgbox gUnknown_8196F64, 3 + msgbox gUnknown_8196F64, MSGBOX_SIGN end CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63 - msgbox gUnknown_8196F81, 3 + msgbox gUnknown_8196F81, MSGBOX_SIGN end CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C - msgbox gUnknown_8196FA0, 3 + msgbox gUnknown_8196FA0, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 33f5da4bb..20427a77a 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -2,21 +2,20 @@ CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 .byte 0 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76 - msgbox gUnknown_8196FC1, 2 + msgbox gUnknown_8196FC1, MSGBOX_NPC end CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F - msgbox gUnknown_8196FFF, 2 + msgbox gUnknown_8196FFF, MSGBOX_NPC end CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CBB2 @@ -43,12 +42,12 @@ EventScript_16CC10:: @ 816CC10 EventScript_16CC15:: @ 816CC15 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_ABRA - setvar VAR_0x4002, 180 + setvar VAR_TEMP_1, SPECIES_ABRA + setvar VAR_TEMP_2, 180 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_ABRA - setvar VAR_0x4002, 120 + setvar VAR_TEMP_1, SPECIES_ABRA + setvar VAR_TEMP_2, 120 .endif .endif goto EventScript_16CC65 @@ -56,12 +55,12 @@ EventScript_16CC15:: @ 816CC15 EventScript_16CC25:: @ 816CC25 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_CLEFAIRY - setvar VAR_0x4002, 500 + setvar VAR_TEMP_1, SPECIES_CLEFAIRY + setvar VAR_TEMP_2, 500 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_CLEFAIRY - setvar VAR_0x4002, 750 + setvar VAR_TEMP_1, SPECIES_CLEFAIRY + setvar VAR_TEMP_2, 750 .endif .endif goto EventScript_16CC65 @@ -69,12 +68,12 @@ EventScript_16CC25:: @ 816CC25 EventScript_16CC35:: @ 816CC35 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_DRATINI - setvar VAR_0x4002, 2800 + setvar VAR_TEMP_1, SPECIES_DRATINI + setvar VAR_TEMP_2, 2800 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_PINSIR - setvar VAR_0x4002, 2500 + setvar VAR_TEMP_1, SPECIES_PINSIR + setvar VAR_TEMP_2, 2500 .endif .endif goto EventScript_16CC65 @@ -82,12 +81,12 @@ EventScript_16CC35:: @ 816CC35 EventScript_16CC45:: @ 816CC45 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_SCYTHER - setvar VAR_0x4002, 5500 + setvar VAR_TEMP_1, SPECIES_SCYTHER + setvar VAR_TEMP_2, 5500 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_DRATINI - setvar VAR_0x4002, 4600 + setvar VAR_TEMP_1, SPECIES_DRATINI + setvar VAR_TEMP_2, 4600 .endif .endif goto EventScript_16CC65 @@ -95,27 +94,27 @@ EventScript_16CC45:: @ 816CC45 EventScript_16CC55:: @ 816CC55 .ifdef FIRERED - setvar VAR_0x4001, SPECIES_PORYGON - setvar VAR_0x4002, 9999 + setvar VAR_TEMP_1, SPECIES_PORYGON + setvar VAR_TEMP_2, 9999 .else .ifdef LEAFGREEN - setvar VAR_0x4001, SPECIES_PORYGON - setvar VAR_0x4002, 6500 + setvar VAR_TEMP_1, SPECIES_PORYGON + setvar VAR_TEMP_2, 6500 .endif .endif goto EventScript_16CC65 end EventScript_16CC65:: @ 816CC65 - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16CC10 + compare VAR_RESULT, NO + goto_if_eq EventScript_16CC10 checkcoins VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x4002 - goto_if lt, EventScript_16CDA5 + compare VAR_RESULT, VAR_TEMP_2 + goto_if_lt EventScript_16CDA5 textcolor 3 - switch VAR_0x4001 + switch VAR_TEMP_1 case SPECIES_ABRA, EventScript_16CCD4 case SPECIES_CLEFAIRY, EventScript_16CCE9 case SPECIES_DRATINI, EventScript_16CCFE @@ -126,10 +125,10 @@ EventScript_16CC65:: @ 816CC65 EventScript_16CCD4:: @ 816CCD4 .ifdef FIRERED - givemon VAR_0x4001, 9, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 9, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_0x4001, 7, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 7, ITEM_NONE .endif .endif goto EventScript_16CD52 @@ -137,10 +136,10 @@ EventScript_16CCD4:: @ 816CCD4 EventScript_16CCE9:: @ 816CCE9 .ifdef FIRERED - givemon VAR_0x4001, 8, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 8, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_0x4001, 12, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 12, ITEM_NONE .endif .endif goto EventScript_16CD52 @@ -148,43 +147,43 @@ EventScript_16CCE9:: @ 816CCE9 EventScript_16CCFE:: @ 816CCFE .ifdef FIRERED - givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_0x4001, 24, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 24, ITEM_NONE .endif .endif goto EventScript_16CD52 end EventScript_16CD13:: @ 816CD13 - givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 25, ITEM_NONE goto EventScript_16CD52 end EventScript_16CD28:: @ 816CD28 .ifdef FIRERED - givemon VAR_0x4001, 26, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 26, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE .endif .endif goto EventScript_16CD52 end EventScript_16CD3D:: @ 816CD3D - givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE goto EventScript_16CD52 end EventScript_16CD52:: @ 816CD52 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16CDB3 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16CDE0 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_16CD74 + compare VAR_RESULT, 0 + goto_if_eq EventScript_16CDB3 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16CDE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_16CD74 end EventScript_16CD74:: @ 816CD74 @@ -195,7 +194,7 @@ EventScript_16CD74:: @ 816CD74 end EventScript_16CD83:: @ 816CD83 - countpokemon + getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT call EventScript_1A74EB @@ -214,30 +213,30 @@ EventScript_16CDA5:: @ 816CDA5 end EventScript_16CDB3:: @ 816CDB3 - takecoins VAR_0x4002 + takecoins VAR_TEMP_2 updatecoinsbox 0, 5 - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_1A5DF1 waitmessage waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16CD83 + compare VAR_RESULT, YES + goto_if_eq EventScript_16CD83 goto EventScript_16CC10 end EventScript_16CDE0:: @ 816CDE0 - takecoins VAR_0x4002 + takecoins VAR_TEMP_2 updatecoinsbox 0, 5 - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_1A5DF1 waitmessage waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16CE12 + compare VAR_RESULT, NO + goto_if_eq EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 end @@ -250,11 +249,10 @@ EventScript_16CE12:: @ 816CE12 CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CE47 @@ -275,72 +273,72 @@ EventScript_16CE47:: @ 816CE47 end EventScript_16CEA5:: @ 816CEA5 - setvar VAR_0x4001, ITEM_TM13 - setvar VAR_0x4002, 4000 + setvar VAR_TEMP_1, ITEM_TM13 + setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_ICE_BEAM goto EventScript_16CF09 end EventScript_16CEB9:: @ 816CEB9 - setvar VAR_0x4001, ITEM_TM23 - setvar VAR_0x4002, 3500 + setvar VAR_TEMP_1, ITEM_TM23 + setvar VAR_TEMP_2, 3500 getmovename 1, MOVE_IRON_TAIL goto EventScript_16CF09 end EventScript_16CECD:: @ 816CECD - setvar VAR_0x4001, ITEM_TM24 - setvar VAR_0x4002, 4000 + setvar VAR_TEMP_1, ITEM_TM24 + setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_THUNDERBOLT goto EventScript_16CF09 end EventScript_16CEE1:: @ 816CEE1 - setvar VAR_0x4001, ITEM_TM30 - setvar VAR_0x4002, 4500 + setvar VAR_TEMP_1, ITEM_TM30 + setvar VAR_TEMP_2, 4500 getmovename 1, MOVE_SHADOW_BALL goto EventScript_16CF09 end EventScript_16CEF5:: @ 816CEF5 - setvar VAR_0x4001, ITEM_TM35 - setvar VAR_0x4002, 4000 + setvar VAR_TEMP_1, ITEM_TM35 + setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_FLAMETHROWER goto EventScript_16CF09 end EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16CC10 + compare VAR_RESULT, NO + goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end EventScript_16CF22:: @ 816CF22 - getitemname 0, VAR_0x4001 + getitemname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16CC10 + compare VAR_RESULT, NO + goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end EventScript_16CF3F:: @ 816CF3F - getitemname 0, VAR_0x4001 + getitemname 0, VAR_TEMP_1 checkcoins VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x4002 - goto_if lt, EventScript_16CDA5 - checkitemspace VAR_0x4001, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16CF79 - takecoins VAR_0x4002 + compare VAR_RESULT, VAR_TEMP_2 + goto_if_lt EventScript_16CDA5 + checkitemspace VAR_TEMP_1, 1 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16CF79 + takecoins VAR_TEMP_2 updatecoinsbox 0, 5 - giveitem VAR_0x4001 + giveitem VAR_TEMP_1 goto EventScript_16CC10 end EventScript_16CF79:: @ 816CF79 textcolor 3 - msgbox gUnknown_81A5242 + msgbox Text_TooBadBagFull hidecoinsbox 0, 0 release end @@ -348,11 +346,10 @@ EventScript_16CF79:: @ 816CF79 CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CFB2 @@ -373,31 +370,31 @@ EventScript_16CFB2:: @ 816CFB2 end EventScript_16D010:: @ 816D010 - setvar VAR_0x4001, ITEM_SMOKE_BALL - setvar VAR_0x4002, 800 + setvar VAR_TEMP_1, ITEM_SMOKE_BALL + setvar VAR_TEMP_2, 800 goto EventScript_16CF22 end EventScript_16D020:: @ 816D020 - setvar VAR_0x4001, ITEM_MIRACLE_SEED - setvar VAR_0x4002, 1000 + setvar VAR_TEMP_1, ITEM_MIRACLE_SEED + setvar VAR_TEMP_2, 1000 goto EventScript_16CF22 end EventScript_16D030:: @ 816D030 - setvar VAR_0x4001, ITEM_CHARCOAL - setvar VAR_0x4002, 1000 + setvar VAR_TEMP_1, ITEM_CHARCOAL + setvar VAR_TEMP_2, 1000 goto EventScript_16CF22 end EventScript_16D040:: @ 816D040 - setvar VAR_0x4001, ITEM_MYSTIC_WATER - setvar VAR_0x4002, 1000 + setvar VAR_TEMP_1, ITEM_MYSTIC_WATER + setvar VAR_TEMP_2, 1000 goto EventScript_16CF22 end EventScript_16D050:: @ 816D050 - setvar VAR_0x4001, ITEM_YELLOW_FLUTE - setvar VAR_0x4002, 1600 + setvar VAR_TEMP_1, ITEM_YELLOW_FLUTE + setvar VAR_TEMP_2, 1600 goto EventScript_16CF22 end diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index b92e99fe1..60a945e21 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -3,9 +3,8 @@ CeladonCity_Gym_MapScripts:: @ 816D060 CeladonCity_Gym_EventScript_16D061:: @ 816D061 famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0 - checkflag FLAG_GOT_TM19_FROM_ERIKA - goto_if FALSE, EventScript_16D0C6 + trainerbattle_single TRAINER_LEADER_ERIKA, Text_197114, Text_197260, EventScript_16D0A0, NO_MUSIC + goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, EventScript_16D0C6 famechecker FAMECHECKER_ERIKA, 4 msgbox gUnknown_81972B8 release @@ -23,10 +22,9 @@ EventScript_16D0A0:: @ 816D0A0 EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16D107 - additem ITEM_TM19, 1 - giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16D107 + giveitem_msg gUnknown_81973BA, ITEM_TM19 setflag FLAG_GOT_TM19_FROM_ERIKA msgbox gUnknown_81973D7 release @@ -38,46 +36,45 @@ EventScript_16D107:: @ 816D107 end CeladonCity_Gym_EventScript_16D111:: @ 816D111 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4 - msgbox gUnknown_81974D6, 6 + trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4 + msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D128:: @ 816D128 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF + trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF famechecker FAMECHECKER_ERIKA, 2 - msgbox gUnknown_8197708, 6 + msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB - msgbox gUnknown_81975D1, 6 + trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB + msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C - msgbox gUnknown_8197527, 6 + trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C + msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D17A:: @ 816D17A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660 + trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660 famechecker FAMECHECKER_ERIKA, 3 - msgbox gUnknown_8197664, 6 + msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A - msgbox gUnknown_8197788, 6 + trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A + msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832 - msgbox gUnknown_819783E, 6 + trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832 + msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC lockall - checkflag FLAG_BADGE04_GET - goto_if TRUE, EventScript_16D1E0 + goto_if_set FLAG_BADGE04_GET, EventScript_16D1E0 msgbox gUnknown_8197874 releaseall end diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc index 39326647a..4f136bad3 100644 --- a/data/maps/CeladonCity_Hotel/scripts.inc +++ b/data/maps/CeladonCity_Hotel/scripts.inc @@ -2,17 +2,17 @@ CeladonCity_Hotel_MapScripts:: @ 816D283 .byte 0 CeladonCity_Hotel_EventScript_16D284:: @ 816D284 - msgbox gUnknown_8197B77, 2 + msgbox gUnknown_8197B77, MSGBOX_NPC end CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D - msgbox gUnknown_8197BBE, 2 + msgbox gUnknown_8197BBE, MSGBOX_NPC end CeladonCity_Hotel_EventScript_16D296:: @ 816D296 - msgbox gUnknown_8197C0C, 2 + msgbox gUnknown_8197C0C, MSGBOX_NPC end CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F - msgbox gUnknown_8197C30, 2 + msgbox gUnknown_8197C30, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc index be1415217..6c8dab4ff 100644 --- a/data/maps/CeladonCity_House1/scripts.inc +++ b/data/maps/CeladonCity_House1/scripts.inc @@ -2,13 +2,13 @@ CeladonCity_House1_MapScripts:: @ 816D267 .byte 0 CeladonCity_House1_EventScript_16D268:: @ 816D268 - msgbox gUnknown_8197A9F, 2 + msgbox gUnknown_8197A9F, MSGBOX_NPC end CeladonCity_House1_EventScript_16D271:: @ 816D271 - msgbox gUnknown_8197AD3, 2 + msgbox gUnknown_8197AD3, MSGBOX_NPC end CeladonCity_House1_EventScript_16D27A:: @ 816D27A - msgbox gUnknown_8197B20, 2 + msgbox gUnknown_8197B20, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 92bde48ad..322968550 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC - map_script 3, CeladonCity_PokemonCenter_1F_MapScript1_16C5F7 - map_script 5, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7 +CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 setrespawn SPAWN_CELADON_CITY end CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604 - msgbox gUnknown_819685B, 2 + msgbox gUnknown_819685B, MSGBOX_NPC end CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D - msgbox gUnknown_81968C2, 2 + msgbox gUnknown_81968C2, MSGBOX_NPC end CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616 - msgbox gUnknown_8196913, 2 + msgbox gUnknown_8196913, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index c0cac69eb..efb05b214 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc index 1b07679eb..19975f531 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F - map_script 2, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CeladonCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CeladonCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816C634 + call CableClub_EventScript_Colosseum end -EventScript_16C63A:: @ 816C63A - call EventScript_1BB6AB +CeladonCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816C63A + call CableClub_EventScript_TradeCenter end -EventScript_16C640:: @ 816C640 - call EventScript_1BB7DE +CeladonCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816C640 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 82ecb417e..c8ab9469a 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -2,24 +2,22 @@ CeladonCity_Restaurant_MapScripts:: @ 816D1EA .byte 0 CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB - msgbox gUnknown_81978E6, 2 + msgbox gUnknown_81978E6, MSGBOX_NPC end CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 - msgbox gUnknown_8197915, 2 + msgbox gUnknown_8197915, MSGBOX_NPC end CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if TRUE, EventScript_16D24B + goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16D241 - additem ITEM_COIN_CASE, 1 - giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16D241 + giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE setflag FLAG_GOT_COIN_CASE release end @@ -35,9 +33,9 @@ EventScript_16D24B:: @ 816D24B end CeladonCity_Restaurant_EventScript_16D255:: @ 816D255 - msgbox gUnknown_8197952, 2 + msgbox gUnknown_8197952, MSGBOX_NPC end CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E - msgbox gUnknown_819798A, 2 + msgbox gUnknown_819798A, MSGBOX_NPC end diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 8914af7e7..65e99c9d2 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BEA47", + "script": "CeruleanCave_1F_EventScript_ItemNugget", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BEA54", + "script": "CeruleanCave_1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BEA3A", + "script": "CeruleanCave_1F_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR" }, { diff --git a/data/maps/CeruleanCave_1F/scripts.inc b/data/maps/CeruleanCave_1F/scripts.inc index db76ddfd7..2113716e2 100644 --- a/data/maps/CeruleanCave_1F/scripts.inc +++ b/data/maps/CeruleanCave_1F/scripts.inc @@ -1,7 +1,7 @@ CeruleanCave_1F_MapScripts:: @ 81624B3 - map_script 3, CeruleanCave_1F_MapScript1_1624B9 + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_1F_OnTransition .byte 0 -CeruleanCave_1F_MapScript1_1624B9:: @ 81624B9 +CeruleanCave_1F_OnTransition:: @ 81624B9 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CAVE_1F end diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 89438c4fb..e3fe97b91 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BEA6E", + "script": "CeruleanCave_2F_EventScript_ItemPPUp", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BEA7B", + "script": "CeruleanCave_2F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BEA61", + "script": "CeruleanCave_2F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE" }, { diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 87b278438..4245e8a07 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BEA95", + "script": "CeruleanCave_B1F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BEA88", + "script": "CeruleanCave_B1F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE" }, { diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 5c51d2601..874bfce06 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -1,23 +1,21 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE - map_script 5, CeruleanCave_B1F_MapScript1_1624C9 - map_script 3, CeruleanCave_B1F_MapScript2_1624E7 + map_script MAP_SCRIPT_ON_RESUME, CeruleanCave_B1F_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_B1F_OnTransition .byte 0 -CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_1624D3 +CeruleanCave_B1F_OnResume:: @ 81624C9 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1624D3 end EventScript_1624D3:: @ 81624D3 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + compare VAR_RESULT, B_OUTCOME_CAUGHT + goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return -CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 - checkflag FLAG_FOUGHT_MEWTWO - call_if FALSE, EventScript_1624F1 +CeruleanCave_B1F_OnTransition:: @ 81624E7 + call_if_unset FLAG_FOUGHT_MEWTWO, EventScript_1624F1 end EventScript_1624F1:: @ 81624F1 @@ -26,8 +24,8 @@ EventScript_1624F1:: @ 81624F1 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 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 lock faceplayer @@ -45,26 +43,26 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_162558 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_162561 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_162561 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq EventScript_162558 + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq EventScript_162561 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq EventScript_162561 setflag FLAG_FOUGHT_MEWTWO release end EventScript_162558:: @ 8162558 setflag FLAG_FOUGHT_MEWTWO - goto EventScript_1A922D + goto EventScript_RemoveStaticMon EventScript_162560:: @ 8162560 end EventScript_162561:: @ 8162561 setvar VAR_0x8004, SPECIES_MEWTWO - goto EventScript_1A9236 + goto EventScript_MonFlewAway EventScript_16256B:: @ 816256B end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index bd660c660..2e75b82b4 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -1,11 +1,10 @@ CeruleanCity_MapScripts:: @ 8166471 - map_script 3, CeruleanCity_MapScript1_166477 + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition .byte 0 -CeruleanCity_MapScript1_166477:: @ 8166477 +CeruleanCity_OnTransition:: @ 8166477 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY - checkflag FLAG_GOT_SS_TICKET - call_if FALSE, EventScript_166484 + call_if_unset FLAG_GOT_SS_TICKET, EventScript_166484 end EventScript_166484:: @ 8166484 @@ -16,20 +15,20 @@ EventScript_166484:: @ 8166484 CeruleanCity_EventScript_16649A:: @ 816649A lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1664CC end CeruleanCity_EventScript_1664A6:: @ 81664A6 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 8, 23, 0 goto EventScript_1664CC end CeruleanCity_EventScript_1664B9:: @ 81664B9 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setobjectxyperm 8, 24, 0 goto EventScript_1664CC end @@ -43,22 +42,22 @@ EventScript_1664CC:: @ 81664CC waitmovement 0 msgbox gUnknown_817EAD7 setvar VAR_LAST_TALKED, 8 - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_166582 - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_16658D - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_166598 + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_166582 + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_16658D + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_166598 famechecker FAMECHECKER_BILL, 0 msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_1665A3 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_1665A3 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1665B5 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_1665A3 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_1665A3 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_1665B5 msgbox gUnknown_817ECD4 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 setflag FLAG_GOT_FAME_CHECKER @@ -73,111 +72,110 @@ EventScript_1664CC:: @ 81664CC end EventScript_166582:: @ 8166582 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_SQUIRTLE, Text_17EB71 return EventScript_16658D:: @ 816658D - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_BULBASAUR, Text_17EB71 return EventScript_166598:: @ 8166598 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_CHARMANDER, Text_17EB71 return EventScript_1665A3:: @ 81665A3 - applymovement 255, Movement_1665C7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1665C7 applymovement 8, Movement_1665D9 waitmovement 0 return EventScript_1665B5:: @ 81665B5 - applymovement 255, Movement_1665CD + applymovement OBJ_EVENT_ID_PLAYER, Movement_1665CD applymovement 8, Movement_1665EA waitmovement 0 return Movement_1665C7:: @ 81665C7 - step_1c - step_1b - step_30 - step_1c - step_2d + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_down step_end Movement_1665CD:: @ 81665CD - step_1c - step_1b - step_2f - step_1c - step_2d + delay_16 + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end Movement_1665D3:: @ 81665D3 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_1665D9:: @ 81665D9 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1c - step_1c - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1665EA:: @ 81665EA - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1c - step_1c - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1665FB:: @ 81665FB - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5 - goto_if eq, EventScript_16662E + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, EventScript_16662E message Text_17EE0E waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70 setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -185,15 +183,14 @@ CeruleanCity_EventScript_166603:: @ 8166603 EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_166677 - additem ITEM_TM28, 1 - giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_166677 + giveitem_msg gUnknown_817EEBF, ITEM_TM28 msgbox gUnknown_817EEED closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 - fadescreen 0 + fadescreen FADE_FROM_BLACK setflag FLAG_GOT_TM28_FROM_ROCKET release end @@ -206,20 +203,20 @@ EventScript_166677:: @ 8166677 CeruleanCity_EventScript_166683:: @ 8166683 lockall - setvar VAR_0x4001, 0 - applymovement 2, Movement_1A75E9 + setvar VAR_TEMP_1, 0 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 goto EventScript_1666C3 end CeruleanCity_EventScript_1666A3:: @ 81666A3 lockall - setvar VAR_0x4001, 1 - applymovement 2, Movement_1A75ED + setvar VAR_TEMP_1, 1 + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 goto EventScript_1666C3 end @@ -228,7 +225,7 @@ EventScript_1666C3:: @ 81666C3 textcolor 0 msgbox Text_17EE0E setvar VAR_LAST_TALKED, 2 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70 setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -238,7 +235,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7 faceplayer msgbox gUnknown_817F0F1 closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -246,8 +243,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7 CeruleanCity_EventScript_1666FE:: @ 81666FE lock faceplayer - checkflag FLAG_GOT_SS_TICKET - goto_if TRUE, EventScript_166713 + goto_if_set FLAG_GOT_SS_TICKET, EventScript_166713 msgbox gUnknown_817F01D release end @@ -258,15 +254,15 @@ EventScript_166713:: @ 8166713 end CeruleanCity_EventScript_16671D:: @ 816671D - msgbox gUnknown_817F0B2, 2 + msgbox gUnknown_817F0B2, MSGBOX_NPC end CeruleanCity_EventScript_166726:: @ 8166726 - msgbox gUnknown_817EF3F, 2 + msgbox gUnknown_817EF3F, MSGBOX_NPC end CeruleanCity_EventScript_16672F:: @ 816672F - msgbox gUnknown_817F319, 2 + msgbox gUnknown_817F319, MSGBOX_NPC end CeruleanCity_EventScript_166738:: @ 8166738 @@ -274,7 +270,7 @@ CeruleanCity_EventScript_166738:: @ 8166738 faceplayer msgbox gUnknown_817F2CF closemessage - applymovement 11, Movement_1A75E5 + applymovement 11, Movement_FaceOriginalDirection waitmovement 0 release end @@ -283,24 +279,24 @@ CeruleanCity_EventScript_16674F:: @ 816674F lock random 3 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 - call_if eq, EventScript_1667B0 - compare_var_to_value VAR_0x8008, 1 - call_if eq, EventScript_1667B6 - compare_var_to_value VAR_0x8008, 2 - call_if eq, EventScript_1667BC + compare VAR_0x8008, 0 + call_if_eq EventScript_1667B0 + compare VAR_0x8008, 1 + call_if_eq EventScript_1667B6 + compare VAR_0x8008, 2 + call_if_eq EventScript_1667BC waitmessage delay 40 playse SE_PIN - applymovement 5, Movement_1A75D9 + applymovement 5, Movement_QuestionMark waitmovement 0 delay 30 - compare_var_to_value VAR_0x8008, 0 - call_if eq, EventScript_1667C2 - compare_var_to_value VAR_0x8008, 1 - call_if eq, EventScript_1667CB - compare_var_to_value VAR_0x8008, 2 - call_if eq, EventScript_1667D4 + compare VAR_0x8008, 0 + call_if_eq EventScript_1667C2 + compare VAR_0x8008, 1 + call_if_eq EventScript_1667CB + compare VAR_0x8008, 2 + call_if_eq EventScript_1667D4 release end @@ -332,14 +328,14 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD lock random 4 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 - call_if eq, EventScript_166814 - compare_var_to_value VAR_0x8008, 1 - call_if eq, EventScript_16681D - compare_var_to_value VAR_0x8008, 2 - call_if eq, EventScript_166826 - compare_var_to_value VAR_0x8008, 3 - call_if eq, EventScript_16682F + compare VAR_0x8008, 0 + call_if_eq EventScript_166814 + compare VAR_0x8008, 1 + call_if_eq EventScript_16681D + compare VAR_0x8008, 2 + call_if_eq EventScript_166826 + compare VAR_0x8008, 3 + call_if_eq EventScript_16682F release end @@ -360,15 +356,15 @@ EventScript_16682F:: @ 816682F return CeruleanCity_EventScript_166838:: @ 8166838 - msgbox gUnknown_817F420, 3 + msgbox gUnknown_817F420, MSGBOX_SIGN end CeruleanCity_EventScript_166841:: @ 8166841 - msgbox gUnknown_817F453, 3 + msgbox gUnknown_817F453, MSGBOX_SIGN end CeruleanCity_EventScript_16684A:: @ 816684A - msgbox gUnknown_817F4C5, 3 + msgbox gUnknown_817F4C5, MSGBOX_SIGN end CeruleanCity_EventScript_166853:: @ 8166853 diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 75ebd4b6b..88c8108cc 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -4,10 +4,8 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD lock faceplayer - checkflag FLAG_GOT_BICYCLE - goto_if TRUE, EventScript_16AC58 - checkflag FLAG_GOT_BIKE_VOUCHER - goto_if TRUE, EventScript_16AC22 + goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC58 + goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16AC22 showmoneybox 0, 0, 0 message Text_192755 waitmessage @@ -31,9 +29,9 @@ EventScript_16AC15:: @ 816AC15 EventScript_16AC22:: @ 816AC22 msgbox gUnknown_81927B2 - giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5 + msgreceiveditem gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5 setflag FLAG_GOT_BICYCLE - additem ITEM_BICYCLE, 1 + additem ITEM_BICYCLE removeitem ITEM_BIKE_VOUCHER, 1 msgbox gUnknown_819280E release @@ -50,14 +48,13 @@ EventScript_16AC62:: @ 816AC62 end CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C - msgbox gUnknown_81928CF, 2 + msgbox gUnknown_81928CF, MSGBOX_NPC end CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 lock faceplayer - checkflag FLAG_GOT_BICYCLE - goto_if TRUE, EventScript_16AC8A + goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC8A msgbox gUnknown_8192937 release end @@ -69,5 +66,5 @@ EventScript_16AC8A:: @ 816AC8A CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94 CeruleanCity_EventScript_16AC94:: @ 816AC94 - msgbox gUnknown_81929AD, 3 + msgbox gUnknown_81929AD, MSGBOX_SIGN end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index a37d3435b..a172dc5b3 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -3,9 +3,8 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 - checkflag FLAG_GOT_TM03_FROM_MISTY - goto_if FALSE, EventScript_16AAF9 + trainerbattle_single TRAINER_LEADER_MISTY, Text_1921EF, Text_19242D, EventScript_16AAD3, NO_MUSIC + goto_if_unset FLAG_GOT_TM03_FROM_MISTY, EventScript_16AAF9 msgbox gUnknown_81922BF release end @@ -22,10 +21,9 @@ EventScript_16AAD3:: @ 816AAD3 EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AB3A - additem ITEM_TM03, 1 - giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16AB3A + giveitem_msg gUnknown_81923F1, ITEM_TM03 setflag FLAG_GOT_TM03_FROM_MISTY msgbox gUnknown_81922BF release @@ -37,21 +35,20 @@ EventScript_16AB3A:: @ 816AB3A end CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0 - msgbox gUnknown_81924E4, 6 + trainerbattle_single TRAINER_PICNICKER_DIANA, Text_192481, Text_1924D0 + msgbox gUnknown_81924E4, MSGBOX_AUTOCLOSE end CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547 + trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, Text_192524, Text_192547 famechecker FAMECHECKER_MISTY, 2 - msgbox gUnknown_8192556, 6 + msgbox gUnknown_8192556, MSGBOX_AUTOCLOSE end CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F lock faceplayer - checkflag FLAG_DEFEATED_MISTY - goto_if TRUE, EventScript_16AB94 + goto_if_set FLAG_DEFEATED_MISTY, EventScript_16AB94 msgbox gUnknown_81925AC release end @@ -63,8 +60,7 @@ EventScript_16AB94:: @ 816AB94 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E lockall - checkflag FLAG_BADGE02_GET - goto_if TRUE, EventScript_16ABB2 + goto_if_set FLAG_BADGE02_GET, EventScript_16ABB2 msgbox gUnknown_81926E1 releaseall end diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index bdd52e3b0..1ebae8838 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -4,8 +4,7 @@ CeruleanCity_House2_MapScripts:: @ 816A975 CeruleanCity_House2_EventScript_16A976:: @ 816A976 lock faceplayer - checkflag FLAG_GOT_TM28_FROM_ROCKET - goto_if TRUE, EventScript_16A98B + goto_if_set FLAG_GOT_TM28_FROM_ROCKET, EventScript_16A98B msgbox gUnknown_8191E13 release end @@ -16,9 +15,9 @@ EventScript_16A98B:: @ 816A98B end CeruleanCity_House2_EventScript_16A995:: @ 816A995 - msgbox gUnknown_8191F2A, 2 + msgbox gUnknown_8191F2A, MSGBOX_NPC end CeruleanCity_House2_EventScript_16A99E:: @ 816A99E - msgbox gUnknown_8191F64, 3 + msgbox gUnknown_8191F64, MSGBOX_SIGN end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 36ce99bdb..ce76ef039 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -2,7 +2,7 @@ CeruleanCity_House3_MapScripts:: @ 816A9A7 .byte 0 CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8 - msgbox gUnknown_8191F80, 2 + msgbox gUnknown_8191F80, MSGBOX_NPC end CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 @@ -10,17 +10,16 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 faceplayer setvar VAR_0x8008, 1 call EventScript_1A8CAD - checkflag FLAG_DID_ZYNX_TRADE - goto_if TRUE, EventScript_16AA23 + goto_if_set FLAG_DID_ZYNX_TRADE, EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AA0B + compare VAR_RESULT, NO + goto_if_eq EventScript_16AA0B call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_16AA0B + compare VAR_0x8004, 6 + goto_if_ge EventScript_16AA0B call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16AA15 + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_16AA15 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D setflag FLAG_DID_ZYNX_TRADE diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index afbb35c5f..432f1a9f3 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -3,26 +3,26 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF 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 lock specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8004, 0 - goto_if eq, EventScript_CeruleanCity_House4_NoNews - compare_var_to_value VAR_0x8004, 1 - goto_if eq, EventScript_CeruleanCity_House4_News1 - compare_var_to_value VAR_0x8004, 2 - goto_if eq, EventScript_CeruleanCity_House4_News2 - compare_var_to_value VAR_0x8004, 3 - goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread - compare_var_to_value VAR_0x8004, 4 - goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1 - compare_var_to_value VAR_0x8004, 5 - goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2 - compare_var_to_value VAR_0x8004, 6 - goto_if eq, EventScript_CeruleanCity_House4_NewsDone + compare VAR_0x8004, 0 + goto_if_eq EventScript_CeruleanCity_House4_NoNews + compare VAR_0x8004, 1 + goto_if_eq EventScript_CeruleanCity_House4_News1 + compare VAR_0x8004, 2 + goto_if_eq EventScript_CeruleanCity_House4_News2 + compare VAR_0x8004, 3 + goto_if_eq EventScript_CeruleanCity_House4_NewsNotSpread + compare VAR_0x8004, 4 + goto_if_eq EventScript_CeruleanCity_House4_NewsSpread1 + compare VAR_0x8004, 5 + goto_if_eq EventScript_CeruleanCity_House4_NewsSpread2 + compare VAR_0x8004, 6 + goto_if_eq EventScript_CeruleanCity_House4_NewsDone end EventScript_CeruleanCity_House4_NoNews:: @ 816AD59 @@ -34,8 +34,8 @@ EventScript_CeruleanCity_House4_News1:: @ 816AD63 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192B43 giveitem VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + compare VAR_RESULT, 0 + goto_if_eq EventScript_16AE45 release end @@ -43,13 +43,13 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192C07 giveitem VAR_0x8008, 4 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + compare VAR_RESULT, 0 + goto_if_eq EventScript_16AE45 release end EventScript_CeruleanCity_House4_NewsNotSpread:: @ 816ADAF - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_8192CD5 release @@ -59,8 +59,8 @@ EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192D4B giveitem VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + compare VAR_RESULT, 0 + goto_if_eq EventScript_16AE45 release end @@ -68,13 +68,13 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192DE3 giveitem VAR_0x8008, 4 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + compare VAR_RESULT, 0 + goto_if_eq EventScript_16AE45 release end EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_8192EC5 release @@ -82,11 +82,11 @@ EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F EventScript_CeruleanCity_House4_MovementReactionToNews:: @ 816AE23 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 return diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 79cd75785..51243d31f 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -4,18 +4,16 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 lock faceplayer - checkflag FLAG_GOT_POWDER_JAR - goto_if TRUE, EventScript_16AEB7 + goto_if_set FLAG_GOT_POWDER_JAR, EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AEAD - checkflag FLAG_SYS_GOT_BERRY_POUCH - goto_if FALSE, EventScript_16AEA3 + compare VAR_RESULT, NO + goto_if_eq EventScript_16AEAD + goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_GOT_POWDER_JAR giveitem ITEM_POWDER_JAR - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull msgbox gUnknown_8193033 release end @@ -143,28 +141,28 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AEC8 + compare VAR_RESULT, NO + goto_if_eq EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B0CC + compare VAR_RESULT, 0 + goto_if_eq EventScript_16B0CC giveitem VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B0BF + compare VAR_RESULT, 0 + goto_if_eq EventScript_16B0BF copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16AEC8 + compare VAR_RESULT, YES + goto_if_eq EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 release end EventScript_16B0BF:: @ 816B0BF - msgbox gUnknown_81A5207 + msgbox Text_BagIsFull special sub_815F114 release end @@ -177,8 +175,8 @@ EventScript_16B0CC:: @ 816B0CC CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA lockall 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_814EA7C waitstate releaseall diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index c99795d35..d6d132e79 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -2,23 +2,23 @@ CeruleanCity_Mart_MapScripts:: @ 816AC9D .byte 0 CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E - msgbox gUnknown_81929C2, 2 + msgbox gUnknown_81929C2, MSGBOX_NPC end CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 - msgbox gUnknown_8192A79, 2 + msgbox gUnknown_8192A79, MSGBOX_NPC end CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16ACD8 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index 6a67f0fe1..a59e9710d 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -1,25 +1,25 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D - map_script 3, CeruleanCity_PokemonCenter_1F_MapScript1_16AA38 - map_script 5, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38 +CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38 setrespawn SPAWN_CERULEAN_CITY end CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45 - msgbox gUnknown_8192079, 2 + msgbox gUnknown_8192079, MSGBOX_NPC end CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E - msgbox gUnknown_8191FFB, 2 + msgbox gUnknown_8191FFB, MSGBOX_NPC end CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 @@ -31,5 +31,5 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 end CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70 - msgbox gUnknown_819214C, 2 + msgbox gUnknown_819214C, MSGBOX_NPC end diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index e15dbda8e..837ab4956 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc index 3778c494d..f6f83f0da 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 - map_script 2, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CeruleanCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816AA8E + call CableClub_EventScript_Colosseum end -EventScript_16AA94:: @ 816AA94 - call EventScript_1BB6AB +CeruleanCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816AA94 + call CableClub_EventScript_TradeCenter end -EventScript_16AA9A:: @ 816AA9A - call EventScript_1BB7DE +CeruleanCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816AA9A + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index ecc68bb6d..c83feff7b 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -120,7 +120,7 @@ "x": 20, "y": 5, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "CinnabarIsland_EventScript_1671CA" } diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 2ebce51b7..b3cd646b4 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -1,17 +1,17 @@ CinnabarIsland_MapScripts:: @ 8166ED6 - map_script 3, CinnabarIsland_MapScript1_166EE1 - map_script 2, CinnabarIsland_MapScript2_166F6E + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_OnFrame .byte 0 -CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 +CinnabarIsland_OnTransition:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 - call_if eq, EventScript_166F24 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3 - call_if eq, EventScript_166F52 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 - call_if eq, EventScript_166F0B + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1 + call_if_eq EventScript_166F24 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3 + call_if_eq EventScript_166F52 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 + call_if_eq EventScript_166F0B end EventScript_166F0B:: @ 8166F0B @@ -24,8 +24,8 @@ EventScript_166F0B:: @ 8166F0B EventScript_166F24:: @ 8166F24 getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 18 - goto_if ge, EventScript_166F4A + compare VAR_0x8004, 18 + goto_if_ge EventScript_166F4A setflag FLAG_TEMP_2 setobjectxyperm 3, 18, 12 setobjectmovementtype 3, 7 @@ -42,15 +42,14 @@ EventScript_166F52:: @ 8166F52 return EventScript_166F5E:: @ 8166F5E - checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY - goto_if TRUE, EventScript_166F68 + goto_if_set FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY, EventScript_166F68 return EventScript_166F68:: @ 8166F68 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return -CinnabarIsland_MapScript2_166F6E:: @ 8166F6E +CinnabarIsland_OnFrame:: @ 8166F6E map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, EventScript_166F88 map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166FCD map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, EventScript_166FA0 @@ -82,45 +81,41 @@ EventScript_166FA0:: @ 8166FA0 end Movement_166FC6:: @ 8166FC6 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end EventScript_166FCD:: @ 8166FCD lockall textcolor 0 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167032 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_16703D + call_if_unset FLAG_TEMP_2, EventScript_167032 + call_if_set FLAG_TEMP_2, EventScript_16703D playse SE_PIN - applymovement 3, Movement_1A75DB + applymovement 3, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_1A75DD + applymovement 3, Movement_Delay48 waitmovement 0 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167048 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167053 + call_if_unset FLAG_TEMP_2, EventScript_167048 + call_if_set FLAG_TEMP_2, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_167068 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_167078 + compare VAR_RESULT, YES + goto_if_eq EventScript_167068 + compare VAR_RESULT, NO + goto_if_eq EventScript_167078 end EventScript_167032:: @ 8167032 - applymovement 3, Movement_1A75E9 + applymovement 3, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_16703D:: @ 816703D - applymovement 3, Movement_1A75E7 + applymovement 3, Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -132,7 +127,7 @@ EventScript_167048:: @ 8167048 EventScript_167053:: @ 8167053 applymovement 3, Movement_1671A6 waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -146,10 +141,8 @@ EventScript_167068:: @ 8167068 EventScript_167078:: @ 8167078 msgbox gUnknown_8180DF8 closemessage - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1670A0 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_1670B3 + call_if_unset FLAG_TEMP_2, EventScript_1670A0 + call_if_set FLAG_TEMP_2, EventScript_1670B3 removeobject 3 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL @@ -162,17 +155,17 @@ EventScript_1670A0:: @ 81670A0 return Movement_1670AB:: @ 81670AB - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end EventScript_1670B3:: @ 81670B3 - applymovement 255, Movement_1670DB + applymovement OBJ_EVENT_ID_PLAYER, Movement_1670DB applymovement 3, Movement_1670DE waitmovement 0 opendoor 14, 11 @@ -184,36 +177,31 @@ EventScript_1670B3:: @ 81670B3 return Movement_1670DB:: @ 81670DB - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end Movement_1670DE:: @ 81670DE - step_1c - step_12 - step_2e + delay_16 + walk_left + walk_in_place_fastest_up step_end Movement_1670E2:: @ 81670E2 - step_11 - step_1a - step_60 + walk_up + delay_4 + set_invisible step_end EventScript_1670E6:: @ 81670E6 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167142 + call_if_set FLAG_TEMP_2, EventScript_167142 addobject 4 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167154 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167166 + call_if_unset FLAG_TEMP_2, EventScript_167154 + call_if_set FLAG_TEMP_2, EventScript_167166 msgbox gUnknown_8180EAD closemessage - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167171 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167183 + call_if_unset FLAG_TEMP_2, EventScript_167171 + call_if_set FLAG_TEMP_2, EventScript_167183 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 removeobject 3 delay 40 @@ -226,7 +214,7 @@ EventScript_1670E6:: @ 81670E6 EventScript_167142:: @ 8167142 applymovement 3, Movement_1671AF - applymovement 255, Movement_1671AF + applymovement OBJ_EVENT_ID_PLAYER, Movement_1671AF waitmovement 0 return @@ -243,101 +231,101 @@ EventScript_167166:: @ 8167166 EventScript_167171:: @ 8167171 applymovement 3, Movement_16719D - applymovement 255, Movement_1671BA + applymovement OBJ_EVENT_ID_PLAYER, Movement_1671BA waitmovement 0 return EventScript_167183:: @ 8167183 applymovement 3, Movement_1671B6 - applymovement 255, Movement_1671C4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1671C4 waitmovement 0 return Movement_167195:: @ 8167195 - step_1c - step_1c - step_1f - step_1f - step_12 - step_left - step_left + delay_16 + delay_16 + walk_fast_left + walk_fast_left + walk_left + walk_slowest_left + walk_slowest_left step_end Movement_16719D:: @ 816719D - step_13 - step_10 - step_10 - step_13 - step_1a - step_60 + walk_right + walk_down + walk_down + walk_right + delay_4 + set_invisible step_end Movement_1671A4:: @ 81671A4 - step_11 + walk_up step_end Movement_1671A6:: @ 81671A6 - step_12 - step_12 - step_12 + walk_left + walk_left + walk_left step_end Movement_1671AA:: @ 81671AA - step_1c - step_1c - step_1b - step_30 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_right step_end Movement_1671AF:: @ 81671AF - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_1671B6:: @ 81671B6 - step_13 - step_1a - step_60 + walk_right + delay_4 + set_invisible step_end Movement_1671BA:: @ 81671BA - step_10 - step_13 - step_10 - step_10 - step_30 - step_1a - step_13 - step_1a - step_60 + walk_down + walk_right + walk_down + walk_down + walk_in_place_fastest_right + delay_4 + walk_right + delay_4 + set_invisible step_end Movement_1671C4:: @ 81671C4 - step_13 - step_1a - step_13 - step_1a - step_60 + walk_right + delay_4 + walk_right + delay_4 + set_invisible step_end CinnabarIsland_EventScript_1671CA:: @ 81671CA lockall - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 msgbox gUnknown_8180B20 closemessage - applymovement 255, Movement_1671ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_1671ED waitmovement 0 releaseall end Movement_1671ED:: @ 81671ED - step_10 + walk_down step_end CinnabarIsland_EventScript_1671EF:: @ 81671EF @@ -349,15 +337,15 @@ CinnabarIsland_EventScript_1671EF:: @ 81671EF end CinnabarIsland_EventScript_167208:: @ 8167208 - msgbox gUnknown_8180BA0, 2 + msgbox gUnknown_8180BA0, MSGBOX_NPC end CinnabarIsland_EventScript_167211:: @ 8167211 - msgbox gUnknown_8180C0D, 3 + msgbox gUnknown_8180C0D, MSGBOX_SIGN end CinnabarIsland_EventScript_16721A:: @ 816721A - msgbox gUnknown_8180C3E, 3 + msgbox gUnknown_8180C3E, MSGBOX_SIGN end CinnabarIsland_EventScript_167223:: @ 8167223 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 9e67b156d..15496a023 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -1,22 +1,15 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B - map_script 1, CinnabarIsland_Gym_MapScript1_16D951 + map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_Gym_OnLoad .byte 0 -CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 - checkflag FLAG_DEFEATED_BLAINE - goto_if TRUE, EventScript_16D991 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - call_if TRUE, EventScript_16D9B0 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - call_if TRUE, EventScript_16D9B6 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - call_if TRUE, EventScript_16D9BC - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - call_if TRUE, EventScript_16D9C2 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - call_if TRUE, EventScript_16D9C8 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - call_if TRUE, EventScript_16D9CE +CinnabarIsland_Gym_OnLoad:: @ 816D951 + goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16D991 + call_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16D9B0 + call_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16D9B6 + call_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16D9BC + call_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16D9C2 + call_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16D9C8 + call_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16D9CE end EventScript_16D991:: @ 816D991 @@ -54,9 +47,8 @@ EventScript_16D9CE:: @ 816D9CE CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06 - checkflag FLAG_GOT_TM38_FROM_BLAINE - goto_if FALSE, EventScript_16DA34 + trainerbattle_single TRAINER_LEADER_BLAINE, Text_199543, Text_1995FA, EventScript_16DA06, NO_MUSIC + goto_if_unset FLAG_GOT_TM38_FROM_BLAINE, EventScript_16DA34 msgbox gUnknown_819971D release end @@ -75,10 +67,9 @@ EventScript_16DA06:: @ 816DA06 EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DA75 - additem ITEM_TM38, 1 - giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16DA75 + giveitem_msg gUnknown_81996FF, ITEM_TM38 setflag FLAG_GOT_TM38_FROM_BLAINE msgbox gUnknown_8199652 release @@ -90,18 +81,17 @@ EventScript_16DA75:: @ 816DA75 end CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6 - msgbox gUnknown_81997EA, 6 + trainerbattle_single TRAINER_SUPER_NERD_ERIK, Text_1997A5, Text_1997D6 + msgbox gUnknown_81997EA, MSGBOX_AUTOCLOSE end CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 - msgbox gUnknown_8199911, 6 + trainerbattle_single TRAINER_SUPER_NERD_AVERY, Text_1998BD, Text_1998ED, EventScript_16DAB1 + msgbox gUnknown_8199911, MSGBOX_AUTOCLOSE end EventScript_16DAB1:: @ 816DAB1 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - call_if FALSE, EventScript_16DABC + call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DABC release end @@ -110,14 +100,13 @@ EventScript_16DABC:: @ 816DABC return CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA + trainerbattle_single TRAINER_SUPER_NERD_DEREK, Text_1999B7, Text_1999DB, EventScript_16DAEA famechecker FAMECHECKER_BLAINE, 2 - msgbox gUnknown_81999DF, 6 + msgbox gUnknown_81999DF, MSGBOX_AUTOCLOSE end EventScript_16DAEA:: @ 816DAEA - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - call_if FALSE, EventScript_16DAF5 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DAF5 release end @@ -126,13 +115,12 @@ EventScript_16DAF5:: @ 816DAF5 return CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16 - msgbox gUnknown_8199B27, 6 + trainerbattle_single TRAINER_SUPER_NERD_ZAC, Text_199AFC, Text_199B16, EventScript_16DB16 + msgbox gUnknown_8199B27, MSGBOX_AUTOCLOSE end EventScript_16DB16:: @ 816DB16 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - call_if FALSE, EventScript_16DB21 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DB21 release end @@ -141,13 +129,12 @@ EventScript_16DB21:: @ 816DB21 return CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42 - msgbox gUnknown_819987D, 6 + trainerbattle_single TRAINER_BURGLAR_QUINN, Text_19983F, Text_199870, EventScript_16DB42 + msgbox gUnknown_819987D, MSGBOX_AUTOCLOSE end EventScript_16DB42:: @ 816DB42 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - call_if FALSE, EventScript_16DB4D + call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DB4D release end @@ -156,13 +143,12 @@ EventScript_16DB4D:: @ 816DB4D return CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E - msgbox gUnknown_8199986, 6 + trainerbattle_single TRAINER_BURGLAR_RAMON, Text_199948, Text_199973, EventScript_16DB6E + msgbox gUnknown_8199986, MSGBOX_AUTOCLOSE end EventScript_16DB6E:: @ 816DB6E - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - call_if FALSE, EventScript_16DB79 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DB79 release end @@ -171,13 +157,12 @@ EventScript_16DB79:: @ 816DB79 return CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A - msgbox gUnknown_8199AC9, 6 + trainerbattle_single TRAINER_BURGLAR_DUSTY, Text_199A7F, Text_199AB9, EventScript_16DB9A + msgbox gUnknown_8199AC9, MSGBOX_AUTOCLOSE end EventScript_16DB9A:: @ 816DB9A - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - call_if FALSE, EventScript_16DBA5 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DBA5 release end @@ -188,8 +173,7 @@ EventScript_16DBA5:: @ 816DBA5 CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB lock faceplayer - checkflag FLAG_DEFEATED_BLAINE - goto_if TRUE, EventScript_16DBC0 + goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16DBC0 msgbox gUnknown_8199B81 release end @@ -201,8 +185,7 @@ EventScript_16DBC0:: @ 816DBC0 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA lockall - checkflag FLAG_BADGE07_GET - goto_if TRUE, EventScript_16DBDE + goto_if_set FLAG_BADGE07_GET, EventScript_16DBDE msgbox gUnknown_8199C29 releaseall end @@ -214,23 +197,23 @@ EventScript_16DBDE:: @ 816DBDE CinnabarIsland_Gym_EventScript_16DBE8:: @ 816DBE8 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DC00 end CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DC00 end EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16DC43 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DC6A + compare VAR_RESULT, YES + goto_if_eq EventScript_16DC43 + compare VAR_RESULT, NO + goto_if_eq EventScript_16DC6A end EventScript_16DC27:: @ 816DC27 @@ -249,8 +232,7 @@ EventScript_16DC34:: @ 816DC34 EventScript_16DC43:: @ 816DC43 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -269,71 +251,68 @@ EventScript_16DC68:: @ 816DC68 EventScript_16DC6A:: @ 816DC6A call EventScript_16DC34 - checktrainerflag TRAINER_BURGLAR_QUINN - goto_if lt, EventScript_16DC7A + goto_if_undefeated TRAINER_BURGLAR_QUINN, EventScript_16DC7A releaseall end EventScript_16DC7A:: @ 816DC7A - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16DCB4 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16DCC6 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16DCB4 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_QUINN, 0, Text_199870 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_QUINN, Text_199870 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68 call EventScript_16DC58 releaseall end EventScript_16DCB4:: @ 816DCB4 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 1, Movement_16DCD8 waitmovement 0 return EventScript_16DCC6:: @ 816DCC6 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 1, Movement_16DCDB waitmovement 0 return Movement_16DCD8:: @ 816DCD8 - step_12 - step_12 + walk_left + walk_left step_end Movement_16DCDB:: @ 816DCDB - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DCF5 end CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DCF5 end EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16DD41 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DD1C + compare VAR_RESULT, YES + goto_if_eq EventScript_16DD41 + compare VAR_RESULT, NO + goto_if_eq EventScript_16DD1C end EventScript_16DD1C:: @ 816DD1C call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -348,80 +327,77 @@ EventScript_16DD31:: @ 816DD31 EventScript_16DD41:: @ 816DD41 call EventScript_16DC34 - checktrainerflag TRAINER_SUPER_NERD_AVERY - goto_if lt, EventScript_16DD51 + goto_if_undefeated TRAINER_SUPER_NERD_AVERY, EventScript_16DD51 releaseall end EventScript_16DD51:: @ 816DD51 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16DD8B - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16DD9D + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16DD8B + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, Text_1998ED + goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68 call EventScript_16DD31 releaseall end EventScript_16DD8B:: @ 816DD8B - applymovement 255, Movement_16DDB7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7 applymovement 3, Movement_16DDAF waitmovement 0 return EventScript_16DD9D:: @ 816DD9D - applymovement 255, Movement_16DDB7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7 applymovement 3, Movement_16DDB3 waitmovement 0 return Movement_16DDAF:: @ 816DDAF - step_11 - step_11 - step_12 + walk_up + walk_up + walk_left step_end Movement_16DDB3:: @ 816DDB3 - step_11 - step_11 - step_2f + walk_up + walk_up + walk_in_place_fastest_left step_end Movement_16DDB7:: @ 816DDB7 - step_1c - step_1c - step_30 + delay_16 + delay_16 + walk_in_place_fastest_right step_end CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DDD3 end CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DDD3 end EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16DE1F - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DDFA + compare VAR_RESULT, YES + goto_if_eq EventScript_16DE1F + compare VAR_RESULT, NO + goto_if_eq EventScript_16DDFA end EventScript_16DDFA:: @ 816DDFA call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -436,71 +412,68 @@ EventScript_16DE0F:: @ 816DE0F EventScript_16DE1F:: @ 816DE1F call EventScript_16DC34 - checktrainerflag TRAINER_BURGLAR_RAMON - goto_if lt, EventScript_16DE2F + goto_if_undefeated TRAINER_BURGLAR_RAMON, EventScript_16DE2F releaseall end EventScript_16DE2F:: @ 816DE2F - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16DE69 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16DE7B + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16DE69 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_RAMON, 0, Text_199973 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_RAMON, Text_199973 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68 call EventScript_16DE0F releaseall end EventScript_16DE69:: @ 816DE69 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 4, Movement_16DE8D waitmovement 0 return EventScript_16DE7B:: @ 816DE7B - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 4, Movement_16DE90 waitmovement 0 return Movement_16DE8D:: @ 816DE8D - step_12 - step_12 + walk_left + walk_left step_end Movement_16DE90:: @ 816DE90 - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DEAA end CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DEAA end EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16DEF6 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DED1 + compare VAR_RESULT, YES + goto_if_eq EventScript_16DEF6 + compare VAR_RESULT, NO + goto_if_eq EventScript_16DED1 end EventScript_16DED1:: @ 816DED1 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -515,71 +488,68 @@ EventScript_16DEE6:: @ 816DEE6 EventScript_16DEF6:: @ 816DEF6 call EventScript_16DC34 - checktrainerflag TRAINER_SUPER_NERD_DEREK - goto_if lt, EventScript_16DF06 + goto_if_undefeated TRAINER_SUPER_NERD_DEREK, EventScript_16DF06 releaseall end EventScript_16DF06:: @ 816DF06 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16DF40 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16DF52 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16DF40 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, Text_1999DB + goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68 call EventScript_16DEE6 releaseall end EventScript_16DF40:: @ 816DF40 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 5, Movement_16DF64 waitmovement 0 return EventScript_16DF52:: @ 816DF52 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 5, Movement_16DF67 waitmovement 0 return Movement_16DF64:: @ 816DF64 - step_12 - step_12 + walk_left + walk_left step_end Movement_16DF67:: @ 816DF67 - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DF81 end CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DF81 end EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16DFA8 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DFCD + compare VAR_RESULT, YES + goto_if_eq EventScript_16DFA8 + compare VAR_RESULT, NO + goto_if_eq EventScript_16DFCD end EventScript_16DFA8:: @ 816DFA8 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -594,71 +564,68 @@ EventScript_16DFBD:: @ 816DFBD EventScript_16DFCD:: @ 816DFCD call EventScript_16DC34 - checktrainerflag TRAINER_BURGLAR_DUSTY - goto_if lt, EventScript_16DFDD + goto_if_undefeated TRAINER_BURGLAR_DUSTY, EventScript_16DFDD releaseall end EventScript_16DFDD:: @ 816DFDD - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16E017 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16E029 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16E017 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, Text_199AB9 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68 call EventScript_16DFBD releaseall end EventScript_16E017:: @ 816E017 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 6, Movement_16E03B waitmovement 0 return EventScript_16E029:: @ 816E029 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 6, Movement_16E03E waitmovement 0 return Movement_16E03B:: @ 816E03B - step_12 - step_12 + walk_left + walk_left step_end Movement_16E03E:: @ 816E03E - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16E040:: @ 816E040 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16E058 end CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16E058 end EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E0A4 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E07F + compare VAR_RESULT, YES + goto_if_eq EventScript_16E0A4 + compare VAR_RESULT, NO + goto_if_eq EventScript_16E07F end EventScript_16E07F:: @ 816E07F call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68 call EventScript_16E094 releaseall end @@ -673,44 +640,42 @@ EventScript_16E094:: @ 816E094 EventScript_16E0A4:: @ 816E0A4 call EventScript_16DC34 - checktrainerflag TRAINER_SUPER_NERD_ZAC - goto_if lt, EventScript_16E0B4 + goto_if_undefeated TRAINER_SUPER_NERD_ZAC, EventScript_16E0B4 releaseall end EventScript_16E0B4:: @ 816E0B4 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16E0EE - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16E100 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16E0EE + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, Text_199B16 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68 call EventScript_16E094 releaseall end EventScript_16E0EE:: @ 816E0EE - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 7, Movement_16E112 waitmovement 0 return EventScript_16E100:: @ 816E100 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 7, Movement_16E115 waitmovement 0 return Movement_16E112:: @ 816E112 - step_12 - step_12 + walk_left + walk_left step_end Movement_16E115:: @ 816E115 - step_12 + walk_left step_end EventScript_16E117:: @ 816E117 diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index 85ad79e4e..5d512a32b 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -2,23 +2,23 @@ CinnabarIsland_Mart_MapScripts:: @ 816EA0F .byte 0 CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10 - msgbox gUnknown_819A7A0, 2 + msgbox gUnknown_819A7A0, MSGBOX_NPC end CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 - msgbox gUnknown_819A7F1, 2 + msgbox gUnknown_819A7F1, MSGBOX_NPC end CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16EA48 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 640446bf0..626263f76 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,37 +1,37 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 - map_script 3, CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2 - map_script 5, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2 +CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2 setrespawn SPAWN_CINNABAR_ISLAND end CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF - msgbox gUnknown_819A5BE, 2 + msgbox gUnknown_819A5BE, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8 - msgbox gUnknown_819A4F8, 2 + msgbox gUnknown_819A4F8, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901 - msgbox gUnknown_819A6B1, 2 + msgbox gUnknown_819A6B1, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A lock faceplayer msgbox gUnknown_819A725, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E9A5 + compare VAR_RESULT, NO + goto_if_eq EventScript_16E9A5 msgbox gUnknown_819A785 closemessage playbgm MUS_ANNAI, 1 @@ -39,12 +39,12 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_16E96F - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_16E981 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_16E993 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_16E96F + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_16E981 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_HIDE_CINNABAR_BILL @@ -55,19 +55,19 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A EventScript_16E96F:: @ 816E96F applymovement 7, Movement_16E9AF - applymovement 255, Movement_16E9B9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9B9 waitmovement 0 return EventScript_16E981:: @ 816E981 applymovement 7, Movement_16E9C3 - applymovement 255, Movement_16E9CF + applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9CF waitmovement 0 return EventScript_16E993:: @ 816E993 applymovement 7, Movement_16E9AF - applymovement 255, Movement_16E9DE + applymovement OBJ_EVENT_ID_PLAYER, Movement_16E9DE waitmovement 0 return @@ -77,68 +77,68 @@ EventScript_16E9A5:: @ 816E9A5 end Movement_16E9AF:: @ 816E9AF - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_1b - step_60 + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + delay_8 + set_invisible step_end Movement_16E9B9:: @ 816E9B9 - step_10 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_1c - step_10 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + delay_16 + walk_down step_end Movement_16E9C3:: @ 816E9C3 - step_11 - step_12 - step_12 - step_10 - step_12 - step_12 - step_10 - step_10 - step_10 - step_1b - step_60 + walk_up + walk_left + walk_left + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + delay_8 + set_invisible step_end Movement_16E9CF:: @ 816E9CF - step_1c - step_1c - step_1c - step_02 - step_1c - step_12 - step_12 - step_12 - step_10 - step_10 - step_1b - step_10 - step_1b - step_60 + delay_16 + delay_16 + delay_16 + face_left + delay_16 + walk_left + walk_left + walk_left + walk_down + walk_down + delay_8 + walk_down + delay_8 + set_invisible step_end Movement_16E9DE:: @ 816E9DE - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_1c - step_10 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + delay_16 + walk_down step_end diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 4bb297599..bd8c9d41e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc index 828f9296a..9cec10be2 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 - map_script 2, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CinnabarIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 816E9FD + call CableClub_EventScript_Colosseum end -EventScript_16EA03:: @ 816EA03 - call EventScript_1BB6AB +CinnabarIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EA03 + call CableClub_EventScript_TradeCenter end -EventScript_16EA09:: @ 816EA09 - call EventScript_1BB7DE +CinnabarIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EA09 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index 780103629..caf07f29d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -1,10 +1,10 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 - map_script 3, CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279 + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonLab_Entrance_OnTransition .byte 0 -CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - call_if eq, EventScript_16E285 +CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + call_if_eq EventScript_16E285 end EventScript_16E285:: @ 816E285 @@ -12,21 +12,21 @@ EventScript_16E285:: @ 816E285 return CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B - msgbox gUnknown_8199EE5, 2 + msgbox gUnknown_8199EE5, MSGBOX_NPC end CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294 - msgbox gUnknown_8199F41, 3 + msgbox gUnknown_8199F41, MSGBOX_SIGN end CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D - msgbox gUnknown_8199F6A, 3 + msgbox gUnknown_8199F6A, MSGBOX_SIGN end CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6 - msgbox gUnknown_8199F83, 3 + msgbox gUnknown_8199F83, MSGBOX_SIGN end CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF - msgbox gUnknown_8199F9A, 3 + msgbox gUnknown_8199F9A, MSGBOX_SIGN end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 27fb47f63..41e0bc938 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -6,17 +6,16 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 faceplayer setvar VAR_0x8008, 8 call EventScript_1A8CAD - checkflag FLAG_DID_SEELOR_TRADE - goto_if TRUE, EventScript_16E473 + goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E45B + compare VAR_RESULT, NO + goto_if_eq EventScript_16E45B call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_16E45B + compare VAR_0x8004, 6 + goto_if_ge EventScript_16E45B call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16E465 + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_16E465 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_SEELOR_TRADE @@ -43,48 +42,41 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D lock faceplayer setvar VAR_RESULT, 0 - checkflag FLAG_REVIVED_AMBER - call_if TRUE, EventScript_16E8A1 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E897 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 - goto_if eq, EventScript_16E736 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - goto_if eq, EventScript_16E72C + call_if_set FLAG_REVIVED_AMBER, EventScript_16E8A1 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16E897 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 + goto_if_eq EventScript_16E736 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + goto_if_eq EventScript_16E72C call EventScript_16E4EC - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E544 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16E544 call EventScript_16E504 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E586 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16E586 call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E5C8 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16E5C8 msgbox gUnknown_819A282 goto EventScript_16E53A end EventScript_16E4EC:: @ 816E4EC - checkflag FLAG_GOT_HELIX_FOSSIL - goto_if FALSE, EventScript_16E534 - checkflag FLAG_REVIVED_HELIX - goto_if TRUE, EventScript_16E534 + goto_if_unset FLAG_GOT_HELIX_FOSSIL, EventScript_16E534 + goto_if_set FLAG_REVIVED_HELIX, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E504:: @ 816E504 - checkflag FLAG_GOT_DOME_FOSSIL - goto_if FALSE, EventScript_16E534 - checkflag FLAG_REVIVED_DOME - goto_if TRUE, EventScript_16E534 + goto_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_16E534 + goto_if_set FLAG_REVIVED_DOME, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E51C:: @ 816E51C - checkflag FLAG_GOT_OLD_AMBER - goto_if FALSE, EventScript_16E534 - checkflag FLAG_REVIVED_AMBER - goto_if TRUE, EventScript_16E534 + goto_if_unset FLAG_GOT_OLD_AMBER, EventScript_16E534 + goto_if_set FLAG_REVIVED_AMBER, EventScript_16E534 setvar VAR_RESULT, 1 return @@ -101,8 +93,8 @@ EventScript_16E544:: @ 816E544 message Text_19A282 waitmessage call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E5FA + compare VAR_RESULT, 1 + goto_if_eq EventScript_16E5FA multichoice 0, 0, MULTICHOICE_HELIX, FALSE switch VAR_RESULT case 0, EventScript_16E668 @@ -114,8 +106,8 @@ EventScript_16E586:: @ 816E586 message Text_19A282 waitmessage call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E631 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16E631 multichoice 0, 0, MULTICHOICE_DOME, FALSE switch VAR_RESULT case 0, EventScript_16E6A6 @@ -155,8 +147,8 @@ EventScript_16E668:: @ 816E668 getspeciesname 0, SPECIES_OMANYTE getitemname 1, ITEM_HELIX_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E722 + compare VAR_RESULT, NO + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_HELIX_FOSSIL, 1 @@ -170,8 +162,8 @@ EventScript_16E6A6:: @ 816E6A6 getspeciesname 0, SPECIES_KABUTO getitemname 1, ITEM_DOME_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E722 + compare VAR_RESULT, NO + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_DOME_FOSSIL, 1 @@ -185,8 +177,8 @@ EventScript_16E6E4:: @ 816E6E4 getspeciesname 0, SPECIES_AERODACTYL getitemname 1, ITEM_OLD_AMBER msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E722 + compare VAR_RESULT, NO + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_OLD_AMBER, 1 @@ -207,54 +199,54 @@ EventScript_16E72C:: @ 816E72C end EventScript_16E736:: @ 816E736 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 - goto_if eq, EventScript_16E758 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 - goto_if eq, EventScript_16E79D - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 - goto_if eq, EventScript_16E7E2 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 + goto_if_eq EventScript_16E758 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 + goto_if_eq EventScript_16E79D + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 + goto_if_eq EventScript_16E7E2 end EventScript_16E758:: @ 816E758 - setvar VAR_0x4001, SPECIES_OMANYTE + setvar VAR_TEMP_1, SPECIES_OMANYTE getspeciesname 0, SPECIES_OMANYTE msgbox gUnknown_819A34F - givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + givemon SPECIES_OMANYTE, 5, ITEM_NONE + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A927C setflag FLAG_REVIVED_HELIX - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E85B + compare VAR_RESULT, 0 + goto_if_eq EventScript_16E827 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16E85B end EventScript_16E79D:: @ 816E79D - setvar VAR_0x4001, SPECIES_KABUTO + setvar VAR_TEMP_1, SPECIES_KABUTO getspeciesname 0, SPECIES_KABUTO msgbox gUnknown_819A34F - givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + givemon SPECIES_KABUTO, 5, ITEM_NONE + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A927C setflag FLAG_REVIVED_DOME - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E85B + compare VAR_RESULT, 0 + goto_if_eq EventScript_16E827 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16E85B end EventScript_16E7E2:: @ 816E7E2 - setvar VAR_0x4001, SPECIES_AERODACTYL + setvar VAR_TEMP_1, SPECIES_AERODACTYL getspeciesname 0, SPECIES_AERODACTYL msgbox gUnknown_819A34F - givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + givemon SPECIES_AERODACTYL, 5, ITEM_NONE + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A927C setflag FLAG_REVIVED_AMBER - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E85B + compare VAR_RESULT, 0 + goto_if_eq EventScript_16E827 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16E85B end EventScript_16E827:: @ 816E827 @@ -265,8 +257,8 @@ EventScript_16E827:: @ 816E827 waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E895 + compare VAR_RESULT, NO + goto_if_eq EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16E895 @@ -280,8 +272,8 @@ EventScript_16E85B:: @ 816E85B waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E88A + compare VAR_RESULT, NO + goto_if_eq EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A end @@ -301,21 +293,17 @@ EventScript_16E897:: @ 816E897 end EventScript_16E8A1:: @ 816E8A1 - checkflag FLAG_GOT_HELIX_FOSSIL - goto_if TRUE, EventScript_16E8B9 - checkflag FLAG_GOT_DOME_FOSSIL - goto_if TRUE, EventScript_16E8C8 + goto_if_set FLAG_GOT_HELIX_FOSSIL, EventScript_16E8B9 + goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_16E8C8 goto EventScript_16E534 end EventScript_16E8B9:: @ 816E8B9 - checkflag FLAG_REVIVED_HELIX - goto_if FALSE, EventScript_16E534 + goto_if_unset FLAG_REVIVED_HELIX, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E8C8:: @ 816E8C8 - checkflag FLAG_REVIVED_DOME - goto_if FALSE, EventScript_16E534 + goto_if_unset FLAG_REVIVED_DOME, EventScript_16E534 setvar VAR_RESULT, 1 return diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc index dda99e8ea..6b36fd1a3 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc @@ -1,4 +1,4 @@ -Text_19A137:: @ 819A137 +Text_MetronomeTeach:: @ 819A137 .string "Tch-tch-tch!\n" .string "I'll teach you a nifty move.\p" .string "Teach it to a POKéMON, and watch\n" @@ -6,14 +6,14 @@ Text_19A137:: @ 819A137 .string "It's a move called METRONOME.\n" .string "Does it strike your fancy?$" -Text_19A1CB:: @ 819A1CB +Text_MetronomeDeclined:: @ 819A1CB .string "I tell you, it's a lot of fun!$" -Text_19A1EA:: @ 819A1EA +Text_MetronomeWhichMon:: @ 819A1EA .string "Okay!\n" .string "Which POKéMON should I teach?$" -Text_19A20E:: @ 819A20E +Text_MetronomeTaught:: @ 819A20E .string "Tch-tch-tch!\n" .string "That's the sound of a METRONOME.\p" .string "It tweaks your POKéMON's brain into\n" diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 8a7dc8df1..2a9dc1edf 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -2,7 +2,7 @@ CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8 .byte 0 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9 - msgbox gUnknown_8199FB3, 2 + msgbox gUnknown_8199FB3, MSGBOX_NPC end CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 @@ -10,17 +10,16 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 faceplayer setvar VAR_0x8008, 6 call EventScript_1A8CAD - checkflag FLAG_DID_ESPHERE_TRADE - goto_if TRUE, EventScript_16E334 + goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E31C + compare VAR_RESULT, NO + goto_if_eq EventScript_16E31C call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_16E31C + compare VAR_0x8004, 6 + goto_if_ge EventScript_16E31C call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16E326 + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_16E326 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D setflag FLAG_DID_ESPHERE_TRADE @@ -50,21 +49,20 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - checkflag FLAG_DID_TANGENY_TRADE - goto_if TRUE, EventScript_16E3D4 + goto_if_set FLAG_DID_TANGENY_TRADE, EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E3BC + compare VAR_RESULT, NO + goto_if_eq EventScript_16E3BC special Special_ChooseMonFromParty waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_16E3BC + compare VAR_0x8004, 6 + goto_if_ge EventScript_16E3BC copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16E3C6 + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_16E3C6 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 093cf61c7..c8c7f0414 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF", + "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor", "flag": "0" }, { diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc index e390fd266..3dcd07733 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc @@ -1,18 +1,18 @@ CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE .byte 0 -CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF - goto EventScript_1C4C8E +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor:: @ 816E3DF + goto EventScript_MetronomeTutor end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5 - msgbox gUnknown_819A015, 2 + msgbox gUnknown_819A015, MSGBOX_NPC end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE - msgbox gUnknown_819A04A, 3 + msgbox gUnknown_819A04A, MSGBOX_SIGN end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7 - msgbox gUnknown_819A128, 3 + msgbox gUnknown_819A128, MSGBOX_SIGN end diff --git a/data/maps/DiglettsCave_B1F/scripts.inc b/data/maps/DiglettsCave_B1F/scripts.inc index 28bd063ac..9cf544838 100644 --- a/data/maps/DiglettsCave_B1F/scripts.inc +++ b/data/maps/DiglettsCave_B1F/scripts.inc @@ -1,7 +1,7 @@ DiglettsCave_B1F_MapScripts:: @ 8160EF1 - map_script 3, DiglettsCave_B1F_MapScript1_160EF7 + map_script MAP_SCRIPT_ON_TRANSITION, DiglettsCave_B1F_OnTransition .byte 0 -DiglettsCave_B1F_MapScript1_160EF7:: @ 8160EF7 +DiglettsCave_B1F_OnTransition:: @ 8160EF7 setworldmapflag FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F end diff --git a/data/maps/DiglettsCave_NorthEntrance/scripts.inc b/data/maps/DiglettsCave_NorthEntrance/scripts.inc index 890c5183c..a11fa4c3a 100644 --- a/data/maps/DiglettsCave_NorthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_NorthEntrance/scripts.inc @@ -2,5 +2,5 @@ DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7 .byte 0 DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8 - msgbox gUnknown_817462C, 2 + msgbox gUnknown_817462C, MSGBOX_NPC end diff --git a/data/maps/DiglettsCave_SouthEntrance/scripts.inc b/data/maps/DiglettsCave_SouthEntrance/scripts.inc index 0aab02b7f..2ee397c02 100644 --- a/data/maps/DiglettsCave_SouthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_SouthEntrance/scripts.inc @@ -2,5 +2,5 @@ DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB .byte 0 DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC - msgbox gUnknown_81746A7, 2 + msgbox gUnknown_81746A7, MSGBOX_NPC end diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index 916cba8a1..6b925d8f9 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -1,19 +1,19 @@ FiveIsland_MapScripts:: @ 8167E8E - map_script 3, FiveIsland_MapScript1_167E94 + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_OnTransition .byte 0 -FiveIsland_MapScript1_167E94:: @ 8167E94 +FiveIsland_OnTransition:: @ 8167E94 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND end FiveIsland_EventScript_167E98:: @ 8167E98 - msgbox gUnknown_8182DFB, 3 + msgbox gUnknown_8182DFB, MSGBOX_SIGN end FiveIsland_EventScript_167EA1:: @ 8167EA1 - msgbox gUnknown_8182E26, 2 + msgbox gUnknown_8182E26, MSGBOX_NPC end FiveIsland_EventScript_167EAA:: @ 8167EAA - msgbox gUnknown_8182E96, 2 + msgbox gUnknown_8182E96, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc index 9ab26aa3a..71f305d0b 100644 --- a/data/maps/FiveIsland_Harbor/scripts.inc +++ b/data/maps/FiveIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_Harbor_MapScripts:: @ 8171D42 FiveIsland_Harbor_EventScript_171D43:: @ 8171D43 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND goto EventScript_1A900F diff --git a/data/maps/FiveIsland_House1/scripts.inc b/data/maps/FiveIsland_House1/scripts.inc index 4f34587d7..86f6cbcb4 100644 --- a/data/maps/FiveIsland_House1/scripts.inc +++ b/data/maps/FiveIsland_House1/scripts.inc @@ -2,5 +2,5 @@ FiveIsland_House1_MapScripts:: @ 8171D56 .byte 0 FiveIsland_House1_EventScript_171D57:: @ 8171D57 - msgbox gUnknown_81A3CAC, 2 + msgbox gUnknown_81A3CAC, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House2/scripts.inc b/data/maps/FiveIsland_House2/scripts.inc index e46909905..79cfa755f 100644 --- a/data/maps/FiveIsland_House2/scripts.inc +++ b/data/maps/FiveIsland_House2/scripts.inc @@ -2,5 +2,5 @@ FiveIsland_House2_MapScripts:: @ 8171D60 .byte 0 FiveIsland_House2_EventScript_171D61:: @ 8171D61 - msgbox gUnknown_81A3D5E, 2 + msgbox gUnknown_81A3D5E, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc index e288ceff6..9292c9e5e 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC - map_script 3, FiveIsland_LostCave_Entrance_MapScript1_164BF2 + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_LostCave_Entrance_OnTransition .byte 0 -FiveIsland_LostCave_Entrance_MapScript1_164BF2:: @ 8164BF2 +FiveIsland_LostCave_Entrance_OnTransition:: @ 8164BF2 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE end diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 62880594c..b6f4e0257 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -2,6 +2,6 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 .byte 0 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAWSON, 0, Text_17CEF5, Text_17CF42 - msgbox gUnknown_817CF54, 6 + trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, Text_17CEF5, Text_17CF42 + msgbox gUnknown_817CF54, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 606513822..980df7a4b 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB", + "script": "FiveIsland_LostCave_Room10_EventScript_ItemSilkScarf", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM10_SILK_SCARF" } ], diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index b214279d1..3b3dffc4d 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -1,18 +1,17 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D - map_script 5, FiveIsland_LostCave_Room10_MapScript1_164C38 - map_script 2, FiveIsland_LostCave_Room10_MapScript2_164C48 + map_script MAP_SCRIPT_ON_RESUME, FiveIsland_LostCave_Room10_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_LostCave_Room10_OnFrame .byte 0 -FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 - checktrainerflag TRAINER_LADY_SELPHY - call_if eq, EventScript_164C42 +FiveIsland_LostCave_Room10_OnResume:: @ 8164C38 + call_if_defeated TRAINER_LADY_SELPHY, EventScript_164C42 end EventScript_164C42:: @ 8164C42 setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 return -FiveIsland_LostCave_Room10_MapScript2_164C48:: @ 8164C48 +FiveIsland_LostCave_Room10_OnFrame:: @ 8164C48 map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, EventScript_164C52 .2byte 0 @@ -26,9 +25,9 @@ EventScript_164C52:: @ 8164C52 waitmovement 0 msgbox gUnknown_817D062 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_164CB6 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_LADY_SELPHY, 0, Text_17D086 + compare VAR_RESULT, 2 + goto_if_eq EventScript_164CB6 + trainerbattle_no_intro TRAINER_LADY_SELPHY, Text_17D086 msgbox gUnknown_817D0B2 closemessage call EventScript_164CA5 @@ -51,16 +50,16 @@ EventScript_164CB6:: @ 8164CB6 end Movement_164CC0:: @ 8164CC0 - step_12 - step_1c - step_13 - step_1c - step_2e - step_1c - step_2d + walk_left + delay_16 + walk_right + delay_16 + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_down step_end Movement_164CC8:: @ 8164CC8 - step_10 - step_10 + walk_down + walk_down step_end diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 52b658dcb..3b08bf303 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8", + "script": "FiveIsland_LostCave_Room11_EventScript_ItemLaxIncense", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM11_LAX_INCENSE" } ], diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 09392a2ca..67626feb7 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room12_EventScript_1BEDD5", + "script": "FiveIsland_LostCave_Room12_EventScript_ItemSeaIncense", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM12_SEA_INCENSE" } ], diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 028c7cea6..41b48cce9 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room13_EventScript_1BEDE2", + "script": "FiveIsland_LostCave_Room13_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM13_MAX_REVIVE" } ], diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index f25b7ee72..17b9542f4 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room14_EventScript_1BEDEF", + "script": "FiveIsland_LostCave_Room14_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM14_RARE_CANDY" } ], diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 28913bb80..38241ab71 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -2,6 +2,6 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 .byte 0 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_LAURA, 0, Text_17CFC1, Text_17CFFB - msgbox gUnknown_817D037, 6 + trainerbattle_single TRAINER_PSYCHIC_LAURA, Text_17CFC1, Text_17CFFB + msgbox gUnknown_817D037, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 66ac71058..2b4630ca3 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Meadow_EventScript_1BEC69", + "script": "FiveIsland_Meadow_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Meadow_EventScript_1BEC76", + "script": "FiveIsland_Meadow_EventScript_ItemPPUp", "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_PP_UP" } ], diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 51ddd9dd9..21fd9be76 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -1,18 +1,15 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 - map_script 1, FiveIsland_Meadow_MapScript1_168938 + map_script MAP_SCRIPT_ON_LOAD, FiveIsland_Meadow_OnLoad .byte 0 -FiveIsland_Meadow_MapScript1_168938:: @ 8168938 - checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE - call_if TRUE, EventScript_168983 +FiveIsland_Meadow_OnLoad:: @ 8168938 + call_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168983 end FiveIsland_Meadow_EventScript_168942:: @ 8168942 lockall - checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE - goto_if TRUE, EventScript_168979 - checkflag FLAG_LEARNED_YES_NAH_CHANSEY - goto_if TRUE, EventScript_16895F + goto_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168979 + goto_if_set FLAG_LEARNED_YES_NAH_CHANSEY, EventScript_16895F msgbox gUnknown_818AB8E releaseall end @@ -39,16 +36,16 @@ EventScript_168983:: @ 8168983 return FiveIsland_Meadow_EventScript_16898D:: @ 816898D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_49, 0, Text_18AC88, Text_18ACB3 - msgbox gUnknown_818ACC5, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, Text_18AC88, Text_18ACB3 + msgbox gUnknown_818ACC5, MSGBOX_AUTOCLOSE end FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_50, 0, Text_18ACF0, Text_18AD39 - msgbox gUnknown_818AD59, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, Text_18ACF0, Text_18AD39 + msgbox gUnknown_818AD59, MSGBOX_AUTOCLOSE end FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_51, 0, Text_18ADC6, Text_18ADFB - msgbox gUnknown_818AE16, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, Text_18ADC6, Text_18ADFB + msgbox gUnknown_818AE16, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 2054a0159..7aac310dc 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -81,7 +81,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_MemorialPillar_EventScript_1BEC83", + "script": "FiveIsland_MemorialPillar_EventScript_ItemMetalCoat", "flag": "FLAG_HIDE_FIVE_ISLAND_MEMORIAL_PILLAR_METAL_COAT" } ], diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index a47767ca0..b193e830e 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -3,17 +3,15 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 lock - checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168A18 - checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168A22 + goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168A18 + goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168A22 msgbox gUnknown_818B02E closemessage - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 delay 45 msgbox gUnknown_818B03C - applymovement 1, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_818B05E release @@ -27,33 +25,31 @@ EventScript_168A18:: @ 8168A18 EventScript_168A22:: @ 8168A22 msgbox gUnknown_818B282 giveitem ITEM_TM42 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_168AFE + compare VAR_RESULT, 0 + goto_if_eq EventScript_168AFE call EventScript_168AE8 release end FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 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 lockall - checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168B0B - checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168B0B + goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B + goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_168A86 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_168A86 releaseall end EventScript_168A86:: @ 8168A86 msgbox gUnknown_818B105, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_168A9B + compare VAR_RESULT, YES + goto_if_eq EventScript_168A9B releaseall end @@ -61,23 +57,23 @@ EventScript_168A9B:: @ 8168A9B removeitem ITEM_LEMONADE, 1 msgbox gUnknown_818B13E closemessage - applymovement 1, Movement_1A75EB + applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 delay 45 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 textcolor 0 msgbox gUnknown_818B171 giveitem ITEM_TM42 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_168AFE + compare VAR_RESULT, 0 + goto_if_eq EventScript_168AFE call EventScript_168AE8 releaseall end EventScript_168AE8:: @ 8168AE8 msgbox gUnknown_818B219 - applymovement 1, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestUp waitmovement 0 setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR return diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index a16cb37d1..21148cede 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -1,23 +1,23 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 - map_script 3, FiveIsland_PokemonCenter_1F_MapScript1_171CFC - map_script 5, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC +FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC setrespawn SPAWN_FIVE_ISLAND end FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09 - msgbox gUnknown_81A3BBA, 2 + msgbox gUnknown_81A3BBA, MSGBOX_NPC end FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12 - msgbox gUnknown_81A3BFD, 2 + msgbox gUnknown_81A3BFD, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index dc97dcdc3..d28b198ce 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc index 5c50a6092..67f84b9bc 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B - map_script 2, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FiveIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FiveIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171D30 + call CableClub_EventScript_Colosseum end -EventScript_171D36:: @ 8171D36 - call EventScript_1BB6AB +FiveIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171D36 + call CableClub_EventScript_TradeCenter end -EventScript_171D3C:: @ 8171D3C - call EventScript_1BB7DE +FiveIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171D3C + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index a4d49de1b..4a5502062 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -1,17 +1,17 @@ FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 - map_script 4, FiveIsland_ResortGorgeous_MapScript1_1687EF - map_script 2, FiveIsland_ResortGorgeous_MapScript2_1687FE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_ResortGorgeous_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_ResortGorgeous_OnFrame .byte 0 -FiveIsland_ResortGorgeous_MapScript1_1687EF:: @ 81687EF +FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_1687F9 .2byte 0 EventScript_1687F9:: @ 81687F9 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -FiveIsland_ResortGorgeous_MapScript2_1687FE:: @ 81687FE +FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_168808 .2byte 0 @@ -20,7 +20,7 @@ EventScript_168808:: @ 8168808 textcolor 1 msgbox gUnknown_818A7DB closemessage - applymovement 8, Movement_1A75E9 + applymovement 8, Movement_WalkInPlaceFastestUp waitmovement 0 opendoor 39, 8 waitdooranim @@ -35,10 +35,10 @@ EventScript_168808:: @ 8168808 end Movement_168841:: @ 8168841 - step_11 - step_60 + walk_up + set_invisible step_end FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844 - msgbox gUnknown_818A7FE, 3 + msgbox gUnknown_818A7FE, MSGBOX_SIGN end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 1d1610ace..946508db5 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -3,17 +3,16 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE 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 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_172043 - compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF - goto_if eq, EventScript_171F0B - compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE - goto_if ne, EventScript_171F19 + goto_if_set FLAG_TEMP_2, EventScript_172043 + compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF + goto_if_eq EventScript_171F0B + compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE + goto_if_ne EventScript_171F19 msgbox gUnknown_81A42A0 goto EventScript_171EFE end @@ -32,8 +31,8 @@ EventScript_171F0B:: @ 8171F0B EventScript_171F19:: @ 8171F19 copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171F34 + compare VAR_RESULT, 1 + goto_if_eq EventScript_171F34 goto EventScript_171EFE end @@ -45,51 +44,51 @@ EventScript_171F34:: @ 8171F34 waitmovement 0 textcolor 0 msgbox gUnknown_81A450B - applymovement 1, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 1 msgbox gUnknown_81A4521 textcolor 0 msgbox gUnknown_81A4566 closemessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_171FCD - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_171FE9 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_171FFE - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_17201A + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_171FCD + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_171FE9 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_171FFE + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E giveitem VAR_RESORT_GORGEOUS_REWARD - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_172025 + compare VAR_RESULT, 0 + goto_if_eq EventScript_172025 setflag FLAG_TEMP_2 setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 release end EventScript_171FCD:: @ 8171FCD - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown applymovement 2, Movement_17204D waitmovement 0 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_171FE9:: @ 8171FE9 applymovement 2, Movement_172055 waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_171FFE:: @ 8171FFE - applymovement 1, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestLeft applymovement 2, Movement_172059 waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -114,36 +113,36 @@ EventScript_172043:: @ 8172043 end Movement_17204D:: @ 817204D - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_30 + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end Movement_172055:: @ 8172055 - step_12 - step_12 - step_2d + walk_left + walk_left + walk_in_place_fastest_down step_end Movement_172059:: @ 8172059 - step_12 - step_12 - step_12 - step_10 + walk_left + walk_left + walk_left + walk_down step_end Movement_17205E:: @ 817205E - step_11 + walk_up step_end Movement_172060:: @ 8172060 - step_25 + walk_in_place_down step_end FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062 - msgbox gUnknown_81A4657, 2 + msgbox gUnknown_81A4657, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index a89fe7b45..3bc0ee2c9 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BED87", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemBigPearl", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BED94", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemTM36", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BEDA1", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemPearl", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BEDAE", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemUpGrade", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_UP_GRADE" } ], diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index e6fb90088..8382d4a72 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -1,15 +1,14 @@ FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E - map_script 1, FiveIsland_RocketWarehouse_MapScript1_163F3D - map_script 3, FiveIsland_RocketWarehouse_MapScript2_163F39 + map_script MAP_SCRIPT_ON_LOAD, FiveIsland_RocketWarehouse_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_RocketWarehouse_OnTransition .byte 0 -FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 +FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE end -FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D - checktrainerflag TRAINER_TEAM_ROCKET_ADMIN - call_if eq, EventScript_163F47 +FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D + call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, EventScript_163F47 end EventScript_163F47:: @ 8163F47 @@ -19,8 +18,7 @@ EventScript_163F47:: @ 8163F47 FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A lockall - checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE - goto_if TRUE, EventScript_163F6E + goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_163F6E msgbox gUnknown_817B4E3 releaseall end @@ -31,27 +29,26 @@ EventScript_163F6E:: @ 8163F6E end FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78 - msgbox gUnknown_817BB15, 3 + msgbox gUnknown_817BB15, MSGBOX_SIGN end FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 lockall - applymovement 4, Movement_1A75E7 + applymovement 4, Movement_WalkInPlaceFastestLeft waitmovement 0 setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 releaseall end FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SCIENTIST_GIDEON, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_163FB7 - msgbox gUnknown_817BCA3, 6 + trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7 + msgbox gUnknown_817BCA3, MSGBOX_AUTOCLOSE end EventScript_163FB7:: @ 8163FB7 famechecker FAMECHECKER_GIOVANNI, 5 - msgbox gUnknown_817BCD7, 6 + msgbox gUnknown_817BCD7, MSGBOX_AUTOCLOSE end EventScript_163FCD:: @ 8163FCD @@ -62,88 +59,88 @@ EventScript_163FCD:: @ 8163FCD end FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_47, 0, Text_17B54D, Text_17B585 - msgbox gUnknown_817B5A6, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585 + msgbox gUnknown_817B5A6, MSGBOX_AUTOCLOSE end FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_48, 0, Text_17B677, Text_17B6D9 - msgbox gUnknown_817B6EF, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9 + msgbox gUnknown_817B6EF, MSGBOX_AUTOCLOSE end FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_ADMIN_2, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F - msgbox gUnknown_817BA64, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F + msgbox gUnknown_817BA64, MSGBOX_AUTOCLOSE end EventScript_16402F:: @ 816402F getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 24 - call_if le, EventScript_164065 + compare VAR_0x8004, 24 + call_if_le EventScript_164065 msgbox gUnknown_817BA64 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 1 removeobject 2 removeobject 4 removeobject 3 setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS - fadescreen 0 + fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 setflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE release end EventScript_164065:: @ 8164065 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_42, 0, Text_17B5D6, Text_17B62F - msgbox gUnknown_817B642, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F + msgbox gUnknown_817B642, MSGBOX_AUTOCLOSE end FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_ADMIN, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 - msgbox gUnknown_817B7FA, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2 + msgbox gUnknown_817B7FA, MSGBOX_AUTOCLOSE end EventScript_1640A2:: @ 81640A2 getplayerxy VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, GetPlayerFacingDirection - compare_var_to_value VAR_RESULT, 2 - call_if eq, EventScript_16412E + compare VAR_RESULT, DIR_NORTH + call_if_eq EventScript_16412E msgbox gUnknown_817B7AE closemessage - compare_var_to_value VAR_0x8004, 24 - call_if le, EventScript_164144 - compare_var_to_value VAR_0x8004, 25 - call_if eq, EventScript_16414F - compare_var_to_value VAR_0x8004, 26 - call_if eq, EventScript_16415A - compare_var_to_value VAR_0x8004, 27 - call_if eq, EventScript_16415A + compare VAR_0x8004, 24 + call_if_le EventScript_164144 + compare VAR_0x8004, 25 + call_if_eq EventScript_16414F + compare VAR_0x8004, 26 + call_if_eq EventScript_16415A + compare VAR_0x8004, 27 + call_if_eq EventScript_16415A playse SE_PIN call EventScript_163F47 special DrawWholeMapView waitse - compare_var_to_value VAR_0x8004, 24 - call_if le, EventScript_164165 - compare_var_to_value VAR_0x8004, 25 - call_if eq, EventScript_164165 - compare_var_to_value VAR_0x8004, 26 - call_if eq, EventScript_164165 - compare_var_to_value VAR_0x8004, 27 - call_if eq, EventScript_164170 + compare VAR_0x8004, 24 + call_if_le EventScript_164165 + compare VAR_0x8004, 25 + call_if_eq EventScript_164165 + compare VAR_0x8004, 26 + call_if_eq EventScript_164165 + compare VAR_0x8004, 27 + call_if_eq EventScript_164170 msgbox gUnknown_817B7FA release end EventScript_16412E:: @ 816412E - compare_var_to_value VAR_0x8004, 27 - goto_if eq, EventScript_1A77A9 - applymovement 255, Movement_1A75EB + compare VAR_0x8004, 27 + goto_if_eq EventScript_Return + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -158,27 +155,27 @@ EventScript_16414F:: @ 816414F return EventScript_16415A:: @ 816415A - applymovement 3, Movement_1A75E9 + applymovement 3, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_164165:: @ 8164165 - applymovement 3, Movement_1A75E7 + applymovement 3, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_164170:: @ 8164170 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 return Movement_16417B:: @ 816417B - step_13 - step_13 - step_2e + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_16417F:: @ 816417F - step_13 - step_2e + walk_right + walk_in_place_fastest_up step_end diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index a334ab2df..605b05065 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -3,19 +3,17 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E 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 lock faceplayer - checkflag FLAG_GOT_TOGEPI_EGG - goto_if TRUE, EventScript_1688E3 - checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG - goto_if TRUE, EventScript_16892C + goto_if_set FLAG_GOT_TOGEPI_EGG, EventScript_1688E3 + goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, EventScript_16892C msgbox gUnknown_818A80D specialvar VAR_RESULT, Special_GetLeadMonFriendship - compare_var_to_value VAR_RESULT, 6 - goto_if eq, EventScript_1688AC + compare VAR_RESULT, 6 + goto_if_eq EventScript_1688AC msgbox gUnknown_818A88F release end @@ -32,9 +30,9 @@ EventScript_1688AC:: @ 81688AC end EventScript_1688BA:: @ 81688BA - countpokemon - compare_var_to_value VAR_RESULT, 6 - goto_if eq, EventScript_16891F + getpartysize + compare VAR_RESULT, PARTY_SIZE + goto_if_eq EventScript_16891F setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI textcolor 3 @@ -50,13 +48,13 @@ EventScript_1688E3:: @ 81688E3 getspeciesname 1, SPECIES_TOGEPI setvar VAR_0x8004, SPECIES_TOGEPI specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_168895 + compare VAR_RESULT, 1 + goto_if_eq EventScript_168895 getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, SPECIES_TOGETIC specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_168895 + compare VAR_RESULT, 1 + goto_if_eq EventScript_168895 msgbox gUnknown_818A9C0 release end diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 0e7b31ad7..4e8aab27c 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_1BEC28", + "script": "FourIsland_EventScript_ItemStarPiece", "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_1BEC35", + "script": "FourIsland_EventScript_ItemStardust", "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" }, { diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 68788f93a..8f84b1e6c 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -1,12 +1,12 @@ FourIsland_MapScripts:: @ 8167CAE - map_script 3, FourIsland_MapScript1_167CB9 - map_script 2, FourIsland_MapScript2_167CE2 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame .byte 0 -FourIsland_MapScript1_167CB9:: @ 8167CB9 +FourIsland_OnTransition:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND - compare_var_to_value VAR_MAP_SCENE_FOUR_ISLAND, 0 - call_if eq, EventScript_167CCD + compare VAR_MAP_SCENE_FOUR_ISLAND, 0 + call_if_eq EventScript_167CCD call EventScript_167CD1 end @@ -15,33 +15,32 @@ EventScript_167CCD:: @ 8167CCD return EventScript_167CD1:: @ 8167CD1 - checkflag FLAG_PENDING_DAYCARE_EGG - goto_if FALSE, EventScript_167CE1 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, EventScript_167CE1 setobjectxyperm 1, 16, 14 EventScript_167CE1:: @ 8167CE1 return -FourIsland_MapScript2_167CE2:: @ 8167CE2 +FourIsland_OnFrame:: @ 8167CE2 map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC .2byte 0 EventScript_167CEC:: @ 8167CEC lockall textcolor 0 - applymovement 10, Movement_1A75ED + applymovement 10, Movement_WalkInPlaceFastestDown waitmovement 0 playbgm MUS_RIVAL1, 0 - applymovement 10, Movement_1A75DB + applymovement 10, Movement_ExclamationMark waitmovement 0 - applymovement 10, Movement_1A75DD + applymovement 10, Movement_Delay48 waitmovement 0 delay 25 applymovement 10, Movement_167D49 waitmovement 0 msgbox gUnknown_8182B37 closemessage - applymovement 255, Movement_167D52 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167D52 applymovement 10, Movement_167D4E waitmovement 0 fadedefaultbgm @@ -53,49 +52,49 @@ EventScript_167CEC:: @ 8167CEC end Movement_167D49:: @ 8167D49 - step_13 - step_13 - step_10 - step_10 + walk_right + walk_right + walk_down + walk_down step_end Movement_167D4E:: @ 8167D4E - step_1c - step_1a - step_10 + delay_16 + delay_4 + walk_down step_end Movement_167D52:: @ 8167D52 - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end FourIsland_EventScript_167D55:: @ 8167D55 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 lock faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_167D9B - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_167E0C - compare_var_to_value VAR_RESULT, 3 - goto_if eq, EventScript_167E19 + compare VAR_RESULT, 1 + goto_if_eq EventScript_167D9B + compare VAR_RESULT, 2 + goto_if_eq EventScript_167E0C + compare VAR_RESULT, 3 + goto_if_eq EventScript_167E19 msgbox gUnknown_81BF555 release end EventScript_167D9B:: @ 8167D9B msgbox gUnknown_81BF5E3, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_167DD1 + compare VAR_RESULT, YES + goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_167DD1 + compare VAR_RESULT, YES + goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare @@ -104,8 +103,8 @@ EventScript_167D9B:: @ 8167D9B EventScript_167DD1:: @ 8167DD1 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 - goto_if ne, EventScript_167DEB + compare VAR_RESULT, 6 + goto_if_ne EventScript_167DEB msgbox gUnknown_81BF6F0 release end @@ -142,8 +141,7 @@ EventScript_167E19:: @ 8167E19 FourIsland_EventScript_167E2E:: @ 8167E2E lock faceplayer - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_167E43 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167E43 msgbox gUnknown_8182A2B release end @@ -163,13 +161,13 @@ FourIsland_EventScript_167E5A:: @ 8167E5A end FourIsland_EventScript_167E73:: @ 8167E73 - msgbox gUnknown_8182D8E, 2 + msgbox gUnknown_8182D8E, MSGBOX_NPC end FourIsland_EventScript_167E7C:: @ 8167E7C - msgbox gUnknown_8182A03, 3 + msgbox gUnknown_8182A03, MSGBOX_SIGN end FourIsland_EventScript_167E85:: @ 8167E85 - msgbox gUnknown_8182DEB, 3 + msgbox gUnknown_8182DEB, MSGBOX_SIGN end diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc index b9c632972..39d98de68 100644 --- a/data/maps/FourIsland_Harbor/scripts.inc +++ b/data/maps/FourIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ FourIsland_Harbor_MapScripts:: @ 8171C98 FourIsland_Harbor_EventScript_171C99:: @ 8171C99 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_FOUR_ISLAND goto EventScript_1A900F diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 0fd639d54..8320de554 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_House1_EventScript_1C4D84", + "script": "FourIsland_House1_EventScript_BodySlamTutor", "flag": "0" }, { diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc index d7139c370..46ec500fe 100644 --- a/data/maps/FourIsland_House1/scripts.inc +++ b/data/maps/FourIsland_House1/scripts.inc @@ -2,5 +2,5 @@ FourIsland_House1_MapScripts:: @ 8171C44 .byte 0 FourIsland_House1_EventScript_171C45:: @ 8171C45 - msgbox gUnknown_81A3802, 2 + msgbox gUnknown_81A3802, MSGBOX_NPC end diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 575294c84..39aaec8e8 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_1F_EventScript_1BED53", + "script": "FourIsland_IcefallCave_1F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_1F_EventScript_1BED60", + "script": "FourIsland_IcefallCave_1F_EventScript_ItemHM07", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07" } ], diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index 1c3d8da1f..c3e3eaff2 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -1,25 +1,25 @@ FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44 - map_script 5, FourIsland_IcefallCave_1F_MapScript1_163D54 - map_script 1, FourIsland_IcefallCave_1F_MapScript2_163D57 - map_script 2, FourIsland_IcefallCave_1F_MapScript3_163D5B + map_script MAP_SCRIPT_ON_RESUME, FourIsland_IcefallCave_1F_OnResume + map_script MAP_SCRIPT_ON_LOAD, FourIsland_IcefallCave_1F_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_IcefallCave_1F_OnFrame .byte 0 -FourIsland_IcefallCave_1F_MapScript1_163D54:: @ 8163D54 +FourIsland_IcefallCave_1F_OnResume:: @ 8163D54 setstepcallback 4 end -FourIsland_IcefallCave_1F_MapScript2_163D57:: @ 8163D57 +FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 special Special_SetIcefallCaveCrackedIceMetatiles end -FourIsland_IcefallCave_1F_MapScript3_163D5B:: @ 8163D5B - map_script_2 VAR_0x4001, 1, EventScript_163D65 +FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B + map_script_2 VAR_TEMP_1, 1, EventScript_163D65 .2byte 0 EventScript_163D65:: @ 8163D65 lockall delay 20 - applymovement 255, Movement_163D7F + applymovement OBJ_EVENT_ID_PLAYER, Movement_163D7F waitmovement 0 playse SE_RU_HYUU delay 60 @@ -29,5 +29,5 @@ EventScript_163D65:: @ 8163D65 end Movement_163D7F:: @ 8163D7F - step_60 + set_invisible step_end diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index c6b9e866e..d8ba2545e 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_B1F_EventScript_1BED6D", + "script": "FourIsland_IcefallCave_B1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_B1F_EventScript_1BED7A", + "script": "FourIsland_IcefallCave_B1F_EventScript_ItemNeverMeltIce", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_NEVER_MELT_ICE" } ], diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 684c7506c..39eb3f0b4 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -1,10 +1,10 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 - map_script 3, FourIsland_IcefallCave_Back_MapScript1_163D88 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition .byte 0 -FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 - compare_var_to_value VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 - call_if eq, EventScript_163D94 +FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88 + compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 + call_if_eq EventScript_163D94 end EventScript_163D94:: @ 8163D94 @@ -21,24 +21,24 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 msgbox gUnknown_817B0B9 closemessage playse SE_PIN - applymovement 3, Movement_1A75DB + applymovement 3, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 3, Movement_1A75DD + applymovement 3, Movement_Delay48 waitmovement 0 textcolor 1 msgbox gUnknown_817B109 closemessage - applymovement 3, Movement_1A75EB + applymovement 3, Movement_WalkInPlaceFastestRight waitmovement 0 delay 18 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 delay 35 applymovement 4, Movement_163F11 applymovement 3, Movement_163F18 - applymovement 255, Movement_163EDD + applymovement OBJ_EVENT_ID_PLAYER, Movement_163EDD waitmovement 0 applymovement 2, Movement_163EE8 waitmovement 0 @@ -46,7 +46,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 textcolor 0 msgbox gUnknown_817B20B setvar VAR_LAST_TALKED, 4 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_45, 0, Text_17B251 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251 applymovement 3, Movement_163F1B waitmovement 0 textcolor 1 @@ -66,7 +66,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 msgbox gUnknown_817B399 closemessage applymovement 3, Movement_163F1D - applymovement 255, Movement_163EE2 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163EE2 applymovement 1, Movement_163EF0 applymovement 2, Movement_163EFA applymovement 4, Movement_163F05 @@ -77,7 +77,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 delay 50 applymovement 3, Movement_163F23 waitmovement 0 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 textcolor 1 msgbox gUnknown_817B457 @@ -88,105 +88,105 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 end Movement_163EDD:: @ 8163EDD - step_11 - step_11 - step_13 - step_11 + walk_up + walk_up + walk_right + walk_up step_end Movement_163EE2:: @ 8163EE2 - step_1c - step_2f - step_1c - step_1c - step_2d + delay_16 + walk_in_place_fastest_left + delay_16 + delay_16 + walk_in_place_fastest_down step_end Movement_163EE8:: @ 8163EE8 - step_25 + walk_in_place_down step_end gUnknown_163EEA:: @ 8163EEA - step_4c - step_13 - step_4d + lock_facing_direction + walk_right + unlock_facing_direction step_end Movement_163EEE:: @ 8163EEE - step_29 + walk_in_place_fast_down step_end Movement_163EF0:: @ 8163EF0 - step_13 - step_10 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + walk_right + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_163EFA:: @ 8163EFA - step_1c - step_12 - step_10 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + delay_16 + walk_left + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_163F05:: @ 8163F05 - step_1c - step_10 - step_1c - step_10 - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d + delay_16 + walk_down + delay_16 + walk_down + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_163F11:: @ 8163F11 - step_1c - step_1b - step_30 + delay_16 + delay_8 + walk_in_place_fastest_right step_end Movement_163F15:: @ 8163F15 - step_12 - step_12 + walk_left + walk_left step_end Movement_163F18:: @ 8163F18 - step_12 - step_11 + walk_left + walk_up step_end Movement_163F1B:: @ 8163F1B - step_26 + walk_in_place_up step_end Movement_163F1D:: @ 8163F1D - step_1b - step_30 - step_1c - step_1c - step_2d + delay_8 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_down step_end Movement_163F23:: @ 8163F23 - step_13 + walk_right step_end FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25 - msgbox gUnknown_817B457, 2 + msgbox gUnknown_817B457, MSGBOX_NPC end diff --git a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc index a3c4ea616..b8bbd1102 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc @@ -1,7 +1,7 @@ FourIsland_IcefallCave_Entrance_MapScripts:: @ 8163D3A - map_script 3, FourIsland_IcefallCave_Entrance_MapScript1_163D40 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Entrance_OnTransition .byte 0 -FourIsland_IcefallCave_Entrance_MapScript1_163D40:: @ 8163D40 +FourIsland_IcefallCave_Entrance_OnTransition:: @ 8163D40 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE end diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index 6a8915d83..c39cc1da9 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -1,18 +1,16 @@ FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E - map_script 3, FourIsland_LoreleisHouse_MapScript1_171C54 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_LoreleisHouse_OnTransition .byte 0 -FourIsland_LoreleisHouse_MapScript1_171C54:: @ 8171C54 +FourIsland_LoreleisHouse_OnTransition:: @ 8171C54 special Special_ComputeLoreleiDollCollection end FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 lock faceplayer - checkflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE - goto_if TRUE, EventScript_171C83 - checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE - goto_if TRUE, EventScript_171C76 + goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, EventScript_171C83 + goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_171C76 msgbox gUnknown_81A3826 release end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index c74ac396a..0d0d1c6df 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -3,14 +3,14 @@ FourIsland_Mart_MapScripts:: @ 8171CAD FourIsland_Mart_EventScript_171CAE:: @ 8171CAE special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_171CD4 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -29,5 +29,5 @@ Items_171CD4:: @ 8171CD4 end FourIsland_Mart_EventScript_171CE8:: @ 8171CE8 - msgbox gUnknown_81A3B14, 2 + msgbox gUnknown_81A3B14, MSGBOX_NPC end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index cc4cb5ffa..4ee8e33c1 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA - map_script 3, FourIsland_PokemonCenter_1F_MapScript1_171BF5 - map_script 5, FourIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5 +FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 setrespawn SPAWN_FOUR_ISLAND end FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02 - msgbox gUnknown_81A3627, 2 + msgbox gUnknown_81A3627, MSGBOX_NPC end FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B - msgbox gUnknown_81A3697, 2 + msgbox gUnknown_81A3697, MSGBOX_NPC end FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14 - msgbox gUnknown_81A3734, 2 + msgbox gUnknown_81A3734, MSGBOX_NPC end diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc index 59beaf443..954aabd96 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/text.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -Text_1A3505:: @ 81A3505 +Text_BodySlamTeach:: @ 81A3505 .string "Ready?\n" .string "Boing!\p" .string "We're having a BODY SLAM match\n" @@ -8,15 +8,15 @@ Text_1A3505:: @ 81A3505 .string "How about I teach BODY SLAM to\n" .string "a POKéMON of yours instead?$" -Text_1A35C7:: @ 81A35C7 +Text_BodySlamDeclined:: @ 81A35C7 .string "Come again!\n" .string "Boing!$" -Text_1A35DA:: @ 81A35DA +Text_BodySlamWhichMon:: @ 81A35DA .string "Which POKéMON wants to learn how\n" .string "to BODY SLAM?$" -Text_1A3609:: @ 81A3609 +Text_BodySlamTaught:: @ 81A3609 .string "Boioing!$" Text_1A3612:: @ 81A3612 diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 332a0efa7..af9538b03 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc index 08482ec27..a8cc194aa 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D - map_script 2, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FourIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FourIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171C32 + call CableClub_EventScript_Colosseum end -EventScript_171C38:: @ 8171C38 - call EventScript_1BB6AB +FourIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171C38 + call CableClub_EventScript_TradeCenter end -EventScript_171C3E:: @ 8171C3E - call EventScript_1BB7DE +FourIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171C3E + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index c91cc86e5..f3b695231 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -3,37 +3,37 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171A2E - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_171A52 - compare_var_to_value VAR_RESULT, 3 - goto_if eq, EventScript_171B86 + compare VAR_RESULT, 1 + goto_if_eq EventScript_171A2E + compare VAR_RESULT, 2 + goto_if_eq EventScript_171A52 + compare VAR_RESULT, 3 + goto_if_eq EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171993 + compare VAR_RESULT, YES + goto_if_eq EventScript_171993 msgbox gUnknown_81BF916 release end EventScript_171993:: @ 8171993 specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171A1A + compare VAR_RESULT, 1 + goto_if_eq EventScript_171A1A msgbox gUnknown_81BF839 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseSendDaycareMon waitstate - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_1719F7 + compare VAR_0x8004, 6 + goto_if_ge EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_171A24 + compare VAR_RESULT, 0 + goto_if_eq EventScript_171A24 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 @@ -42,8 +42,8 @@ EventScript_171993:: @ 8171993 special StoreSelectedPokemonInDaycare incrementgamestat GAME_STAT_USED_DAYCARE specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_171A01 + compare VAR_RESULT, 2 + goto_if_eq EventScript_171A01 release end @@ -54,8 +54,8 @@ EventScript_1719F7:: @ 81719F7 EventScript_171A01:: @ 8171A01 msgbox gUnknown_81BF89F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171993 + compare VAR_RESULT, YES + goto_if_eq EventScript_171993 goto EventScript_1719F7 end @@ -80,8 +80,8 @@ EventScript_171A38:: @ 8171A38 EventScript_171A41:: @ 8171A41 specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare - compare_var_to_value VAR_RESULT, 0 - call_if ne, EventScript_171A38 + compare VAR_RESULT, 0 + call_if_ne EventScript_171A38 return EventScript_171A52:: @ 8171A52 @@ -89,42 +89,42 @@ EventScript_171A52:: @ 8171A52 setvar VAR_0x8004, 0 call EventScript_171A41 msgbox gUnknown_81BF89F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171993 + compare VAR_RESULT, YES + goto_if_eq EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171A90 + compare VAR_RESULT, YES + goto_if_eq EventScript_171A90 goto EventScript_1719F7 end EventScript_171A90:: @ 8171A90 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 - goto_if eq, EventScript_171B67 + compare VAR_RESULT, 6 + goto_if_eq EventScript_171B67 specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_171ACF + compare VAR_RESULT, 2 + goto_if_eq EventScript_171ACF special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1719F7 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1719F7 goto EventScript_171ACF end EventScript_171ACF:: @ 8171ACF special GetDaycareCost msgbox gUnknown_81BFA3B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171AEB + compare VAR_RESULT, YES + goto_if_eq EventScript_171AEB goto EventScript_1719F7 end EventScript_171AEB:: @ 8171AEB specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171B05 + compare VAR_RESULT, 1 + goto_if_eq EventScript_171B05 msgbox gUnknown_81BF932 release end @@ -143,15 +143,15 @@ EventScript_171B05:: @ 8171B05 call EventScript_1A6675 waitmoncry specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_171B4E + compare VAR_RESULT, 2 + goto_if_eq EventScript_171B4E goto EventScript_1719F7 end EventScript_171B4E:: @ 8171B4E msgbox gUnknown_81BF94F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171A90 + compare VAR_RESULT, YES + goto_if_eq EventScript_171A90 goto EventScript_1719F7 end @@ -161,25 +161,25 @@ EventScript_171B67:: @ 8171B67 end Movement_171B71:: @ 8171B71 - step_1c - step_1c - step_03 - step_1c - step_1c - step_02 - step_1c - step_1c - step_01 - step_up - step_60 - step_1c - step_1c - step_1c - step_1c - step_1c - step_00 - step_61 - step_down + delay_16 + delay_16 + face_right + delay_16 + delay_16 + face_left + delay_16 + delay_16 + face_up + walk_slowest_up + set_invisible + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_down + set_visible + walk_slowest_down step_end EventScript_171B85:: @ 8171B85 @@ -192,8 +192,8 @@ EventScript_171B86:: @ 8171B86 setvar VAR_0x8004, 1 call EventScript_171A41 msgbox gUnknown_81BFAE8, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171A90 + compare VAR_RESULT, YES + goto_if_eq EventScript_171A90 msgbox gUnknown_81BF976 release end @@ -201,8 +201,8 @@ EventScript_171B86:: @ 8171B86 EventScript_171BBF:: @ 8171BBF special ShowDaycareLevelMenu waitstate - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1719F7 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1719F7 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare msgbox gUnknown_81BFA67 diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 6c4b76320..35a26edc6 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -221,7 +221,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_EventScript_1C4AEE", + "script": "FuchsiaCity_EventScript_SubstituteTutor", "flag": "0" }, { diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index f66cf33e6..cde08dd9b 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -1,13 +1,11 @@ FuchsiaCity_MapScripts:: @ 8166D75 - map_script 3, FuchsiaCity_MapScript1_166D7B + map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_OnTransition .byte 0 -FuchsiaCity_MapScript1_166D7B:: @ 8166D7B +FuchsiaCity_OnTransition:: @ 8166D7B setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY - checkflag FLAG_GOT_DOME_FOSSIL - call_if TRUE, EventScript_166D91 - checkflag FLAG_GOT_DOME_FOSSIL - call_if FALSE, EventScript_166D97 + call_if_set FLAG_GOT_DOME_FOSSIL, EventScript_166D91 + call_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_166D97 end EventScript_166D91:: @ 8166D91 @@ -19,19 +17,19 @@ EventScript_166D97:: @ 8166D97 return FuchsiaCity_EventScript_166D9D:: @ 8166D9D - msgbox gUnknown_818056E, 2 + msgbox gUnknown_818056E, MSGBOX_NPC end FuchsiaCity_EventScript_166DA6:: @ 8166DA6 - msgbox gUnknown_81805C6, 2 + msgbox gUnknown_81805C6, MSGBOX_NPC end FuchsiaCity_EventScript_166DAF:: @ 8166DAF - msgbox gUnknown_818062C, 2 + msgbox gUnknown_818062C, MSGBOX_NPC end FuchsiaCity_EventScript_166DB8:: @ 8166DB8 - msgbox gUnknown_818065A, 2 + msgbox gUnknown_818065A, MSGBOX_NPC end FuchsiaCity_EventScript_166DC1:: @ 8166DC1 @@ -43,23 +41,23 @@ FuchsiaCity_EventScript_166DC1:: @ 8166DC1 end FuchsiaCity_EventScript_166DDA:: @ 8166DDA - msgbox gUnknown_81806AB, 3 + msgbox gUnknown_81806AB, MSGBOX_SIGN end FuchsiaCity_EventScript_166DE3:: @ 8166DE3 - msgbox gUnknown_81806D3, 3 + msgbox gUnknown_81806D3, MSGBOX_SIGN end FuchsiaCity_EventScript_166DEC:: @ 8166DEC - msgbox gUnknown_81806F0, 3 + msgbox gUnknown_81806F0, MSGBOX_SIGN end FuchsiaCity_EventScript_166DF5:: @ 8166DF5 - msgbox gUnknown_818070D, 3 + msgbox gUnknown_818070D, MSGBOX_SIGN end EventScript_166DFE:: @ 8166DFE - msgbox gUnknown_8180727, 3 + msgbox gUnknown_8180727, MSGBOX_SIGN end FuchsiaCity_EventScript_166E07:: @ 8166E07 @@ -121,8 +119,7 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83 FuchsiaCity_EventScript_166E9C:: @ 8166E9C lockall - checkflag FLAG_GOT_DOME_FOSSIL - goto_if TRUE, EventScript_166EBE + goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_166EBE setvar VAR_0x8004, SPECIES_KABUTO special Special_SetSeenMon drawmonpic SPECIES_KABUTO, 10, 3 diff --git a/data/maps/FuchsiaCity/text.inc b/data/maps/FuchsiaCity/text.inc index 2916a29cf..969846706 100644 --- a/data/maps/FuchsiaCity/text.inc +++ b/data/maps/FuchsiaCity/text.inc @@ -79,7 +79,7 @@ gUnknown_81808FA:: @ 81808FA Text_180945:: @ 8180945 .string "……$" -Text_180948:: @ 8180948 +Text_SubstituteTeach:: @ 8180948 .string "Aww, I wish I was a KANGASKHAN\n" .string "baby.\p" .string "I'd love to be a substitute for the\n" @@ -91,15 +91,15 @@ Text_180948:: @ 8180948 .string "Want me to teach SUBSTITUTE to\n" .string "one of your POKéMON?$" -Text_180A32:: @ 8180A32 +Text_SubstituteDeclined:: @ 8180A32 .string "Oh, really?\n" .string "SUBSTITUTE seems so fun…$" -Text_180A57:: @ 8180A57 +Text_SubstituteWhichMon:: @ 8180A57 .string "Which POKéMON wants to learn\n" .string "SUBSTITUTE?$" -Text_180A80:: @ 8180A80 +Text_SubstituteTaught:: @ 8180A80 .string "Boy, what I'd give to crawl inside\n" .string "a KANGASKHAN belly pouch…$" diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index 8b91a19fa..b018a2b1e 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_Building1_EventScript_1BEAA2", + "script": "FuchsiaCity_Building1_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_FUCHSIA_CITY_BUILDING1_RARE_CANDY" }, { diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index 2a07b6bb0..0011190dc 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -4,15 +4,13 @@ FuchsiaCity_Building1_MapScripts:: @ 816D74B FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C lock faceplayer - checkflag FLAG_GOT_HM04 - goto_if TRUE, EventScript_16D7FA - checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH - goto_if TRUE, EventScript_16D780 + goto_if_set FLAG_GOT_HM04, EventScript_16D7FA + goto_if_set FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH, EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16D7E8 - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16D7F1 + compare VAR_RESULT, YES + call_if_eq EventScript_16D7E8 + compare VAR_RESULT, NO + call_if_eq EventScript_16D7F1 release end @@ -25,12 +23,11 @@ EventScript_16D780:: @ 816D780 msgbox gUnknown_8198EAA call EventScript_1A6675 checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16D7D6 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16D7DF - additem ITEM_HM04, 1 - giveitemfanfaremsg gUnknown_8199068, ITEM_HM04 + compare VAR_RESULT, MALE + call_if_eq EventScript_16D7D6 + compare VAR_RESULT, FEMALE + call_if_eq EventScript_16D7DF + giveitem_msg gUnknown_8199068, ITEM_HM04 setflag FLAG_GOT_HM04 removeitem ITEM_GOLD_TEETH, 1 release @@ -58,9 +55,9 @@ EventScript_16D7FA:: @ 816D7FA end FuchsiaCity_Building1_EventScript_16D804:: @ 816D804 - msgbox gUnknown_819913C, 3 + msgbox gUnknown_819913C, MSGBOX_SIGN end FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D - msgbox gUnknown_8199167, 3 + msgbox gUnknown_8199167, MSGBOX_SIGN end diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 8160e0fb3..d20eeb409 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -3,9 +3,8 @@ FuchsiaCity_Gym_MapScripts:: @ 816D54D FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580 - checkflag FLAG_GOT_TM06_FROM_KOGA - goto_if FALSE, EventScript_16D5A6 + trainerbattle_single TRAINER_LEADER_KOGA, Text_19832E, Text_198444, EventScript_16D580, NO_MUSIC + goto_if_unset FLAG_GOT_TM06_FROM_KOGA, EventScript_16D5A6 msgbox gUnknown_8198481 release end @@ -22,10 +21,9 @@ EventScript_16D580:: @ 816D580 EventScript_16D5A6:: @ 816D5A6 msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16D5E7 - additem ITEM_TM06, 1 - giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16D5E7 + giveitem_msg gUnknown_819858F, ITEM_TM06 setflag FLAG_GOT_TM06_FROM_KOGA msgbox gUnknown_81985AB release @@ -37,41 +35,40 @@ EventScript_16D5E7:: @ 816D5E7 end FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_PHIL, 0, Text_198866, Text_1988B6 - msgbox gUnknown_81988CB, 6 + trainerbattle_single TRAINER_TAMER_PHIL, Text_198866, Text_1988B6 + msgbox gUnknown_81988CB, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D608:: @ 816D608 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EDGAR, 0, Text_19891F, Text_19897F - msgbox gUnknown_8198985, 6 + trainerbattle_single TRAINER_TAMER_EDGAR, Text_19891F, Text_19897F + msgbox gUnknown_8198985, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779 + trainerbattle_single TRAINER_JUGGLER_KIRK, Text_19871E, Text_198779 famechecker FAMECHECKER_KOGA, 2 - msgbox gUnknown_8198787, 6 + msgbox gUnknown_8198787, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D643:: @ 816D643 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_SHAWN, 0, Text_1989A1, Text_1989EA - msgbox gUnknown_8198A10, 6 + trainerbattle_single TRAINER_JUGGLER_SHAWN, Text_1989A1, Text_1989EA + msgbox gUnknown_8198A10, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KAYDEN, 0, Text_198629, Text_1986B4 - msgbox gUnknown_81986C9, 6 + trainerbattle_single TRAINER_JUGGLER_KAYDEN, Text_198629, Text_1986B4 + msgbox gUnknown_81986C9, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D671:: @ 816D671 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NATE, 0, Text_1987E8, Text_198812 - msgbox gUnknown_8198825, 6 + trainerbattle_single TRAINER_JUGGLER_NATE, Text_1987E8, Text_198812 + msgbox gUnknown_8198825, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 lock faceplayer - checkflag FLAG_DEFEATED_KOGA - goto_if TRUE, EventScript_16D69D + goto_if_set FLAG_DEFEATED_KOGA, EventScript_16D69D msgbox gUnknown_8198A5E release end @@ -83,8 +80,7 @@ EventScript_16D69D:: @ 816D69D FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 lockall - checkflag FLAG_BADGE05_GET - goto_if TRUE, EventScript_16D6BB + goto_if_set FLAG_BADGE05_GET, EventScript_16D6BB msgbox gUnknown_8198B4B releaseall end diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc index 32be06c57..dc32f78c4 100644 --- a/data/maps/FuchsiaCity_House1/scripts.inc +++ b/data/maps/FuchsiaCity_House1/scripts.inc @@ -2,7 +2,7 @@ FuchsiaCity_House1_MapScripts:: @ 816D6C5 .byte 0 FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6 - msgbox gUnknown_8198BBB, 2 + msgbox gUnknown_8198BBB, MSGBOX_NPC end FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF @@ -14,5 +14,5 @@ FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF end FuchsiaCity_House1_EventScript_16D6E8:: @ 816D6E8 - msgbox gUnknown_8198C7B, 2 + msgbox gUnknown_8198C7B, MSGBOX_NPC end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 4470655ff..95e481963 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -4,11 +4,10 @@ FuchsiaCity_House2_MapScripts:: @ 816D816 FuchsiaCity_House2_EventScript_16D817:: @ 816D817 lock faceplayer - checkflag FLAG_GOT_GOOD_ROD - goto_if TRUE, EventScript_16D83F + goto_if_set FLAG_GOT_GOOD_ROD, EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16D849 + compare VAR_RESULT, YES + goto_if_eq EventScript_16D849 msgbox gUnknown_8199337 release end @@ -21,10 +20,9 @@ EventScript_16D83F:: @ 816D83F EventScript_16D849:: @ 816D849 msgbox gUnknown_8199207 checkitemspace ITEM_GOOD_ROD, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16D88A - additem ITEM_GOOD_ROD, 1 - giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16D88A + giveitem_msg gUnknown_819925E, ITEM_GOOD_ROD msgbox gUnknown_8199296 setflag FLAG_GOT_GOOD_ROD release diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index dfbfd1365..5eb556a79 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -5,8 +5,8 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895 lock faceplayer msgbox gUnknown_81993B9, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16D8B0 + compare VAR_RESULT, YES + goto_if_eq EventScript_16D8B0 goto EventScript_16D941 end @@ -14,24 +14,24 @@ EventScript_16D8B0:: @ 816D8B0 msgbox gUnknown_8199421 special Special_ChooseMonFromParty waitstate - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_16D941 + compare VAR_0x8004, 6 + goto_if_ge EventScript_16D941 special Special_IsSelectedMonEgg - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16D937 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16D937 special Special_GetNumMovesSelectedMonHas - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16D92A + compare VAR_RESULT, 1 + goto_if_eq EventScript_16D92A msgbox gUnknown_8199445 - fadescreen 1 + fadescreen FADE_TO_BLACK special Special_SelectMove - fadescreen 0 - compare_var_to_value VAR_0x8005, 4 - goto_if eq, EventScript_16D8B0 + fadescreen FADE_FROM_BLACK + compare VAR_0x8005, 4 + goto_if_eq EventScript_16D8B0 special Special_BufferMoveDeleterNicknameAndMove msgbox gUnknown_8199485, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16D919 + compare VAR_RESULT, YES + goto_if_eq EventScript_16D919 goto EventScript_16D941 end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index dea51b320..7d2df7e8f 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -2,23 +2,23 @@ FuchsiaCity_Mart_MapScripts:: @ 816D4E0 .byte 0 FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1 - msgbox gUnknown_8198134, 2 + msgbox gUnknown_8198134, MSGBOX_NPC end FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA - msgbox gUnknown_81980BC, 2 + msgbox gUnknown_81980BC, MSGBOX_NPC end FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16D518 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index 062f93acc..428305d1c 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 - map_script 3, FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC - map_script 5, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC +FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC setrespawn SPAWN_FUCHSIA_CITY end FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709 - msgbox gUnknown_8198CB7, 2 + msgbox gUnknown_8198CB7, MSGBOX_NPC end FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712 - msgbox gUnknown_8198D2E, 2 + msgbox gUnknown_8198D2E, MSGBOX_NPC end FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B - msgbox gUnknown_8198D9B, 2 + msgbox gUnknown_8198D9B, MSGBOX_NPC end diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 6e82de7a9..6ce142aac 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc index 322dd3930..2be67866e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 - map_script 2, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FuchsiaCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816D739 + call CableClub_EventScript_Colosseum end -EventScript_16D73F:: @ 816D73F - call EventScript_1BB6AB +FuchsiaCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816D73F + call CableClub_EventScript_TradeCenter end -EventScript_16D745:: @ 816D745 - call EventScript_1BB7DE +FuchsiaCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816D745 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 13f4ee261..625d4098b 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -76,7 +76,7 @@ "x": 4, "y": 3, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D36D" }, @@ -85,7 +85,7 @@ "x": 5, "y": 3, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D379" }, @@ -94,7 +94,7 @@ "x": 3, "y": 3, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "FuchsiaCity_SafariZone_Entrance_EventScript_16D385" } diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 777e88a96..d3f100d76 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -1,8 +1,8 @@ FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8 - map_script 2, FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE + map_script MAP_SCRIPT_ON_FRAME_TABLE, FuchsiaCity_SafariZone_Entrance_OnFrame .byte 0 -FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE:: @ 816D2AE +FuchsiaCity_SafariZone_Entrance_OnFrame:: @ 816D2AE map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1, EventScript_16D2F2 map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2, EventScript_16D312 map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3, EventScript_16D2C8 @@ -11,11 +11,11 @@ FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE:: @ 816D2AE EventScript_16D2C8:: @ 816D2C8 lockall textcolor 0 - applymovement 255, Movement_16D36A + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D36A waitmovement 0 msgbox gUnknown_8197E85 closemessage - applymovement 255, Movement_16D367 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D367 waitmovement 0 special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 @@ -27,7 +27,7 @@ EventScript_16D2F2:: @ 816D2F2 textcolor 0 msgbox gUnknown_8197E85 closemessage - applymovement 255, Movement_16D362 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362 waitmovement 0 special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 @@ -38,11 +38,11 @@ EventScript_16D312:: @ 816D312 lockall textcolor 0 msgbox gUnknown_8197E1A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16D345 + compare VAR_RESULT, NO + goto_if_eq EventScript_16D345 msgbox gUnknown_8197E48 closemessage - applymovement 255, Movement_16D362 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362 waitmovement 0 special ExitSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0 @@ -52,58 +52,58 @@ EventScript_16D312:: @ 816D312 EventScript_16D345:: @ 816D345 msgbox gUnknown_8197E7A closemessage - applymovement 255, Movement_16D365 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D365 waitmovement 0 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 waitstate end Movement_16D362:: @ 816D362 - step_10 - step_10 + walk_down + walk_down step_end Movement_16D365:: @ 816D365 - step_11 + walk_up step_end Movement_16D367:: @ 816D367 - step_10 - step_10 + walk_down + walk_down step_end Movement_16D36A:: @ 816D36A - step_10 - step_1b + walk_down + delay_8 step_end FuchsiaCity_SafariZone_Entrance_EventScript_16D36D:: @ 816D36D lockall - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 goto EventScript_16D391 end FuchsiaCity_SafariZone_Entrance_EventScript_16D379:: @ 816D379 lockall - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 goto EventScript_16D391 end FuchsiaCity_SafariZone_Entrance_EventScript_16D385:: @ 816D385 lockall - setvar VAR_0x4002, 2 + setvar VAR_TEMP_2, 2 goto EventScript_16D391 end EventScript_16D391:: @ 816D391 textcolor 0 msgbox gUnknown_8197C6B - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16D3CA + compare VAR_RESULT, YES + goto_if_eq EventScript_16D3CA msgbox gUnknown_8197DE9 goto EventScript_16D49A end @@ -111,8 +111,8 @@ EventScript_16D391:: @ 816D391 EventScript_16D3CA:: @ 816D3CA call EventScript_16D462 checkmoney 500, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16D48C + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16D48C takemoney 500, 0 updatemoneybox 0, 0, 0 msgbox gUnknown_8197D07 @@ -124,12 +124,12 @@ EventScript_16D3CA:: @ 816D3CA msgbox gUnknown_8197D80 closemessage hidemoneybox 0, 0 - compare_var_to_value VAR_0x4002, 0 - call_if eq, EventScript_16D44C - compare_var_to_value VAR_0x4002, 1 - call_if eq, EventScript_16D441 - compare_var_to_value VAR_0x4002, 2 - call_if eq, EventScript_16D457 + compare VAR_TEMP_2, 0 + call_if_eq EventScript_16D44C + compare VAR_TEMP_2, 1 + call_if_eq EventScript_16D441 + compare VAR_TEMP_2, 2 + call_if_eq EventScript_16D457 special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 @@ -137,27 +137,27 @@ EventScript_16D3CA:: @ 816D3CA end EventScript_16D441:: @ 816D441 - applymovement 255, Movement_16D4AF + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AF waitmovement 0 return EventScript_16D44C:: @ 816D44C - applymovement 255, Movement_16D4AC + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AC waitmovement 0 return EventScript_16D457:: @ 816D457 - applymovement 255, Movement_16D4B3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4B3 waitmovement 0 return EventScript_16D462:: @ 816D462 - countpokemon - compare_var_to_value VAR_RESULT, 6 - goto_if ne, EventScript_1A77A9 + getpartysize + compare VAR_RESULT, PARTY_SIZE + goto_if_ne EventScript_Return specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_1A77A9 + compare VAR_RESULT, 1 + goto_if_eq EventScript_Return msgbox gUnknown_81BFEAC goto EventScript_16D49A end @@ -170,38 +170,38 @@ EventScript_16D48C:: @ 816D48C EventScript_16D49A:: @ 816D49A closemessage hidemoneybox 0, 0 - applymovement 255, Movement_16D4AA + applymovement OBJ_EVENT_ID_PLAYER, Movement_16D4AA waitmovement 0 releaseall end Movement_16D4AA:: @ 816D4AA - step_10 + walk_down step_end Movement_16D4AC:: @ 816D4AC - step_11 - step_11 + walk_up + walk_up step_end Movement_16D4AF:: @ 816D4AF - step_11 - step_12 - step_11 + walk_up + walk_left + walk_up step_end Movement_16D4B3:: @ 816D4B3 - step_11 - step_13 - step_11 + walk_up + walk_right + walk_up step_end FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 lock faceplayer msgbox gUnknown_8197EB0, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16D4D6 + compare VAR_RESULT, YES + goto_if_eq EventScript_16D4D6 msgbox gUnknown_819809E release end diff --git a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc index bbff0b929..210acd87f 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc +++ b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc @@ -2,17 +2,17 @@ FuchsiaCity_ZooBuilding_MapScripts:: @ 816D528 .byte 0 FuchsiaCity_ZooBuilding_EventScript_16D529:: @ 816D529 - msgbox gUnknown_819816B, 2 + msgbox gUnknown_819816B, MSGBOX_NPC end FuchsiaCity_ZooBuilding_EventScript_16D532:: @ 816D532 - msgbox gUnknown_81981C2, 2 + msgbox gUnknown_81981C2, MSGBOX_NPC end FuchsiaCity_ZooBuilding_EventScript_16D53B:: @ 816D53B - msgbox gUnknown_819822A, 2 + msgbox gUnknown_819822A, MSGBOX_NPC end FuchsiaCity_ZooBuilding_EventScript_16D544:: @ 816D544 - msgbox gUnknown_8198285, 2 + msgbox gUnknown_8198285, MSGBOX_NPC end diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 01f9f6a62..bc9827037 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -1,19 +1,19 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B - map_script 3, IndigoPlateau_Exterior_MapScript1_167246 - map_script 2, IndigoPlateau_Exterior_MapScript2_16725A + map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame .byte 0 -IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 +IndigoPlateau_Exterior_OnTransition:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR - compare_var_to_value VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 - call_if eq, EventScript_IndigoPlateau_Exterior_PlayCreditsMusic + compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 + call_if_eq EventScript_IndigoPlateau_Exterior_PlayCreditsMusic end EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255 playbgm MUS_ENDING, 0 return -IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A +IndigoPlateau_Exterior_OnFrame:: @ 816725A map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_IndigoPlateau_Exterior_Credits .2byte 0 @@ -31,13 +31,13 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264 special SpawnCameraObject addobject 1 applymovement 1, Movement_167346 - applymovement 255, Movement_167337 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167337 waitmovement 0 closedoor 11, 6 waitdooranim @ Rival runs off - applymovement 255, Movement_16731B + applymovement OBJ_EVENT_ID_PLAYER, Movement_16731B applymovement 1, Movement_16733E waitmovement 0 delay 100 @@ -53,23 +53,23 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264 delay 160 @ Oak looks at player, then walks off - applymovement 255, Movement_16731F + applymovement OBJ_EVENT_ID_PLAYER, Movement_16731F applymovement 2, Movement_167348 waitmovement 0 delay 100 - applymovement 255, Movement_16732E + applymovement OBJ_EVENT_ID_PLAYER, Movement_16732E waitmovement 0 delay 155 @ Player turns to face the League - applymovement 255, Movement_16733C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16733C waitmovement 0 delay 90 @ Player runs off - applymovement 255, Movement_167335 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167335 waitmovement 0 - applymovement 255, Movement_167311 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167311 waitmovement 0 @ Reset the map state and roll the credits @@ -83,103 +83,103 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264 end Movement_167311:: @ 8167311 - step_3d - step_3d - step_3d - step_3d - step_3d - step_3d + player_run_down + player_run_down + player_run_down + player_run_down + player_run_down + player_run_down step_end Movement_167318:: @ 8167318 - step_10 - step_10 + walk_down + walk_down step_end Movement_16731B:: @ 816731B - step_1c - step_1a - step_2d + delay_16 + delay_4 + walk_in_place_fastest_down step_end Movement_16731F:: @ 816731F - step_1b - step_30 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2d + delay_8 + walk_in_place_fastest_right + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down step_end Movement_16732E:: @ 816732E - step_13 - step_1c - step_10 - step_10 - step_1c - step_1c + walk_right + delay_16 + walk_down + walk_down + delay_16 + delay_16 step_end Movement_167335:: @ 8167335 - step_2d + walk_in_place_fastest_down step_end Movement_167337:: @ 8167337 - step_03 - step_4c - step_12 - step_4d + face_right + lock_facing_direction + walk_left + unlock_facing_direction step_end Movement_16733C:: @ 816733C - step_2e + walk_in_place_fastest_up step_end Movement_16733E:: @ 816733E - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_167346:: @ 8167346 - step_1d + walk_fast_down step_end Movement_167348:: @ 8167348 - step_2f - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2d - step_1c - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_in_place_fastest_left + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down + delay_16 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_16735D:: @ 816735D - step_10 + walk_down step_end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index f3c9c7c3f..d1496398b 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,18 +1,17 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A - map_script 3, IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65 - map_script 5, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 +IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16EA79 + compare VAR_RESULT, TRUE + call_if_eq EventScript_16EA79 end EventScript_16EA79:: @ 816EA79 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return setobjectxyperm 4, 4, 2 return @@ -20,15 +19,14 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A lock faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16EAA6 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_16EAA6 msgbox gUnknown_819A8D8 release end EventScript_16EAA6:: @ 816EAA6 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_16EAB9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16EAB9 msgbox gUnknown_819A943 release end @@ -39,19 +37,19 @@ EventScript_16EAB9:: @ 816EAB9 end IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 - msgbox gUnknown_819A837, 2 + msgbox gUnknown_819A837, MSGBOX_NPC end IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16EAF4 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -71,6 +69,6 @@ Items_16EAF4:: @ 816EAF4 IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 81a413874..7298dc99f 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc index 6c2955435..b2b3bd00d 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F - map_script 2, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +IndigoPlateau_PokemonCenter_2F_EventScript_Colosseum:: @ 816EB24 + call CableClub_EventScript_Colosseum end -EventScript_16EB2A:: @ 816EB2A - call EventScript_1BB6AB +IndigoPlateau_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EB2A + call CableClub_EventScript_TradeCenter end -EventScript_16EB30:: @ 816EB30 - call EventScript_1BB7DE +IndigoPlateau_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EB30 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index dfd6cb3d7..3996e80dd 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -1,8 +1,8 @@ LavenderTown_MapScripts:: @ 816686B - map_script 3, LavenderTown_MapScript1_166871 + map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_OnTransition .byte 0 -LavenderTown_MapScript1_166871:: @ 8166871 +LavenderTown_OnTransition:: @ 8166871 setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 setflag FLAG_HIDE_SS_ANNE_RIVAL @@ -12,8 +12,8 @@ LavenderTown_EventScript_16687D:: @ 816687D lock faceplayer msgbox gUnknown_817F52E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16689C + compare VAR_RESULT, YES + goto_if_eq EventScript_16689C msgbox gUnknown_817F568 release end @@ -24,25 +24,25 @@ EventScript_16689C:: @ 816689C end LavenderTown_EventScript_1668A6:: @ 81668A6 - msgbox gUnknown_817F5B6, 2 + msgbox gUnknown_817F5B6, MSGBOX_NPC end LavenderTown_EventScript_1668AF:: @ 81668AF - msgbox gUnknown_817F614, 2 + msgbox gUnknown_817F614, MSGBOX_NPC end LavenderTown_EventScript_1668B8:: @ 81668B8 - msgbox gUnknown_817F676, 3 + msgbox gUnknown_817F676, MSGBOX_SIGN end LavenderTown_EventScript_1668C1:: @ 81668C1 - msgbox gUnknown_817F69A, 3 + msgbox gUnknown_817F69A, MSGBOX_SIGN end LavenderTown_EventScript_1668CA:: @ 81668CA - msgbox gUnknown_817F6D6, 3 + msgbox gUnknown_817F6D6, MSGBOX_SIGN end LavenderTown_EventScript_1668D3:: @ 81668D3 - msgbox gUnknown_817F6F7, 3 + msgbox gUnknown_817F6F7, MSGBOX_SIGN end diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index 2469d4503..d57871971 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -4,8 +4,7 @@ LavenderTown_House1_MapScripts:: @ 816B232 LavenderTown_House1_EventScript_16B233:: @ 816B233 lock faceplayer - checkflag FLAG_RESCUED_MR_FUJI - goto_if TRUE, EventScript_16B248 + goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B248 msgbox gUnknown_819397D release end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index cd9e5e8d7..b6d5ae142 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -5,20 +5,20 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 lock faceplayer msgbox gUnknown_8193A4B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16B287 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B2AA + compare VAR_RESULT, YES + goto_if_eq EventScript_16B287 + compare VAR_RESULT, NO + goto_if_eq EventScript_16B2AA end EventScript_16B287:: @ 816B287 msgbox gUnknown_8193AA6 special Special_ChooseMonFromParty waitstate - compare_var_to_value VAR_0x8004, 6 - goto_if lt, EventScript_16B2B4 - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_16B2AA + compare VAR_0x8004, PARTY_SIZE + goto_if_lt EventScript_16B2B4 + compare VAR_0x8004, PARTY_SIZE + goto_if_ge EventScript_16B2AA end EventScript_16B2AA:: @ 816B2AA @@ -28,21 +28,21 @@ EventScript_16B2AA:: @ 816B2AA EventScript_16B2B4:: @ 816B2B4 specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 - compare_var_to_value VAR_RESULT, SPECIES_EGG - goto_if eq, EventScript_16B307 + compare VAR_RESULT, SPECIES_EGG + goto_if_eq EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16B311 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16B311 specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16B311 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16B31B - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B2AA + compare VAR_RESULT, YES + goto_if_eq EventScript_16B31B + compare VAR_RESULT, NO + goto_if_eq EventScript_16B2AA end EventScript_16B307:: @ 816B307 @@ -60,8 +60,8 @@ EventScript_16B31B:: @ 816B31B call EventScript_1A74EB specialvar VAR_RESULT, NameRaterWasNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16B345 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16B345 msgbox gUnknown_8193BF0 release end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 47cef8633..1007b34cf 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -2,27 +2,27 @@ LavenderTown_Mart_MapScripts:: @ 816B34F .byte 0 LavenderTown_Mart_EventScript_16B350:: @ 816B350 - msgbox gUnknown_8193CE5, 2 + msgbox gUnknown_8193CE5, MSGBOX_NPC end LavenderTown_Mart_EventScript_16B359:: @ 816B359 - msgbox gUnknown_8193DB6, 2 + msgbox gUnknown_8193DB6, MSGBOX_NPC end LavenderTown_Mart_EventScript_16B362:: @ 816B362 - msgbox gUnknown_8193DF1, 2 + msgbox gUnknown_8193DF1, MSGBOX_NPC end LavenderTown_Mart_EventScript_16B36B:: @ 816B36B special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16B390 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index f7341b8f9..2109df4d0 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF - map_script 3, LavenderTown_PokemonCenter_1F_MapScript1_16B0FA - map_script 5, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -LavenderTown_PokemonCenter_1F_MapScript1_16B0FA:: @ 816B0FA +LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA setrespawn SPAWN_LAVENDER_TOWN end LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end LavenderTown_PokemonCenter_1F_EventScript_16B107:: @ 816B107 - msgbox gUnknown_8193465, 2 + msgbox gUnknown_8193465, MSGBOX_NPC end LavenderTown_PokemonCenter_1F_EventScript_16B110:: @ 816B110 - msgbox gUnknown_81934DE, 2 + msgbox gUnknown_81934DE, MSGBOX_NPC end LavenderTown_PokemonCenter_1F_EventScript_16B119:: @ 816B119 - msgbox gUnknown_819353A, 2 + msgbox gUnknown_819353A, MSGBOX_NPC end diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 1880c2425..beefaa49a 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc index 7042c66c8..2ef3c6643 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 - map_script 2, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, LavenderTown_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +LavenderTown_PokemonCenter_2F_EventScript_Colosseum:: @ 816B137 + call CableClub_EventScript_Colosseum end -EventScript_16B13D:: @ 816B13D - call EventScript_1BB6AB +LavenderTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B13D + call CableClub_EventScript_TradeCenter end -EventScript_16B143:: @ 816B143 - call EventScript_1BB7DE +LavenderTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B143 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index d82308203..feda220fd 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -4,15 +4,13 @@ LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149 LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A lock faceplayer - checkflag FLAG_GOT_POKE_FLUTE - goto_if TRUE, EventScript_16B196 + goto_if_set FLAG_GOT_POKE_FLUTE, EventScript_16B196 msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B1A0 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16B1A0 setflag FLAG_GOT_POKE_FLUTE - additem ITEM_POKE_FLUTE, 1 - giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 + giveitem_msg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 msgbox gUnknown_81937E5 release end @@ -36,14 +34,13 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA end LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3 - msgbox gUnknown_81936B4, 2 + msgbox gUnknown_81936B4, MSGBOX_NPC end LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC lock faceplayer - checkflag FLAG_RESCUED_MR_FUJI - goto_if TRUE, EventScript_16B1E1 + goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B1E1 msgbox gUnknown_81935ED release end @@ -81,5 +78,5 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211 end LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229 - msgbox gUnknown_819392B, 3 + msgbox gUnknown_819392B, MSGBOX_SIGN end diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 45fcd4703..7e0cb8dad 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1C48E6", + "script": "MtEmber_Exterior_EventScript_ExplosionTutor", "flag": "0" }, { @@ -244,7 +244,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BED2C", + "script": "MtEmber_Exterior_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL" }, { @@ -257,7 +257,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BED39", + "script": "MtEmber_Exterior_EventScript_ItemFireStone", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE" }, { @@ -270,7 +270,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BED46", + "script": "MtEmber_Exterior_EventScript_ItemDireHit", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_DIRE_HIT" } ], diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 1ee18f696..67b563e72 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -1,12 +1,12 @@ MtEmber_Exterior_MapScripts:: @ 8163946 - map_script 3, MtEmber_Exterior_MapScript1_163951 - map_script 1, MtEmber_Exterior_MapScript2_163969 + map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Exterior_OnTransition + map_script MAP_SCRIPT_ON_LOAD, MtEmber_Exterior_OnLoad .byte 0 -MtEmber_Exterior_MapScript1_163951:: @ 8163951 +MtEmber_Exterior_OnTransition:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR - compare_var_to_value VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 - call_if eq, EventScript_163960 + compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 + call_if_eq EventScript_163960 end EventScript_163960:: @ 8163960 @@ -14,9 +14,9 @@ EventScript_163960:: @ 8163960 setobjectmovementtype 3, 8 return -MtEmber_Exterior_MapScript2_163969:: @ 8163969 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - call_if ge, EventScript_163975 +MtEmber_Exterior_OnLoad:: @ 8163969 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + call_if_ge EventScript_163975 end EventScript_163975:: @ 8163975 @@ -25,10 +25,9 @@ EventScript_163975:: @ 8163975 MtEmber_Exterior_EventScript_16397F:: @ 816397F lock - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 - goto_if eq, EventScript_16399E - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if eq, EventScript_1639A8 + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, EventScript_16399E + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + goto_if_eq EventScript_1639A8 msgbox gUnknown_817A82A release end @@ -39,37 +38,35 @@ EventScript_16399E:: @ 816399E end EventScript_1639A8:: @ 81639A8 - applymovement 2, Movement_1A75E1 + applymovement 2, Movement_FacePlayer waitmovement 0 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA06 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_43, 0, Text_17AA34 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, Text_17AA34 msgbox gUnknown_817AA3F - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 - goto_if eq, EventScript_1639DB + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, EventScript_1639DB release end EventScript_1639DB:: @ 81639DB msgbox gUnknown_817AAD7 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 removeobject 3 - fadescreen 0 + fadescreen FADE_FROM_BLACK release end MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 lock faceplayer - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 - goto_if eq, EventScript_163A1B - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if eq, EventScript_163A25 + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, EventScript_163A1B + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + goto_if_eq EventScript_163A25 msgbox gUnknown_817A88C closemessage - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end @@ -82,10 +79,9 @@ EventScript_163A1B:: @ 8163A1B EventScript_163A25:: @ 8163A25 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA56 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_44, 0, Text_17AA8A + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, Text_17AA8A msgbox gUnknown_817AA99 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 - goto_if eq, EventScript_1639DB + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, EventScript_1639DB release end @@ -96,18 +92,18 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E message Text_17A8EE waitmessage playse SE_PIN - applymovement 3, Movement_1A75D9 + applymovement 3, Movement_QuestionMark waitmovement 0 waitbuttonpress msgbox gUnknown_817A970 - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 2, Movement_1A75DB + applymovement 2, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_1A75DD + applymovement 2, Movement_Delay48 waitmovement 0 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 call EventScript_163960 msgbox gUnknown_817A9E1 @@ -116,16 +112,16 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E end MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_LOGAN, 0, Text_17AB73, Text_17ABAA - msgbox gUnknown_817ABD8, 6 + trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, Text_17AB73, Text_17ABAA + msgbox gUnknown_817ABD8, MSGBOX_AUTOCLOSE end MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_BETH, 0, Text_17AC55, Text_17AC82 - msgbox gUnknown_817ACA2, 6 + trainerbattle_single TRAINER_PKMN_RANGER_BETH, Text_17AC55, Text_17AC82 + msgbox gUnknown_817ACA2, MSGBOX_AUTOCLOSE end MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_JOCELYN, 0, Text_17AD06, Text_17AD6B - msgbox gUnknown_817AD89, 6 + trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, Text_17AD06, Text_17AD6B + msgbox gUnknown_817AD89, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtEmber_Exterior/text.inc b/data/maps/MtEmber_Exterior/text.inc index d9a365f95..a3099147c 100644 --- a/data/maps/MtEmber_Exterior/text.inc +++ b/data/maps/MtEmber_Exterior/text.inc @@ -1,4 +1,4 @@ -Text_17A642:: @ 817A642 +Text_ExplosionTeach:: @ 817A642 .string "Can you imagine?\n" .string "If this volcano were to erupt?\p" .string "The explosion would be the end of\n" @@ -6,16 +6,16 @@ Text_17A642:: @ 817A642 .string "While we're terrified, would you\n" .string "like me to teach EXPLOSION?$" -Text_17A6ED:: @ 817A6ED +Text_ExplosionDeclined:: @ 817A6ED .string "Yeah, you're right.\n" .string "It is too terrifying.$" -Text_17A717:: @ 817A717 +Text_ExplosionWhichMon:: @ 817A717 .string "You're terribly brave!\p" .string "Which POKéMON should I teach\n" .string "EXPLOSION?$" -Text_17A756:: @ 817A756 +Text_ExplosionTaught:: @ 817A756 .string "Using EXPLOSION while on this\n" .string "volcano…\p" .string "What a terrifying thrill!$" diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 17d276620..59fb37bf3 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -7,7 +7,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 faceplayer setflag FLAG_GOT_RUBY removeobject 1 - additem ITEM_RUBY, 1 - giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5 + giveitem_msg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5 release end diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 3f8256837..76261b037 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -1,23 +1,21 @@ MtEmber_Summit_MapScripts:: @ 8163AFC - map_script 3, MtEmber_Summit_MapScript1_163B25 - map_script 5, MtEmber_Summit_MapScript2_163B07 + map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Summit_OnTransition + map_script MAP_SCRIPT_ON_RESUME, MtEmber_Summit_OnResume .byte 0 -MtEmber_Summit_MapScript2_163B07:: @ 8163B07 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_163B11 +MtEmber_Summit_OnResume:: @ 8163B07 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163B11 end EventScript_163B11:: @ 8163B11 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + compare VAR_RESULT, B_OUTCOME_CAUGHT + goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return -MtEmber_Summit_MapScript1_163B25:: @ 8163B25 - checkflag FLAG_FOUGHT_MOLTRES - call_if FALSE, EventScript_163B2F +MtEmber_Summit_OnTransition:: @ 8163B25 + call_if_unset FLAG_FOUGHT_MOLTRES, EventScript_163B2F end EventScript_163B2F:: @ 8163B2F @@ -26,8 +24,8 @@ EventScript_163B2F:: @ 8163B2F MtEmber_Summit_EventScript_163B33:: @ 8163B33 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 lock faceplayer @@ -45,22 +43,22 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_163B96 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163B9F - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163B9F + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq EventScript_163B96 + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq EventScript_163B9F + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq EventScript_163B9F setflag FLAG_FOUGHT_MOLTRES release end EventScript_163B96:: @ 8163B96 setflag FLAG_FOUGHT_MOLTRES - goto EventScript_1A922D + goto EventScript_RemoveStaticMon end EventScript_163B9F:: @ 8163B9F setvar VAR_0x8004, SPECIES_MOLTRES - goto EventScript_1A9236 + goto EventScript_MonFlewAway end diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 432699237..1a1de5162 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5CF", + "script": "MtMoon_1F_EventScript_ItemParalyzeHeal", "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5DC", + "script": "MtMoon_1F_EventScript_ItemTM09", "flag": "FLAG_HIDE_MT_MOON_1F_TM09" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5E9", + "script": "MtMoon_1F_EventScript_ItemPotion", "flag": "FLAG_HIDE_MT_MOON_1F_POTION" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5F6", + "script": "MtMoon_1F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE603", + "script": "MtMoon_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE610", + "script": "MtMoon_1F_EventScript_ItemMoonStone", "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE" }, { diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 28bc65ec9..4c80943d1 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -1,46 +1,46 @@ MtMoon_1F_MapScripts:: @ 81605E4 - map_script 3, MtMoon_1F_MapScript1_1605EA + map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_1F_OnTransition .byte 0 -MtMoon_1F_MapScript1_1605EA:: @ 81605EA +MtMoon_1F_OnTransition:: @ 81605EA setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F end MtMoon_1F_EventScript_1605EE:: @ 81605EE - msgbox gUnknown_8172AE0, 3 + msgbox gUnknown_8172AE0, MSGBOX_SIGN end MtMoon_1F_EventScript_1605F7:: @ 81605F7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_MARCOS, 0, Text_17279D, Text_1727CB - msgbox gUnknown_81727DF, 6 + trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB + msgbox gUnknown_81727DF, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_16060E:: @ 816060E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOSH, 0, Text_17281D, Text_172844 - msgbox gUnknown_8172863, 6 + trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844 + msgbox gUnknown_8172863, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_160625:: @ 8160625 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MIRIAM, 0, Text_172896, Text_1728C3 - msgbox gUnknown_81728D2, 6 + trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3 + msgbox gUnknown_81728D2, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_16063C:: @ 816063C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_IRIS, 0, Text_172972, Text_1729A4 - msgbox gUnknown_81729AC, 6 + trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4 + msgbox gUnknown_81729AC, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_160653:: @ 8160653 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_JOVAN, 0, Text_17290B, Text_172927 - msgbox gUnknown_817293C, 6 + trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927 + msgbox gUnknown_817293C, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_16066A:: @ 816066A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KENT, 0, Text_1729EA, Text_172A1A - msgbox gUnknown_8172A26, 6 + trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A + msgbox gUnknown_8172A26, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_160681:: @ 8160681 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ROBBY, 0, Text_172A55, Text_172A8F - msgbox gUnknown_8172A97, 6 + trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F + msgbox gUnknown_8172A97, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 478a00f7d..deb0a6c79 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BE61D", + "script": "MtMoon_B2F_EventScript_ItemStarPiece", "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BE62A", + "script": "MtMoon_B2F_EventScript_ItemTM46", "flag": "FLAG_HIDE_MT_MOON_B2F_TM46" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BEAD6", + "script": "MtMoon_B2F_EventScript_ItemRevive", "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BEAE3", + "script": "MtMoon_B2F_EventScript_ItemAntidote", "flag": "FLAG_HIDE_MT_MOON_B2F_ANTIDOTE" } ], diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 5c26a3ad1..71c458c12 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -1,10 +1,9 @@ MtMoon_B2F_MapScripts:: @ 8160699 - map_script 3, MtMoon_B2F_MapScript1_16069F + map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition .byte 0 -MtMoon_B2F_MapScript1_16069F:: @ 816069F - checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - call_if FALSE, EventScript_1606A9 +MtMoon_B2F_OnTransition:: @ 816069F + call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9 end EventScript_1606A9:: @ 81606A9 @@ -14,7 +13,7 @@ EventScript_1606A9:: @ 81606A9 MtMoon_B2F_EventScript_1606B0:: @ 81606B0 lockall - applymovement 3, Movement_1A75EB + applymovement 3, Movement_WalkInPlaceFastestRight waitmovement 0 call EventScript_1606DD releaseall @@ -23,10 +22,8 @@ MtMoon_B2F_EventScript_1606B0:: @ 81606B0 MtMoon_B2F_EventScript_1606C2:: @ 81606C2 lock faceplayer - checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - goto_if TRUE, EventScript_160707 - checktrainerflag TRAINER_SUPER_NERD_MIGUEL - goto_if eq, EventScript_160711 + goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707 + goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, EventScript_160711 call EventScript_1606DD release end @@ -38,7 +35,7 @@ EventScript_1606DD:: @ 81606DD playbgm MUS_EXEYE, 0 waitbuttonpress setvar VAR_LAST_TALKED, 3 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99 + trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99 setvar VAR_MAP_SCENE_MT_MOON_B2F, 1 msgbox gUnknown_8172BAB return @@ -57,11 +54,10 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B lock faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1607DE + compare VAR_RESULT, NO + goto_if_eq EventScript_1607DE removeobject 1 - additem ITEM_DOME_FOSSIL, 1 - giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 + giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 @@ -80,21 +76,20 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B end Movement_16077A:: @ 816077A - step_13 - step_11 - step_11 - step_11 + walk_right + walk_up + walk_up + walk_up step_end MtMoon_B2F_EventScript_16077F:: @ 816077F lock faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1607DE + compare VAR_RESULT, NO + goto_if_eq EventScript_1607DE removeobject 2 - additem ITEM_HELIX_FOSSIL, 1 - giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 + giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 @@ -117,27 +112,27 @@ EventScript_1607DE:: @ 81607DE end Movement_1607E0:: @ 81607E0 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up step_end MtMoon_B2F_EventScript_1607E4:: @ 81607E4 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT, 0, Text_172C5A, Text_172CB8 - msgbox gUnknown_8172CCB, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8 + msgbox gUnknown_8172CCB, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_1607FB:: @ 81607FB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_2, 0, Text_172CFC, Text_172D46 - msgbox gUnknown_8172D51, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46 + msgbox gUnknown_8172D51, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_160812:: @ 8160812 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_3, 0, Text_172D82, Text_172DAF - msgbox gUnknown_8172DC1, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF + msgbox gUnknown_8172DC1, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_160829:: @ 8160829 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_4, 0, Text_172DF0, Text_172E3E - msgbox gUnknown_8172E4B, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E + msgbox gUnknown_8172E4B, MSGBOX_AUTOCLOSE end diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index f483a5f85..656956abc 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "NavelRock_Base_EventScript_165134", + "script": "NavelRock_Base_EventScript_Lugia", "flag": "FLAG_HIDE_LUGIA" } ], diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 20cff0f8f..4a844fe12 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -1,58 +1,54 @@ NavelRock_Base_MapScripts:: @ 81650E7 - map_script 3, NavelRock_Base_MapScript1_1650F2 - map_script 5, NavelRock_Base_MapScript2_165116 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Base_OnTransition + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Base_OnResume .byte 0 -NavelRock_Base_MapScript1_1650F2:: @ 81650F2 - checkflag FLAG_FOUGHT_LUGIA - call_if TRUE, EventScript_165105 - checkflag FLAG_FOUGHT_LUGIA - call_if FALSE, EventScript_165109 +NavelRock_Base_OnTransition:: @ 81650F2 + call_if_set FLAG_FOUGHT_LUGIA, NavelRock_Base_EventScript_HideLugia + call_if_unset FLAG_FOUGHT_LUGIA, NavelRock_Base_EventScript_TryShowLugia end -EventScript_165105:: @ 8165105 +NavelRock_Base_EventScript_HideLugia:: @ 8165105 setflag FLAG_HIDE_LUGIA return -EventScript_165109:: @ 8165109 - checkflag FLAG_LUGIA_FLEW_AWAY - goto_if TRUE, EventScript_1A77A9 +NavelRock_Base_EventScript_TryShowLugia:: @ 8165109 + goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_Return clearflag FLAG_HIDE_LUGIA return -NavelRock_Base_MapScript2_165116:: @ 8165116 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_165120 +NavelRock_Base_OnResume:: @ 8165116 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, NavelRock_Base_EventScript_TryRemoveLugia end -EventScript_165120:: @ 8165120 +NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + compare VAR_RESULT, B_OUTCOME_CAUGHT + goto_if_ne EventScript_Return removeobject 1 return -NavelRock_Base_EventScript_165134:: @ 8165134 +NavelRock_Base_EventScript_Lugia:: @ 8165134 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 lock faceplayer waitse delay 20 playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 + setvar VAR_0x8004, 0 @ Vertical pan + setvar VAR_0x8005, 3 @ Horizontal pan + setvar VAR_0x8006, 4 @ Num shakes + setvar VAR_0x8007, 2 @ Shake delay special Special_ShakeScreen delay 30 playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 + setvar VAR_0x8004, 0 @ Vertical pan + setvar VAR_0x8005, 3 @ Horizontal pan + setvar VAR_0x8006, 4 @ Num shakes + setvar VAR_0x8007, 2 @ Shake delay special Special_ShakeScreen delay 30 delay 50 @@ -61,31 +57,31 @@ NavelRock_Base_EventScript_165134:: @ 8165134 waitmoncry delay 20 setvar VAR_0x8004, SPECIES_LUGIA - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 + setvar VAR_0x8005, 70 @ Level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE special Special_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_1651D9 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_1651E7 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_1651E7 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq NavelRock_Base_EventScript_DefeatedLugia + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq NavelRock_Base_EventScript_RanFromLugia + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq NavelRock_Base_EventScript_RanFromLugia setflag FLAG_FOUGHT_LUGIA release end -EventScript_1651D9:: @ 81651D9 +NavelRock_Base_EventScript_DefeatedLugia:: @ 81651D9 setflag FLAG_LUGIA_FLEW_AWAY setvar VAR_0x8004, SPECIES_LUGIA - goto EventScript_1A9236 + goto EventScript_MonFlewAway end -EventScript_1651E7:: @ 81651E7 +NavelRock_Base_EventScript_RanFromLugia:: @ 81651E7 setvar VAR_0x8004, SPECIES_LUGIA - goto EventScript_1A9236 + goto EventScript_MonFlewAway end diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 26ef2885c..20e7fdcbe 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,7 +1,7 @@ NavelRock_Exterior_MapScripts:: @ 81646AE - map_script 3, NavelRock_Exterior_MapScript1_1646B4 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_OnTransition .byte 0 -NavelRock_Exterior_MapScript1_1646B4:: @ 81646B4 +NavelRock_Exterior_OnTransition:: @ 81646B4 setworldmapflag FLAG_WORLD_MAP_NAVEL_ROCK_EXTERIOR end diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 334886745..c19fdb1a0 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "NavelRock_Harbor_EventScript_165421", + "script": "NavelRock_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 60832d168..facc302f1 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -1,16 +1,15 @@ - NavelRock_Harbor_MapScripts:: @ 8165420 .byte 0 -NavelRock_Harbor_EventScript_165421:: @ 8165421 +NavelRock_Harbor_EventScript_Sailor:: @ 8165421 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE switch VAR_RESULT - case 0, EventScript_1A91D5 - case 1, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 0, EventScript_SailToVermilionCity + case 1, EventScript_CancelSail + case 127, EventScript_CancelSail end diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 6baaa256f..11808290f 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -42,9 +42,9 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, - "script": "NavelRock_Summit_EventScript_164FFB" + "script": "NavelRock_Summit_EventScript_HoOh" } ], "bg_events": [ diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 563ef520f..97eb64ff2 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -1,53 +1,49 @@ NavelRock_Summit_MapScripts:: @ 8164F9F - map_script 3, NavelRock_Summit_MapScript1_164FAA - map_script 5, NavelRock_Summit_MapScript2_164FDD + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Summit_OnTransition + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Summit_OnResume .byte 0 -NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA - checkflag FLAG_FOUGHT_HO_OH - call_if TRUE, EventScript_164FBD - checkflag FLAG_FOUGHT_HO_OH - call_if FALSE, EventScript_164FC6 +NavelRock_Summit_OnTransition:: @ 8164FAA + call_if_set FLAG_FOUGHT_HO_OH, NavelRock_Summit_EventScript_HideHoOh + call_if_unset FLAG_FOUGHT_HO_OH, NavelRock_Summit_EventScript_TryShowHoOh end -EventScript_164FBD:: @ 8164FBD - setvar VAR_0x4001, 1 +NavelRock_Summit_EventScript_HideHoOh:: @ 8164FBD + setvar VAR_TEMP_1, 1 setflag FLAG_HIDE_HO_OH return -EventScript_164FC6:: @ 8164FC6 - setvar VAR_0x4001, 1 - checkflag FLAG_HO_OH_FLEW_AWAY - goto_if TRUE, EventScript_1A77A9 - setvar VAR_0x4001, 0 +NavelRock_Summit_EventScript_TryShowHoOh:: @ 8164FC6 + setvar VAR_TEMP_1, 1 + goto_if_set FLAG_HO_OH_FLEW_AWAY, EventScript_Return + setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return -NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_164FE7 +NavelRock_Summit_OnResume:: @ 8164FDD + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, NavelRock_Summit_EventScript_TryRemoveHoOh end -EventScript_164FE7:: @ 8164FE7 +NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + compare VAR_RESULT, B_OUTCOME_CAUGHT + goto_if_ne EventScript_Return removeobject 1 return -NavelRock_Summit_EventScript_164FFB:: @ 8164FFB +NavelRock_Summit_EventScript_HoOh:: @ 8164FFB 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 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 special SpawnCameraObject - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 35 + setvar VAR_0x8004, 3 @ Num loops + setvar VAR_0x8005, 35 @ Delay special Special_LoopWingFlapSound - applymovement 1, Movement_1650E0 - applymovement 127, Movement_1650CD + applymovement 1, Movement_HoOhAppear + applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp waitmovement 0 delay 50 setweather 0 @@ -57,16 +53,16 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB delay 30 waitmoncry delay 60 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 35 + setvar VAR_0x8004, 3 @ Num loops + setvar VAR_0x8005, 35 @ Delay special Special_LoopWingFlapSound - applymovement 127, Movement_1650D1 - applymovement 1, Movement_1650D7 + applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown + applymovement 1, Movement_HoOhApproach waitmovement 0 special RemoveCameraObject setvar VAR_0x8004, SPECIES_HO_OH - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 + setvar VAR_0x8005, 70 @ Level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE special Special_StartLegendaryBattle @@ -74,57 +70,57 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB clearflag FLAG_SYS_SPECIAL_WILD_BATTLE setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_1650B4 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_1650C2 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_1650C2 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq NavelRock_Summit_EventScript_DefeatedHoOh + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq NavelRock_Summit_EventScript_RanFromHoOh + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq NavelRock_Summit_EventScript_RanFromHoOh setflag FLAG_FOUGHT_HO_OH releaseall end -EventScript_1650B4:: @ 81650B4 +NavelRock_Summit_EventScript_DefeatedHoOh:: @ 81650B4 setflag FLAG_HO_OH_FLEW_AWAY setvar VAR_0x8004, SPECIES_HO_OH - goto EventScript_1A9236 + goto EventScript_MonFlewAway end -EventScript_1650C2:: @ 81650C2 +NavelRock_Summit_EventScript_RanFromHoOh:: @ 81650C2 setvar VAR_0x8004, SPECIES_HO_OH - goto EventScript_1A9236 + goto EventScript_MonFlewAway end -Movement_1650CD:: @ 81650CD - step_11 - step_11 - step_11 +Movement_CameraPanUp: @ 81650CD + walk_up + walk_up + walk_up step_end -Movement_1650D1:: @ 81650D1 - step_1c - step_1c - step_10 - step_10 - step_10 +Movement_CameraPanDown: @ 81650D1 + delay_16 + delay_16 + walk_down + walk_down + walk_down step_end -Movement_1650D7:: @ 81650D7 - step_10 - step_10 - step_10 - step_10 - step_10 - step_25 - step_1c - step_1c +Movement_HoOhApproach: @ 81650D7 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_in_place_down + delay_16 + delay_16 step_end -Movement_1650E0:: @ 81650E0 - step_1c - step_1c - step_25 - step_25 - step_25 - step_25 +Movement_HoOhAppear: @ 81650E0 + delay_16 + delay_16 + walk_in_place_down + walk_in_place_down + walk_in_place_down + walk_in_place_down step_end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 16830e056..545a3d333 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -1,30 +1,30 @@ OneIsland_MapScripts:: @ 8167484 - map_script 3, OneIsland_MapScript1_16748F - map_script 2, OneIsland_MapScript2_167493 + map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame .byte 0 -OneIsland_MapScript1_16748F:: @ 816748F +OneIsland_OnTransition:: @ 816748F setworldmapflag FLAG_WORLD_MAP_ONE_ISLAND end -OneIsland_MapScript2_167493:: @ 8167493 +OneIsland_OnFrame:: @ 8167493 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, EventScript_16749D .2byte 0 EventScript_16749D:: @ 816749D lockall textcolor 0 - applymovement 255, Movement_167505 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167505 waitmovement 0 msgbox gUnknown_818161B closemessage applymovement 1, Movement_167507 - applymovement 255, Movement_1674F4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1674F4 waitmovement 0 opendoor 14, 5 waitdooranim applymovement 1, Movement_167514 - applymovement 255, Movement_167501 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167501 waitmovement 0 closedoor 14, 5 waitdooranim @@ -36,57 +36,55 @@ EventScript_16749D:: @ 816749D end Movement_1674F4:: @ 81674F4 - step_11 - step_11 - step_11 - step_11 - step_11 - step_13 - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_167501:: @ 8167501 - step_11 - step_11 - step_60 + walk_up + walk_up + set_invisible step_end Movement_167505:: @ 8167505 - step_11 + walk_up step_end Movement_167507:: @ 8167507 - step_11 - step_11 - step_11 - step_11 - step_13 - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_167514:: @ 8167514 - step_11 - step_60 + walk_up + set_invisible step_end OneIsland_EventScript_167517:: @ 8167517 lock faceplayer - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_16753F - checkflag FLAG_SEVII_DETOUR_FINISHED - goto_if TRUE, EventScript_167535 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16753F + goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_167535 msgbox gUnknown_818174E release end @@ -102,13 +100,13 @@ EventScript_16753F:: @ 816753F end OneIsland_EventScript_167549:: @ 8167549 - msgbox gUnknown_8181A4A, 2 + msgbox gUnknown_8181A4A, MSGBOX_NPC end OneIsland_EventScript_167552:: @ 8167552 - msgbox gUnknown_81819E1, 3 + msgbox gUnknown_81819E1, MSGBOX_SIGN end OneIsland_EventScript_16755B:: @ 816755B - msgbox gUnknown_8181A0A, 3 + msgbox gUnknown_8181A0A, MSGBOX_SIGN end diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc index f3777a036..aeccc1e47 100644 --- a/data/maps/OneIsland/text.inc +++ b/data/maps/OneIsland/text.inc @@ -19,7 +19,7 @@ gUnknown_818161B:: @ 818161B .string "…Why am I telling you this now?\n" .string "Let's just go see CELIO!$" -Text_181726:: @ 8181726 +Text_WhereDoYouWantToSail:: @ 8181726 .string "Ahoy, there!\n" .string "Where do you want to sail?$" diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 75e74dad7..754c6f7c6 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -1,24 +1,24 @@ OneIsland_Harbor_MapScripts:: @ 8171378 - map_script 4, OneIsland_Harbor_MapScript1_171383 - map_script 2, OneIsland_Harbor_MapScript2_171392 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OneIsland_Harbor_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_Harbor_OnFrame .byte 0 -OneIsland_Harbor_MapScript1_171383:: @ 8171383 +OneIsland_Harbor_OnWarp:: @ 8171383 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17138D .2byte 0 EventScript_17138D:: @ 817138D - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -OneIsland_Harbor_MapScript2_171392:: @ 8171392 +OneIsland_Harbor_OnFrame:: @ 8171392 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17139C .2byte 0 EventScript_17139C:: @ 817139C lockall textcolor 0 - applymovement 255, Movement_1713B9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1713B9 waitmovement 0 setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2 warp MAP_ONE_ISLAND, 255, 12, 18 @@ -27,15 +27,15 @@ EventScript_17139C:: @ 817139C end Movement_1713B9:: @ 81713B9 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up step_end OneIsland_Harbor_EventScript_1713BD:: @ 81713BD lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND goto EventScript_1A8EC5 diff --git a/data/maps/OneIsland_House1/scripts.inc b/data/maps/OneIsland_House1/scripts.inc index 957dcada9..172f5f4a9 100644 --- a/data/maps/OneIsland_House1/scripts.inc +++ b/data/maps/OneIsland_House1/scripts.inc @@ -2,9 +2,9 @@ OneIsland_House1_MapScripts:: @ 817135B .byte 0 OneIsland_House1_EventScript_17135C:: @ 817135C - msgbox gUnknown_81A2332, 2 + msgbox gUnknown_81A2332, MSGBOX_NPC end OneIsland_House1_EventScript_171365:: @ 8171365 - msgbox gUnknown_81A2380, 2 + msgbox gUnknown_81A2380, MSGBOX_NPC end diff --git a/data/maps/OneIsland_House2/scripts.inc b/data/maps/OneIsland_House2/scripts.inc index 9966217cd..0b1761475 100644 --- a/data/maps/OneIsland_House2/scripts.inc +++ b/data/maps/OneIsland_House2/scripts.inc @@ -2,5 +2,5 @@ OneIsland_House2_MapScripts:: @ 817136E .byte 0 OneIsland_House2_EventScript_17136F:: @ 817136F - msgbox gUnknown_81A23B8, 2 + msgbox gUnknown_81A23B8, MSGBOX_NPC end diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 3520eaac0..7e12d3946 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -367,7 +367,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BEC42", + "script": "OneIsland_KindleRoad_EventScript_ItemEther", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER" }, { @@ -380,7 +380,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BEC4F", + "script": "OneIsland_KindleRoad_EventScript_ItemMaxRepel", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL" }, { @@ -393,7 +393,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BEC5C", + "script": "OneIsland_KindleRoad_EventScript_ItemCarbos", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_CARBOS" } ], diff --git a/data/maps/OneIsland_KindleRoad/scripts.inc b/data/maps/OneIsland_KindleRoad/scripts.inc index 78c2efb13..00c5106a7 100644 --- a/data/maps/OneIsland_KindleRoad/scripts.inc +++ b/data/maps/OneIsland_KindleRoad/scripts.inc @@ -2,9 +2,9 @@ OneIsland_KindleRoad_MapScripts:: @ 8168758 .byte 0 OneIsland_KindleRoad_EventScript_168759:: @ 8168759 - msgbox gUnknown_8189D02, 3 + msgbox gUnknown_8189D02, MSGBOX_SIGN end OneIsland_KindleRoad_EventScript_168762:: @ 8168762 - msgbox gUnknown_8189D32, 3 + msgbox gUnknown_8189D32, MSGBOX_SIGN end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index a04cfa085..97c4318c3 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -107,7 +107,7 @@ "x": 13, "y": 13, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "OneIsland_KindleRoad_EmberSpa_EventScript_1653CF" } diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index a713b044f..d32ab0d4a 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -2,19 +2,19 @@ OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B .byte 0 OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C - msgbox gUnknown_817D34A, 2 + msgbox gUnknown_817D34A, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365 - msgbox gUnknown_817D3DE, 2 + msgbox gUnknown_817D3DE, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E - msgbox gUnknown_817D4AA, 2 + msgbox gUnknown_817D4AA, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377 - msgbox gUnknown_817D4E3, 2 + msgbox gUnknown_817D4E3, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 @@ -28,8 +28,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 lock faceplayer - checkflag FLAG_GOT_HM06 - goto_if TRUE, EventScript_1653C5 + goto_if_set FLAG_GOT_HM06, EventScript_1653C5 msgbox gUnknown_817D622 giveitem ITEM_HM06 setflag FLAG_GOT_HM06 @@ -44,10 +43,10 @@ EventScript_1653C5:: @ 81653C5 OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF lockall - fadescreen 3 + fadescreen FADE_TO_WHITE special HealPlayerParty - fadescreen 2 + fadescreen FADE_FROM_WHITE msgbox gUnknown_817D450 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index a1d5b25a7..4f1a059ad 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,15 +1,14 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 - map_script 3, OneIsland_PokemonCenter_1F_MapScript1_170C4E - map_script 5, OneIsland_PokemonCenter_1F_MapScript2_1BC05C - map_script 1, OneIsland_PokemonCenter_1F_MapScript3_170C0D - map_script 2, OneIsland_PokemonCenter_1F_MapScript4_170CA7 + map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume + map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_1F_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_1F_OnFrame .byte 0 -OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - call_if ge, EventScript_170C22 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_170C36 +OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + call_if_ge EventScript_170C22 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_170C36 end EventScript_170C22:: @ 8170C22 @@ -26,14 +25,14 @@ EventScript_170C36:: @ 8170C36 setmetatile 15, 4, 859, 1 return -OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E +OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - call_if eq, EventScript_170C73 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 - call_if eq, EventScript_170C79 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 - call_if eq, EventScript_170C90 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 + call_if_eq EventScript_170C73 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 + call_if_eq EventScript_170C79 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 + call_if_eq EventScript_170C90 end EventScript_170C73:: @ 8170C73 @@ -54,74 +53,71 @@ EventScript_170C90:: @ 8170C90 setobjectmovementtype 3, 9 return -OneIsland_PokemonCenter_1F_MapScript4_170CA7:: @ 8170CA7 +OneIsland_PokemonCenter_1F_OnFrame:: @ 8170CA7 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, EventScript_170CB1 .2byte 0 EventScript_170CB1:: @ 8170CB1 lockall textcolor 0 - applymovement 255, Movement_170E7D + applymovement OBJ_EVENT_ID_PLAYER, Movement_170E7D applymovement 2, Movement_170E86 waitmovement 0 msgbox gUnknown_81A0CDE - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN - applymovement 3, Movement_1A75DB + applymovement 3, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_1A75E7 + applymovement 3, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 3, Movement_1A75DD + applymovement 3, Movement_Delay48 waitmovement 0 msgbox gUnknown_81A0CF7 msgbox gUnknown_81A0D27 - applymovement 2, Movement_1A75ED - applymovement 255, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A0D72 - applymovement 2, Movement_1A75EB + applymovement 2, Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_170E34 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_170E3D - applymovement 3, Movement_1A75ED + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_170E34 + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_170E3D + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A0E17 msgbox gUnknown_81A0E90 - applymovement 3, Movement_1A75E7 + applymovement 3, Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox gUnknown_81A0ECC closemessage - applymovement 2, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A0F40 - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A0FB1 - giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 - additem ITEM_METEORITE, 1 - applymovement 3, Movement_1A75ED + msgreceiveditem gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 + additem ITEM_METEORITE + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A1113 - additem ITEM_TRI_PASS, 1 - giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 + giveitem_msg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 msgbox gUnknown_81A1150 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if ge, EventScript_170E46 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if lt, EventScript_170E58 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + call_if_ge EventScript_170E46 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + call_if_lt EventScript_170E58 setflag FLAG_SYS_SEVII_MAP_123 msgbox gUnknown_81A1230 closemessage - applymovement 2, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 3, Movement_1A75E9 + applymovement 3, Movement_WalkInPlaceFastestUp waitmovement 0 setflag FLAG_SYS_PC_STORAGE_DISABLED setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 @@ -148,58 +144,56 @@ EventScript_170E46:: @ 8170E46 EventScript_170E58:: @ 8170E58 setflag FLAG_HIDE_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - additem ITEM_TOWN_MAP, 1 - giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 return Movement_170E7D:: @ 8170E7D - step_11 - step_11 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_170E86:: @ 8170E86 - step_11 - step_13 - step_13 - step_13 - step_13 - step_13 - step_11 - step_30 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_in_place_fastest_right step_end Movement_170E8F:: @ 8170E8F - step_11 + walk_up step_end Movement_170E91:: @ 8170E91 - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D lock - checkflag FLAG_SEVII_DETOUR_FINISHED - goto_if TRUE, EventScript_170EB1 + goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_170EB1 msgbox gUnknown_81A1266 release end EventScript_170EB1:: @ 8170EB1 - applymovement 2, Movement_1A75E1 + applymovement 2, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A128C release @@ -208,26 +202,24 @@ EventScript_170EB1:: @ 8170EB1 OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 - goto_if eq, EventScript_170F35 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - goto_if eq, EventScript_170F9B - checkflag FLAG_RECOVERED_SAPPHIRE - goto_if TRUE, EventScript_170FA5 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if eq, EventScript_17103A - checkflag FLAG_GOT_RUBY - goto_if TRUE, EventScript_171044 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if eq, EventScript_1710F2 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 + goto_if_eq EventScript_170F35 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 + goto_if_eq EventScript_170F9B + goto_if_set FLAG_RECOVERED_SAPPHIRE, EventScript_170FA5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + goto_if_eq EventScript_17103A + goto_if_set FLAG_GOT_RUBY, EventScript_171044 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + goto_if_eq EventScript_1710F2 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_1710FC - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - goto_if eq, EventScript_171134 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_1710FC + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 + goto_if_eq EventScript_171134 msgbox gUnknown_81A1321 closemessage - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end @@ -235,10 +227,10 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 EventScript_170F35:: @ 8170F35 msgbox gUnknown_81A1EBD random 3 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_170F6D - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_170F84 + compare VAR_RESULT, 0 + goto_if_eq EventScript_170F6D + compare VAR_RESULT, 1 + goto_if_eq EventScript_170F84 famechecker FAMECHECKER_BILL, 5 msgbox gUnknown_81A2076 release @@ -289,7 +281,7 @@ EventScript_170FA5:: @ 8170FA5 call EventScript_170C36 special DrawWholeMapView msgbox gUnknown_81A1D59 - applymovement 3, Movement_1A75E1 + applymovement 3, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A1D7D special sub_810B82C @@ -321,18 +313,18 @@ EventScript_171044:: @ 8171044 call EventScript_170C22 special DrawWholeMapView delay 30 - applymovement 3, Movement_1A75E1 + applymovement 3, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_171099 + compare VAR_RESULT, NO + goto_if_eq EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 msgbox gUnknown_81A1A08, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_171099 + compare VAR_RESULT, NO + goto_if_eq EventScript_171099 goto EventScript_1710B2 end @@ -341,7 +333,7 @@ EventScript_1710B2:: @ 81710B2 removeitem ITEM_RUBY, 1 removeitem ITEM_TRI_PASS, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - additem ITEM_RAINBOW_PASS, 1 + additem ITEM_RAINBOW_PASS setflag FLAG_SYS_SEVII_MAP_4567 textcolor 3 playfanfare MUS_FAN5 @@ -363,10 +355,10 @@ EventScript_1710F2:: @ 81710F2 EventScript_1710FC:: @ 81710FC msgbox gUnknown_81A169B - applymovement 3, Movement_1A75E9 + applymovement 3, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A1723 - applymovement 3, Movement_1A75E1 + applymovement 3, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A17DF setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 1 @@ -380,32 +372,31 @@ EventScript_171134:: @ 8171134 end Movement_17113E:: @ 817113E - step_26 - step_1b - step_26 + walk_in_place_up + delay_8 + walk_in_place_up step_end Movement_171142:: @ 8171142 - step_2e - step_26 - step_1c - step_26 - step_26 + walk_in_place_fastest_up + walk_in_place_up + delay_16 + walk_in_place_up + walk_in_place_up step_end OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148 - msgbox gUnknown_81A20D5, 2 + msgbox gUnknown_81A20D5, MSGBOX_NPC end OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 - msgbox gUnknown_81A212D, 2 + msgbox gUnknown_81A212D, MSGBOX_NPC end OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A lock faceplayer - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_17116F + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_17116F msgbox gUnknown_81A218D release end @@ -417,10 +408,8 @@ EventScript_17116F:: @ 817116F OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 lockall - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_1711A0 - checkflag FLAG_SEVII_DETOUR_FINISHED - goto_if TRUE, EventScript_171196 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1711A0 + goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_171196 msgbox gUnknown_81A223F releaseall end @@ -437,74 +426,74 @@ EventScript_1711A0:: @ 81711A0 OneIsland_PokemonCenter_1F_EventScript_1711AA:: @ 81711AA lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1711DA end OneIsland_PokemonCenter_1F_EventScript_1711B6:: @ 81711B6 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_1711DA end OneIsland_PokemonCenter_1F_EventScript_1711C2:: @ 81711C2 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto EventScript_1711DA end OneIsland_PokemonCenter_1F_EventScript_1711CE:: @ 81711CE lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 goto EventScript_1711DA end EventScript_1711DA:: @ 81711DA textcolor 0 playse SE_PIN - applymovement 2, Movement_1A75DB + applymovement 2, Movement_ExclamationMark waitmovement 0 msgbox gUnknown_81A13B8 closemessage - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_1712E4 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1712EF - compare_var_to_value VAR_0x4001, 3 - call_if eq, EventScript_1712FA - compare_var_to_value VAR_0x4001, 4 - call_if eq, EventScript_171305 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_1712E4 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_1712EF + compare VAR_TEMP_1, 3 + call_if_eq EventScript_1712FA + compare VAR_TEMP_1, 4 + call_if_eq EventScript_171305 delay 10 msgbox gUnknown_81A13CB - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A1431 - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 3, Movement_1A75E9 + applymovement 3, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A1470 msgbox gUnknown_81A14E1 closemessage - applymovement 2, Movement_1A75E7 + applymovement 2, Movement_WalkInPlaceFastestLeft waitmovement 0 delay 10 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 delay 15 msgbox gUnknown_81A14FB closemessage - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 delay 15 - applymovement 3, Movement_1A75E7 + applymovement 3, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A1574 closemessage delay 25 - applymovement 255, Movement_171326 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171326 applymovement 2, Movement_17132D waitmovement 0 playse SE_KAIDAN @@ -518,73 +507,73 @@ EventScript_1711DA:: @ 81711DA end EventScript_1712E4:: @ 81712E4 - applymovement 255, Movement_171310 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171310 waitmovement 0 return EventScript_1712EF:: @ 81712EF - applymovement 255, Movement_171314 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171314 waitmovement 0 return EventScript_1712FA:: @ 81712FA - applymovement 255, Movement_171316 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171316 waitmovement 0 return EventScript_171305:: @ 8171305 - applymovement 255, Movement_17131A + applymovement OBJ_EVENT_ID_PLAYER, Movement_17131A waitmovement 0 return Movement_171310:: @ 8171310 - step_13 - step_10 - step_30 + walk_right + walk_down + walk_in_place_fastest_right step_end Movement_171314:: @ 8171314 - step_13 + walk_right step_end Movement_171316:: @ 8171316 - step_13 - step_11 - step_30 + walk_right + walk_up + walk_in_place_fastest_right step_end Movement_17131A:: @ 817131A - step_13 - step_11 - step_11 - step_30 + walk_right + walk_up + walk_up + walk_in_place_fastest_right step_end Movement_17131F:: @ 817131F - step_1c - step_1c - step_1a - step_2f + delay_16 + delay_16 + delay_4 + walk_in_place_fastest_left step_end Movement_171324:: @ 8171324 - step_29 + walk_in_place_fast_down step_end Movement_171326:: @ 8171326 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_17132D:: @ 817132D - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down step_end diff --git a/data/maps/OneIsland_PokemonCenter_1F/text.inc b/data/maps/OneIsland_PokemonCenter_1F/text.inc index 3e9e5b521..e2d6c7fed 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/text.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/text.inc @@ -108,7 +108,7 @@ gUnknown_81A1321:: @ 81A1321 .string "I'm also sorry for being such a \n" .string "poor host on your visit here.$" -Text_1A1390:: @ 81A1390 +Text_UsualPCServicesUnavailable:: @ 81A1390 .string "The usual PC services aren't\n" .string "available…$" diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 96d913b13..a74cbc00a 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc index 0948f1cee..8adbf8907 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 - map_script 2, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, OneIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +OneIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171349 + call CableClub_EventScript_Colosseum end -EventScript_17134F:: @ 817134F - call EventScript_1BB6AB +OneIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 817134F + call CableClub_EventScript_TradeCenter end -EventScript_171355:: @ 8171355 - call EventScript_1BB7DE +OneIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171355 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/OneIsland_TreasureBeach/scripts.inc b/data/maps/OneIsland_TreasureBeach/scripts.inc index 192cf4898..a49a763a1 100644 --- a/data/maps/OneIsland_TreasureBeach/scripts.inc +++ b/data/maps/OneIsland_TreasureBeach/scripts.inc @@ -2,5 +2,5 @@ OneIsland_TreasureBeach_MapScripts:: @ 816876B .byte 0 OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C - msgbox gUnknown_8189DCE, 2 + msgbox gUnknown_8189DCE, MSGBOX_NPC end diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 2b2c4330a..1d65c1c3f 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -111,7 +111,7 @@ "x": 13, "y": 2, "elevation": 3, - "var": "VAR_0x4002", + "var": "VAR_TEMP_2", "var_value": 1, "script": "PalletTown_EventScript_16587B" } diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index d4e6c0cf3..9fd73f882 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -1,23 +1,21 @@ PalletTown_MapScripts:: @ 816545A - map_script 3, PalletTown_MapScript1_165465 - map_script 2, PalletTown_MapScript2_1654CE + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_OnFrame .byte 0 -PalletTown_MapScript1_165465:: @ 8165465 +PalletTown_OnTransition:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN - checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - call_if TRUE, EventScript_165488 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 - call_if eq, EventScript_1654A8 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - call_if eq, EventScript_1654A2 + call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_165488 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 + call_if_eq EventScript_1654A8 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + call_if_eq EventScript_1654A2 end EventScript_165488:: @ 8165488 - checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - goto_if FALSE, EventScript_1A77A9 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if ge, EventScript_1A77A9 + goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_Return + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + goto_if_ge EventScript_Return setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return @@ -26,8 +24,7 @@ EventScript_1654A2:: @ 81654A2 return EventScript_1654A8:: @ 81654A8 - checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - goto_if TRUE, EventScript_1654BD + goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_1654BD setobjectxyperm 1, 5, 15 setobjectmovementtype 1, 7 return @@ -35,10 +32,10 @@ EventScript_1654A8:: @ 81654A8 EventScript_1654BD:: @ 81654BD setobjectxyperm 1, 12, 2 setobjectmovementtype 1, 8 - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 return -PalletTown_MapScript2_1654CE:: @ 81654CE +PalletTown_OnFrame:: @ 81654CE map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, EventScript_1654D8 .2byte 0 @@ -50,8 +47,7 @@ EventScript_1654D8:: @ 81654D8 addobject 3 applymovement 3, Movement_1655AF waitmovement 0 - checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if FALSE, EventScript_1655A1 + goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1655A1 msgbox gUnknown_817D8BF setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount @@ -59,18 +55,18 @@ EventScript_1654D8:: @ 81654D8 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 - compare_var_to_value VAR_0x8009, 60 - goto_if lt, EventScript_165593 + compare VAR_0x8009, 60 + goto_if_lt EventScript_165593 msgbox gUnknown_817D9AA closemessage playbgm MUS_ANNAI, 0 - applymovement 255, Movement_1655DD + applymovement OBJ_EVENT_ID_PLAYER, Movement_1655DD applymovement 3, Movement_1655CC waitmovement 0 opendoor 16, 13 waitdooranim applymovement 3, Movement_16572E - applymovement 255, Movement_165758 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165758 waitmovement 0 closedoor 16, 13 waitdooranim @@ -102,84 +98,84 @@ EventScript_1655A1:: @ 81655A1 end Movement_1655AF:: @ 81655AF - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end Movement_1655BE:: @ 81655BE - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end Movement_1655CC:: @ 81655CC - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_1655DD:: @ 81655DD - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end PalletTown_EventScript_1655ED:: @ 81655ED lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_165605 end PalletTown_EventScript_1655F9:: @ 81655F9 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_165605 end @@ -192,29 +188,29 @@ EventScript_165605:: @ 8165605 waitmessage delay 85 closemessage - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 255, Movement_1A75DB + applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark waitmovement 0 delay 30 addobject 3 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_1656B8 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_1656C3 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_1656B8 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_1656C3 delay 30 msgbox gUnknown_817D74A closemessage delay 30 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_1656CE - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_1656E0 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_1656CE + compare VAR_TEMP_1, 1 + call_if_eq EventScript_1656E0 opendoor 16, 13 waitdooranim applymovement 3, Movement_16572E - applymovement 255, Movement_165758 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165758 waitmovement 0 closedoor 16, 13 waitdooranim @@ -240,162 +236,161 @@ EventScript_1656C3:: @ 81656C3 EventScript_1656CE:: @ 81656CE applymovement 3, Movement_165705 - applymovement 255, Movement_165731 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165731 waitmovement 0 return EventScript_1656E0:: @ 81656E0 applymovement 3, Movement_165719 - applymovement 255, Movement_165744 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165744 waitmovement 0 return Movement_1656F2:: @ 81656F2 - step_11 - step_11 - step_13 - step_11 - step_11 - step_13 - step_11 - step_11 + walk_up + walk_up + walk_right + walk_up + walk_up + walk_right + walk_up + walk_up step_end Movement_1656FB:: @ 81656FB - step_13 - step_11 - step_11 - step_13 - step_11 - step_11 - step_13 - step_11 - step_11 + walk_right + walk_up + walk_up + walk_right + walk_up + walk_up + walk_right + walk_up + walk_up step_end Movement_165705:: @ 8165705 - step_10 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e + walk_down + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_165719:: @ 8165719 - step_10 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2e + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_16572E:: @ 816572E - step_11 - step_60 + walk_up + set_invisible step_end Movement_165731:: @ 8165731 - step_10 - step_10 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 + walk_down + walk_down + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end Movement_165744:: @ 8165744 - step_10 - step_10 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end Movement_165758:: @ 8165758 - step_13 - step_11 - step_60 + walk_right + walk_up + set_invisible step_end PalletTown_EventScript_16575C:: @ 816575C lock - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 - goto_if eq, EventScript_1657ED - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if eq, EventScript_165815 - compare_var_to_value VAR_0x4002, 1 - goto_if eq, EventScript_1658C2 - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_165801 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 + goto_if_eq EventScript_1657ED + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + goto_if_eq EventScript_165815 + compare VAR_TEMP_2, 1 + goto_if_eq EventScript_1658C2 + goto_if_set FLAG_TEMP_2, EventScript_165801 msgbox gUnknown_81B1C8B - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_81B1C9F closemessage - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_1657D7 - compare_var_to_value VAR_FACING, 4 - call_if ne, EventScript_1657E2 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_1657D7 + compare VAR_FACING, DIR_EAST + call_if_ne EventScript_1657E2 moveobjectoffscreen 1 setflag FLAG_TEMP_2 release @@ -412,38 +407,38 @@ EventScript_1657E2:: @ 81657E2 return EventScript_1657ED:: @ 81657ED - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_817D7C8 release end EventScript_165801:: @ 8165801 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81B1CAF release end EventScript_165815:: @ 8165815 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81B1CEC release end Movement_165829:: @ 8165829 - step_13 - step_2f + walk_right + walk_in_place_fastest_left step_end Movement_16582C:: @ 816582C - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end PalletTown_EventScript_16582F:: @ 816582F - msgbox gUnknown_817D80D, 2 + msgbox gUnknown_817D80D, MSGBOX_NPC end PalletTown_EventScript_165838:: @ 8165838 @@ -454,15 +449,15 @@ PalletTown_EventScript_165838:: @ 8165838 end PalletTown_EventScript_165850:: @ 8165850 - msgbox gUnknown_817D87F, 3 + msgbox gUnknown_817D87F, MSGBOX_SIGN end PalletTown_EventScript_165859:: @ 8165859 - msgbox gUnknown_817D88A, 3 + msgbox gUnknown_817D88A, MSGBOX_SIGN end PalletTown_EventScript_165862:: @ 8165862 - msgbox gUnknown_817D895, 3 + msgbox gUnknown_817D895, MSGBOX_SIGN end PalletTown_EventScript_16586B:: @ 816586B @@ -474,8 +469,8 @@ PalletTown_EventScript_16586B:: @ 816586B PalletTown_EventScript_16587B:: @ 816587B lockall - applymovement 1, Movement_1A75EB - applymovement 255, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 call EventScript_165894 releaseall @@ -489,7 +484,7 @@ EventScript_165894:: @ 8165894 textcolor 3 setflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - setvar VAR_0x4002, 0 + setvar VAR_TEMP_2, 0 special sub_80699E0 special sub_80699BC signmsg @@ -498,7 +493,7 @@ EventScript_165894:: @ 8165894 return EventScript_1658C2:: @ 81658C2 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 call EventScript_165894 release diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 42c7d44ad..80cb0a484 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -1,12 +1,12 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 - map_script 3, PalletTown_GarysHouse_MapScript1_168D2D + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_GarysHouse_OnTransition .byte 0 -PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if lt, EventScript_168D44 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if ge, EventScript_168D50 +PalletTown_GarysHouse_OnTransition:: @ 8168D2D + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + call_if_lt EventScript_168D44 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + call_if_ge EventScript_168D50 end EventScript_168D44:: @ 8168D44 @@ -15,26 +15,25 @@ EventScript_168D44:: @ 8168D44 return EventScript_168D50:: @ 8168D50 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 lock faceplayer famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_168DB9 - compare_var_to_value VAR_0x4001, 1 - goto_if eq, EventScript_168EEC - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - goto_if eq, EventScript_168F59 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 - goto_if eq, EventScript_168EF6 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - goto_if ge, EventScript_168DAF + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_168DB9 + compare VAR_TEMP_1, 1 + goto_if_eq EventScript_168EEC + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + goto_if_eq EventScript_168F59 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 + goto_if_eq EventScript_168EF6 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 + goto_if_ge EventScript_168DAF msgbox gUnknown_818D58C closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -46,31 +45,31 @@ EventScript_168DAF:: @ 8168DAF EventScript_168DB9:: @ 8168DB9 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 - compare_var_to_value VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 - goto_if lt, EventScript_168E46 + compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 + goto_if_lt EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_168E3C + compare VAR_RESULT, NO + goto_if_eq EventScript_168E3C msgbox gUnknown_818D8B2 special Special_ChooseMonFromParty waitstate lock faceplayer - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_168E3C + compare VAR_0x8004, 6 + goto_if_ge EventScript_168E3C specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 - compare_var_to_value VAR_RESULT, SPECIES_EGG - goto_if eq, EventScript_168E32 + compare VAR_RESULT, SPECIES_EGG + goto_if_eq EventScript_168E32 msgbox gUnknown_818D8CC closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare special Special_DaisyMassageServices - fadescreen 0 + fadescreen FADE_FROM_BLACK special TV_CopyNicknameToStringVar1AndEnsureTerminated msgbox gUnknown_818D8FE release @@ -143,18 +142,17 @@ EventScript_168EF6:: @ 8168EF6 msgbox gUnknown_818D60A closemessage checkitemspace ITEM_TOWN_MAP, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_168F4F - applymovement 1, Movement_1A75EB + compare VAR_RESULT, FALSE + goto_if_eq EventScript_168F4F + applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 removeobject 2 setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 delay 15 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 delay 12 - additem ITEM_TOWN_MAP, 1 - giveitemfanfaremsg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5 release end @@ -169,13 +167,13 @@ EventScript_168F59:: @ 8168F59 end PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63 - msgbox gUnknown_818D763, 2 + msgbox gUnknown_818D763, MSGBOX_NPC end PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C - msgbox gUnknown_818D7A1, 3 + msgbox gUnknown_818D7A1, MSGBOX_SIGN end PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75 - msgbox gUnknown_818DC47, 3 + msgbox gUnknown_818DC47, MSGBOX_SIGN end diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 900dd06aa..6dc0a1a47 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -4,15 +4,14 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 lock faceplayer - checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB - goto_if TRUE, EventScript_168C4A + goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, EventScript_168C4A checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_168C38 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_168C41 + compare VAR_RESULT, MALE + call_if_eq EventScript_168C38 + compare VAR_RESULT, FEMALE + call_if_eq EventScript_168C41 closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -28,25 +27,25 @@ EventScript_168C41:: @ 8168C41 EventScript_168C4A:: @ 8168C4A msgbox gUnknown_818D3D1 closemessage - call EventScript_FadeOut_Heal_FadeIn + call EventScript_OutOfCenterPartyHeal msgbox gUnknown_818D3F8 release end PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall - compare_var_to_value VAR_FACING, 2 - goto_if eq, EventScript_168C78 + compare VAR_FACING, DIR_NORTH + goto_if_eq EventScript_168C78 msgbox gUnknown_818D4F9 releaseall end EventScript_168C78:: @ 8168C78 checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_168C91 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_168C9A + compare VAR_RESULT, MALE + call_if_eq EventScript_168C91 + compare VAR_RESULT, FEMALE + call_if_eq EventScript_168C9A releaseall end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index dc90bc7bf..0c623394d 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -1,46 +1,46 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 - map_script 3, PalletTown_PlayersHouse_2F_MapScript1_168CAE - map_script 4, PalletTown_PlayersHouse_2F_MapScript2_168CBE + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_PlayersHouse_2F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_PlayersHouse_2F_OnWarp .byte 0 -PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 - call_if eq, EventScript_168CBA +PalletTown_PlayersHouse_2F_OnTransition:: @ 8168CAE + compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 + call_if_eq EventScript_168CBA end EventScript_168CBA:: @ 8168CBA setrespawn SPAWN_PALLET_TOWN return -PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE +PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, EventScript_168CC8 .2byte 0 EventScript_168CC8:: @ 8168CC8 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1 end PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2 - msgbox gUnknown_818D50B, 3 + msgbox gUnknown_818D50B, MSGBOX_SIGN end PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB - msgbox gUnknown_818D53B, 3 + msgbox gUnknown_818D53B, MSGBOX_SIGN end gUnknown_8168CE4:: @ 8168CE4 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lockall setvar VAR_0x8004, 32 special Special_SetSomeVariable setvar VAR_0x8004, 1 special Special_AnimatePcTurnOn playse SE_PC_ON - msgbox gUnknown_81A5420 + msgbox Text_PlayerBootedUpPC special BedroomPC waitstate special sub_812B35C diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 38d85f0d1..0b5008f79 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1,19 +1,18 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E - map_script 3, PalletTown_ProfessorOaksLab_MapScript1_168F8E - map_script 4, PalletTown_ProfessorOaksLab_MapScript2_168FE1 - map_script 2, PalletTown_ProfessorOaksLab_MapScript3_168FF0 + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_ProfessorOaksLab_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_ProfessorOaksLab_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_ProfessorOaksLab_OnFrame .byte 0 -PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E +PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E setflag FLAG_VISITED_OAKS_LAB - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - call_if eq, EventScript_168FC6 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 - call_if eq, EventScript_168FD5 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - call_if eq, EventScript_168FC0 - checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL - call_if TRUE, EventScript_168FBC + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 + call_if_eq EventScript_168FC6 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 + call_if_eq EventScript_168FD5 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 + call_if_eq EventScript_168FC0 + call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_168FBC end EventScript_168FBC:: @ 8168FBC @@ -35,22 +34,22 @@ EventScript_168FD5:: @ 8168FD5 setobjectmovementtype 4, 7 return -PalletTown_ProfessorOaksLab_MapScript2_168FE1:: @ 8168FE1 +PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1 map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_168FEB .2byte 0 EventScript_168FEB:: @ 8168FEB - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PalletTown_ProfessorOaksLab_MapScript3_168FF0:: @ 8168FF0 +PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_16923E map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, EventScript_169002 .2byte 0 EventScript_169002:: @ 8169002 lockall - setvar VAR_FACING, 2 + setvar VAR_FACING, DIR_NORTH textcolor 0 applymovement 4, Movement_1692B0 waitmovement 0 @@ -58,7 +57,7 @@ EventScript_169002:: @ 8169002 setobjectxyperm 4, 6, 3 setobjectmovementtype 4, 8 clearflag FLAG_HIDE_OAK_IN_HIS_LAB - applymovement 255, Movement_1692B7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7 waitmovement 0 goto EventScript_169035 end @@ -66,33 +65,33 @@ EventScript_169002:: @ 8169002 EventScript_169035:: @ 8169035 msgbox gUnknown_818EE60 closemessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_169174 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_1691BB - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_169194 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_169194 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_169174 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_1691BB + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_169194 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_169194 msgbox gUnknown_818EF59 fadedefaultbgm msgbox gUnknown_818F004 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_1691DB - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_1691E6 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_1691DB + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_1691E6 textcolor 3 msgbox gUnknown_818F062 closemessage call EventScript_1A6675 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_1691F1 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_1691FC - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_169215 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_169227 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_1691F1 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_1691FC + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_169215 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_169227 addobject 9 addobject 10 delay 30 @@ -101,14 +100,14 @@ EventScript_169035:: @ 8169035 removeobject 9 removeobject 10 delay 30 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_169845 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_169850 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_16985B - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_16986D + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_169845 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_169850 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_16985B + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_16986D textcolor 3 playfanfare MUS_FAN5 message Text_18F0E8 @@ -120,14 +119,14 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818F1DB closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_169B69 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_169B7B + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_169B69 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_169B7B + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_169B7B + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 @@ -138,7 +137,7 @@ EventScript_169174:: @ 8169174 setobjectxyperm 8, 5, 10 addobject 8 playbgm MUS_RIVAL1, 0 - applymovement 255, Movement_169B94 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94 applymovement 8, Movement_169B9D waitmovement 0 return @@ -147,8 +146,8 @@ EventScript_169194:: @ 8169194 setobjectxyperm 8, 6, 10 addobject 8 playbgm MUS_RIVAL1, 0 - applymovement 4, Movement_1A75ED - applymovement 255, Movement_169B91 + applymovement 4, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 applymovement 8, Movement_169B9D waitmovement 0 return @@ -157,18 +156,18 @@ EventScript_1691BB:: @ 81691BB setobjectxyperm 8, 6, 10 addobject 8 playbgm MUS_RIVAL1, 0 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement 8, Movement_169B9D waitmovement 0 return EventScript_1691DB:: @ 81691DB - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_1691E6:: @ 81691E6 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -179,14 +178,14 @@ EventScript_1691F1:: @ 81691F1 EventScript_1691FC:: @ 81691FC applymovement 4, Movement_169238 - applymovement 255, Movement_1698C7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7 applymovement 8, Movement_1698C7 waitmovement 4 return EventScript_169215:: @ 8169215 applymovement 4, Movement_169232 - applymovement 255, Movement_1698C3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3 waitmovement 4 return @@ -196,19 +195,19 @@ EventScript_169227:: @ 8169227 return Movement_169232:: @ 8169232 - step_11 - step_12 - step_2e - step_1c - step_1a + walk_up + walk_left + walk_in_place_fastest_up + delay_16 + delay_4 step_end Movement_169238:: @ 8169238 - step_12 - step_12 - step_11 - step_1c - step_1a + walk_left + walk_left + walk_up + delay_16 + delay_4 step_end EventScript_16923E:: @ 816923E @@ -220,9 +219,9 @@ EventScript_16923E:: @ 816923E setobjectxyperm 4, 6, 3 setobjectmovementtype 4, 8 clearflag FLAG_HIDE_OAK_IN_HIS_LAB - applymovement 255, Movement_1692B7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7 waitmovement 0 - applymovement 8, Movement_1A75E9 + applymovement 8, Movement_WalkInPlaceFastestUp waitmovement 0 clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm SE_STOP @@ -242,90 +241,90 @@ EventScript_16923E:: @ 816923E end Movement_1692B0:: @ 81692B0 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1692B7:: @ 81692B7 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1692C0:: @ 81692C0 - step_26 - step_26 + walk_in_place_up + walk_in_place_up step_end PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3 lockall textcolor 0 - applymovement 4, Movement_1A75F1 + applymovement 4, Movement_FaceDown waitmovement 0 msgbox gUnknown_818E177 closemessage - applymovement 255, Movement_1692E5 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1692E5 waitmovement 0 releaseall end Movement_1692E5:: @ 81692E5 - step_11 + walk_up step_end PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7 lockall - setvar VAR_0x4002, 1 + setvar VAR_TEMP_2, 1 goto EventScript_16930B end PalletTown_ProfessorOaksLab_EventScript_1692F3:: @ 81692F3 lockall - setvar VAR_0x4002, 2 + setvar VAR_TEMP_2, 2 goto EventScript_16930B end PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF lockall - setvar VAR_0x4002, 3 + setvar VAR_TEMP_2, 3 goto EventScript_16930B end EventScript_16930B:: @ 816930B textcolor 0 playbgm MUS_RIVAL1, 0 - applymovement 8, Movement_1A75ED + applymovement 8, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_818DDA4 closemessage - applymovement 4, Movement_1A75F1 + applymovement 4, Movement_FaceDown waitmovement 0 - compare_var_to_value VAR_STARTER_MON, 0 - goto_if eq, EventScript_1693D2 - compare_var_to_value VAR_STARTER_MON, 1 - goto_if eq, EventScript_16944D - compare_var_to_value VAR_STARTER_MON, 2 - goto_if eq, EventScript_16935A + compare VAR_STARTER_MON, 0 + goto_if_eq EventScript_1693D2 + compare VAR_STARTER_MON, 1 + goto_if_eq EventScript_16944D + compare VAR_STARTER_MON, 2 + goto_if_eq EventScript_16935A end EventScript_16935A:: @ 816935A - compare_var_to_value VAR_0x4002, 1 - goto_if eq, EventScript_16937C - compare_var_to_value VAR_0x4002, 2 - goto_if eq, EventScript_16938C - compare_var_to_value VAR_0x4002, 3 - goto_if eq, EventScript_16939C + compare VAR_TEMP_2, 1 + goto_if_eq EventScript_16937C + compare VAR_TEMP_2, 2 + goto_if_eq EventScript_16938C + compare VAR_TEMP_2, 3 + goto_if_eq EventScript_16939C end EventScript_16937C:: @ 816937C @@ -347,41 +346,41 @@ EventScript_16939C:: @ 816939C end EventScript_1693AC:: @ 81693AC - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end Movement_1693C0:: @ 81693C0 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_1693C7:: @ 81693C7 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_1693CD:: @ 81693CD - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_down + walk_down step_end EventScript_1693D2:: @ 81693D2 - compare_var_to_value VAR_0x4002, 1 - goto_if eq, EventScript_1693F4 - compare_var_to_value VAR_0x4002, 2 - goto_if eq, EventScript_169404 - compare_var_to_value VAR_0x4002, 3 - goto_if eq, EventScript_169414 + compare VAR_TEMP_2, 1 + goto_if_eq EventScript_1693F4 + compare VAR_TEMP_2, 2 + goto_if_eq EventScript_169404 + compare VAR_TEMP_2, 3 + goto_if_eq EventScript_169414 end EventScript_1693F4:: @ 81693F4 @@ -403,44 +402,44 @@ EventScript_169414:: @ 8169414 end EventScript_169424:: @ 8169424 - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end Movement_169438:: @ 8169438 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_169440:: @ 8169440 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_169447:: @ 8169447 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_down + walk_down step_end EventScript_16944D:: @ 816944D - compare_var_to_value VAR_0x4002, 1 - goto_if eq, EventScript_16946F - compare_var_to_value VAR_0x4002, 2 - goto_if eq, EventScript_16947F - compare_var_to_value VAR_0x4002, 3 - goto_if eq, EventScript_16948F + compare VAR_TEMP_2, 1 + goto_if_eq EventScript_16946F + compare VAR_TEMP_2, 2 + goto_if_eq EventScript_16947F + compare VAR_TEMP_2, 3 + goto_if_eq EventScript_16948F end EventScript_16946F:: @ 816946F @@ -462,29 +461,29 @@ EventScript_16948F:: @ 816948F end EventScript_16949F:: @ 816949F - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end Movement_1694B3:: @ 81694B3 - step_12 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_left + walk_down + walk_down step_end Movement_1694B9:: @ 81694B9 - step_12 - step_12 - step_10 - step_10 + walk_left + walk_left + walk_down + walk_down step_end Movement_1694BE:: @ 81694BE - step_12 - step_10 - step_10 + walk_left + walk_down + walk_down step_end EventScript_1694C2:: @ 81694C2 @@ -492,12 +491,12 @@ EventScript_1694C2:: @ 81694C2 msgbox gUnknown_818DE38 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4002, 1 - call_if eq, EventScript_169504 - compare_var_to_value VAR_0x4002, 2 - call_if eq, EventScript_169516 - compare_var_to_value VAR_0x4002, 3 - call_if eq, EventScript_169528 + compare VAR_TEMP_2, 1 + call_if_eq EventScript_169504 + compare VAR_TEMP_2, 2 + call_if_eq EventScript_169516 + compare VAR_TEMP_2, 3 + call_if_eq EventScript_169528 removeobject 8 playse SE_KAIDAN fadedefaultbgm @@ -508,76 +507,76 @@ EventScript_1694C2:: @ 81694C2 EventScript_169504:: @ 8169504 applymovement 8, Movement_16953A - applymovement 255, Movement_169553 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169553 waitmovement 8 return EventScript_169516:: @ 8169516 applymovement 8, Movement_16954A - applymovement 255, Movement_169553 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169553 waitmovement 8 return EventScript_169528:: @ 8169528 applymovement 8, Movement_169542 - applymovement 255, Movement_169559 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169559 waitmovement 8 return Movement_16953A:: @ 816953A - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1b + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + delay_8 step_end Movement_169542:: @ 8169542 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1b + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + delay_8 step_end Movement_16954A:: @ 816954A - step_13 - step_10 - step_10 - step_10 - step_12 - step_10 - step_10 - step_1b + walk_right + walk_down + walk_down + walk_down + walk_left + walk_down + walk_down + delay_8 step_end Movement_169553:: @ 8169553 - step_1c - step_1b - step_30 - step_1c - step_2d + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_down step_end Movement_169559:: @ 8169559 - step_1c - step_1b - step_2f - step_1c - step_2d + delay_16 + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if eq, EventScript_16958B - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169581 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + goto_if_eq EventScript_16958B + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + goto_if_eq EventScript_169581 msgbox gUnknown_818DC67 release end @@ -595,24 +594,22 @@ EventScript_16958B:: @ 816958B PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_169600 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 - goto_if eq, EventScript_169903 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - goto_if eq, EventScript_169A6E - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_1699CE - compare_var_to_value VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 - goto_if eq, EventScript_169903 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if eq, EventScript_1698D6 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if ge, EventScript_16961E - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - goto_if eq, EventScript_169614 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if eq, EventScript_16960A + goto_if_set FLAG_TEMP_2, EventScript_169600 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 + goto_if_eq EventScript_169903 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 + goto_if_eq EventScript_169A6E + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1699CE + compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 + goto_if_eq EventScript_169903 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 + goto_if_eq EventScript_1698D6 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 + goto_if_ge EventScript_16961E + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 + goto_if_eq EventScript_169614 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + goto_if_eq EventScript_16960A msgbox gUnknown_818E116 release end @@ -645,60 +642,60 @@ EventScript_16961E:: @ 816961E playbgm MUS_RIVAL1, 0 msgbox gUnknown_818DE8D closemessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_169A82 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_169AC1 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_169A9E - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_169A9E + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_169A82 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_169AC1 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_169A9E + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_169A9E fadedefaultbgm msgbox gUnknown_818DE99 closemessage delay 30 playse SE_PIN - applymovement 4, Movement_1A75DB + applymovement 4, Movement_ExclamationMark waitmovement 0 - applymovement 4, Movement_1A75DD + applymovement 4, Movement_Delay48 waitmovement 0 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_169ADD - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_169B14 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_169AF5 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_169B86 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_169ADD + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_169B14 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_169AF5 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_169B86 msgbox gUnknown_818E508 closemessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_169882 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_16988D - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_1698A6 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_1698B8 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_169882 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_16988D + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_1698A6 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_1698B8 msgbox gUnknown_818E536 closemessage delay 40 msgbox gUnknown_818E5C5 closemessage - applymovement 4, Movement_1A75E9 + applymovement 4, Movement_WalkInPlaceFastestUp waitmovement 0 removeobject 9 delay 10 removeobject 10 delay 25 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_169845 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_169850 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_16985B - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_16986D + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_169845 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_169850 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_16985B + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_16986D delay 10 textcolor 3 playfanfare MUS_FAN5 @@ -710,31 +707,30 @@ EventScript_16961E:: @ 816961E special sub_810B810 setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 msgbox gUnknown_818E612 - additem ITEM_POKE_BALL, 5 - giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 + giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5 msgbox gUnknown_818E6D0 famechecker FAMECHECKER_OAK, 1 msgbox gUnknown_818E784 msgbox gUnknown_818DEC8 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_169B33 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_169B45 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_169B57 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_169B57 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_169B33 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_169B45 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_169B57 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_169B57 msgbox gUnknown_818DEF3 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_169B69 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_169B7B + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_169B69 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_169B7B + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_169B7B + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 @@ -757,7 +753,7 @@ EventScript_169850:: @ 8169850 EventScript_16985B:: @ 816985B applymovement 4, Movement_16987C - applymovement 255, Movement_169878 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169878 waitmovement 0 return @@ -767,19 +763,19 @@ EventScript_16986D:: @ 816986D return Movement_169878:: @ 8169878 - step_1c - step_1b - step_30 + delay_16 + delay_8 + walk_in_place_fastest_right step_end Movement_16987C:: @ 816987C - step_13 - step_10 + walk_right + walk_down step_end Movement_16987F:: @ 816987F - step_10 - step_13 + walk_down + walk_right step_end EventScript_169882:: @ 8169882 @@ -789,14 +785,14 @@ EventScript_169882:: @ 8169882 EventScript_16988D:: @ 816988D applymovement 4, Movement_1698D0 - applymovement 255, Movement_1698C7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7 applymovement 8, Movement_1698C7 waitmovement 4 return EventScript_1698A6:: @ 81698A6 applymovement 4, Movement_1698CB - applymovement 255, Movement_1698C3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3 waitmovement 4 return @@ -806,30 +802,30 @@ EventScript_1698B8:: @ 81698B8 return Movement_1698C3:: @ 81698C3 - step_1c - step_1b - step_2e + delay_16 + delay_8 + walk_in_place_fastest_up step_end Movement_1698C7:: @ 81698C7 - step_1c - step_1b - step_2f + delay_16 + delay_8 + walk_in_place_fastest_left step_end Movement_1698CB:: @ 81698CB - step_11 - step_12 - step_1c - step_2d + walk_up + walk_left + delay_16 + walk_in_place_fastest_down step_end Movement_1698D0:: @ 81698D0 - step_12 - step_12 - step_11 - step_1c - step_30 + walk_left + walk_left + walk_up + delay_16 + walk_in_place_fastest_right step_end EventScript_1698D6:: @ 81698D6 @@ -839,15 +835,14 @@ EventScript_1698D6:: @ 81698D6 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 - compare_var_to_value VAR_0x8009, 1 - goto_if eq, EventScript_1699FB + compare VAR_0x8009, 1 + goto_if_eq EventScript_1699FB goto EventScript_169903 end EventScript_169903:: @ 8169903 - call EventScript_1A737B - checkflag FLAG_OAK_SAW_DEX_COMPLETION - goto_if TRUE, EventScript_169913 + call ProfOak_EventScript_RatePokedexInPerson + goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913 release end @@ -856,15 +851,15 @@ EventScript_169913:: @ 8169913 delay 40 message Text_1A7291 waitmessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_169964 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_16996F - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_16997A - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_169985 - applymovement 4, Movement_1A75E1 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_169964 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_16996F + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_16997A + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_169985 + applymovement 4, Movement_FacePlayer waitmovement 0 closemessage delay 70 @@ -894,86 +889,85 @@ EventScript_169985:: @ 8169985 return Movement_169990:: @ 8169990 - step_25 - step_29 - step_25 - step_25 - step_29 - step_25 + walk_in_place_down + walk_in_place_fast_down + walk_in_place_down + walk_in_place_down + walk_in_place_fast_down + walk_in_place_down step_end Movement_169997:: @ 8169997 - step_26 - step_2a - step_26 - step_26 - step_2a - step_26 + walk_in_place_up + walk_in_place_fast_up + walk_in_place_up + walk_in_place_up + walk_in_place_fast_up + walk_in_place_up step_end Movement_16999E:: @ 816999E - step_27 - step_2b - step_27 - step_27 - step_2b - step_27 + walk_in_place_left + walk_in_place_fast_left + walk_in_place_left + walk_in_place_left + walk_in_place_fast_left + walk_in_place_left step_end Movement_1699A5:: @ 81699A5 - step_28 - step_2c - step_28 - step_28 - step_2c - step_28 + walk_in_place_right + walk_in_place_fast_right + walk_in_place_right + walk_in_place_right + walk_in_place_fast_right + walk_in_place_right step_end Movement_1699AC:: @ 81699AC - step_12 - step_2d - step_1b - step_30 - step_1b - step_2e - step_1b - step_2f - step_1b - step_2d - step_1b - step_13 - step_13 - step_2e - step_1b - step_2f - step_1b - step_2d - step_1b - step_30 - step_1b - step_2e - step_1b - step_12 + walk_left + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_left + delay_8 + walk_in_place_fastest_down + delay_8 + walk_right + walk_right + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_left + delay_8 + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_up + delay_8 + walk_left step_end Movement_1699C5: - step_11 - step_10 - step_10 - step_25 - step_11 - step_1c - step_1c - step_1c + walk_up + walk_down + walk_down + walk_in_place_down + walk_up + delay_16 + delay_16 + delay_16 step_end EventScript_1699CE:: @ 81699CE - call EventScript_1A737B + call ProfOak_EventScript_RatePokedexInPerson closemessage - compare_var_to_value VAR_0x8009, 60 - goto_if lt, EventScript_1699F9 - checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if FALSE, EventScript_1699F9 + compare VAR_0x8009, 60 + goto_if_lt EventScript_1699F9 + goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1699F9 delay 30 msgbox gUnknown_818EDF5 goto EventScript_169035 @@ -985,29 +979,26 @@ EventScript_1699F9:: @ 81699F9 EventScript_1699FB:: @ 81699FB 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 - checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK - goto_if TRUE, EventScript_169A6E - checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL - goto_if TRUE, EventScript_169A78 + goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E + goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78 checkitem ITEM_POKE_BALL, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_169A34 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_169A34 goto EventScript_169A6E end EventScript_169A34:: @ 8169A34 - compare_var_to_value VAR_MAP_SCENE_ROUTE22, 2 - goto_if ge, EventScript_169A45 + compare VAR_MAP_SCENE_ROUTE22, 2 + goto_if_ge EventScript_169A45 goto EventScript_169A6E end EventScript_169A45:: @ 8169A45 msgbox gUnknown_818E89C - additem ITEM_POKE_BALL, 5 - giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 + giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5 setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL release end @@ -1025,7 +1016,7 @@ EventScript_169A78:: @ 8169A78 EventScript_169A82:: @ 8169A82 setobjectxyperm 8, 5, 10 addobject 8 - applymovement 255, Movement_169B94 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94 applymovement 8, Movement_169B9D waitmovement 0 return @@ -1033,8 +1024,8 @@ EventScript_169A82:: @ 8169A82 EventScript_169A9E:: @ 8169A9E setobjectxyperm 8, 6, 10 addobject 8 - applymovement 4, Movement_1A75ED - applymovement 255, Movement_169B91 + applymovement 4, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 applymovement 8, Movement_169B9D waitmovement 0 return @@ -1042,57 +1033,57 @@ EventScript_169A9E:: @ 8169A9E EventScript_169AC1:: @ 8169AC1 setobjectxyperm 8, 6, 10 addobject 8 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement 8, Movement_169B9D waitmovement 0 return EventScript_169ADD:: @ 8169ADD - applymovement 4, Movement_1A75E1 + applymovement 4, Movement_FacePlayer waitmovement 0 delay 15 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_169AF5:: @ 8169AF5 - applymovement 4, Movement_1A75E1 + applymovement 4, Movement_FacePlayer waitmovement 0 delay 15 - applymovement 255, Movement_1A75E7 - applymovement 4, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement 4, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_169B14:: @ 8169B14 - applymovement 4, Movement_1A75E1 + applymovement 4, Movement_FacePlayer waitmovement 0 delay 15 - applymovement 255, Movement_1A75EB - applymovement 4, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement 4, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_169B33:: @ 8169B33 - applymovement 8, Movement_1A75E1 - applymovement 255, Movement_1A75E7 + applymovement 8, Movement_FacePlayer + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_169B45:: @ 8169B45 - applymovement 8, Movement_1A75E9 - applymovement 255, Movement_1A75ED + applymovement 8, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_169B57:: @ 8169B57 - applymovement 8, Movement_1A75E1 - applymovement 255, Movement_1A75ED + applymovement 8, Movement_FacePlayer + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_169B69:: @ 8169B69 - applymovement 255, Movement_169B91 + applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91 applymovement 8, Movement_169BA4 waitmovement 0 return @@ -1103,48 +1094,48 @@ EventScript_169B7B:: @ 8169B7B return EventScript_169B86:: @ 8169B86 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return Movement_169B91:: @ 8169B91 - step_1a - step_2d + delay_4 + walk_in_place_fastest_down step_end Movement_169B94:: @ 8169B94 - step_2d - step_1c - step_1c - step_1c - step_1c - step_1c - step_1b - step_2f + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_left step_end Movement_169B9D:: @ 8169B9D - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_169BA4:: @ 8169BA4 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end - .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_0x4001 - .equ VAR_OAKSLAB_PLAYER_STARTER_SPECIES, VAR_0x4002 - .equ VAR_OAKSLAB_RIVAL_STARTER_SPECIES, VAR_0x4003 - .equ VAR_OAKSLAB_RIVAL_STARTER_OBJID, VAR_0x4004 + .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_TEMP_1 + .equ VAR_OAKSLAB_PLAYER_STARTER_SPECIES, VAR_TEMP_2 + .equ VAR_OAKSLAB_RIVAL_STARTER_SPECIES, VAR_TEMP_3 + .equ VAR_OAKSLAB_RIVAL_STARTER_OBJID, VAR_TEMP_4 PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB lock @@ -1153,49 +1144,49 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if ge, EventScript_169DE4 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169BE1 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + goto_if_ge EventScript_169DE4 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end EventScript_169BE1:: @ 8169BE1 - applymovement 4, Movement_1A75EF + applymovement 4, Movement_FaceRight waitmovement 0 drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if eq, EventScript_OakDescribesBulbasaur - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if eq, EventScript_OakDescribesCharmander - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if eq, EventScript_OakDescribesSquirtle + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + goto_if_eq EventScript_OakDescribesBulbasaur + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + goto_if_eq EventScript_OakDescribesCharmander + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + goto_if_eq EventScript_OakDescribesSquirtle end EventScript_OakDescribesBulbasaur:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_ThisPokeIsRealyEnergetic - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_DeclinedStarter + compare VAR_RESULT, YES + goto_if_eq EventScript_ThisPokeIsRealyEnergetic + compare VAR_RESULT, NO + goto_if_eq EventScript_DeclinedStarter end EventScript_OakDescribesCharmander:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_ThisPokeIsRealyEnergetic - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_DeclinedStarter + compare VAR_RESULT, YES + goto_if_eq EventScript_ThisPokeIsRealyEnergetic + compare VAR_RESULT, NO + goto_if_eq EventScript_DeclinedStarter end EventScript_OakDescribesSquirtle:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_ThisPokeIsRealyEnergetic - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_DeclinedStarter + compare VAR_RESULT, YES + goto_if_eq EventScript_ThisPokeIsRealyEnergetic + compare VAR_RESULT, NO + goto_if_eq EventScript_DeclinedStarter end EventScript_DeclinedStarter:: @ 8169C71 @@ -1210,7 +1201,7 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 call EventScript_1A6675 setflag FLAG_SYS_POKEMON_GET setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE, 0, 0, 0 + givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES message Text_18E30D @@ -1218,10 +1209,10 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 playfanfare MUS_FAN5 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_GiveNicknameToStarter - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_SkipGiveNicknameToStarter + compare VAR_RESULT, YES + goto_if_eq EventScript_GiveNicknameToStarter + compare VAR_RESULT, NO + goto_if_eq EventScript_SkipGiveNicknameToStarter end EventScript_GiveNicknameToStarter:: @ 8169CCC @@ -1232,12 +1223,12 @@ EventScript_GiveNicknameToStarter:: @ 8169CCC EventScript_SkipGiveNicknameToStarter:: @ 8169CDC closemessage - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if eq, EventScript_RivalWalksToCharmander - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if eq, EventScript_RivalWalksToSquirtle - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if eq, EventScript_RivalWalksToBulbasaur + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + goto_if_eq EventScript_RivalWalksToCharmander + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + goto_if_eq EventScript_RivalWalksToSquirtle + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + goto_if_eq EventScript_RivalWalksToBulbasaur end EventScript_RivalWalksToCharmander:: @ 8169CFF @@ -1269,8 +1260,7 @@ Movement_RivalTakesHisStarter:: @ 8169D2F playfanfare MUS_FAN5 waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - call_if TRUE, EventScript_169D5C + call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_169D5C release end @@ -1279,31 +1269,31 @@ EventScript_169D5C:: @ 8169D5C return Movement_RivalWalksToCharmander:: @ 8169D62 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_11 + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up step_end Movement_RivalWalksToBulbasaur:: @ 8169D6B - step_10 - step_13 - step_13 - step_13 - step_13 - step_2e + walk_down + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_RivalWalksToSquirtle:: @ 8169D72 - step_10 - step_13 - step_13 - step_13 - step_2e + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 @@ -1313,10 +1303,10 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if ge, EventScript_169DE4 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169BE1 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + goto_if_ge EventScript_169DE4 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1328,10 +1318,10 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if ge, EventScript_169DE4 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169BE1 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + goto_if_ge EventScript_169DE4 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1344,8 +1334,7 @@ EventScript_169DE4:: @ 8169DE4 PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_169E03 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E03 msgbox gUnknown_818EBE6 release end @@ -1359,8 +1348,7 @@ EventScript_169E03:: @ 8169E03 PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_169E2F + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E2F msgbox gUnknown_818EBE6 release end @@ -1380,21 +1368,21 @@ PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46 end PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F - msgbox gUnknown_818E9E5, 2 + msgbox gUnknown_818E9E5, MSGBOX_NPC end PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68 - msgbox gUnknown_818EAF4, 3 + msgbox gUnknown_818EAF4, MSGBOX_SIGN end PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 - msgbox gUnknown_818EA66, 3 + msgbox gUnknown_818EA66, MSGBOX_SIGN end PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if ge, EventScript_169E90 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 + goto_if_ge EventScript_169E90 msgbox gUnknown_818EA84 releaseall end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 352da6d31..fd8b6ec9a 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1,8 +1,8 @@ PewterCity_MapScripts:: @ 8165B8E - map_script 3, PewterCity_MapScript1_165B94 + map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_OnTransition .byte 0 -PewterCity_MapScript1_165B94:: @ 8165B94 +PewterCity_OnTransition:: @ 8165B94 setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 0 end @@ -13,8 +13,8 @@ PewterCity_EventScript_165B9D:: @ 8165B9D msgbox gUnknown_817E67E closemessage playbgm MUS_ANNAI, 0 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_165BD3 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 @@ -26,417 +26,417 @@ PewterCity_EventScript_165B9D:: @ 8165B9D end EventScript_165BD3:: @ 8165BD3 - applymovement 255, Movement_165C3C + applymovement OBJ_EVENT_ID_PLAYER, Movement_165C3C applymovement 5, Movement_165CDE waitmovement 0 - applymovement 255, Movement_165C41 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165C41 applymovement 5, Movement_165CE3 waitmovement 0 return EventScript_165BF6:: @ 8165BF6 - applymovement 255, Movement_165C80 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165C80 applymovement 5, Movement_165D23 waitmovement 0 - applymovement 255, Movement_165C82 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165C82 applymovement 5, Movement_165D25 waitmovement 0 return EventScript_165C19:: @ 8165C19 - applymovement 255, Movement_165CAF + applymovement OBJ_EVENT_ID_PLAYER, Movement_165CAF applymovement 5, Movement_165D53 waitmovement 0 - applymovement 255, Movement_165CB1 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165CB1 applymovement 5, Movement_165D55 waitmovement 0 return Movement_165C3C:: @ 8165C3C - step_1c - step_1c - step_1a - step_2d + delay_16 + delay_16 + delay_4 + walk_in_place_fastest_down step_end Movement_165C41:: @ 8165C41 - step_10 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_down + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_165C80:: @ 8165C80 - step_1c + delay_16 step_end Movement_165C82:: @ 8165C82 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right step_end Movement_165CAF:: @ 8165CAF - step_1c + delay_16 step_end Movement_165CB1:: @ 8165CB1 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right step_end Movement_165CDE:: @ 8165CDE - step_10 - step_12 - step_2e - step_26 + walk_down + walk_left + walk_in_place_fastest_up + walk_in_place_up step_end Movement_165CE3:: @ 8165CE3 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_165D23:: @ 8165D23 - step_28 + walk_in_place_right step_end Movement_165D25:: @ 8165D25 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_165D53:: @ 8165D53 - step_25 + walk_in_place_down step_end Movement_165D55:: @ 8165D55 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_165D83:: @ 8165D83 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PewterCity_EventScript_165D8E:: @ 8165D8E lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_165DBE end PewterCity_EventScript_165D9A:: @ 8165D9A lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_165DBE end PewterCity_EventScript_165DA6:: @ 8165DA6 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_165DBE end PewterCity_EventScript_165DB2:: @ 8165DB2 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto EventScript_165DBE end @@ -445,12 +445,12 @@ EventScript_165DBE:: @ 8165DBE msgbox gUnknown_817E67E closemessage playbgm MUS_ANNAI, 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_165E0A - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_165E26 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_165E42 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_165E0A + compare VAR_TEMP_1, 1 + call_if_eq EventScript_165E26 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_165E42 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 @@ -464,7 +464,7 @@ EventScript_165DBE:: @ 8165DBE EventScript_165E0A:: @ 8165E0A applymovement 5, Movement_165F6C waitmovement 0 - applymovement 255, Movement_165E7A + applymovement OBJ_EVENT_ID_PLAYER, Movement_165E7A applymovement 5, Movement_165F7F waitmovement 0 return @@ -472,7 +472,7 @@ EventScript_165E0A:: @ 8165E0A EventScript_165E26:: @ 8165E26 applymovement 5, Movement_165F71 waitmovement 0 - applymovement 255, Movement_165EB9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165EB9 applymovement 5, Movement_165FBF waitmovement 0 return @@ -480,7 +480,7 @@ EventScript_165E26:: @ 8165E26 EventScript_165E42:: @ 8165E42 applymovement 5, Movement_165F74 waitmovement 0 - applymovement 255, Movement_165EF9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165EF9 applymovement 5, Movement_166000 waitmovement 0 return @@ -488,564 +488,564 @@ EventScript_165E42:: @ 8165E42 EventScript_165E5E:: @ 8165E5E applymovement 5, Movement_165F78 waitmovement 0 - applymovement 255, Movement_165F3A + applymovement OBJ_EVENT_ID_PLAYER, Movement_165F3A applymovement 5, Movement_166042 waitmovement 0 return Movement_165E7A:: @ 8165E7A - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_165EB9:: @ 8165EB9 - step_11 - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_165EF9:: @ 8165EF9 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_165F3A:: @ 8165F3A - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right step_end Movement_165F6C:: @ 8165F6C - step_12 - step_10 - step_30 - step_28 + walk_left + walk_down + walk_in_place_fastest_right + walk_in_place_right step_end Movement_165F71:: @ 8165F71 - step_10 - step_25 + walk_down + walk_in_place_down step_end Movement_165F74:: @ 8165F74 - step_10 - step_10 - step_25 + walk_down + walk_down + walk_in_place_down step_end Movement_165F78:: @ 8165F78 - step_10 - step_10 - step_13 - step_10 - step_13 - step_28 + walk_down + walk_down + walk_right + walk_down + walk_right + walk_in_place_right step_end Movement_165F7F:: @ 8165F7F - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_165FBF:: @ 8165FBF - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_166000:: @ 8166000 - step_11 - step_12 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2f + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left step_end Movement_166042:: @ 8166042 - step_12 - step_12 - step_12 - step_11 - step_12 - step_12 - step_12 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_13 - step_2f + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_left step_end PewterCity_EventScript_166075:: @ 8166075 - msgbox gUnknown_817E436, 2 + msgbox gUnknown_817E436, MSGBOX_NPC end PewterCity_EventScript_16607E:: @ 816607E lock faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_166136 + compare VAR_RESULT, YES + goto_if_eq EventScript_166136 msgbox gUnknown_817E589 closemessage delay 10 playbgm MUS_ANNAI, 0 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_1660EE - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_166100 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_166112 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_166124 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_1660EE + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_166100 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_166112 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_166124 msgbox gUnknown_817E5AC closemessage delay 10 @@ -1059,25 +1059,25 @@ PewterCity_EventScript_16607E:: @ 816607E EventScript_1660EE:: @ 81660EE applymovement 2, Movement_16615C - applymovement 255, Movement_166140 + applymovement OBJ_EVENT_ID_PLAYER, Movement_166140 waitmovement 0 return EventScript_166100:: @ 8166100 applymovement 2, Movement_166193 - applymovement 255, Movement_166177 + applymovement OBJ_EVENT_ID_PLAYER, Movement_166177 waitmovement 0 return EventScript_166112:: @ 8166112 applymovement 2, Movement_1661CA - applymovement 255, Movement_1661AE + applymovement OBJ_EVENT_ID_PLAYER, Movement_1661AE waitmovement 0 return EventScript_166124:: @ 8166124 applymovement 2, Movement_166201 - applymovement 255, Movement_1661E5 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1661E5 waitmovement 0 return @@ -1087,256 +1087,256 @@ EventScript_166136:: @ 8166136 end Movement_166140:: @ 8166140 - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 + walk_in_place_fastest_up step_end Movement_16615C:: @ 816615C - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end Movement_166177:: @ 8166177 - step_1c - step_1c - step_12 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e + delay_16 + delay_16 + walk_left + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 + walk_in_place_fastest_up step_end Movement_166193:: @ 8166193 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end Movement_1661AE:: @ 81661AE - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 + walk_in_place_fastest_up step_end Movement_1661CA:: @ 81661CA - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end Movement_1661E5:: @ 81661E5 - step_13 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_1b - step_2e + walk_right + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 + walk_in_place_fastest_up step_end Movement_166201:: @ 8166201 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_2e + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end Movement_16621C:: @ 816621C - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_13 - step_13 - step_13 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end PewterCity_EventScript_16622B:: @ 816622B @@ -1351,8 +1351,8 @@ PewterCity_EventScript_166244:: @ 8166244 lock faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_166263 + compare VAR_RESULT, YES + goto_if_eq EventScript_166263 msgbox gUnknown_817E644 release end @@ -1363,15 +1363,15 @@ EventScript_166263:: @ 8166263 end PewterCity_EventScript_16626D:: @ 816626D - msgbox gUnknown_817E6F6, 3 + msgbox gUnknown_817E6F6, MSGBOX_SIGN end PewterCity_EventScript_166276:: @ 8166276 - msgbox gUnknown_817E748, 3 + msgbox gUnknown_817E748, MSGBOX_SIGN end PewterCity_EventScript_16627F:: @ 816627F - msgbox gUnknown_817E7C5, 3 + msgbox gUnknown_817E7C5, MSGBOX_SIGN end PewterCity_EventScript_166288:: @ 8166288 @@ -1382,61 +1382,61 @@ PewterCity_EventScript_166288:: @ 8166288 end PewterCity_EventScript_1662A0:: @ 81662A0 - msgbox gUnknown_817E824, 3 + msgbox gUnknown_817E824, MSGBOX_SIGN end PewterCity_EventScript_1662A9:: @ 81662A9 lock faceplayer - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 call EventScript_1662DE release end PewterCity_EventScript_1662B7:: @ 81662B7 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call EventScript_1662DE releaseall end PewterCity_EventScript_1662C4:: @ 81662C4 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 call EventScript_1662DE releaseall end PewterCity_EventScript_1662D1:: @ 81662D1 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 call EventScript_1662DE releaseall end EventScript_1662DE:: @ 81662DE textcolor 0 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_1663CA - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1663CA - compare_var_to_value VAR_0x4001, 3 - call_if eq, EventScript_1663CA + compare VAR_TEMP_1, 1 + call_if_eq EventScript_1663CA + compare VAR_TEMP_1, 2 + call_if_eq EventScript_1663CA + compare VAR_TEMP_1, 3 + call_if_eq EventScript_1663CA waitse playse SE_PIN - applymovement 7, Movement_1A75DB + applymovement 7, Movement_ExclamationMark waitmovement 0 - applymovement 7, Movement_1A75DD + applymovement 7, Movement_Delay48 waitmovement 0 msgbox gUnknown_817E902 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_1663D5 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_1663DA - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1663E6 - compare_var_to_value VAR_0x4001, 3 - call_if eq, EventScript_1663FC + compare VAR_TEMP_1, 0 + call_if_eq EventScript_1663D5 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_1663DA + compare VAR_TEMP_1, 2 + call_if_eq EventScript_1663E6 + compare VAR_TEMP_1, 3 + call_if_eq EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 playfanfare MUS_FAN5 @@ -1451,14 +1451,14 @@ EventScript_1662DE:: @ 81662DE call EventScript_1A6675 msgbox gUnknown_817EA06 closemessage - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_166412 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16641D - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_166428 - compare_var_to_value VAR_0x4001, 3 - call_if eq, EventScript_166433 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_166412 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16641D + compare VAR_TEMP_1, 2 + call_if_eq EventScript_166428 + compare VAR_TEMP_1, 3 + call_if_eq EventScript_166433 delay 30 textcolor 3 msgbox gUnknown_817EA36 @@ -1469,7 +1469,7 @@ EventScript_1662DE:: @ 81662DE return EventScript_1663CA:: @ 81663CA - applymovement 7, Movement_1A75ED + applymovement 7, Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -1480,7 +1480,7 @@ EventScript_1663D5:: @ 81663D5 EventScript_1663DA:: @ 81663DA closemessage - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -1488,7 +1488,7 @@ EventScript_1663E6:: @ 81663E6 closemessage applymovement 7, Movement_16643E waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -1496,7 +1496,7 @@ EventScript_1663FC:: @ 81663FC closemessage applymovement 7, Movement_166441 waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -1521,66 +1521,66 @@ EventScript_166433:: @ 8166433 return Movement_16643E:: @ 816643E - step_1a - step_10 + delay_4 + walk_down step_end Movement_166441:: @ 8166441 - step_1a - step_10 - step_10 + delay_4 + walk_down + walk_down step_end Movement_166445:: @ 8166445 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Movement_166450:: @ 8166450 - step_12 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Movement_16645B:: @ 816645B - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Movement_166465:: @ 8166465 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Movement_16646F:: @ 816646F - step_27 + walk_in_place_left step_end diff --git a/data/maps/PewterCity/text.inc b/data/maps/PewterCity/text.inc index de975f32d..966cbcfe4 100644 --- a/data/maps/PewterCity/text.inc +++ b/data/maps/PewterCity/text.inc @@ -1,4 +1,4 @@ -Text_17E316:: @ 817E316 +Text_DreamEaterTeach:: @ 817E316 .string "Yawn!\n" .string "I must have dozed off in the sun.\p" .string "I had this weird dream about\n" @@ -9,14 +9,14 @@ Text_17E316:: @ 817E316 .string "Let me teach it to a POKéMON so\n" .string "I can forget about it!$" -Text_17E3E9:: @ 817E3E9 +Text_DreamEaterDeclined:: @ 817E3E9 .string "…Snore…$" -Text_17E3F1:: @ 817E3F1 +Text_DreamEaterWhichMon:: @ 817E3F1 .string "Which POKéMON wants to learn\n" .string "DREAM EATER?$" -Text_17E41B:: @ 817E41B +Text_DreamEaterTaught:: @ 817E41B .string "…ZZZ…\n" .string "I…can't eat…anymore…$" diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 39a6be51b..9774003b2 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -3,9 +3,8 @@ PewterCity_Gym_MapScripts:: @ 816A592 PewterCity_Gym_EventScript_16A593:: @ 816A593 famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 - checkflag FLAG_GOT_TM39_FROM_BROCK - goto_if FALSE, EventScript_16A5F3 + trainerbattle_single TRAINER_LEADER_BROCK, Text_190CD4, Text_190E4F, EventScript_16A5C5, NO_MUSIC + goto_if_unset FLAG_GOT_TM39_FROM_BROCK, EventScript_16A5F3 msgbox gUnknown_819110F release end @@ -24,10 +23,9 @@ EventScript_16A5C5:: @ 816A5C5 EventScript_16A5F3:: @ 816A5F3 msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16A634 - additem ITEM_TM39, 1 - giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16A634 + giveitem_msg gUnknown_8190FDB, ITEM_TM39 setflag FLAG_GOT_TM39_FROM_BROCK msgbox gUnknown_8190FF8 release @@ -39,20 +37,19 @@ EventScript_16A634:: @ 816A634 end PewterCity_Gym_EventScript_16A63E:: @ 816A63E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_LIAM, 0, Text_1911EC, Text_191237 - msgbox gUnknown_819126B, 6 + trainerbattle_single TRAINER_CAMPER_LIAM, Text_1911EC, Text_191237 + msgbox gUnknown_819126B, MSGBOX_AUTOCLOSE end PewterCity_Gym_EventScript_16A655:: @ 816A655 lock faceplayer - checkflag FLAG_DEFEATED_BROCK - goto_if TRUE, EventScript_16A67F + goto_if_set FLAG_DEFEATED_BROCK, EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16A689 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16A697 + compare VAR_RESULT, YES + goto_if_eq EventScript_16A689 + compare VAR_RESULT, NO + goto_if_eq EventScript_16A697 end EventScript_16A67F:: @ 816A67F @@ -77,8 +74,7 @@ EventScript_16A6A5:: @ 816A6A5 PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF lockall - checkflag FLAG_BADGE01_GET - goto_if TRUE, EventScript_16A6C3 + goto_if_set FLAG_BADGE01_GET, EventScript_16A6C3 msgbox gUnknown_819146E releaseall end diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index 3be582ab3..58d201193 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -2,7 +2,7 @@ PewterCity_House1_MapScripts:: @ 816A71C .byte 0 PewterCity_House1_EventScript_16A71D:: @ 816A71D - msgbox gUnknown_81915DB, 2 + msgbox gUnknown_81915DB, MSGBOX_NPC end PewterCity_House1_EventScript_16A726:: @ 816A726 @@ -16,7 +16,7 @@ PewterCity_House1_EventScript_16A736:: @ 816A736 lock faceplayer call EventScript_16A749 - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/PewterCity_House2/scripts.inc b/data/maps/PewterCity_House2/scripts.inc index 2db341b30..52a5bbc02 100644 --- a/data/maps/PewterCity_House2/scripts.inc +++ b/data/maps/PewterCity_House2/scripts.inc @@ -2,9 +2,9 @@ PewterCity_House2_MapScripts:: @ 816A7DC .byte 0 PewterCity_House2_EventScript_16A7DD:: @ 816A7DD - msgbox gUnknown_81917E4, 2 + msgbox gUnknown_81917E4, MSGBOX_NPC end PewterCity_House2_EventScript_16A7E6:: @ 816A7E6 - msgbox gUnknown_8191840, 2 + msgbox gUnknown_8191840, MSGBOX_NPC end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index e45959442..e03f14deb 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -2,23 +2,23 @@ PewterCity_Mart_MapScripts:: @ 816A6CD .byte 0 PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE - msgbox gUnknown_81914DE, 2 + msgbox gUnknown_81914DE, MSGBOX_NPC end PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 - msgbox gUnknown_8191541, 2 + msgbox gUnknown_8191541, MSGBOX_NPC end PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16A708 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 76945d8ca..aef59195d 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_Museum_1F_EventScript_1C4BBE", + "script": "PewterCity_Museum_1F_EventScript_SeismicTossTutor", "flag": "0" } ], diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 7e4973a15..4622ee8a7 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -4,58 +4,58 @@ PewterCity_Museum_1F_MapScripts:: @ 816A31A PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B lock faceplayer - compare_var_to_value VAR_FACING, 3 - goto_if eq, EventScript_16A348 - compare_var_to_value VAR_FACING, 1 - goto_if eq, EventScript_16A348 - compare_var_to_value VAR_FACING, 2 - goto_if eq, EventScript_16A348 + compare VAR_FACING, DIR_WEST + goto_if_eq EventScript_16A348 + compare VAR_FACING, DIR_SOUTH + goto_if_eq EventScript_16A348 + compare VAR_FACING, DIR_NORTH + goto_if_eq EventScript_16A348 msgbox gUnknown_8190539 release end EventScript_16A348:: @ 816A348 msgbox gUnknown_8190550, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16A367 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16A37B + compare VAR_RESULT, YES + goto_if_eq EventScript_16A367 + compare VAR_RESULT, NO + goto_if_eq EventScript_16A37B end EventScript_16A367:: @ 816A367 msgbox gUnknown_81905B1 - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end EventScript_16A37B:: @ 816A37B msgbox gUnknown_8190627 - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end PewterCity_Museum_1F_EventScript_16A38F:: @ 816A38F lockall - setvar VAR_0x4001, 0 - applymovement 255, Movement_1A75EB + setvar VAR_TEMP_1, 0 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 end PewterCity_Museum_1F_EventScript_16A3A5:: @ 816A3A5 lockall - setvar VAR_0x4001, 1 - applymovement 255, Movement_1A75EB + setvar VAR_TEMP_1, 1 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 end PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB lockall - setvar VAR_0x4001, 2 - applymovement 255, Movement_1A75EB + setvar VAR_TEMP_1, 2 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 goto EventScript_16A3D1 end @@ -64,27 +64,27 @@ EventScript_16A3D1:: @ 816A3D1 textcolor 0 showmoneybox 0, 0, 0 msgbox gUnknown_81904B5, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16A402 + compare VAR_RESULT, YES + goto_if_eq EventScript_16A402 msgbox gUnknown_81904F9 closemessage hidemoneybox 0, 0 - applymovement 255, Movement_16A48E + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A48E waitmovement 0 releaseall end EventScript_16A402:: @ 816A402 checkmoney 50, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16A476 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16A476 closemessage - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16A455 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16A460 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16A46B + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16A455 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16A460 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16A46B playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 @@ -96,17 +96,17 @@ EventScript_16A402:: @ 816A402 end EventScript_16A455:: @ 816A455 - applymovement 255, Movement_16A490 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A490 waitmovement 0 return EventScript_16A460:: @ 816A460 - applymovement 255, Movement_16A495 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A495 waitmovement 0 return EventScript_16A46B:: @ 816A46B - applymovement 255, Movement_16A499 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A499 waitmovement 0 return @@ -114,54 +114,52 @@ EventScript_16A476:: @ 816A476 msgbox gUnknown_819051C closemessage hidemoneybox 0, 0 - applymovement 255, Movement_16A48E + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A48E waitmovement 0 releaseall end Movement_16A48E:: @ 816A48E - step_10 + walk_down step_end Movement_16A490:: @ 816A490 - step_13 - step_13 - step_1b - step_28 + walk_right + walk_right + delay_8 + walk_in_place_right step_end Movement_16A495:: @ 816A495 - step_13 - step_1b - step_28 + walk_right + delay_8 + walk_in_place_right step_end Movement_16A499:: @ 816A499 - step_1b - step_28 + delay_8 + walk_in_place_right step_end PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C - msgbox gUnknown_81908CD, 2 + msgbox gUnknown_81908CD, MSGBOX_NPC end PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 - msgbox gUnknown_81906B4, 2 + msgbox gUnknown_81906B4, MSGBOX_NPC end PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE lock faceplayer - checkflag FLAG_GOT_OLD_AMBER - goto_if TRUE, EventScript_16A4FF + goto_if_set FLAG_GOT_OLD_AMBER, EventScript_16A4FF msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16A4F5 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16A4F5 setflag FLAG_GOT_OLD_AMBER removeobject 4 - additem ITEM_OLD_AMBER, 1 - giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5 + giveitem_msg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5 release end @@ -176,7 +174,7 @@ EventScript_16A4FF:: @ 816A4FF end PewterCity_Museum_1F_EventScript_16A509:: @ 816A509 - msgbox gUnknown_819090A, 2 + msgbox gUnknown_819090A, MSGBOX_NPC end PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 diff --git a/data/maps/PewterCity_Museum_2F/scripts.inc b/data/maps/PewterCity_Museum_2F/scripts.inc index 0e57e2c70..11b1af625 100644 --- a/data/maps/PewterCity_Museum_2F/scripts.inc +++ b/data/maps/PewterCity_Museum_2F/scripts.inc @@ -2,29 +2,29 @@ PewterCity_Museum_2F_MapScripts:: @ 816A552 .byte 0 PewterCity_Museum_2F_EventScript_16A553:: @ 816A553 - msgbox gUnknown_8190B30, 2 + msgbox gUnknown_8190B30, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A55C:: @ 816A55C - msgbox gUnknown_8190B80, 2 + msgbox gUnknown_8190B80, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A565:: @ 816A565 - msgbox gUnknown_8190BF3, 2 + msgbox gUnknown_8190BF3, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A56E:: @ 816A56E - msgbox gUnknown_8190C1E, 2 + msgbox gUnknown_8190C1E, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A577:: @ 816A577 - msgbox gUnknown_8190C60, 2 + msgbox gUnknown_8190C60, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A580:: @ 816A580 - msgbox gUnknown_8190C81, 3 + msgbox gUnknown_8190C81, MSGBOX_SIGN end PewterCity_Museum_2F_EventScript_16A589:: @ 816A589 - msgbox gUnknown_8190C8F, 3 + msgbox gUnknown_8190C8F, MSGBOX_SIGN end diff --git a/data/maps/PewterCity_Museum_2F/text.inc b/data/maps/PewterCity_Museum_2F/text.inc index b1767c681..2c1cd4d20 100644 --- a/data/maps/PewterCity_Museum_2F/text.inc +++ b/data/maps/PewterCity_Museum_2F/text.inc @@ -1,4 +1,4 @@ -Text_1909A3:: @ 81909A3 +Text_SeismicTossTeach:: @ 81909A3 .string "The secrets of space…\n" .string "The mysteries of earth…\p" .string "There are so many things about\n" @@ -9,15 +9,15 @@ Text_1909A3:: @ 81909A3 .string "Well, how about SEISMIC TOSS?\n" .string "Should I teach that to a POKéMON?$" -Text_190AA9:: @ 8190AA9 +Text_SeismicTossDeclined:: @ 8190AA9 .string "Is that so?\n" .string "I'm sure you'll be back for it.$" -Text_190AD5:: @ 8190AD5 +Text_SeismicTossWhichMon:: @ 8190AD5 .string "Which POKéMON wants to learn\n" .string "SEISMIC TOSS?$" -Text_190B00:: @ 8190B00 +Text_SeismicTossTaught:: @ 8190B00 .string "I hope you won't toss in the towel.\n" .string "Keep it up.$" diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 1a54e269b..683805b3c 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_1F_EventScript_1BEE16", + "script": "MysteryEventClub_EventScript_Man", "flag": "0" }, { diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index dfaab8a86..6cf1f5137 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -1,21 +1,21 @@ PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 - map_script 3, PewterCity_PokemonCenter_1F_MapScript1_16A76B - map_script 5, PewterCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B +PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B setrespawn SPAWN_PEWTER_CITY end PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end PewterCity_PokemonCenter_1F_EventScript_16A778:: @ 816A778 - msgbox gUnknown_81916A9, 2 + msgbox gUnknown_81916A9, MSGBOX_NPC end PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 @@ -31,7 +31,7 @@ PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 end PewterCity_PokemonCenter_1F_EventScript_16A798:: @ 816A798 - msgbox gUnknown_8191701, 2 + msgbox gUnknown_8191701, MSGBOX_NPC end PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 @@ -41,5 +41,5 @@ PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 end PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC - msgbox gUnknown_8191780, 2 + msgbox gUnknown_8191780, MSGBOX_NPC end diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index f223ec1fc..b5017653f 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc index 6fce8dda2..1bcf9728b 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 - map_script 2, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, PewterCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +PewterCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A7CA + call CableClub_EventScript_Colosseum end -EventScript_16A7D0:: @ 816A7D0 - call EventScript_1BB6AB +PewterCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A7D0 + call CableClub_EventScript_TradeCenter end -EventScript_16A7D6:: @ 816A7D6 - call EventScript_1BB7DE +PewterCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A7D6 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 260a2acff..62293c1ec 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -1,20 +1,19 @@ PokemonLeague_AgathasRoom_MapScripts:: @ 8162810 - map_script 5, PokemonLeague_AgathasRoom_MapScript1_162825 - map_script 1, PokemonLeague_AgathasRoom_MapScript2_162830 - map_script 4, PokemonLeague_AgathasRoom_MapScript3_162851 - map_script 2, PokemonLeague_AgathasRoom_MapScript4_162860 + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_AgathasRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_AgathasRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_AgathasRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_AgathasRoom_OnFrame .byte 0 -PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 +PokemonLeague_AgathasRoom_OnResume:: @ 8162825 setvar VAR_0x8004, 2 call EventScript_1A75D5 end -PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 - checkflag FLAG_DEFEATED_AGATHA - call_if TRUE, EventScript_16284B - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3 - call_if eq, EventScript_162845 +PokemonLeague_AgathasRoom_OnLoad:: @ 8162830 + call_if_set FLAG_DEFEATED_AGATHA, EventScript_16284B + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3 + call_if_eq EventScript_162845 end EventScript_162845:: @ 8162845 @@ -25,15 +24,15 @@ EventScript_16284B:: @ 816284B call EventScript_1A7538 return -PokemonLeague_AgathasRoom_MapScript3_162851:: @ 8162851 - map_script_2 VAR_0x4001, 0, EventScript_16285B +PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 + map_script_2 VAR_TEMP_1, 0, EventScript_16285B .2byte 0 EventScript_16285B:: @ 816285B - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_AgathasRoom_MapScript4_162860:: @ 8162860 +PokemonLeague_AgathasRoom_OnFrame:: @ 8162860 map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, EventScript_16286A .2byte 0 @@ -48,21 +47,16 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 lock faceplayer famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_AGATHA - goto_if TRUE, EventScript_162911 + goto_if_set FLAG_DEFEATED_AGATHA, EventScript_162911 famechecker FAMECHECKER_AGATHA, 0 famechecker FAMECHECKER_AGATHA, 4 famechecker FAMECHECKER_OAK, 4 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_1628E9 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_1628F2 + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1628E9 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_1628F2 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_1628FB - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_162906 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1628FB + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162906 clearflag FLAG_TEMP_5 goto EventScript_16291B @@ -78,11 +72,11 @@ EventScript_1628F2:: @ 81628F2 return EventScript_1628FB:: @ 81628FB - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA, 0, Text_1786D7 + trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, Text_1786D7 return EventScript_162906:: @ 8162906 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA_2, 0, Text_1786D7 + trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, Text_1786D7 return EventScript_162911:: @ 8162911 diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index afbaad9e6..709b5ab03 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -1,20 +1,19 @@ PokemonLeague_BrunosRoom_MapScripts:: @ 8162685 - map_script 5, PokemonLeague_BrunosRoom_MapScript1_16269A - map_script 1, PokemonLeague_BrunosRoom_MapScript2_1626A5 - map_script 4, PokemonLeague_BrunosRoom_MapScript3_1626C6 - map_script 2, PokemonLeague_BrunosRoom_MapScript4_1626D5 + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_BrunosRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_BrunosRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_BrunosRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_BrunosRoom_OnFrame .byte 0 -PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A +PokemonLeague_BrunosRoom_OnResume:: @ 816269A setvar VAR_0x8004, 1 call EventScript_1A75D5 end -PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 - checkflag FLAG_DEFEATED_BRUNO - call_if TRUE, EventScript_1626C0 - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2 - call_if eq, EventScript_1626BA +PokemonLeague_BrunosRoom_OnLoad:: @ 81626A5 + call_if_set FLAG_DEFEATED_BRUNO, EventScript_1626C0 + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2 + call_if_eq EventScript_1626BA end EventScript_1626BA:: @ 81626BA @@ -25,15 +24,15 @@ EventScript_1626C0:: @ 81626C0 call EventScript_1A7538 return -PokemonLeague_BrunosRoom_MapScript3_1626C6:: @ 81626C6 - map_script_2 VAR_0x4001, 0, EventScript_1626D0 +PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6 + map_script_2 VAR_TEMP_1, 0, EventScript_1626D0 .2byte 0 EventScript_1626D0:: @ 81626D0 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5 +PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5 map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, EventScript_1626DF .2byte 0 @@ -48,20 +47,15 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC lock faceplayer famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_BRUNO - goto_if TRUE, EventScript_162779 + goto_if_set FLAG_DEFEATED_BRUNO, EventScript_162779 famechecker FAMECHECKER_BRUNO, 0 famechecker FAMECHECKER_BRUNO, 1 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_162751 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_16275A + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162751 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_16275A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162763 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_16276E + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162763 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16276E clearflag FLAG_TEMP_5 goto EventScript_1627B0 @@ -77,24 +71,24 @@ EventScript_16275A:: @ 816275A return EventScript_162763:: @ 8162763 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_BRUNO, 0, Text_178409 + trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, Text_178409 return EventScript_16276E:: @ 816276E - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_BRUNO_2, 0, Text_178409 + trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, Text_178409 return EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_1627FA - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_1627EF - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_162805 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_162805 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_1627FA + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_1627EF + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_162805 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_162805 release end @@ -103,28 +97,28 @@ EventScript_1627B0:: @ 81627B0 call EventScript_1A7506 msgbox gUnknown_8178420 closemessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_1627FA - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_1627EF - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_162805 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_162805 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_1627FA + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_1627EF + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_162805 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_162805 release end EventScript_1627EF:: @ 81627EF - applymovement 1, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_1627FA:: @ 81627FA - applymovement 1, Movement_1A75EB + applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 return EventScript_162805:: @ 8162805 - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 8b0fff2ce..a0f5b8379 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -1,78 +1,68 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 - map_script 4, PokemonLeague_ChampionsRoom_MapScript1_162B5D - map_script 5, PokemonLeague_ChampionsRoom_MapScript2_162AF2 - map_script 2, PokemonLeague_ChampionsRoom_MapScript3_162B6C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_ChampionsRoom_OnFrame .byte 0 -PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 +PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_162B1E - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_162B31 - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_162B44 + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_162B1E + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_162B31 + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_162B44 end EventScript_162B1E:: @ 8162B1E - checktrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE - goto_if eq, EventScript_162B57 - checktrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE - goto_if eq, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, EventScript_162B57 return EventScript_162B31:: @ 8162B31 - checktrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR - goto_if eq, EventScript_162B57 - checktrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR - goto_if eq, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, EventScript_162B57 return EventScript_162B44:: @ 8162B44 - checktrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER - goto_if eq, EventScript_162B57 - checktrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER - goto_if eq, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, EventScript_162B57 + goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, EventScript_162B57 return EventScript_162B57:: @ 8162B57 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return -PokemonLeague_ChampionsRoom_MapScript1_162B5D:: @ 8162B5D - map_script_2 VAR_0x4001, 0, EventScript_162B67 +PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D + map_script_2 VAR_TEMP_1, 0, EventScript_162B67 .2byte 0 EventScript_162B67:: @ 8162B67 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C - map_script_2 VAR_0x4001, 0, EventScript_162B76 +PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C + map_script_2 VAR_TEMP_1, 0, EventScript_162B76 .2byte 0 EventScript_162B76:: @ 8162B76 lockall textcolor 0 setflag FLAG_TEMP_2 - applymovement 255, Movement_162D07 + applymovement OBJ_EVENT_ID_PLAYER, Movement_162D07 waitmovement 0 delay 20 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_162CB3 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_162CBC + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162CB3 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162CBC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_162C68 + compare VAR_RESULT, 2 + goto_if_eq EventScript_162C68 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162C6F - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_162C91 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C6F + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C91 setflag FLAG_TEMP_4 clearflag FLAG_TEMP_5 setflag FLAG_DEFEATED_CHAMP @@ -82,7 +72,7 @@ EventScript_162B76:: @ 8162B76 addobject 2 msgbox gUnknown_8178FC6 closemessage - applymovement 255, Movement_162D1F + applymovement OBJ_EVENT_ID_PLAYER, Movement_162D1F applymovement 1, Movement_162D41 applymovement 2, Movement_162D2A waitmovement 0 @@ -90,21 +80,21 @@ EventScript_162B76:: @ 8162B76 specialvar VAR_RESULT, ScrSpecial_GetStarter getspeciesname 0, VAR_RESULT msgbox gUnknown_8178FCF - applymovement 2, Movement_1A75EB - applymovement 1, Movement_1A75E7 + applymovement 2, Movement_WalkInPlaceFastestRight + applymovement 1, Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox gUnknown_817908F closemessage - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 delay 20 msgbox gUnknown_81791A3 closemessage delay 13 applymovement 2, Movement_162D37 - applymovement 255, Movement_162D12 + applymovement OBJ_EVENT_ID_PLAYER, Movement_162D12 waitmovement 0 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12 waitstate releaseall @@ -116,21 +106,21 @@ EventScript_162C68:: @ 8162C68 end EventScript_162C6F:: @ 8162C6F - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_162CC5 - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_162CD0 - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_162CDB + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_162CC5 + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_162CD0 + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_162CDB return EventScript_162C91:: @ 8162C91 - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_162CE6 - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_162CF1 - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_162CFC + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_162CE6 + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_162CF1 + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_162CFC return EventScript_162CB3:: @ 8162CB3 @@ -142,106 +132,106 @@ EventScript_162CBC:: @ 8162CBC return EventScript_162CC5:: @ 8162CC5 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_SQUIRTLE, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, Text_178E3F return EventScript_162CD0:: @ 8162CD0 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_BULBASAUR, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, Text_178E3F return EventScript_162CDB:: @ 8162CDB - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_CHARMANDER, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, Text_178E3F return EventScript_162CE6:: @ 8162CE6 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_SQUIRTLE, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, Text_178E3F return EventScript_162CF1:: @ 8162CF1 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_BULBASAUR, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, Text_178E3F return EventScript_162CFC:: @ 8162CFC - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_CHARMANDER, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, Text_178E3F return Movement_162D07:: @ 8162D07 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_162D12:: @ 8162D12 - step_1c - step_12 - step_11 - step_11 - step_11 - step_13 - step_11 - step_11 - step_11 - step_11 - step_1b - step_60 + delay_16 + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end Movement_162D1F:: @ 8162D1F - step_1b - step_2d - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2f + delay_8 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end Movement_162D2A:: @ 8162D2A - step_1c - step_1c - step_11 - step_11 - step_11 - step_11 - step_11 - step_12 - step_11 - step_11 - step_2d - step_1c + delay_16 + delay_16 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_in_place_fastest_down + delay_16 step_end Movement_162D37:: @ 8162D37 - step_11 - step_11 - step_13 - step_11 - step_11 - step_11 - step_11 - step_1b - step_60 + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end Movement_162D41:: @ 8162D41 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_2f + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 11df46047..080e65ece 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -1,54 +1,54 @@ PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C - map_script 2, PokemonLeague_HallOfFame_MapScript1_162D66 - map_script 4, PokemonLeague_HallOfFame_MapScript2_162D57 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_HallOfFame_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_HallOfFame_OnWarp .byte 0 -PokemonLeague_HallOfFame_MapScript2_162D57:: @ 8162D57 - map_script_2 VAR_0x4001, 0, EventScript_162D61 +PokemonLeague_HallOfFame_OnWarp:: @ 8162D57 + map_script_2 VAR_TEMP_1, 0, EventScript_162D61 .2byte 0 EventScript_162D61:: @ 8162D61 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_HallOfFame_MapScript1_162D66:: @ 8162D66 - map_script_2 VAR_0x4001, 0, EventScript_162D70 +PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 + map_script_2 VAR_TEMP_1, 0, EventScript_162D70 .2byte 0 EventScript_162D70:: @ 8162D70 lockall textcolor 0 - applymovement 255, Movement_162DCD + applymovement OBJ_EVENT_ID_PLAYER, Movement_162DCD waitmovement 0 - applymovement 1, Movement_1A75E7 - applymovement 255, Movement_1A75EB + applymovement 1, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 delay 18 msgbox gUnknown_817922F closemessage - applymovement 1, Movement_1A75E9 - applymovement 255, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 dofieldeffect 62 waitfieldeffect 62 delay 40 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 call EventScript_1A651A setrespawn SPAWN_PALLET_TOWN - fadescreenspeed 1, 24 + fadescreenspeed FADE_TO_BLACK, 24 special Special_HallOfFame waitstate releaseall end Movement_162DCD:: @ 8162DCD - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 0ec0cb7e6..8c6b9924e 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -1,20 +1,19 @@ PokemonLeague_LancesRoom_MapScripts:: @ 816292D - map_script 5, PokemonLeague_LancesRoom_MapScript1_162942 - map_script 1, PokemonLeague_LancesRoom_MapScript2_16294D - map_script 4, PokemonLeague_LancesRoom_MapScript3_16296E - map_script 2, PokemonLeague_LancesRoom_MapScript4_16297D + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LancesRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LancesRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_LancesRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_LancesRoom_OnFrame .byte 0 -PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 +PokemonLeague_LancesRoom_OnResume:: @ 8162942 setvar VAR_0x8004, 3 call EventScript_1A75D5 end -PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 4 - call_if eq, EventScript_162962 - checkflag FLAG_DEFEATED_LANCE - call_if TRUE, EventScript_162968 +PokemonLeague_LancesRoom_OnLoad:: @ 816294D + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4 + call_if_eq EventScript_162962 + call_if_set FLAG_DEFEATED_LANCE, EventScript_162968 end EventScript_162962:: @ 8162962 @@ -25,21 +24,21 @@ EventScript_162968:: @ 8162968 call EventScript_1A7589 return -PokemonLeague_LancesRoom_MapScript3_16296E:: @ 816296E - map_script_2 VAR_0x4001, 0, EventScript_162978 +PokemonLeague_LancesRoom_OnWarp:: @ 816296E + map_script_2 VAR_TEMP_1, 0, EventScript_162978 .2byte 0 EventScript_162978:: @ 8162978 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_LancesRoom_MapScript4_16297D:: @ 816297D +PokemonLeague_LancesRoom_OnFrame:: @ 816297D map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, EventScript_162987 .2byte 0 EventScript_162987:: @ 8162987 lockall - applymovement 255, Movement_1629F1 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1629F1 waitmovement 0 setflag FLAG_TEMP_2 call EventScript_1629A8 @@ -62,60 +61,55 @@ EventScript_1629A8:: @ 81629A8 return Movement_1629F1:: @ 81629F1 - step_11 - step_11 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 lock faceplayer famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_LANCE - goto_if TRUE, EventScript_162AA1 + goto_if_set FLAG_DEFEATED_LANCE, EventScript_162AA1 famechecker FAMECHECKER_LANCE, 0 famechecker FAMECHECKER_LANCE, 1 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_162A79 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_162A82 + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162A79 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162A82 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162A8B - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_162A96 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A8B + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A96 clearflag FLAG_TEMP_5 goto EventScript_162AAB @@ -131,11 +125,11 @@ EventScript_162A82:: @ 8162A82 return EventScript_162A8B:: @ 8162A8B - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LANCE, 0, Text_178A15 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, Text_178A15 return EventScript_162A96:: @ 8162A96 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LANCE_2, 0, Text_178A15 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, Text_178A15 return EventScript_162AA1:: @ 8162AA1 @@ -164,11 +158,11 @@ EventScript_162AD1:: @ 8162AD1 return Movement_162ADC:: @ 8162ADC - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end Movement_162ADF:: @ 8162ADF - step_13 - step_2f + walk_right + walk_in_place_fastest_left step_end diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index df1cf1579..e95ecfd98 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -1,21 +1,20 @@ PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C - map_script 5, PokemonLeague_LoreleisRoom_MapScript1_162586 - map_script 1, PokemonLeague_LoreleisRoom_MapScript2_162591 - map_script 3, PokemonLeague_LoreleisRoom_MapScript3_1625B2 - map_script 4, PokemonLeague_LoreleisRoom_MapScript4_1625B6 - map_script 2, PokemonLeague_LoreleisRoom_MapScript5_1625C5 + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LoreleisRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LoreleisRoom_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, PokemonLeague_LoreleisRoom_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_LoreleisRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_LoreleisRoom_OnFrame .byte 0 -PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 +PokemonLeague_LoreleisRoom_OnResume:: @ 8162586 setvar VAR_0x8004, 0 call EventScript_1A75D5 end -PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 - checkflag FLAG_DEFEATED_LORELEI - call_if TRUE, EventScript_1625AC - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 1 - call_if eq, EventScript_1625A6 +PokemonLeague_LoreleisRoom_OnLoad:: @ 8162591 + call_if_set FLAG_DEFEATED_LORELEI, EventScript_1625AC + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1 + call_if_eq EventScript_1625A6 end EventScript_1625A6:: @ 81625A6 @@ -26,19 +25,19 @@ EventScript_1625AC:: @ 81625AC call EventScript_1A7538 return -PokemonLeague_LoreleisRoom_MapScript3_1625B2:: @ 81625B2 +PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2 setworldmapflag FLAG_WORLD_MAP_POKEMON_LEAGUE_LORELEIS_ROOM end -PokemonLeague_LoreleisRoom_MapScript4_1625B6:: @ 81625B6 - map_script_2 VAR_0x4001, 0, EventScript_1625C0 +PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6 + map_script_2 VAR_TEMP_1, 0, EventScript_1625C0 .2byte 0 EventScript_1625C0:: @ 81625C0 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_LoreleisRoom_MapScript5_1625C5:: @ 81625C5 +PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5 map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, EventScript_1625CF .2byte 0 @@ -53,20 +52,15 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC lock faceplayer famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_LORELEI - goto_if TRUE, EventScript_162669 + goto_if_set FLAG_DEFEATED_LORELEI, EventScript_162669 famechecker FAMECHECKER_LORELEI, 0 famechecker FAMECHECKER_LORELEI, 1 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162641 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_16264A + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162641 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16264A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162653 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_16265E + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162653 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16265E clearflag FLAG_TEMP_5 goto EventScript_162673 @@ -82,11 +76,11 @@ EventScript_16264A:: @ 816264A return EventScript_162653:: @ 8162653 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LORELEI, 0, Text_178191 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, Text_178191 return EventScript_16265E:: @ 816265E - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LORELEI_2, 0, Text_178191 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, Text_178191 return EventScript_162669:: @ 8162669 diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 8f26c3d11..31b5155c4 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_1F_EventScript_1BE95D", + "script": "PokemonMansion_1F_EventScript_ItemCarbos", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_1F_EventScript_1BE96A", + "script": "PokemonMansion_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_1F_EventScript_1BEB65", + "script": "PokemonMansion_1F_EventScript_ItemProtein", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN" }, { diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index ceb59874a..6fd52bafc 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -1,14 +1,13 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 - map_script 1, PokemonMansion_1F_MapScript1_162204 - map_script 3, PokemonMansion_1F_MapScript2_16220E + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, PokemonMansion_1F_OnTransition .byte 0 -PokemonMansion_1F_MapScript1_162204:: @ 8162204 - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7B7A +PokemonMansion_1F_OnLoad:: @ 8162204 + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B7A end -PokemonMansion_1F_MapScript2_16220E:: @ 816220E +PokemonMansion_1F_OnTransition:: @ 816220E setworldmapflag FLAG_WORLD_MAP_POKEMON_MANSION_1F end @@ -23,11 +22,11 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212 end PokemonMansion_1F_EventScript_162226:: @ 8162226 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TED, 0, Text_177364, Text_177391 - msgbox gUnknown_8177397, 6 + trainerbattle_single TRAINER_SCIENTIST_TED, Text_177364, Text_177391 + msgbox gUnknown_8177397, MSGBOX_AUTOCLOSE end PokemonMansion_1F_EventScript_16223D:: @ 816223D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOHNSON, 0, Text_1773C6, Text_1773FD - msgbox gUnknown_8177418, 6 + trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, Text_1773C6, Text_1773FD + msgbox gUnknown_8177418, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index b5bf6d6d3..e3d543e08 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_2F_EventScript_1BE977", + "script": "PokemonMansion_2F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_2F_EventScript_1BEB72", + "script": "PokemonMansion_2F_EventScript_ItemZinc", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_2F_EventScript_1BEB7F", + "script": "PokemonMansion_2F_EventScript_ItemHPUp", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_HP_UP" } ], diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index c0bdae1e9..e19c2ed7f 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -1,10 +1,9 @@ PokemonMansion_2F_MapScripts:: @ 8162254 - map_script 1, PokemonMansion_2F_MapScript1_16225A + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_2F_OnLoad .byte 0 -PokemonMansion_2F_MapScript1_16225A:: @ 816225A - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7D3E +PokemonMansion_2F_OnLoad:: @ 816225A + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7D3E end PokemonMansion_2F_EventScript_162264:: @ 8162264 @@ -18,14 +17,14 @@ PokemonMansion_2F_EventScript_162264:: @ 8162264 end PokemonMansion_2F_EventScript_162278:: @ 8162278 - msgbox gUnknown_817751F, 3 + msgbox gUnknown_817751F, MSGBOX_SIGN end PokemonMansion_2F_EventScript_162281:: @ 8162281 - msgbox gUnknown_8177574, 3 + msgbox gUnknown_8177574, MSGBOX_SIGN end PokemonMansion_2F_EventScript_16228A:: @ 816228A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_ARNIE, 0, Text_177498, Text_1774CB - msgbox gUnknown_81774E3, 6 + trainerbattle_single TRAINER_BURGLAR_ARNIE, Text_177498, Text_1774CB + msgbox gUnknown_81774E3, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 47ef76894..07bcf2dc3 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_3F_EventScript_1BE984", + "script": "PokemonMansion_3F_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_3F_EventScript_1BE991", + "script": "PokemonMansion_3F_EventScript_ItemIron", "flag": "FLAG_HIDE_POKEMON_MANSION_3F_IRON" } ], diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 6546b024e..fe6eefcb0 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -1,10 +1,9 @@ PokemonMansion_3F_MapScripts:: @ 81622A1 - map_script 1, PokemonMansion_3F_MapScript1_1622A7 + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_3F_OnLoad .byte 0 -PokemonMansion_3F_MapScript1_1622A7:: @ 81622A7 - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7E72 +PokemonMansion_3F_OnLoad:: @ 81622A7 + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7E72 end PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 @@ -18,15 +17,15 @@ PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 end PokemonMansion_3F_EventScript_1622C5:: @ 81622C5 - msgbox gUnknown_8177685, 3 + msgbox gUnknown_8177685, MSGBOX_SIGN end PokemonMansion_3F_EventScript_1622CE:: @ 81622CE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_SIMON, 0, Text_1775E7, Text_177602 - msgbox gUnknown_8177608, 6 + trainerbattle_single TRAINER_BURGLAR_SIMON, Text_1775E7, Text_177602 + msgbox gUnknown_8177608, MSGBOX_AUTOCLOSE end PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_BRAYDON, 0, Text_177628, Text_177643 - msgbox gUnknown_8177657, 6 + trainerbattle_single TRAINER_SCIENTIST_BRAYDON, Text_177628, Text_177643 + msgbox gUnknown_8177657, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 5a6b105ab..e72ff2a96 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE9B8", + "script": "PokemonMansion_B1F_EventScript_ItemTM22", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE99E", + "script": "PokemonMansion_B1F_EventScript_ItemTM14", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE9AB", + "script": "PokemonMansion_B1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE9C5", + "script": "PokemonMansion_B1F_EventScript_ItemSecretKey", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY" } ], diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 3baba4c34..d1641f28a 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -1,10 +1,9 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC - map_script 1, PokemonMansion_B1F_MapScript1_162302 + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_B1F_OnLoad .byte 0 -PokemonMansion_B1F_MapScript1_162302:: @ 8162302 - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7F4C +PokemonMansion_B1F_OnLoad:: @ 8162302 + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7F4C end PokemonMansion_B1F_EventScript_16230C:: @ 816230C @@ -18,15 +17,15 @@ PokemonMansion_B1F_EventScript_16230C:: @ 816230C end PokemonMansion_B1F_EventScript_162320:: @ 8162320 - msgbox gUnknown_8177798, 3 + msgbox gUnknown_8177798, MSGBOX_SIGN end PokemonMansion_B1F_EventScript_162329:: @ 8162329 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_LEWIS, 0, Text_1776C0, Text_1776D7 - msgbox gUnknown_81776DE, 6 + trainerbattle_single TRAINER_BURGLAR_LEWIS, Text_1776C0, Text_1776D7 + msgbox gUnknown_81776DE, MSGBOX_AUTOCLOSE end PokemonMansion_B1F_EventScript_162340:: @ 8162340 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_IVAN, 0, Text_177720, Text_177757 - msgbox gUnknown_817776A, 6 + trainerbattle_single TRAINER_SCIENTIST_IVAN, Text_177720, Text_177757 + msgbox gUnknown_817776A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index e98796864..84509e616 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -1,29 +1,29 @@ PokemonTower_1F_MapScripts:: @ 8163235 - map_script 3, PokemonTower_1F_MapScript1_16323B + map_script MAP_SCRIPT_ON_TRANSITION, PokemonTower_1F_OnTransition .byte 0 -PokemonTower_1F_MapScript1_16323B:: @ 816323B +PokemonTower_1F_OnTransition:: @ 816323B setworldmapflag FLAG_WORLD_MAP_POKEMON_TOWER_1F end PokemonTower_1F_EventScript_16323F:: @ 816323F - msgbox gUnknown_8179CAB, 2 + msgbox gUnknown_8179CAB, MSGBOX_NPC end PokemonTower_1F_EventScript_163248:: @ 8163248 - msgbox gUnknown_8179C8C, 2 + msgbox gUnknown_8179C8C, MSGBOX_NPC end PokemonTower_1F_EventScript_163251:: @ 8163251 - msgbox gUnknown_8179C41, 2 + msgbox gUnknown_8179C41, MSGBOX_NPC end PokemonTower_1F_EventScript_16325A:: @ 816325A lock faceplayer checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_163272 + compare VAR_RESULT, MALE + goto_if_eq EventScript_163272 msgbox gUnknown_8179BFC release end @@ -34,5 +34,5 @@ EventScript_163272:: @ 8163272 end PokemonTower_1F_EventScript_16327C:: @ 816327C - msgbox gUnknown_8179B7A, 2 + msgbox gUnknown_8179B7A, MSGBOX_NPC end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index ff5fd8b9b..7180936fb 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -2,47 +2,47 @@ PokemonTower_2F_MapScripts:: @ 8163285 .byte 0 PokemonTower_2F_EventScript_163286:: @ 8163286 - msgbox gUnknown_8179EAE, 2 + msgbox gUnknown_8179EAE, MSGBOX_NPC end PokemonTower_2F_EventScript_16328F:: @ 816328F lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1632A7 end PokemonTower_2F_EventScript_16329B:: @ 816329B lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1632A7 end EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_163339 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16334B - applymovement 1, Movement_1A75DB + compare VAR_TEMP_1, 0 + call_if_eq EventScript_163339 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16334B + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_16335D - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_163368 - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_163373 + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_16335D + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_163368 + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_163373 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16337E - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_163389 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16337E + compare VAR_TEMP_1, 1 + call_if_eq EventScript_163389 playse SE_KAIDAN delay 25 fadedefaultbgm @@ -52,27 +52,27 @@ EventScript_1632A7:: @ 81632A7 end EventScript_163339:: @ 8163339 - applymovement 1, Movement_1A75EB - applymovement 255, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_16334B:: @ 816334B - applymovement 1, Movement_1A75ED - applymovement 255, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_16335D:: @ 816335D - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, Text_179D73 return EventScript_163368:: @ 8163368 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, Text_179D73 return EventScript_163373:: @ 8163373 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, Text_179D73 return EventScript_16337E:: @ 816337E @@ -86,23 +86,23 @@ EventScript_163389:: @ 8163389 return Movement_163394:: @ 8163394 - step_10 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_30 + walk_down + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end Movement_16339D:: @ 816339D - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_30 + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 668f87e73..c71b75937 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_3F_EventScript_1BE755", + "script": "PokemonTower_3F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_POKEMON_TOWER_3F_ESCAPE_ROPE" } ], diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index 653a4e434..a6a278554 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -2,16 +2,16 @@ PokemonTower_3F_MapScripts:: @ 81633A6 .byte 0 PokemonTower_3F_EventScript_1633A7:: @ 81633A7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_PATRICIA, 0, Text_179FA0, Text_179FBC - msgbox gUnknown_8179FD3, 6 + trainerbattle_single TRAINER_CHANNELER_PATRICIA, Text_179FA0, Text_179FBC + msgbox gUnknown_8179FD3, MSGBOX_AUTOCLOSE end PokemonTower_3F_EventScript_1633BE:: @ 81633BE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_CARLY, 0, Text_179F62, Text_179F72 - msgbox gUnknown_8179F88, 6 + trainerbattle_single TRAINER_CHANNELER_CARLY, Text_179F62, Text_179F72 + msgbox gUnknown_8179F88, MSGBOX_AUTOCLOSE end PokemonTower_3F_EventScript_1633D5:: @ 81633D5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_HOPE, 0, Text_179F09, Text_179F21 - msgbox gUnknown_8179F31, 6 + trainerbattle_single TRAINER_CHANNELER_HOPE, Text_179F09, Text_179F21 + msgbox gUnknown_8179F31, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index e24927018..82088704a 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_4F_EventScript_1BE762", + "script": "PokemonTower_4F_EventScript_ItemElixir", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_4F_EventScript_1BE76F", + "script": "PokemonTower_4F_EventScript_ItemAwakening", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_4F_EventScript_1BE77C", + "script": "PokemonTower_4F_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_GREAT_BALL" } ], diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index 7aa23fbe8..238e600e7 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -2,16 +2,16 @@ PokemonTower_4F_MapScripts:: @ 81633EC .byte 0 PokemonTower_4F_EventScript_1633ED:: @ 81633ED - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_PAULA, 0, Text_17A004, Text_17A017 - msgbox gUnknown_817A02B, 6 + trainerbattle_single TRAINER_CHANNELER_PAULA, Text_17A004, Text_17A017 + msgbox gUnknown_817A02B, MSGBOX_AUTOCLOSE end PokemonTower_4F_EventScript_163404:: @ 8163404 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_LAUREL, 0, Text_17A046, Text_17A061 - msgbox gUnknown_817A067, 6 + trainerbattle_single TRAINER_CHANNELER_LAUREL, Text_17A046, Text_17A061 + msgbox gUnknown_817A067, MSGBOX_AUTOCLOSE end PokemonTower_4F_EventScript_16341B:: @ 816341B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JODY, 0, Text_17A096, Text_17A0AB - msgbox gUnknown_817A0BB, 6 + trainerbattle_single TRAINER_CHANNELER_JODY, Text_17A096, Text_17A0AB + msgbox gUnknown_817A0BB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index bd64e246e..ec66551ae 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_5F_EventScript_1BE789", + "script": "PokemonTower_5F_EventScript_ItemNugget", "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_5F_EventScript_1BEBB3", + "script": "PokemonTower_5F_EventScript_ItemCleanseTag", "flag": "FLAG_HIDE_POKEMON_TOWER_5F_CLEANSE_TAG" } ], @@ -127,7 +127,7 @@ "x": 10, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -136,7 +136,7 @@ "x": 11, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -145,7 +145,7 @@ "x": 12, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -154,7 +154,7 @@ "x": 10, "y": 9, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -163,7 +163,7 @@ "x": 9, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -172,7 +172,7 @@ "x": 12, "y": 9, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -181,7 +181,7 @@ "x": 10, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -190,7 +190,7 @@ "x": 11, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -199,7 +199,7 @@ "x": 12, "y": 10, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "PokemonTower_5F_EventScript_16343C" }, @@ -208,7 +208,7 @@ "x": 9, "y": 9, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -217,7 +217,7 @@ "x": 9, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -226,7 +226,7 @@ "x": 10, "y": 11, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -235,7 +235,7 @@ "x": 11, "y": 11, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -244,7 +244,7 @@ "x": 12, "y": 11, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -253,7 +253,7 @@ "x": 13, "y": 8, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -262,7 +262,7 @@ "x": 13, "y": 9, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" }, @@ -271,7 +271,7 @@ "x": 13, "y": 10, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 1, "script": "PokemonTower_5F_EventScript_163453" } diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index dee5b5bbd..4f9145909 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -2,41 +2,41 @@ PokemonTower_5F_MapScripts:: @ 8163432 .byte 0 PokemonTower_5F_EventScript_163433:: @ 8163433 - msgbox gUnknown_817A0E3, 2 + msgbox gUnknown_817A0E3, MSGBOX_NPC end PokemonTower_5F_EventScript_16343C:: @ 816343C lockall - fadescreen 3 + fadescreen FADE_TO_WHITE special HealPlayerParty - fadescreen 2 + fadescreen FADE_FROM_WHITE msgbox gUnknown_817A1FA - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end PokemonTower_5F_EventScript_163453:: @ 8163453 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end PokemonTower_5F_EventScript_16345B:: @ 816345B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_TAMMY, 0, Text_17A11F, Text_17A132 - msgbox gUnknown_817A138, 6 + trainerbattle_single TRAINER_CHANNELER_TAMMY, Text_17A11F, Text_17A132 + msgbox gUnknown_817A138, MSGBOX_AUTOCLOSE end PokemonTower_5F_EventScript_163472:: @ 8163472 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_RUTH, 0, Text_17A150, Text_17A164 - msgbox gUnknown_817A176, 6 + trainerbattle_single TRAINER_CHANNELER_RUTH, Text_17A150, Text_17A164 + msgbox gUnknown_817A176, MSGBOX_AUTOCLOSE end PokemonTower_5F_EventScript_163489:: @ 8163489 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_KARINA, 0, Text_17A187, Text_17A190 - msgbox gUnknown_817A194, 6 + trainerbattle_single TRAINER_CHANNELER_KARINA, Text_17A187, Text_17A190 + msgbox gUnknown_817A194, MSGBOX_AUTOCLOSE end PokemonTower_5F_EventScript_1634A0:: @ 81634A0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JANAE, 0, Text_17A1AA, Text_17A1B7 - msgbox gUnknown_817A1BD, 6 + trainerbattle_single TRAINER_CHANNELER_JANAE, Text_17A1AA, Text_17A1B7 + msgbox gUnknown_817A1BD, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index 6c9e9aefb..f03a04402 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_6F_EventScript_1BE796", + "script": "PokemonTower_6F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_6F_EventScript_1BE7A3", + "script": "PokemonTower_6F_EventScript_ItemXAccuracy", "flag": "FLAG_HIDE_POKEMON_TOWER_6F_X_ACCURACY" } ], diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 1f889c052..8f4500615 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -6,15 +6,15 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 textcolor 2 msgbox gUnknown_817A2F8 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special ScrSpecial_StartMarowakBattle waitstate special sub_8112364 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1634F5 - applymovement 255, Movement_163512 + compare VAR_RESULT, 0 + goto_if_eq EventScript_1634F5 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163512 waitmovement 0 releaseall end @@ -32,20 +32,20 @@ EventScript_1634F5:: @ 81634F5 end Movement_163512:: @ 8163512 - step_11 + walk_up step_end PokemonTower_6F_EventScript_163514:: @ 8163514 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_ANGELICA, 0, Text_17A243, Text_17A253 - msgbox gUnknown_817A25A, 6 + trainerbattle_single TRAINER_CHANNELER_ANGELICA, Text_17A243, Text_17A253 + msgbox gUnknown_817A25A, MSGBOX_AUTOCLOSE end PokemonTower_6F_EventScript_16352B:: @ 816352B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_EMILIA, 0, Text_17A272, Text_17A27F - msgbox gUnknown_817A293, 6 + trainerbattle_single TRAINER_CHANNELER_EMILIA, Text_17A272, Text_17A27F + msgbox gUnknown_817A293, MSGBOX_AUTOCLOSE end PokemonTower_6F_EventScript_163542:: @ 8163542 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JENNIFER, 0, Text_17A2C8, Text_17A2DC - msgbox gUnknown_817A2E2, 6 + trainerbattle_single TRAINER_CHANNELER_JENNIFER, Text_17A2C8, Text_17A2DC + msgbox gUnknown_817A2E2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index f39d15c7e..9f7986523 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -16,20 +16,20 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A end PokemonTower_7F_EventScript_163586:: @ 8163586 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_19, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 - msgbox gUnknown_817A3AF, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, Text_17A380, Text_17A3A4, EventScript_1635A1 + msgbox gUnknown_817A3AF, MSGBOX_AUTOCLOSE end EventScript_1635A1:: @ 81635A1 msgbox gUnknown_817A3AF closemessage getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 10 - goto_if eq, EventScript_1635E0 - compare_var_to_value VAR_0x8004, 11 - goto_if eq, EventScript_1635F0 - compare_var_to_value VAR_0x8004, 9 - goto_if eq, EventScript_163600 + compare VAR_0x8004, 10 + goto_if_eq EventScript_1635E0 + compare VAR_0x8004, 11 + goto_if_eq EventScript_1635F0 + compare VAR_0x8004, 9 + goto_if_eq EventScript_163600 applymovement 2, Movement_16362C waitmovement 0 goto EventScript_163616 @@ -61,50 +61,50 @@ EventScript_163616:: @ 8163616 end Movement_16361B:: @ 816361B - step_10 - step_13 - step_10 - step_10 - step_10 - step_13 - step_10 - step_10 + walk_down + walk_right + walk_down + walk_down + walk_down + walk_right + walk_down + walk_down step_end Movement_163624:: @ 8163624 - step_10 - step_10 - step_10 - step_10 - step_13 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_right + walk_down + walk_down step_end Movement_16362C:: @ 816362C - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_163633:: @ 8163633 - step_13 - step_10 - step_10 - step_10 - step_10 - step_13 - step_10 - step_10 - step_2f + walk_right + walk_down + walk_down + walk_down + walk_down + walk_right + walk_down + walk_down + walk_in_place_fastest_left step_end PokemonTower_7F_EventScript_16363D:: @ 816363D - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_20, 0, Text_17A3CD, Text_17A466, EventScript_163658 - msgbox gUnknown_817A477, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, Text_17A3CD, Text_17A466, EventScript_163658 + msgbox gUnknown_817A477, MSGBOX_AUTOCLOSE end EventScript_163658:: @ 8163658 @@ -112,10 +112,10 @@ EventScript_163658:: @ 8163658 msgbox gUnknown_817A477 closemessage getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 12 - goto_if eq, EventScript_163699 - compare_var_to_value VAR_0x8004, 13 - goto_if eq, EventScript_1636A9 + compare VAR_0x8004, 12 + goto_if_eq EventScript_163699 + compare VAR_0x8004, 13 + goto_if_eq EventScript_1636A9 applymovement 3, Movement_1636C6 waitmovement 0 goto EventScript_1636B9 @@ -139,48 +139,48 @@ EventScript_1636B9:: @ 81636B9 end Movement_1636BE:: @ 81636BE - step_10 - step_10 - step_10 - step_12 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_left + walk_down + walk_down + walk_down step_end Movement_1636C6:: @ 81636C6 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_1636CD:: @ 81636CD - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end PokemonTower_7F_EventScript_1636D6:: @ 81636D6 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_21, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 - msgbox gUnknown_817A506, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, Text_17A4CF, Text_17A4EE, EventScript_1636F1 + msgbox gUnknown_817A506, MSGBOX_AUTOCLOSE end EventScript_1636F1:: @ 81636F1 msgbox gUnknown_817A506 closemessage getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 10 - goto_if eq, EventScript_163725 - compare_var_to_value VAR_0x8004, 9 - goto_if eq, EventScript_163735 + compare VAR_0x8004, 10 + goto_if_eq EventScript_163725 + compare VAR_0x8004, 9 + goto_if_eq EventScript_163735 applymovement 4, Movement_163754 waitmovement 0 goto EventScript_163745 @@ -208,31 +208,31 @@ EventScript_16374A:: @ 816374A end Movement_16374C:: @ 816374C - step_10 - step_10 - step_10 - step_10 - step_10 - step_13 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_down step_end Movement_163754:: @ 8163754 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_16375B:: @ 816375B - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 751b0448a..8fb90e3c7 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE91C", + "script": "PowerPlant_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE929", + "script": "PowerPlant_EventScript_ItemTM17", "flag": "FLAG_HIDE_POWER_PLANT_TM17" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE936", + "script": "PowerPlant_EventScript_ItemTM25", "flag": "FLAG_HIDE_POWER_PLANT_TM25" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE943", + "script": "PowerPlant_EventScript_ItemThunderStone", "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE950", + "script": "PowerPlant_EventScript_ItemElixir", "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR" }, { diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index aa16e1881..bc6e108f8 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -1,28 +1,24 @@ PowerPlant_MapScripts:: @ 8163764 - map_script 5, PowerPlant_MapScript1_16376F - map_script 3, PowerPlant_MapScript2_16378D + map_script MAP_SCRIPT_ON_RESUME, PowerPlant_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, PowerPlant_OnTransition .byte 0 -PowerPlant_MapScript1_16376F:: @ 816376F - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_163779 +PowerPlant_OnResume:: @ 816376F + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163779 end EventScript_163779:: @ 8163779 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + compare VAR_RESULT, B_OUTCOME_CAUGHT + goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return -PowerPlant_MapScript2_16378D:: @ 816378D +PowerPlant_OnTransition:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT - checkflag FLAG_FOUGHT_ZAPDOS - call_if FALSE, EventScript_1637AC - checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 - call_if FALSE, EventScript_1637B0 - checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 - call_if FALSE, EventScript_1637B4 + call_if_unset FLAG_FOUGHT_ZAPDOS, EventScript_1637AC + call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1, EventScript_1637B0 + call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2, EventScript_1637B4 end EventScript_1637AC:: @ 81637AC @@ -39,8 +35,8 @@ EventScript_1637B4:: @ 81637B4 PowerPlant_EventScript_1637B8:: @ 81637B8 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 lock faceplayer @@ -58,30 +54,30 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16381B - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163824 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163824 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq EventScript_16381B + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq EventScript_163824 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq EventScript_163824 setflag FLAG_FOUGHT_ZAPDOS release end EventScript_16381B:: @ 816381B setflag FLAG_FOUGHT_ZAPDOS - goto EventScript_1A922D + goto EventScript_RemoveStaticMon end EventScript_163824:: @ 8163824 setvar VAR_0x8004, SPECIES_ZAPDOS - goto EventScript_1A9236 + goto EventScript_MonFlewAway end PowerPlant_EventScript_16382F:: @ 816382F special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -94,25 +90,25 @@ PowerPlant_EventScript_16382F:: @ 816382F clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_163884 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163884 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163884 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq EventScript_163884 + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq EventScript_163884 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq EventScript_163884 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 release end EventScript_163884:: @ 8163884 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 - goto EventScript_1A922D + goto EventScript_RemoveStaticMon end PowerPlant_EventScript_16388D:: @ 816388D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -125,17 +121,17 @@ PowerPlant_EventScript_16388D:: @ 816388D clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_1638E2 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_1638E2 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_1638E2 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq EventScript_1638E2 + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq EventScript_1638E2 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq EventScript_1638E2 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 release end EventScript_1638E2:: @ 81638E2 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 - goto EventScript_1A922D + goto EventScript_RemoveStaticMon end diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/RecordCenter/map.json index 611a3c092..9dda49e24 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/RecordCenter/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_02", - "name": "UnknownMap_00_02", - "layout": "LAYOUT_UNKNOWN_MAP_00_02", + "id": "MAP_RECORD_CENTER", + "name": "RecordCenter", + "layout": "LAYOUT_RECORD_CENTER", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_02_EventScript_1BB9D3", + "script": "RecordCenter_EventScript_Attendant", "flag": "0" } ], @@ -63,36 +63,36 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" }, { "type": "trigger", "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" }, { "type": "trigger", "x": 13, "y": 4, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" }, { "type": "trigger", "x": 13, "y": 6, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" + "script": "RecordCenter_EventScript_Spot" } ], "bg_events": [] diff --git a/data/maps/RecordCenter/scripts.inc b/data/maps/RecordCenter/scripts.inc new file mode 100644 index 000000000..873fc2826 --- /dev/null +++ b/data/maps/RecordCenter/scripts.inc @@ -0,0 +1,2 @@ +RecordCenter_MapScripts:: @ 816047A + .byte 0 diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 381dc663b..2c16ae2df 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_1F_EventScript_1BEB0A", + "script": "RockTunnel_1F_EventScript_ItemRepel", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_1F_EventScript_1BEB17", + "script": "RockTunnel_1F_EventScript_ItemPearl", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_1F_EventScript_1BEB24", + "script": "RockTunnel_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_ESCAPE_ROPE" } ], diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index c2bb38afc..49daa21a7 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -1,46 +1,46 @@ RockTunnel_1F_MapScripts:: @ 8162DD6 - map_script 3, RockTunnel_1F_MapScript1_162DDC + map_script MAP_SCRIPT_ON_TRANSITION, RockTunnel_1F_OnTransition .byte 0 -RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC +RockTunnel_1F_OnTransition:: @ 8162DDC setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F end RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 - msgbox gUnknown_817962D, 3 + msgbox gUnknown_817962D, MSGBOX_SIGN end RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LENNY, 0, Text_179366, Text_179388 - msgbox gUnknown_8179396, 6 + trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388 + msgbox gUnknown_8179396, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E00:: @ 8162E00 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_OLIVER, 0, Text_1793F1, Text_17940E - msgbox gUnknown_817943A, 6 + trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E + msgbox gUnknown_817943A, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E17:: @ 8162E17 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LUCAS, 0, Text_17947B, Text_1794AC - msgbox gUnknown_81794B4, 6 + trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC + msgbox gUnknown_81794B4, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E2E:: @ 8162E2E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_ASHTON, 0, Text_1794D4, Text_1794EE - msgbox gUnknown_81794F9, 6 + trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE + msgbox gUnknown_81794F9, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E45:: @ 8162E45 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_LEAH, 0, Text_17951C, Text_179547 - msgbox gUnknown_8179558, 6 + trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547 + msgbox gUnknown_8179558, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E5C:: @ 8162E5C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ARIANA, 0, Text_1795E5, Text_179604 - msgbox gUnknown_8179613, 6 + trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604 + msgbox gUnknown_8179613, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E73:: @ 8162E73 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DANA, 0, Text_179577, Text_1795A1 - msgbox gUnknown_81795B5, 6 + trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1 + msgbox gUnknown_81795B5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 1dd0f419e..d95126744 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1C487E", + "script": "RockTunnel_B1F_EventScript_RockSlideTutor", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BEB31", + "script": "RockTunnel_B1F_EventScript_ItemRevive", "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BEB3E", + "script": "RockTunnel_B1F_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER" }, { diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 27650f752..e2c34b53e 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -2,41 +2,41 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A .byte 0 RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_SOFIA, 0, Text_179657, Text_1796B9 - msgbox gUnknown_81796CE, 6 + trainerbattle_single TRAINER_PICNICKER_SOFIA, Text_179657, Text_1796B9 + msgbox gUnknown_81796CE, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MARTHA, 0, Text_1798AD, Text_1798DD - msgbox gUnknown_81798E9, 6 + trainerbattle_single TRAINER_PICNICKER_MARTHA, Text_1798AD, Text_1798DD + msgbox gUnknown_81798E9, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_DUDLEY, 0, Text_1796E1, Text_179700 - msgbox gUnknown_8179712, 6 + trainerbattle_single TRAINER_HIKER_DUDLEY, Text_1796E1, Text_179700 + msgbox gUnknown_8179712, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ALLEN, 0, Text_179829, Text_179856 - msgbox gUnknown_817987A, 6 + trainerbattle_single TRAINER_HIKER_ALLEN, Text_179829, Text_179856 + msgbox gUnknown_817987A, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ERIC, 0, Text_179916, Text_179932 - msgbox gUnknown_817993E, 6 + trainerbattle_single TRAINER_HIKER_ERIC, Text_179916, Text_179932 + msgbox gUnknown_817993E, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_COOPER, 0, Text_17973A, Text_17975F - msgbox gUnknown_8179777, 6 + trainerbattle_single TRAINER_POKEMANIAC_COOPER, Text_17973A, Text_17975F + msgbox gUnknown_8179777, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162F15:: @ 8162F15 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_STEVE, 0, Text_1797A4, Text_1797CB - msgbox gUnknown_81797DE, 6 + trainerbattle_single TRAINER_POKEMANIAC_STEVE, Text_1797A4, Text_1797CB + msgbox gUnknown_81797DE, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_WINSTON, 0, Text_179968, Text_179997 - msgbox gUnknown_81799AC, 6 + trainerbattle_single TRAINER_POKEMANIAC_WINSTON, Text_179968, Text_179997 + msgbox gUnknown_81799AC, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 1ae6a2b49..b761f7d2d 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B1F_EventScript_1BE6C6", + "script": "RocketHideout_B1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B1F_EventScript_1BE6D3", + "script": "RocketHideout_B1F_EventScript_ItemHyperPotion", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_HYPER_POTION" } ], diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 6e2f8eeb3..874e0b8e9 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -1,40 +1,39 @@ RocketHideout_B1F_MapScripts:: @ 8161195 - map_script 1, RocketHideout_B1F_MapScript1_1611A0 - map_script 3, RocketHideout_B1F_MapScript2_1611AA + map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, RocketHideout_B1F_OnTransition .byte 0 -RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 - call_if lt, EventScript_161233 +RocketHideout_B1F_OnLoad:: @ 81611A0 + call_if_undefeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233 end -RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA +RocketHideout_B1F_OnTransition:: @ 81611AA setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F end RocketHideout_B1F_EventScript_1611AE:: @ 81611AE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_8, 0, Text_174ECA, Text_174EED - msgbox gUnknown_8174EFA, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED + msgbox gUnknown_8174EFA, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_9, 0, Text_174F2C, Text_174F60 - msgbox gUnknown_8174F66, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60 + msgbox gUnknown_8174F66, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611DC:: @ 81611DC - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_10, 0, Text_174F94, Text_174FA4 - msgbox gUnknown_8174FB3, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4 + msgbox gUnknown_8174FB3, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_11, 0, Text_174FE1, Text_174FF8 - msgbox gUnknown_8175007, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8 + msgbox gUnknown_8175007, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_16120A:: @ 816120A - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_12, 0, Text_17503A, Text_17505A, EventScript_161225 - msgbox gUnknown_8175060, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225 + msgbox gUnknown_8175060, MSGBOX_AUTOCLOSE end EventScript_161225:: @ 8161225 diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 4bdde29e9..63a051e5d 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6E0", + "script": "RocketHideout_B2F_EventScript_ItemXSpeed", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6ED", + "script": "RocketHideout_B2F_EventScript_ItemMoonStone", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6FA", + "script": "RocketHideout_B2F_EventScript_ItemTM12", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE707", + "script": "RocketHideout_B2F_EventScript_ItemSuperPotion", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_SUPER_POTION" } ], diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 6264371b7..07916ad03 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -2,6 +2,6 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 .byte 0 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_13, 0, Text_17508C, Text_1750BF - msgbox gUnknown_81750CC, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF + msgbox gUnknown_81750CC, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 40f6c205f..7be2fae4f 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B3F_EventScript_1BE714", + "script": "RocketHideout_B3F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B3F_EventScript_1BE721", + "script": "RocketHideout_B3F_EventScript_ItemTM21", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B3F_EventScript_1BEBCD", + "script": "RocketHideout_B3F_EventScript_ItemBlackGlasses", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_BLACK_GLASSES" } ], diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index 5cc7fc7d8..d6a57ab77 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -2,11 +2,11 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 .byte 0 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_14, 0, Text_17511A, Text_17514A - msgbox gUnknown_817515B, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A + msgbox gUnknown_817515B, MSGBOX_AUTOCLOSE end RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_15, 0, Text_17519E, Text_1751CE - msgbox gUnknown_81751E0, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE + msgbox gUnknown_81751E0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 85113e7c6..06533ad54 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_161363", + "script": "RocketHideout_B4F_EventScript_SilphScope", "flag": "FLAG_HIDE_SILPH_SCOPE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1613AD", + "script": "RocketHideout_B4F_EventScript_LiftKey", "flag": "FLAG_HIDE_LIFT_KEY" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1BE72E", + "script": "RocketHideout_B4F_EventScript_ItemTM49", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1BE73B", + "script": "RocketHideout_B4F_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1BE748", + "script": "RocketHideout_B4F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_CALCIUM" } ], diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 0ab5b0490..68671a7a8 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -1,19 +1,17 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 - map_script 1, RocketHideout_B4F_MapScript1_1612EE + map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B4F_OnLoad .byte 0 -RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE - setvar VAR_0x4001, 0 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if eq, EventScript_161311 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if eq, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 - call_if ne, EventScript_16146A +RocketHideout_B4F_OnLoad:: @ 81612EE + setvar VAR_TEMP_1, 0 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 + compare VAR_TEMP_1, 2 + call_if_ne EventScript_16146A end EventScript_161311:: @ 8161311 - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 return RocketHideout_B4F_EventScript_161317:: @ 8161317 @@ -24,31 +22,31 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI, 0, Text_175318 + trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318 msgbox gUnknown_817532D - fadescreen 1 + fadescreen FADE_TO_BLACK closemessage removeobject 1 addobject 2 clearflag FLAG_HIDE_SILPH_SCOPE setflag FLAG_HIDE_CELADON_ROCKETS famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - fadescreen 0 + fadescreen FADE_FROM_BLACK release end -RocketHideout_B4F_EventScript_161363:: @ 8161363 +RocketHideout_B4F_EventScript_SilphScope:: @ 8161363 lock faceplayer removeobject 2 giveitem ITEM_SILPH_SCOPE - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull release end RocketHideout_B4F_EventScript_161381:: @ 8161381 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_18, 0, Text_175488, Text_1754B9, EventScript_16139D + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, Text_175488, Text_1754B9, EventScript_16139D msgbox gUnknown_81754BD release end @@ -60,50 +58,46 @@ EventScript_16139D:: @ 816139D release end -RocketHideout_B4F_EventScript_1613AD:: @ 81613AD +RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD lock faceplayer setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT removeobject 4 giveitem ITEM_LIFT_KEY - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull release end RocketHideout_B4F_EventScript_1613CE:: @ 81613CE - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_16, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 - msgbox gUnknown_817540C, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9 + msgbox gUnknown_817540C, MSGBOX_AUTOCLOSE end EventScript_1613E9:: @ 81613E9 - setvar VAR_0x4001, 0 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if eq, EventScript_161311 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if eq, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1614A1 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_161462 + setvar VAR_TEMP_1, 0 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_1614A1 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_161462 release end RocketHideout_B4F_EventScript_161418:: @ 8161418 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_17, 0, Text_175437, Text_175463, EventScript_161433 - msgbox gUnknown_817546A, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433 + msgbox gUnknown_817546A, MSGBOX_AUTOCLOSE end EventScript_161433:: @ 8161433 - setvar VAR_0x4001, 0 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if eq, EventScript_161311 - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if eq, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1614A1 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_161462 + setvar VAR_TEMP_1, 0 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_1614A1 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_161462 release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 2b593b1bb..f649e5c40 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -3,14 +3,12 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8 RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 lockall - checkflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT - goto_if FALSE, EventScript_16161B + goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B setvar VAR_0x8004, 2 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow - message Text_1A535C + message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 2 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos @@ -53,8 +51,8 @@ EventScript_161554:: @ 8161554 EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 - compare_var_to_value VAR_ELEVATOR_FLOOR, 3 - goto_if eq, EventScript_161609 + compare VAR_ELEVATOR_FLOOR, 3 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 3 goto EventScript_161609 @@ -65,8 +63,8 @@ EventScript_1615B8:: @ 81615B8 EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 - compare_var_to_value VAR_ELEVATOR_FLOOR, 2 - goto_if eq, EventScript_161609 + compare VAR_ELEVATOR_FLOOR, 2 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 2 goto EventScript_161609 @@ -77,8 +75,8 @@ EventScript_1615E0:: @ 81615E0 EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 - compare_var_to_value VAR_ELEVATOR_FLOOR, 0 - goto_if eq, EventScript_161609 + compare VAR_ELEVATOR_FLOOR, 0 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 0 goto EventScript_161609 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index ef784e8ee..8d5617e3f 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -4,19 +4,18 @@ Route1_MapScripts:: @ 8167EFD Route1_EventScript_167EFE:: @ 8167EFE lock faceplayer - checkflag FLAG_GOT_POTION_ON_ROUTE_1 - goto_if TRUE, EventScript_167F48 + goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, EventScript_167F48 msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 - message Text_1A51F6 + message Text_ObtainedTheX waitmessage waitfanfare - additem ITEM_POTION, 1 + additem ITEM_POTION msgbox gUnknown_8183387 call EventScript_1A6675 setflag FLAG_GOT_POTION_ON_ROUTE_1 @@ -29,9 +28,9 @@ EventScript_167F48:: @ 8167F48 end Route1_EventScript_167F52:: @ 8167F52 - msgbox gUnknown_81833B9, 2 + msgbox gUnknown_81833B9, MSGBOX_NPC end Route1_EventScript_167F5B:: @ 8167F5B - msgbox gUnknown_818343A, 3 + msgbox gUnknown_818343A, MSGBOX_SIGN end diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc index 96ce99c8e..7fb5d64cd 100644 --- a/data/maps/Route10/scripts.inc +++ b/data/maps/Route10/scripts.inc @@ -5,13 +5,13 @@ Route10_EventScript_167FDA:: @ 8167FDA end Route10_EventScript_167FDB:: @ 8167FDB - msgbox gUnknown_8184EC5, 3 + msgbox gUnknown_8184EC5, MSGBOX_SIGN end Route10_EventScript_167FE4:: @ 8167FE4 - msgbox gUnknown_8184EE9, 3 + msgbox gUnknown_8184EE9, MSGBOX_SIGN end Route10_EventScript_167FED:: @ 8167FED - msgbox gUnknown_8184EF5, 3 + msgbox gUnknown_8184EF5, MSGBOX_SIGN end diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 44d9939c0..f81563b0c 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F - map_script 3, Route10_PokemonCenter_1F_MapScript1_16FC3A - map_script 5, Route10_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A +Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F setrespawn SPAWN_ROUTE10 end @@ -11,43 +11,41 @@ Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A - msgbox gUnknown_819E59D, 2 + msgbox gUnknown_819E59D, MSGBOX_NPC end Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53 - msgbox gUnknown_819E523, 2 + msgbox gUnknown_819E523, MSGBOX_NPC end Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C - msgbox gUnknown_819E5D2, 2 + msgbox gUnknown_819E5D2, MSGBOX_NPC end Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 lock faceplayer call EventScript_16FCF1 - checkflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE - goto_if TRUE, EventScript_16FCE7 + goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + compare VAR_RESULT, NO + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 - compare_var_to_value VAR_0x8006, 20 - goto_if lt, EventScript_1A7ABD + compare VAR_0x8006, 20 + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_EVERSTONE, 1 - giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819E786, ITEM_EVERSTONE setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE msgbox gUnknown_819E7AF release diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index e815a98be..31472bf81 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc index 54b5d0036..2760e125c 100644 --- a/data/maps/Route10_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA - map_script 2, Route10_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, Route10_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, Route10_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, Route10_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +Route10_PokemonCenter_2F_EventScript_Colosseum:: @ 816FD0F + call CableClub_EventScript_Colosseum end -EventScript_16FD15:: @ 816FD15 - call EventScript_1BB6AB +Route10_PokemonCenter_2F_EventScript_TradeCenter:: @ 816FD15 + call CableClub_EventScript_TradeCenter end -EventScript_16FD1B:: @ 816FD1B - call EventScript_1BB7DE +Route10_PokemonCenter_2F_EventScript_RecordCorner:: @ 816FD1B + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 854692035..7882673d1 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EventScript_1BEAF0", + "script": "Route11_EventScript_ItemXDefend", "flag": "FLAG_HIDE_ROUTE11_X_DEFEND" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EventScript_1BEB99", + "script": "Route11_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL" }, { @@ -190,7 +190,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EventScript_1BEBA6", + "script": "Route11_EventScript_ItemAwakening", "flag": "FLAG_HIDE_ROUTE11_AWAKENING" } ], diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc index fa85a5bb8..11f052030 100644 --- a/data/maps/Route11/scripts.inc +++ b/data/maps/Route11/scripts.inc @@ -2,5 +2,5 @@ Route11_MapScripts:: @ 8167FF6 .byte 0 Route11_EventScript_167FF7:: @ 8167FF7 - msgbox gUnknown_8185308, 3 + msgbox gUnknown_8185308, MSGBOX_SIGN end diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc index 476379753..0a2f2cb75 100644 --- a/data/maps/Route11_EastEntrance_1F/scripts.inc +++ b/data/maps/Route11_EastEntrance_1F/scripts.inc @@ -2,9 +2,9 @@ Route11_EastEntrance_1F_MapScripts:: @ 816FD21 .byte 0 Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22 - msgbox gUnknown_819E8A6, 2 + msgbox gUnknown_819E8A6, MSGBOX_NPC end Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B - msgbox gUnknown_819E97B, 2 + msgbox gUnknown_819E97B, MSGBOX_NPC end diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 0140d8de3..854a3d5f8 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -3,8 +3,7 @@ Route11_EastEntrance_2F_MapScripts:: @ 816FD34 Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 lockall - checkflag FLAG_WOKE_UP_ROUTE_12_SNORLAX - goto_if TRUE, EventScript_16FD49 + goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, EventScript_16FD49 msgbox gUnknown_819EC8A releaseall end @@ -15,7 +14,7 @@ EventScript_16FD49:: @ 816FD49 end Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53 - msgbox gUnknown_819ED1F, 3 + msgbox gUnknown_819ED1F, MSGBOX_SIGN end Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C @@ -23,17 +22,16 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C faceplayer setvar VAR_0x8008, 4 call EventScript_1A8CAD - checkflag FLAG_DID_NINA_TRADE - goto_if TRUE, EventScript_16FDCE + goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16FDB6 + compare VAR_RESULT, NO + goto_if_eq EventScript_16FDB6 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_16FDB6 + compare VAR_0x8004, 6 + goto_if_ge EventScript_16FDB6 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16FDC0 + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_16FDC0 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_NINA_TRADE @@ -60,23 +58,21 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 lock faceplayer call EventScript_16FE64 - checkflag FLAG_GOT_ITEMFINDER - goto_if TRUE, EventScript_16FE5A + goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + compare VAR_RESULT, NO + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FE64 - compare_var_to_value VAR_0x8006, 30 - goto_if lt, EventScript_1A7ABD + compare VAR_0x8006, 30 + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_ITEMFINDER, 1 - giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER setflag FLAG_GOT_ITEMFINDER msgbox gUnknown_819EB59 release 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 diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 0f0aa4f68..792f9c883 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -4,22 +4,21 @@ Route12_FishingHouse_MapScripts:: @ 816FF0B Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C lock faceplayer - checkflag FLAG_GOT_SUPER_ROD - goto_if TRUE, EventScript_16FF7F + goto_if_set FLAG_GOT_SUPER_ROD, EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16FF34 + compare VAR_RESULT, YES + goto_if_eq EventScript_16FF34 msgbox gUnknown_819F1FA release end EventScript_16FF34:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16FF75 - additem ITEM_SUPER_ROD, 1 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16FF75 + additem ITEM_SUPER_ROD msgbox gUnknown_819F05B - giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD + msgreceiveditem gUnknown_819F0B2, ITEM_SUPER_ROD setflag FLAG_GOT_SUPER_ROD msgbox gUnknown_819F0EB release @@ -32,29 +31,29 @@ EventScript_16FF75:: @ 816FF75 EventScript_16FF7F:: @ 816FF7F 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 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16FFF5 + compare VAR_RESULT, 0 + goto_if_eq EventScript_16FFF5 special GetMagikarpSizeRecordInfo msgbox gUnknown_819F2DB special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 6 - goto_if ge, EventScript_16FFFF + compare VAR_RESULT, 6 + goto_if_ge EventScript_16FFFF special CompareMagikarpSize - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_170001 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_17000B - compare_var_to_value VAR_RESULT, 3 - goto_if eq, EventScript_170031 - compare_var_to_value VAR_RESULT, 4 - goto_if eq, EventScript_17001E + compare VAR_RESULT, 1 + goto_if_eq EventScript_170001 + compare VAR_RESULT, 2 + goto_if_eq EventScript_17000B + compare VAR_RESULT, 3 + goto_if_eq EventScript_170031 + compare VAR_RESULT, 4 + goto_if_eq EventScript_17001E release end @@ -73,15 +72,13 @@ EventScript_170001:: @ 8170001 end EventScript_17000B:: @ 817000B - checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP - goto_if FALSE, EventScript_170031 + goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031 msgbox gUnknown_819F40A release end EventScript_17001E:: @ 817001E - checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP - goto_if FALSE, EventScript_170031 + goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031 msgbox gUnknown_819F3CB release end @@ -90,8 +87,8 @@ EventScript_170031:: @ 8170031 setflag FLAG_GOT_RECORD_SETTING_MAGIKARP msgbox gUnknown_819F31B giveitem ITEM_NET_BALL - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_17005D + compare VAR_RESULT, 0 + goto_if_eq EventScript_17005D msgbox gUnknown_819F395 release end @@ -103,8 +100,7 @@ EventScript_17005D:: @ 817005D Route12_FishingHouse_EventScript_170067:: @ 8170067 lockall - checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP - goto_if TRUE, EventScript_17007B + goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_17007B msgbox gUnknown_819F50C releaseall end diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc index d91f0c7c8..990d5f793 100644 --- a/data/maps/Route12_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc @@ -2,5 +2,5 @@ Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D .byte 0 Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E - msgbox gUnknown_819EDA7, 2 + msgbox gUnknown_819EDA7, MSGBOX_NPC end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index fe288a6d1..b9fee6dda 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -2,28 +2,26 @@ Route12_NorthEntrance_2F_MapScripts:: @ 816FE77 .byte 0 Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78 - msgbox gUnknown_819EF5D, 3 + msgbox gUnknown_819EF5D, MSGBOX_SIGN end Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 - msgbox gUnknown_819EFA0, 3 + msgbox gUnknown_819EFA0, MSGBOX_SIGN end Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A lock faceplayer - checkflag FLAG_GOT_TM27 - goto_if TRUE, EventScript_16FF01 + goto_if_set FLAG_GOT_TM27, EventScript_16FF01 checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16FEE5 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16FEEE + compare VAR_RESULT, MALE + call_if_eq EventScript_16FEE5 + compare VAR_RESULT, FEMALE + call_if_eq EventScript_16FEEE checkitemspace ITEM_TM27, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16FEF7 - additem ITEM_TM27, 1 - giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16FEF7 + giveitem_msg gUnknown_819EE9F, ITEM_TM27 msgbox gUnknown_819EEC6 setflag FLAG_GOT_TM27 release diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc index fcec8204a..6524d5dd6 100644 --- a/data/maps/Route13/scripts.inc +++ b/data/maps/Route13/scripts.inc @@ -2,13 +2,13 @@ Route13_MapScripts:: @ 81680B5 .byte 0 Route13_EventScript_1680B6:: @ 81680B6 - msgbox gUnknown_8185DB7, 3 + msgbox gUnknown_8185DB7, MSGBOX_SIGN end Route13_EventScript_1680BF:: @ 81680BF - msgbox gUnknown_8185DEF, 3 + msgbox gUnknown_8185DEF, MSGBOX_SIGN end Route13_EventScript_1680C8:: @ 81680C8 - msgbox gUnknown_8185E2C, 3 + msgbox gUnknown_8185E2C, MSGBOX_SIGN end diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc index 207604cdc..551940250 100644 --- a/data/maps/Route14/scripts.inc +++ b/data/maps/Route14/scripts.inc @@ -2,5 +2,5 @@ Route14_MapScripts:: @ 81680D1 .byte 0 Route14_EventScript_1680D2:: @ 81680D2 - msgbox gUnknown_8186399, 3 + msgbox gUnknown_8186399, MSGBOX_SIGN end diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 4c6fa5d47..19a33a867 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route15_EventScript_1BE7CA", + "script": "Route15_EventScript_ItemTM18", "flag": "FLAG_HIDE_ROUTE15_TM18" }, { diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc index a4d0a3240..40890250c 100644 --- a/data/maps/Route15/scripts.inc +++ b/data/maps/Route15/scripts.inc @@ -2,5 +2,5 @@ Route15_MapScripts:: @ 81680DB .byte 0 Route15_EventScript_1680DC:: @ 81680DC - msgbox gUnknown_8186A77, 3 + msgbox gUnknown_8186A77, MSGBOX_SIGN end diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc index 458f5e010..9f753e6c9 100644 --- a/data/maps/Route15_WestEntrance_1F/scripts.inc +++ b/data/maps/Route15_WestEntrance_1F/scripts.inc @@ -2,5 +2,5 @@ Route15_WestEntrance_1F_MapScripts:: @ 8170088 .byte 0 Route15_WestEntrance_1F_EventScript_170089:: @ 8170089 - msgbox gUnknown_819F560, 2 + msgbox gUnknown_819F560, MSGBOX_NPC end diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 1b491d4e5..c4cc4b6fd 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -14,30 +14,28 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 end Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0 - msgbox gUnknown_819F7F8, 3 + msgbox gUnknown_819F7F8, MSGBOX_SIGN end Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 lock faceplayer call EventScript_170145 - checkflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE - goto_if TRUE, EventScript_17013B + goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + compare VAR_RESULT, NO + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_170145 - compare_var_to_value VAR_0x8006, 50 - goto_if lt, EventScript_1A7ABD + compare VAR_0x8006, 50 + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_EXP_SHARE, 1 - giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE msgbox gUnknown_819F71F release diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 0bc8d6c8a..eb866388b 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -1,28 +1,27 @@ Route16_MapScripts:: @ 81680E5 - map_script 5, Route16_MapScript1_1680F5 - map_script 3, Route16_MapScript2_168103 - map_script 4, Route16_MapScript3_168113 + map_script MAP_SCRIPT_ON_RESUME, Route16_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, Route16_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route16_OnWarp .byte 0 -Route16_MapScript1_1680F5:: @ 81680F5 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_1680FF +Route16_OnResume:: @ 81680F5 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1680FF end EventScript_1680FF:: @ 81680FF removeobject VAR_LAST_TALKED return -Route16_MapScript2_168103:: @ 8168103 - compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 - call_if eq, EventScript_16810F +Route16_OnTransition:: @ 8168103 + compare VAR_MAP_SCENE_ROUTE16, 1 + call_if_eq EventScript_16810F end EventScript_16810F:: @ 816810F setflag FLAG_SYS_ON_CYCLING_ROAD return -Route16_MapScript3_168113:: @ 8168113 +Route16_OnWarp:: @ 8168113 map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16811D .2byte 0 @@ -33,16 +32,15 @@ EventScript_16811D:: @ 816811D Route16_EventScript_168121:: @ 8168121 lock faceplayer - checkflag FLAG_GOT_POKE_FLUTE - goto_if FALSE, EventScript_1681A3 + goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_1681A3 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_168197 - call EventScript_1A924B + compare VAR_RESULT, NO + goto_if_eq EventScript_168197 + call EventScript_AwakenSnorlax setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse playmoncry SPECIES_SNORLAX, 2 @@ -53,12 +51,12 @@ Route16_EventScript_168121:: @ 8168121 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_168199 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_168199 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_168199 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq EventScript_168199 + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq EventScript_168199 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq EventScript_168199 release end @@ -77,9 +75,9 @@ EventScript_1681A3:: @ 81681A3 end Route16_EventScript_1681AD:: @ 81681AD - msgbox gUnknown_8186F7A, 3 + msgbox gUnknown_8186F7A, MSGBOX_SIGN end Route16_EventScript_1681B6:: @ 81681B6 - msgbox gUnknown_8186F98, 3 + msgbox gUnknown_8186F98, MSGBOX_SIGN end diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 6da2bb12a..94ed9b932 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -4,14 +4,12 @@ Route16_House_MapScripts:: @ 817014E Route16_House_EventScript_17014F:: @ 817014F lock faceplayer - checkflag FLAG_GOT_HM02 - goto_if TRUE, EventScript_1701A5 + goto_if_set FLAG_GOT_HM02, EventScript_1701A5 msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_17019B - additem ITEM_HM02, 1 - giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_17019B + giveitem_msg gUnknown_819F8C0, ITEM_HM02 msgbox gUnknown_819F8E0 setflag FLAG_GOT_HM02 release diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 6288d8418..0618f25fd 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -101,7 +101,7 @@ "x": 6, "y": 10, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1701E4" }, @@ -110,7 +110,7 @@ "x": 6, "y": 11, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1701F0" }, @@ -155,7 +155,7 @@ "x": 6, "y": 12, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_1701FC" }, @@ -164,7 +164,7 @@ "x": 6, "y": 13, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_170208" }, @@ -173,7 +173,7 @@ "x": 6, "y": 14, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route16_NorthEntrance_1F_EventScript_170214" } diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index 32d392818..a99a1ec18 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -1,19 +1,18 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 - map_script 3, Route16_NorthEntrance_1F_MapScript1_1701C8 + map_script MAP_SCRIPT_ON_TRANSITION, Route16_NorthEntrance_1F_OnTransition .byte 0 -Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8 +Route16_NorthEntrance_1F_OnTransition:: @ 81701C8 clearflag FLAG_SYS_ON_CYCLING_ROAD - checkflag FLAG_GOT_BICYCLE - call_if TRUE, EventScript_1701D5 + call_if_set FLAG_GOT_BICYCLE, EventScript_1701D5 end EventScript_1701D5:: @ 81701D5 - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB - msgbox gUnknown_819F98B, 2 + msgbox gUnknown_819F98B, MSGBOX_NPC end Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4 @@ -50,70 +49,70 @@ EventScript_170220:: @ 8170220 textcolor 0 msgbox gUnknown_819F9CC closemessage - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 - compare_var_to_value VAR_0x8008, 1 - call_if eq, EventScript_170279 - compare_var_to_value VAR_0x8008, 2 - call_if eq, EventScript_170284 - compare_var_to_value VAR_0x8008, 3 - call_if eq, EventScript_17028F - compare_var_to_value VAR_0x8008, 4 - call_if eq, EventScript_17029A + compare VAR_0x8008, 1 + call_if_eq EventScript_170279 + compare VAR_0x8008, 2 + call_if_eq EventScript_170284 + compare VAR_0x8008, 3 + call_if_eq EventScript_17028F + compare VAR_0x8008, 4 + call_if_eq EventScript_17029A msgbox gUnknown_819F95F closemessage - applymovement 255, Movement_1702B3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1702B3 waitmovement 0 releaseall end EventScript_170279:: @ 8170279 - applymovement 255, Movement_1702A5 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A5 waitmovement 0 return EventScript_170284:: @ 8170284 - applymovement 255, Movement_1702A7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A7 waitmovement 0 return EventScript_17028F:: @ 817028F - applymovement 255, Movement_1702AA + applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AA waitmovement 0 return EventScript_17029A:: @ 817029A - applymovement 255, Movement_1702AE + applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AE waitmovement 0 return Movement_1702A5:: @ 81702A5 - step_11 + walk_up step_end Movement_1702A7:: @ 81702A7 - step_11 - step_11 + walk_up + walk_up step_end Movement_1702AA:: @ 81702AA - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up step_end Movement_1702AE:: @ 81702AE - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up step_end Movement_1702B3:: @ 81702B3 - step_13 + walk_right step_end Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5 - msgbox gUnknown_819F9E8, 2 + msgbox gUnknown_819F9E8, MSGBOX_NPC end diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 777967038..2dfd8f1b0 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -2,42 +2,40 @@ Route16_NorthEntrance_2F_MapScripts:: @ 81702BE .byte 0 Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF - msgbox gUnknown_819FA07, 2 + msgbox gUnknown_819FA07, MSGBOX_NPC end Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8 - msgbox gUnknown_819FA41, 2 + msgbox gUnknown_819FA41, MSGBOX_NPC end Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1 - msgbox gUnknown_819FA6F, 3 + msgbox gUnknown_819FA6F, MSGBOX_SIGN end Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA - msgbox gUnknown_819FAB9, 3 + msgbox gUnknown_819FAB9, MSGBOX_SIGN end Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 lock faceplayer call EventScript_17036F - checkflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE - goto_if TRUE, EventScript_170365 + goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + compare VAR_RESULT, NO + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_17036F - compare_var_to_value VAR_0x8006, 40 - goto_if lt, EventScript_1A7ABD + compare VAR_0x8006, 40 + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_AMULET_COIN, 1 - giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE msgbox gUnknown_819FC93 release diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc index 12d99102a..8633ab23e 100644 --- a/data/maps/Route17/scripts.inc +++ b/data/maps/Route17/scripts.inc @@ -2,25 +2,25 @@ Route17_MapScripts:: @ 81681BF .byte 0 Route17_EventScript_1681C0:: @ 81681C0 - msgbox gUnknown_81874E4, 3 + msgbox gUnknown_81874E4, MSGBOX_SIGN end Route17_EventScript_1681C9:: @ 81681C9 - msgbox gUnknown_8187512, 3 + msgbox gUnknown_8187512, MSGBOX_SIGN end Route17_EventScript_1681D2:: @ 81681D2 - msgbox gUnknown_818757B, 3 + msgbox gUnknown_818757B, MSGBOX_SIGN end Route17_EventScript_1681DB:: @ 81681DB - msgbox gUnknown_81875BE, 3 + msgbox gUnknown_81875BE, MSGBOX_SIGN end Route17_EventScript_1681E4:: @ 81681E4 - msgbox gUnknown_81875E3, 3 + msgbox gUnknown_81875E3, MSGBOX_SIGN end Route17_EventScript_1681ED:: @ 81681ED - msgbox gUnknown_8187622, 3 + msgbox gUnknown_8187622, MSGBOX_SIGN end diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index cc6d11221..25fda03c2 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -1,18 +1,18 @@ Route18_MapScripts:: @ 81681F6 - map_script 3, Route18_MapScript1_168201 - map_script 4, Route18_MapScript2_168211 + map_script MAP_SCRIPT_ON_TRANSITION, Route18_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route18_OnWarp .byte 0 -Route18_MapScript1_168201:: @ 8168201 - compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 - call_if eq, EventScript_16820D +Route18_OnTransition:: @ 8168201 + compare VAR_MAP_SCENE_ROUTE16, 1 + call_if_eq EventScript_16820D end EventScript_16820D:: @ 816820D setflag FLAG_SYS_ON_CYCLING_ROAD return -Route18_MapScript2_168211:: @ 8168211 +Route18_OnWarp:: @ 8168211 map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B .2byte 0 @@ -21,9 +21,9 @@ EventScript_16821B:: @ 816821B end Route18_EventScript_16821F:: @ 816821F - msgbox gUnknown_8187757, 3 + msgbox gUnknown_8187757, MSGBOX_SIGN end Route18_EventScript_168228:: @ 8168228 - msgbox gUnknown_818777C, 3 + msgbox gUnknown_818777C, MSGBOX_SIGN end diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 6dfc516fd..15d453cce 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -65,7 +65,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_17039A" }, @@ -74,7 +74,7 @@ "x": 6, "y": 5, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703A6" }, @@ -83,7 +83,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703B2" }, @@ -92,7 +92,7 @@ "x": 6, "y": 7, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703BE" }, @@ -101,7 +101,7 @@ "x": 6, "y": 8, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "Route18_EastEntrance_1F_EventScript_1703CA" }, diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 784d1d37f..e49eb285f 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -1,19 +1,18 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 - map_script 3, Route18_EastEntrance_1F_MapScript1_17037E + map_script MAP_SCRIPT_ON_TRANSITION, Route18_EastEntrance_1F_OnTransition .byte 0 -Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E +Route18_EastEntrance_1F_OnTransition:: @ 817037E clearflag FLAG_SYS_ON_CYCLING_ROAD - checkflag FLAG_GOT_BICYCLE - call_if TRUE, EventScript_17038B + call_if_set FLAG_GOT_BICYCLE, EventScript_17038B end EventScript_17038B:: @ 817038B - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 return Route18_EastEntrance_1F_EventScript_170391:: @ 8170391 - msgbox gUnknown_819FD3A, 2 + msgbox gUnknown_819FD3A, MSGBOX_NPC end Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A @@ -50,66 +49,66 @@ EventScript_1703D6:: @ 81703D6 textcolor 0 msgbox gUnknown_819FD60 closemessage - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 - compare_var_to_value VAR_0x8008, 1 - call_if eq, EventScript_17042F - compare_var_to_value VAR_0x8008, 2 - call_if eq, EventScript_17043A - compare_var_to_value VAR_0x8008, 3 - call_if eq, EventScript_170445 - compare_var_to_value VAR_0x8008, 4 - call_if eq, EventScript_170450 + compare VAR_0x8008, 1 + call_if_eq EventScript_17042F + compare VAR_0x8008, 2 + call_if_eq EventScript_17043A + compare VAR_0x8008, 3 + call_if_eq EventScript_170445 + compare VAR_0x8008, 4 + call_if_eq EventScript_170450 msgbox gUnknown_819FD0C closemessage - applymovement 255, Movement_170469 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170469 waitmovement 0 releaseall end EventScript_17042F:: @ 817042F - applymovement 255, Movement_17045B + applymovement OBJ_EVENT_ID_PLAYER, Movement_17045B waitmovement 0 return EventScript_17043A:: @ 817043A - applymovement 255, Movement_17045D + applymovement OBJ_EVENT_ID_PLAYER, Movement_17045D waitmovement 0 return EventScript_170445:: @ 8170445 - applymovement 255, Movement_170460 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170460 waitmovement 0 return EventScript_170450:: @ 8170450 - applymovement 255, Movement_170464 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170464 waitmovement 0 return Movement_17045B:: @ 817045B - step_11 + walk_up step_end Movement_17045D:: @ 817045D - step_11 - step_11 + walk_up + walk_up step_end Movement_170460:: @ 8170460 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up step_end Movement_170464:: @ 8170464 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up step_end Movement_170469:: @ 8170469 - step_13 + walk_right step_end diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index d262aad30..83c79b9ae 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -2,11 +2,11 @@ Route18_EastEntrance_2F_MapScripts:: @ 817046B .byte 0 Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C - msgbox gUnknown_819FD6B, 3 + msgbox gUnknown_819FD6B, MSGBOX_SIGN end Route18_EastEntrance_2F_EventScript_170475:: @ 8170475 - msgbox gUnknown_819FDB3, 3 + msgbox gUnknown_819FDB3, MSGBOX_SIGN end Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E @@ -14,17 +14,16 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E faceplayer setvar VAR_0x8008, 5 call EventScript_1A8CAD - checkflag FLAG_DID_MARC_TRADE - goto_if TRUE, EventScript_1704F0 + goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1704D8 + compare VAR_RESULT, NO + goto_if_eq EventScript_1704D8 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_1704D8 + compare VAR_0x8004, 6 + goto_if_ge EventScript_1704D8 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_1704E2 + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_1704E2 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_MARC_TRADE diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc index 28a71830d..16d6e4669 100644 --- a/data/maps/Route19/scripts.inc +++ b/data/maps/Route19/scripts.inc @@ -2,5 +2,5 @@ Route19_MapScripts:: @ 8168231 .byte 0 Route19_EventScript_168232:: @ 8168232 - msgbox gUnknown_8187C06, 3 + msgbox gUnknown_8187C06, MSGBOX_SIGN end diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index aecf7a7de..d7cd6f16b 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BE58E", + "script": "Route2_EventScript_ItemEther", "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BE59B", + "script": "Route2_EventScript_ItemParalyzeHeal", "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc index 67ba5729e..75a3dd87b 100644 --- a/data/maps/Route2/scripts.inc +++ b/data/maps/Route2/scripts.inc @@ -2,9 +2,9 @@ Route2_MapScripts:: @ 8167F64 .byte 0 Route2_EventScript_167F65:: @ 8167F65 - msgbox gUnknown_818345E, 3 + msgbox gUnknown_818345E, MSGBOX_SIGN end Route2_EventScript_167F6E:: @ 8167F6E - msgbox gUnknown_8183482, 3 + msgbox gUnknown_8183482, MSGBOX_SIGN end diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index be0098a71..a034c3610 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -1,12 +1,10 @@ Route20_MapScripts:: @ 816823B - map_script 3, Route20_MapScript1_168241 + map_script MAP_SCRIPT_ON_TRANSITION, Route20_OnTransition .byte 0 -Route20_MapScript1_168241:: @ 8168241 - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if FALSE, EventScript_168254 - checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT - call_if FALSE, EventScript_16826D +Route20_OnTransition:: @ 8168241 + call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_168254 + call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_16826D end EventScript_168254:: @ 8168254 @@ -30,5 +28,5 @@ EventScript_16826D:: @ 816826D return Route20_EventScript_168280:: @ 8168280 - msgbox gUnknown_81882D1, 3 + msgbox gUnknown_81882D1, MSGBOX_SIGN end diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 8a775e09c..8036883f3 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -3,7 +3,7 @@ Route22_MapScripts:: @ 816828B Route22_EventScript_16828C:: @ 816828C lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1682BE EventScript_168297:: @ 8168297 @@ -11,7 +11,7 @@ EventScript_168297:: @ 8168297 Route22_EventScript_168298:: @ 8168298 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 25, 5 goto EventScript_1682BE @@ -20,7 +20,7 @@ EventScript_1682AA:: @ 81682AA Route22_EventScript_1682AB:: @ 81682AB lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setobjectxyperm 1, 25, 5 goto EventScript_1682BE @@ -31,30 +31,30 @@ EventScript_1682BE:: @ 81682BE textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_168350 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_168350 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16835B + compare VAR_TEMP_1, 0 + call_if_eq EventScript_168350 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_168350 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16835B delay 6 msgbox gUnknown_8188890 - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_16836D - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_16837C - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_16838B + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_16836D + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_16837C + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_16838B msgbox gUnknown_8188974 closemessage delay 10 playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16839A - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16839A - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1683A5 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16839A + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16839A + compare VAR_TEMP_1, 2 + call_if_eq EventScript_1683A5 fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_ROUTE22, 2 @@ -68,20 +68,20 @@ EventScript_168350:: @ 8168350 EventScript_16835B:: @ 816835B applymovement 1, Movement_1683D9 - applymovement 255, Movement_1683E3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3 waitmovement 0 return EventScript_16836D:: @ 816836D - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A return EventScript_16837C:: @ 816837C - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A return EventScript_16838B:: @ 816838B - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A return EventScript_16839A:: @ 816839A @@ -95,81 +95,81 @@ EventScript_1683A5:: @ 81683A5 return Movement_1683B0:: @ 8 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_1683B8:: @ 81683B8 - step_10 - step_13 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_1683C5:: @ 81683C5 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_1683D1:: @ 81683D1 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Movement_1683D9:: @ 81683D9 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_13 - step_2d + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end Movement_1683E3:: @ 81683E3 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c - step_1b - step_2e + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_up step_end Route22_EventScript_1683ED:: @ 81683ED lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16841F EventScript_1683F8:: @ 81683F8 @@ -177,7 +177,7 @@ EventScript_1683F8:: @ 81683F8 Route22_EventScript_1683F9:: @ 81683F9 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 25, 5 goto EventScript_16841F @@ -186,7 +186,7 @@ EventScript_16840B:: @ 816840B Route22_EventScript_16840C:: @ 816840C lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setobjectxyperm 1, 25, 5 goto EventScript_16841F @@ -197,20 +197,20 @@ EventScript_16841F:: @ 816841F textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16849C - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16849C - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1684A7 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16849C + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16849C + compare VAR_TEMP_1, 2 + call_if_eq EventScript_1684A7 msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_1684B9 - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_1684C4 - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_1684CF + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_1684B9 + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_1684C4 + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_1684CF msgbox gUnknown_8188B29 closemessage delay 10 @@ -230,32 +230,32 @@ EventScript_16849C:: @ 816849C EventScript_1684A7:: @ 81684A7 applymovement 1, Movement_1683D9 - applymovement 255, Movement_1683E3 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3 waitmovement 0 return EventScript_1684B9:: @ 81684B9 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, 0, Text_188B08 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08 return EventScript_1684C4:: @ 81684C4 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, 0, Text_188B08 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08 return EventScript_1684CF:: @ 81684CF - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, 0, Text_188B08 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08 return Movement_1684DA:: @ 81684DA - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 - step_12 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route22_EventScript_1684E2:: @ 81684E2 - msgbox gUnknown_8188BFF, 3 + msgbox gUnknown_8188BFF, MSGBOX_SIGN end diff --git a/data/maps/Route22_NorthEntrance/scripts.inc b/data/maps/Route22_NorthEntrance/scripts.inc index 49fba6173..afbfbb165 100644 --- a/data/maps/Route22_NorthEntrance/scripts.inc +++ b/data/maps/Route22_NorthEntrance/scripts.inc @@ -4,14 +4,14 @@ Route22_NorthEntrance_MapScripts:: @ 81704FB Route22_NorthEntrance_EventScript_1704FC:: @ 81704FC lock faceplayer - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 getstdstring 0, 15 goto EventScript_1A7803 end Route22_NorthEntrance_EventScript_17050D:: @ 817050D lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setvar VAR_0x8009, 1 getstdstring 0, 15 goto EventScript_1A796E diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index ed827114c..b5c8da4f3 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -1,8 +1,8 @@ Route23_MapScripts:: @ 81684EB - map_script 3, Route23_MapScript1_1684F1 + map_script MAP_SCRIPT_ON_TRANSITION, Route23_OnTransition .byte 0 -Route23_MapScript1_1684F1:: @ 81684F1 +Route23_OnTransition:: @ 81684F1 clearflag FLAG_HIDE_VICTORY_ROAD_3F_BOULDER setflag FLAG_HIDE_VICTORY_ROAD_2F_BOULDER setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 0 @@ -14,7 +14,7 @@ Route23_MapScript1_1684F1:: @ 81684F1 Route23_EventScript_16850C:: @ 816850C lock faceplayer - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 getstdstring 0, 16 goto EventScript_1A786C end @@ -22,7 +22,7 @@ Route23_EventScript_16850C:: @ 816850C Route23_EventScript_16851D:: @ 816851D lock faceplayer - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 getstdstring 0, 17 goto EventScript_1A786C end @@ -30,7 +30,7 @@ Route23_EventScript_16851D:: @ 816851D Route23_EventScript_16852E:: @ 816852E lock faceplayer - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 getstdstring 0, 18 goto EventScript_1A786C end @@ -38,7 +38,7 @@ Route23_EventScript_16852E:: @ 816852E Route23_EventScript_16853F:: @ 816853F lock faceplayer - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 getstdstring 0, 19 goto EventScript_1A786C end @@ -46,7 +46,7 @@ Route23_EventScript_16853F:: @ 816853F Route23_EventScript_168550:: @ 8168550 lock faceplayer - setvar VAR_0x4001, 6 + setvar VAR_TEMP_1, 6 getstdstring 0, 20 goto EventScript_1A786C end @@ -54,7 +54,7 @@ Route23_EventScript_168550:: @ 8168550 Route23_EventScript_168561:: @ 8168561 lock faceplayer - setvar VAR_0x4001, 7 + setvar VAR_TEMP_1, 7 getstdstring 0, 21 goto EventScript_1A786C end @@ -62,14 +62,14 @@ Route23_EventScript_168561:: @ 8168561 Route23_EventScript_168572:: @ 8168572 lock faceplayer - setvar VAR_0x4001, 8 + setvar VAR_TEMP_1, 8 getstdstring 0, 22 goto EventScript_1A786C end Route23_EventScript_168583:: @ 8168583 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setvar VAR_0x8009, 1 getstdstring 0, 16 goto EventScript_1A796E @@ -77,7 +77,7 @@ Route23_EventScript_168583:: @ 8168583 Route23_EventScript_168598:: @ 8168598 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 setvar VAR_0x8009, 2 getstdstring 0, 17 goto EventScript_1A796E @@ -85,7 +85,7 @@ Route23_EventScript_168598:: @ 8168598 Route23_EventScript_1685AD:: @ 81685AD lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 setvar VAR_0x8009, 3 getstdstring 0, 18 goto EventScript_1A796E @@ -93,7 +93,7 @@ Route23_EventScript_1685AD:: @ 81685AD Route23_EventScript_1685C2:: @ 81685C2 lockall - setvar VAR_0x4001, 5 + setvar VAR_TEMP_1, 5 setvar VAR_0x8009, 4 getstdstring 0, 19 goto EventScript_1A796E @@ -101,7 +101,7 @@ Route23_EventScript_1685C2:: @ 81685C2 Route23_EventScript_1685D7:: @ 81685D7 lockall - setvar VAR_0x4001, 6 + setvar VAR_TEMP_1, 6 setvar VAR_0x8009, 5 getstdstring 0, 20 goto EventScript_1A796E @@ -109,7 +109,7 @@ Route23_EventScript_1685D7:: @ 81685D7 Route23_EventScript_1685EC:: @ 81685EC lockall - setvar VAR_0x4001, 7 + setvar VAR_TEMP_1, 7 setvar VAR_0x8009, 6 getstdstring 0, 21 goto EventScript_1A796E @@ -117,12 +117,12 @@ Route23_EventScript_1685EC:: @ 81685EC Route23_EventScript_168601:: @ 8168601 lockall - setvar VAR_0x4001, 8 + setvar VAR_TEMP_1, 8 setvar VAR_0x8009, 7 getstdstring 0, 22 goto EventScript_1A796E end Route23_EventScript_168616:: @ 8168616 - msgbox gUnknown_8188C19, 3 + msgbox gUnknown_8188C19, MSGBOX_SIGN end diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 9cf6bf74d..56edad166 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route24_EventScript_1BE644", + "script": "Route24_EventScript_ItemTM45", "flag": "FLAG_HIDE_ROUTE24_TM45" } ], diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 2760e17a3..e30913e52 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -4,12 +4,12 @@ Route24_MapScripts:: @ 816861F Route24_EventScript_168620:: @ 8168620 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_ROUTE24, 1 - goto_if eq, EventScript_168656 + compare VAR_MAP_SCENE_ROUTE24, 1 + goto_if_eq EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16864C + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16864C call EventScript_1686B9 release end @@ -26,41 +26,40 @@ EventScript_168656:: @ 8168656 Route24_EventScript_168660:: @ 8168660 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_168678 end Route24_EventScript_16866C:: @ 816866C lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_168678 end EventScript_168678:: @ 8168678 textcolor 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_1686FD - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_168708 - applymovement 255, Movement_1A75EB + compare VAR_TEMP_1, 0 + call_if_eq EventScript_1686FD + compare VAR_TEMP_1, 1 + call_if_eq EventScript_168708 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_168713 + compare VAR_RESULT, 0 + goto_if_eq EventScript_168713 call EventScript_1686B9 releaseall end EventScript_1686B9:: @ 81686B9 - additem ITEM_NUGGET, 1 - giveitemfanfaremsg gUnknown_8188C93, ITEM_NUGGET + giveitem_msg gUnknown_8188C93, ITEM_NUGGET message Text_188CDB waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, 1 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_6, 0, Text_188DDC + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Text_188DDC msgbox gUnknown_8188DF1 setvar VAR_MAP_SCENE_ROUTE24, 1 return @@ -71,17 +70,17 @@ EventScript_1686FD:: @ 81686FD return EventScript_168708:: @ 8168708 - applymovement 1, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_168713:: @ 8168713 msgbox gUnknown_8188CC2 closemessage - applymovement 255, Movement_168743 + applymovement OBJ_EVENT_ID_PLAYER, Movement_168743 waitmovement 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_168733 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_168733 release end @@ -91,14 +90,14 @@ EventScript_168733:: @ 8168733 return Movement_16873E:: @ 816873E - step_12 + walk_left step_end Movement_168740:: @ 8168740 - step_13 - step_2f + walk_right + walk_in_place_fastest_left step_end Movement_168743:: @ 8168743 - step_10 + walk_down step_end diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index d369225d3..c3f1520d5 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -146,7 +146,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_EventScript_1BE651", + "script": "Route25_EventScript_ItemTM43", "flag": "FLAG_HIDE_ROUTE25_TM43" }, { diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc index 81b2704d4..d214cdbf6 100644 --- a/data/maps/Route25/scripts.inc +++ b/data/maps/Route25/scripts.inc @@ -2,9 +2,9 @@ Route25_MapScripts:: @ 8168745 .byte 0 Route25_EventScript_168746:: @ 8168746 - msgbox gUnknown_818954C, 3 + msgbox gUnknown_818954C, MSGBOX_SIGN end Route25_EventScript_16874F:: @ 816874F - msgbox gUnknown_81895C2, 2 + msgbox gUnknown_81895C2, MSGBOX_NPC end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index e8d016a02..ed5aca2c8 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -1,12 +1,10 @@ Route25_SeaCottage_MapScripts:: @ 8170523 - map_script 3, Route25_SeaCottage_MapScript1_170529 + map_script MAP_SCRIPT_ON_TRANSITION, Route25_SeaCottage_OnTransition .byte 0 -Route25_SeaCottage_MapScript1_170529:: @ 8170529 - checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE - call_if FALSE, EventScript_17053C - checkflag FLAG_GOT_SS_TICKET - call_if TRUE, EventScript_170547 +Route25_SeaCottage_OnTransition:: @ 8170529 + call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17053C + call_if_set FLAG_GOT_SS_TICKET, EventScript_170547 end EventScript_17053C:: @ 817053C @@ -21,17 +19,14 @@ EventScript_170547:: @ 8170547 Route25_SeaCottage_EventScript_17054B:: @ 817054B lock faceplayer - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_1706C8 - checkflag FLAG_GOT_SS_TICKET - goto_if TRUE, EventScript_170640 - checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE - goto_if TRUE, EventScript_17064A + goto_if_set FLAG_TEMP_3, EventScript_1706C8 + goto_if_set FLAG_GOT_SS_TICKET, EventScript_170640 + goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17064A checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_170580 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_17058E + compare VAR_RESULT, MALE + goto_if_eq EventScript_170580 + compare VAR_RESULT, FEMALE + goto_if_eq EventScript_17058E end EventScript_170580:: @ 8170580 @@ -45,19 +40,19 @@ EventScript_17058E:: @ 817058E end EventScript_17059C:: @ 817059C - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_170600 + compare VAR_RESULT, NO + call_if_eq EventScript_170600 msgbox gUnknown_819FFD3 closemessage delay 10 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_17062A - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_170635 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_170635 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_170635 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_17062A + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_170635 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_170635 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_170635 opendoor 10, 3 waitdooranim applymovement 2, Movement_1706DB @@ -72,10 +67,10 @@ EventScript_17059C:: @ 817059C EventScript_170600:: @ 8170600 checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_170618 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_170621 + compare VAR_RESULT, MALE + call_if_eq EventScript_170618 + compare VAR_RESULT, FEMALE + call_if_eq EventScript_170621 return EventScript_170618:: @ 8170618 @@ -104,15 +99,14 @@ EventScript_170640:: @ 8170640 EventScript_17064A:: @ 817064A famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_1706AC - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_1706B5 + compare VAR_RESULT, MALE + call_if_eq EventScript_1706AC + compare VAR_RESULT, FEMALE + call_if_eq EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1706BE - additem ITEM_SS_TICKET, 1 - giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1706BE + giveitem_msg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 setflag FLAG_GOT_SS_TICKET_DUP setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET setflag FLAG_GOT_SS_TICKET @@ -139,28 +133,26 @@ EventScript_1706C8:: @ 81706C8 end Movement_1706D2:: @ 81706D2 - step_11 - step_11 + walk_up + walk_up step_end Movement_1706D5:: @ 81706D5 - step_13 - step_11 - step_11 - step_12 - step_2e + walk_right + walk_up + walk_up + walk_left + walk_in_place_fastest_up step_end Movement_1706DB:: @ 81706DB - step_11 + walk_up step_end Route25_SeaCottage_EventScript_1706DD:: @ 81706DD lockall - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_1707CA - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_1706FA + goto_if_set FLAG_TEMP_3, EventScript_1707CA + goto_if_set FLAG_TEMP_2, EventScript_1706FA msgbox gUnknown_81A0402 releaseall end @@ -172,7 +164,7 @@ EventScript_1706FA:: @ 81706FA clearflag FLAG_TEMP_2 setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE special SpawnCameraObject - applymovement 127, Movement_1707BE + applymovement OBJ_EVENT_ID_CAMERA, Movement_1707BE waitmovement 0 delay 35 playse SE_PIN @@ -207,7 +199,7 @@ EventScript_1706FA:: @ 81706FA applymovement 1, Movement_170888 waitmovement 0 waitfanfare - applymovement 127, Movement_1707C3 + applymovement OBJ_EVENT_ID_CAMERA, Movement_1707C3 waitmovement 0 playse SE_C_MAKU_D closedoor 3, 3 @@ -225,19 +217,19 @@ EventScript_1707B6:: @ 81707B6 return Movement_1707BE:: @ 81707BE - step_11 - step_11 - step_13 - step_13 + walk_up + walk_up + walk_right + walk_right step_end Movement_1707C3:: @ 81707C3 - step_1c - step_1c - step_10 - step_10 - step_12 - step_12 + delay_16 + delay_16 + walk_down + walk_down + walk_left + walk_left step_end EventScript_1707CA:: @ 81707CA @@ -299,14 +291,14 @@ EventScript_17087F:: @ 817087F end Movement_170881:: @ 8170881 - step_13 - step_13 - step_13 - step_13 - step_10 - step_10 + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down step_end Movement_170888:: @ 8170888 - step_10 + walk_down step_end diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index de3889bf4..cba95dc0b 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -5,23 +5,21 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F lock faceplayer call EventScript_16F70B - checkflag FLAG_GOT_HM05 - goto_if TRUE, EventScript_16F701 + goto_if_set FLAG_GOT_HM05, EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + compare VAR_RESULT, NO + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16F70B - compare_var_to_value VAR_0x8006, 10 - goto_if lt, EventScript_1A7ABD + compare VAR_0x8006, 10 + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_HM05, 1 - giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819D7A1, ITEM_HM05 setflag FLAG_GOT_HM05 msgbox gUnknown_819D7C1 release @@ -38,5 +36,5 @@ EventScript_16F70B:: @ 816F70B return Route2_EastBuilding_EventScript_16F714:: @ 816F714 - msgbox gUnknown_819D81E, 2 + msgbox gUnknown_819D81E, MSGBOX_NPC end diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 62367586d..f4bc2d0ed 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -2,7 +2,7 @@ Route2_House_MapScripts:: @ 816F5F8 .byte 0 Route2_House_EventScript_16F5F9:: @ 816F5F9 - msgbox gUnknown_819D5E7, 2 + msgbox gUnknown_819D5E7, MSGBOX_NPC end Route2_House_EventScript_16F602:: @ 816F602 @@ -10,17 +10,16 @@ Route2_House_EventScript_16F602:: @ 816F602 faceplayer setvar VAR_0x8008, 0 call EventScript_1A8CAD - checkflag FLAG_DID_MIMIEN_TRADE - goto_if TRUE, EventScript_16F674 + goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16F65C + compare VAR_RESULT, NO + goto_if_eq EventScript_16F65C call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_16F65C + compare VAR_0x8004, 6 + goto_if_ge EventScript_16F65C call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16F666 + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_16F666 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_MIMIEN_TRADE diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc index 6ed3f355a..29e6bd757 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc @@ -2,13 +2,13 @@ Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D .byte 0 Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E - msgbox gUnknown_819D85C, 2 + msgbox gUnknown_819D85C, MSGBOX_NPC end Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727 - msgbox gUnknown_819D8D0, 2 + msgbox gUnknown_819D8D0, MSGBOX_NPC end Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730 - msgbox gUnknown_819D93B, 2 + msgbox gUnknown_819D93B, MSGBOX_NPC end diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc index a8aba4941..aea8bfaa4 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc @@ -2,9 +2,9 @@ Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5 .byte 0 Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6 - msgbox gUnknown_819D52C, 2 + msgbox gUnknown_819D52C, MSGBOX_NPC end Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF - msgbox gUnknown_819D58B, 2 + msgbox gUnknown_819D58B, MSGBOX_NPC end diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc index 7bf593794..bc44936d0 100644 --- a/data/maps/Route3/scripts.inc +++ b/data/maps/Route3/scripts.inc @@ -2,9 +2,9 @@ Route3_MapScripts:: @ 8167F77 .byte 0 Route3_EventScript_167F78:: @ 8167F78 - msgbox gUnknown_8183491, 2 + msgbox gUnknown_8183491, MSGBOX_NPC end Route3_EventScript_167F81:: @ 8167F81 - msgbox gUnknown_81838C0, 3 + msgbox gUnknown_81838C0, MSGBOX_SIGN end diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index b628beefc..1e1dba0c7 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1BE637", + "script": "Route4_EventScript_ItemTM05", "flag": "FLAG_HIDE_ROUTE4_TM05" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1C494E", + "script": "Route4_EventScript_MegaPunchTutor", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1C49B6", + "script": "Route4_EventScript_MegaKickTutor", "flag": "0" }, { diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc index 230c13d3b..9055722eb 100644 --- a/data/maps/Route4/scripts.inc +++ b/data/maps/Route4/scripts.inc @@ -5,13 +5,13 @@ Route4_EventScript_167F8B:: @ 8167F8B end Route4_EventScript_167F8C:: @ 8167F8C - msgbox gUnknown_81838D7, 2 + msgbox gUnknown_81838D7, MSGBOX_NPC end Route4_EventScript_167F95:: @ 8167F95 - msgbox gUnknown_818399B, 3 + msgbox gUnknown_818399B, MSGBOX_SIGN end Route4_EventScript_167F9E:: @ 8167F9E - msgbox gUnknown_81839B4, 3 + msgbox gUnknown_81839B4, MSGBOX_SIGN end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 4b485bbbd..bd2864629 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,15 +1,15 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 - map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744 - map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 +Route4_PokemonCenter_1F_OnTransition:: @ 816F744 setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F setrespawn SPAWN_ROUTE4 end Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B - msgbox gUnknown_819D9D4, 2 + msgbox gUnknown_819D9D4, MSGBOX_NPC end Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 @@ -21,14 +21,13 @@ Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F lock faceplayer - checkflag FLAG_BOUGHT_MAGIKARP - goto_if TRUE, EventScript_16F8A2 + goto_if_set FLAG_BOUGHT_MAGIKARP, EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16F786 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F794 + compare VAR_RESULT, MALE + goto_if_eq EventScript_16F786 + compare VAR_RESULT, FEMALE + goto_if_eq EventScript_16F794 end EventScript_16F786:: @ 816F786 @@ -42,29 +41,29 @@ EventScript_16F794:: @ 816F794 end EventScript_16F7A2:: @ 816F7A2 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16F888 + compare VAR_RESULT, NO + goto_if_eq EventScript_16F888 checkmoney 500, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16F895 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16F895 textcolor 3 - setvar VAR_0x4001, 129 - givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16F7F6 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F822 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_16F8AC + setvar VAR_TEMP_1, 129 + givemon SPECIES_MAGIKARP, 5, ITEM_NONE + compare VAR_RESULT, 0 + goto_if_eq EventScript_16F7F6 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F822 + compare VAR_RESULT, 2 + goto_if_eq EventScript_16F8AC end EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16F861 + compare VAR_RESULT, NO + goto_if_eq EventScript_16F861 call EventScript_1A8C27 - fadescreen 1 + fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangePokemonNickname waitstate @@ -74,9 +73,9 @@ EventScript_16F7F6:: @ 816F7F6 EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16F84B - fadescreen 1 + compare VAR_RESULT, NO + goto_if_eq EventScript_16F84B + fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangeBoxPokemonNickname waitstate @@ -142,12 +141,12 @@ EventScript_16F8AC:: @ 816F8AC Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 - msgbox gUnknown_819DCDB, 2 + msgbox gUnknown_819DCDB, MSGBOX_NPC end Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 2501fc3f4..f602e0e25 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index bff6832da..32b1905a4 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 - map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +Route4_PokemonCenter_2F_EventScript_Colosseum:: @ 816F8ED + call CableClub_EventScript_Colosseum end -EventScript_16F8F3:: @ 816F8F3 - call EventScript_1BB6AB +Route4_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F8F3 + call CableClub_EventScript_TradeCenter end -EventScript_16F8F9:: @ 816F8F9 - call EventScript_1BB7DE +Route4_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F8F9 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc index 8356751b7..3e1b507d2 100644 --- a/data/maps/Route5/scripts.inc +++ b/data/maps/Route5/scripts.inc @@ -2,5 +2,5 @@ Route5_MapScripts:: @ 8167FA7 .byte 0 Route5_EventScript_167FA8:: @ 8167FA8 - msgbox gUnknown_8183DD4, 3 + msgbox gUnknown_8183DD4, MSGBOX_SIGN end diff --git a/data/maps/Route5/text.inc b/data/maps/Route5/text.inc index 066d8cfa6..0a3e80874 100644 --- a/data/maps/Route5/text.inc +++ b/data/maps/Route5/text.inc @@ -1,4 +1,4 @@ -Text_1839D5:: @ 81839D5 +Text_MegaPunchTeach:: @ 81839D5 .string "A punch of roaring ferocity!\p" .string "Packed with destructive power!\p" .string "When the chips are down,\n" @@ -7,22 +7,22 @@ Text_1839D5:: @ 81839D5 .string "Now!\n" .string "Let me teach it to your POKéMON!$" -Text_183A83:: @ 8183A83 +Text_MegaPunchDeclined:: @ 8183A83 .string "You'll be back when you understand\n" .string "the worth of MEGA PUNCH.$" -Text_183ABF:: @ 8183ABF +Text_MegaPunchWhichMon:: @ 8183ABF .string "Fine!\n" .string "Which POKéMON will learn it?$" -Text_183AE2:: @ 8183AE2 +Text_MegaPunchTaught:: @ 8183AE2 .string "Now, we are comrades in the way of\n" .string "punching!\p" .string "You should go before you're seen\n" .string "by the misguided fool who trains\l" .string "only his silly kicking over there.$" -Text_183B74:: @ 8183B74 +Text_MegaKickTeach:: @ 8183B74 .string "A kick of brutal ferocity!\p" .string "Packed with destructive power!\p" .string "When you get right down to it,\n" @@ -31,15 +31,15 @@ Text_183B74:: @ 8183B74 .string "Okay!\n" .string "I'll teach it to your POKéMON!$" -Text_183C25:: @ 8183C25 +Text_MegaKickDeclined:: @ 8183C25 .string "You'll come crawling back when you\n" .string "realize the value of MEGA KICK.$" -Text_183C68:: @ 8183C68 +Text_MegaKickWhichMon:: @ 8183C68 .string "All right!\n" .string "Which POKéMON wants to learn it?$" -Text_183C94:: @ 8183C94 +Text_MegaKickTaught:: @ 8183C94 .string "Now, we are soul mates in the way\n" .string "of kicking!\p" .string "You should run before you're seen\n" diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index fd8a5f6fc..f20da71ae 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -2,36 +2,35 @@ Route5_SouthEntrance_MapScripts:: @ 816F900 .byte 0 Route5_SouthEntrance_EventScript_16F901:: @ 816F901 - msgbox gUnknown_819E16D, 2 + msgbox gUnknown_819E16D, MSGBOX_NPC end Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16F92E end Route5_SouthEntrance_EventScript_16F916:: @ 816F916 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16F92E end Route5_SouthEntrance_EventScript_16F922:: @ 816F922 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16F92E end EventScript_16F92E:: @ 816F92E textcolor 0 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16F958 + goto_if_set FLAG_GOT_TEA, EventScript_16F958 msgbox gUnknown_819E04B closemessage - applymovement 255, Movement_16F9C4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4 waitmovement 0 releaseall end @@ -44,45 +43,45 @@ EventScript_16F958:: @ 816F958 EventScript_16F963:: @ 816F963 msgbox gUnknown_819E09B closemessage - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16F99C - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16F9A7 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16F9B2 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16F99C + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16F9A7 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16F9B2 msgbox gUnknown_819E0C1 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end EventScript_16F99C:: @ 816F99C - applymovement 255, Movement_16F9C2 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C2 waitmovement 0 return EventScript_16F9A7:: @ 816F9A7 - applymovement 255, Movement_16F9BD + applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BD waitmovement 0 return EventScript_16F9B2:: @ 816F9B2 - applymovement 255, Movement_16F9BF + applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BF waitmovement 0 return Movement_16F9BD:: @ 816F9BD - step_12 + walk_left step_end Movement_16F9BF:: @ 816F9BF - step_12 - step_12 + walk_left + walk_left step_end Movement_16F9C2:: @ 816F9C2 - step_27 + walk_in_place_left step_end Movement_16F9C4:: @ 816F9C4 - step_11 + walk_up step_end diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc index 773e1c091..00b3efb56 100644 --- a/data/maps/Route6/scripts.inc +++ b/data/maps/Route6/scripts.inc @@ -2,5 +2,5 @@ Route6_MapScripts:: @ 8167FB1 .byte 0 Route6_EventScript_167FB2:: @ 8167FB2 - msgbox gUnknown_8184067, 3 + msgbox gUnknown_8184067, MSGBOX_SIGN end diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 6edd20f21..d1b9a4555 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -2,36 +2,35 @@ Route6_NorthEntrance_MapScripts:: @ 816F9C6 .byte 0 Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 - msgbox gUnknown_819E2A3, 2 + msgbox gUnknown_819E2A3, MSGBOX_NPC end Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16F9F4 end Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16F9F4 end Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16F9F4 end EventScript_16F9F4:: @ 816F9F4 textcolor 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16FA1E + goto_if_set FLAG_GOT_TEA, EventScript_16FA1E msgbox gUnknown_819E181 closemessage - applymovement 255, Movement_16FA8A + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A waitmovement 0 releaseall end @@ -44,45 +43,45 @@ EventScript_16FA1E:: @ 816FA1E EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16FA62 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16FA6D - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16FA78 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16FA62 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16FA6D + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16FA78 msgbox gUnknown_819E1F7 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end EventScript_16FA62:: @ 816FA62 - applymovement 255, Movement_16FA83 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA83 waitmovement 0 return EventScript_16FA6D:: @ 816FA6D - applymovement 255, Movement_16FA86 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA86 waitmovement 0 return EventScript_16FA78:: @ 816FA78 - applymovement 255, Movement_16FA88 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA88 waitmovement 0 return Movement_16FA83:: @ 816FA83 - step_13 - step_13 + walk_right + walk_right step_end Movement_16FA86:: @ 816FA86 - step_13 + walk_right step_end Movement_16FA88:: @ 816FA88 - step_28 + walk_in_place_right step_end Movement_16FA8A:: @ 816FA8A - step_10 + walk_down step_end diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc index ec34892f4..52d0f5f36 100644 --- a/data/maps/Route7/scripts.inc +++ b/data/maps/Route7/scripts.inc @@ -2,5 +2,5 @@ Route7_MapScripts:: @ 8167FBB .byte 0 Route7_EventScript_167FBC:: @ 8167FBC - msgbox gUnknown_8184097, 3 + msgbox gUnknown_8184097, MSGBOX_SIGN end diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index f8885b53d..cac72463b 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -2,36 +2,35 @@ Route7_EastEntrance_MapScripts:: @ 816FA8D .byte 0 Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E - msgbox gUnknown_819E3D9, 2 + msgbox gUnknown_819E3D9, MSGBOX_NPC end Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16FABB end Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16FABB end Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16FABB end EventScript_16FABB:: @ 816FABB textcolor 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16FAE5 + goto_if_set FLAG_GOT_TEA, EventScript_16FAE5 msgbox gUnknown_819E2B7 closemessage - applymovement 255, Movement_16FB51 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51 waitmovement 0 releaseall end @@ -44,45 +43,45 @@ EventScript_16FAE5:: @ 816FAE5 EventScript_16FAF0:: @ 816FAF0 msgbox gUnknown_819E307 closemessage - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16FB29 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16FB34 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16FB3F + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16FB29 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16FB34 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16FB3F msgbox gUnknown_819E32D setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end EventScript_16FB29:: @ 816FB29 - applymovement 255, Movement_16FB4F + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4F waitmovement 0 return EventScript_16FB34:: @ 816FB34 - applymovement 255, Movement_16FB4A + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4A waitmovement 0 return EventScript_16FB3F:: @ 816FB3F - applymovement 255, Movement_16FB4C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4C waitmovement 0 return Movement_16FB4A:: @ 816FB4A - step_11 + walk_up step_end Movement_16FB4C:: @ 816FB4C - step_11 - step_11 + walk_up + walk_up step_end Movement_16FB4F:: @ 816FB4F - step_26 + walk_in_place_up step_end Movement_16FB51:: @ 816FB51 - step_12 + walk_left step_end diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc index d2bc3749b..c0f7475f3 100644 --- a/data/maps/Route8/scripts.inc +++ b/data/maps/Route8/scripts.inc @@ -2,5 +2,5 @@ Route8_MapScripts:: @ 8167FC5 .byte 0 Route8_EventScript_167FC6:: @ 8167FC6 - msgbox gUnknown_8184576, 3 + msgbox gUnknown_8184576, MSGBOX_SIGN end diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index dfdb0b7ae..df9d1035c 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -2,36 +2,35 @@ Route8_WestEntrance_MapScripts:: @ 816FB53 .byte 0 Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 - msgbox gUnknown_819E50F, 2 + msgbox gUnknown_819E50F, MSGBOX_NPC end Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16FB81 end Route8_WestEntrance_EventScript_16FB69:: @ 816FB69 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16FB81 end Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_16FB81 end EventScript_16FB81:: @ 816FB81 textcolor 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16FBAB + goto_if_set FLAG_GOT_TEA, EventScript_16FBAB msgbox gUnknown_819E3ED closemessage - applymovement 255, Movement_16FC2D + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D waitmovement 0 releaseall end @@ -54,45 +53,45 @@ EventScript_16FBC1:: @ 816FBC1 EventScript_16FBCC:: @ 816FBCC msgbox gUnknown_819E43D closemessage - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16FC05 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16FC10 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16FC1B + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16FC05 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16FC10 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16FC1B msgbox gUnknown_819E463 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end EventScript_16FC05:: @ 816FC05 - applymovement 255, Movement_16FC2B + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2B waitmovement 0 return EventScript_16FC10:: @ 816FC10 - applymovement 255, Movement_16FC26 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC26 waitmovement 0 return EventScript_16FC1B:: @ 816FC1B - applymovement 255, Movement_16FC28 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC28 waitmovement 0 return Movement_16FC26:: @ 816FC26 - step_11 + walk_up step_end Movement_16FC28:: @ 816FC28 - step_11 - step_11 + walk_up + walk_up step_end Movement_16FC2B:: @ 816FC2B - step_26 + walk_in_place_up step_end Movement_16FC2D:: @ 816FC2D - step_13 + walk_right step_end diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index b8e4aef83..c130136b9 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route9_EventScript_1BE6B9", + "script": "Route9_EventScript_ItemTM40", "flag": "FLAG_HIDE_ROUTE9_TM40" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route9_EventScript_1BEAFD", + "script": "Route9_EventScript_ItemBurnHeal", "flag": "FLAG_HIDE_ROUTE9_BURN_HEAL" } ], diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc index 6c3b7927b..1b48cd68e 100644 --- a/data/maps/Route9/scripts.inc +++ b/data/maps/Route9/scripts.inc @@ -2,5 +2,5 @@ Route9_MapScripts:: @ 8167FCF .byte 0 Route9_EventScript_167FD0:: @ 8167FD0 - msgbox gUnknown_8184B66, 3 + msgbox gUnknown_8184B66, MSGBOX_SIGN end diff --git a/data/maps/SSAnne_1F_Corridor/scripts.inc b/data/maps/SSAnne_1F_Corridor/scripts.inc index d9bd8c051..21967cf04 100644 --- a/data/maps/SSAnne_1F_Corridor/scripts.inc +++ b/data/maps/SSAnne_1F_Corridor/scripts.inc @@ -2,9 +2,9 @@ SSAnne_1F_Corridor_MapScripts:: @ 81608CB .byte 0 SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC - msgbox gUnknown_8172EE7, 2 + msgbox gUnknown_8172EE7, MSGBOX_NPC end SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5 - msgbox gUnknown_8172F60, 2 + msgbox gUnknown_8172F60, MSGBOX_NPC end diff --git a/data/maps/SSAnne_1F_Room1/scripts.inc b/data/maps/SSAnne_1F_Room1/scripts.inc index ca75fd46d..5f610c830 100644 --- a/data/maps/SSAnne_1F_Room1/scripts.inc +++ b/data/maps/SSAnne_1F_Room1/scripts.inc @@ -2,5 +2,5 @@ SSAnne_1F_Room1_MapScripts:: @ 8160BDB .byte 0 SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC - msgbox gUnknown_817393B, 2 + msgbox gUnknown_817393B, MSGBOX_NPC end diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index a9ec320be..05b54f33b 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Room2_EventScript_1BE65E", + "script": "SSAnne_1F_Room2_EventScript_ItemTM31", "flag": "FLAG_HIDE_SSANNE_1F_ROOM2_TM31" } ], diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index ef73a522a..3a80d3cfe 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -2,15 +2,15 @@ SSAnne_1F_Room2_MapScripts:: @ 8160BE5 .byte 0 SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 - msgbox gUnknown_8173AC5, 2 + msgbox gUnknown_8173AC5, MSGBOX_NPC end SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ANN, 0, Text_173A1A, Text_173A4F - msgbox gUnknown_8173A7A, 6 + trainerbattle_single TRAINER_LASS_ANN, Text_173A1A, Text_173A4F + msgbox gUnknown_8173A7A, MSGBOX_AUTOCLOSE end SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_TYLER, 0, Text_173999, Text_1739B1 - msgbox gUnknown_81739C5, 6 + trainerbattle_single TRAINER_YOUNGSTER_TYLER, Text_173999, Text_1739B1 + msgbox gUnknown_81739C5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc index bdfe2cc07..7b9651040 100644 --- a/data/maps/SSAnne_1F_Room3/scripts.inc +++ b/data/maps/SSAnne_1F_Room3/scripts.inc @@ -2,11 +2,11 @@ SSAnne_1F_Room3_MapScripts:: @ 8160C1D .byte 0 SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E - msgbox gUnknown_8173B21, 2 + msgbox gUnknown_8173B21, MSGBOX_NPC end SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27 - msgbox gUnknown_8173AFA, 2 + msgbox gUnknown_8173AFA, MSGBOX_NPC end SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30 diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index 2bede7e12..9e6f3fdc2 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -5,8 +5,8 @@ SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 lock faceplayer checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_160C5C + compare VAR_RESULT, MALE + goto_if_eq EventScript_160C5C msgbox gUnknown_8173BA4 release end diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 11040e58f..028442449 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -2,6 +2,6 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 .byte 0 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_ARTHUR, 0, Text_173BD1, Text_173BFA - msgbox gUnknown_8173C30, 6 + trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, Text_173BD1, Text_173BFA + msgbox gUnknown_8173C30, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 755c01a91..42c69fb3b 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -5,18 +5,18 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 lock faceplayer msgbox gUnknown_817445B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_160E18 + compare VAR_RESULT, NO + goto_if_eq EventScript_160E18 closemessage - call EventScript_FadeOut_Heal_FadeIn + call EventScript_OutOfCenterPartyHeal msgbox gUnknown_8174490 release end EventScript_160E18:: @ 8160E18 checkplayergender - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_160E2E + compare VAR_RESULT, MALE + goto_if_eq EventScript_160E2E msgbox gUnknown_8174515 release end diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index 96b0ae20a..5901ee65b 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -2,6 +2,6 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E .byte 0 SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_THOMAS, 0, Text_173C52, Text_173CB4 - msgbox gUnknown_8173CC4, 6 + trainerbattle_single TRAINER_GENTLEMAN_THOMAS, Text_173C52, Text_173CB4 + msgbox gUnknown_8173CC4, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 82d75a686..02b06920a 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -3,7 +3,7 @@ SSAnne_2F_Corridor_MapScripts:: @ 81608DE SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_160903 EventScript_1608EA:: @ 81608EA @@ -11,7 +11,7 @@ EventScript_1608EA:: @ 81608EA SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_160903 EventScript_1608F6:: @ 81608F6 @@ -19,7 +19,7 @@ EventScript_1608F6:: @ 81608F6 SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_160903 EventScript_160902:: @ 8160902 @@ -32,33 +32,33 @@ EventScript_160903:: @ 8160903 playbgm MUS_RIVAL1, 0 addobject 1 delay 10 - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 delay 20 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_1609AD - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_1609B8 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1609CA + compare VAR_TEMP_1, 0 + call_if_eq EventScript_1609AD + compare VAR_TEMP_1, 1 + call_if_eq EventScript_1609B8 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_1609CA msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_1609DC - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_1609E7 - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_1609F2 + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_1609DC + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_1609E7 + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_1609F2 msgbox gUnknown_8173164 closemessage delay 10 playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_1609FD - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_160A08 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_160A13 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_1609FD + compare VAR_TEMP_1, 1 + call_if_eq EventScript_160A08 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_160A13 fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 @@ -72,26 +72,26 @@ EventScript_1609AD:: @ 81609AD EventScript_1609B8:: @ 81609B8 applymovement 1, Movement_160A2E - applymovement 255, Movement_160A24 + applymovement OBJ_EVENT_ID_PLAYER, Movement_160A24 waitmovement 0 return EventScript_1609CA:: @ 81609CA - applymovement 255, Movement_160A1E + applymovement OBJ_EVENT_ID_PLAYER, Movement_160A1E applymovement 1, Movement_160A34 waitmovement 0 return EventScript_1609DC:: @ 81609DC - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_SQUIRTLE, 0, Text_173110 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, Text_173110 return EventScript_1609E7:: @ 81609E7 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_BULBASAUR, 0, Text_173110 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, Text_173110 return EventScript_1609F2:: @ 81609F2 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_CHARMANDER, 0, Text_173110 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, Text_173110 return EventScript_1609FD:: @ 81609FD @@ -110,75 +110,75 @@ EventScript_160A13:: @ 8160A13 return Movement_160A1E:: @ 8160A1E - step_1c - step_1c - step_1c - step_1c - step_2f + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end Movement_160A24:: @ 8160A24 - step_1c - step_1c - step_1c - step_1c - step_2f + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end Movement_160A2A:: @ 8160A2A - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down step_end Movement_160A2E:: @ 8160A2E - step_10 - step_10 - step_10 - step_10 - step_30 + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end Movement_160A34:: @ 8160A34 - step_10 - step_10 - step_10 - step_10 - step_13 - step_1a + walk_down + walk_down + walk_down + walk_down + walk_right + delay_4 step_end Movement_160A3B:: @ 8160A3B - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_160A44:: @ 8160A44 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_160A4C:: @ 8160A4C - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54 - msgbox gUnknown_8172FC3, 2 + msgbox gUnknown_8172FC3, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 1aeabe4d5..6875842e4 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room2_EventScript_1BE66B", + "script": "SSAnne_2F_Room2_EventScript_ItemStardust", "flag": "FLAG_HIDE_SSANNE_2F_ROOM2_STARDUST" } ], diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index cabf92f28..6568baa0e 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -2,11 +2,11 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 .byte 0 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_DALE, 0, Text_173DDB, Text_173DF7 - msgbox gUnknown_8173E04, 6 + trainerbattle_single TRAINER_FISHERMAN_DALE, Text_173DDB, Text_173DF7 + msgbox gUnknown_8173E04, MSGBOX_AUTOCLOSE end SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_BROOKS, 0, Text_173D63, Text_173D92 - msgbox gUnknown_8173DB6, 6 + trainerbattle_single TRAINER_GENTLEMAN_BROOKS, Text_173D63, Text_173D92 + msgbox gUnknown_8173DB6, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room3/scripts.inc b/data/maps/SSAnne_2F_Room3/scripts.inc index 577503151..33924805b 100644 --- a/data/maps/SSAnne_2F_Room3/scripts.inc +++ b/data/maps/SSAnne_2F_Room3/scripts.inc @@ -2,9 +2,9 @@ SSAnne_2F_Room3_MapScripts:: @ 8160CDF .byte 0 SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0 - msgbox gUnknown_8173E3A, 2 + msgbox gUnknown_8173E3A, MSGBOX_NPC end SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9 - msgbox gUnknown_8173E7B, 2 + msgbox gUnknown_8173E7B, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 8cba587e6..422d02458 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room4_EventScript_1BE678", + "script": "SSAnne_2F_Room4_EventScript_ItemXAttack", "flag": "FLAG_HIDE_SSANNE_2F_ROOM4_X_ATTACK" } ], diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 330b18acc..85ecb21bf 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -2,11 +2,11 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 .byte 0 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_LAMAR, 0, Text_173F07, Text_173F42 - msgbox gUnknown_8173F55, 6 + trainerbattle_single TRAINER_GENTLEMAN_LAMAR, Text_173F07, Text_173F42 + msgbox gUnknown_8173F55, MSGBOX_AUTOCLOSE end SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_DAWN, 0, Text_173F83, Text_173FAB - msgbox gUnknown_8173FB9, 6 + trainerbattle_single TRAINER_LASS_DAWN, Text_173F83, Text_173FAB + msgbox gUnknown_8173FB9, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room5/scripts.inc b/data/maps/SSAnne_2F_Room5/scripts.inc index fb835d315..9635b4bf7 100644 --- a/data/maps/SSAnne_2F_Room5/scripts.inc +++ b/data/maps/SSAnne_2F_Room5/scripts.inc @@ -2,9 +2,9 @@ SSAnne_2F_Room5_MapScripts:: @ 8160D21 .byte 0 SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22 - msgbox gUnknown_8173FF7, 2 + msgbox gUnknown_8173FF7, MSGBOX_NPC end SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B - msgbox gUnknown_817404F, 2 + msgbox gUnknown_817404F, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room6/scripts.inc b/data/maps/SSAnne_2F_Room6/scripts.inc index 2fb6544da..e92a5501e 100644 --- a/data/maps/SSAnne_2F_Room6/scripts.inc +++ b/data/maps/SSAnne_2F_Room6/scripts.inc @@ -2,9 +2,9 @@ SSAnne_2F_Room6_MapScripts:: @ 8160D34 .byte 0 SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35 - msgbox gUnknown_81740A1, 2 + msgbox gUnknown_81740A1, MSGBOX_NPC end SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E - msgbox gUnknown_81740D6, 2 + msgbox gUnknown_81740D6, MSGBOX_NPC end diff --git a/data/maps/SSAnne_3F_Corridor/scripts.inc b/data/maps/SSAnne_3F_Corridor/scripts.inc index b4f61fe75..5e67f5532 100644 --- a/data/maps/SSAnne_3F_Corridor/scripts.inc +++ b/data/maps/SSAnne_3F_Corridor/scripts.inc @@ -2,5 +2,5 @@ SSAnne_3F_Corridor_MapScripts:: @ 8160A5D .byte 0 SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E - msgbox gUnknown_817320C, 2 + msgbox gUnknown_817320C, MSGBOX_NPC end diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index 06903353d..44cb7d2d1 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -2,11 +2,11 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 .byte 0 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_BARNY, 0, Text_174177, Text_1741EF - msgbox gUnknown_817420E, 6 + trainerbattle_single TRAINER_FISHERMAN_BARNY, Text_174177, Text_1741EF + msgbox gUnknown_817420E, MSGBOX_AUTOCLOSE end SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_PHILLIP, 0, Text_1740F6, Text_174123 - msgbox gUnknown_817413A, 6 + trainerbattle_single TRAINER_SAILOR_PHILLIP, Text_1740F6, Text_174123 + msgbox gUnknown_817413A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 173d2149e..629043f6f 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room2_EventScript_1BE685", + "script": "SSAnne_B1F_Room2_EventScript_ItemTM44", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM2_TM44" } ], diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index 01772cab8..db9f37fe3 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -2,6 +2,6 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 .byte 0 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_HUEY, 0, Text_174239, Text_17425C - msgbox gUnknown_8174272, 6 + trainerbattle_single TRAINER_SAILOR_HUEY, Text_174239, Text_17425C + msgbox gUnknown_8174272, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index f1acb1d5a..0d4141a48 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room3_EventScript_1BE692", + "script": "SSAnne_B1F_Room3_EventScript_ItemEther", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM3_ETHER" } ], diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index da4ed9aaf..df90031ac 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -2,6 +2,6 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E .byte 0 SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DYLAN, 0, Text_1742A6, Text_1742C3 - msgbox gUnknown_81742D2, 6 + trainerbattle_single TRAINER_SAILOR_DYLAN, Text_1742A6, Text_1742C3 + msgbox gUnknown_81742D2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index e9730a19e..c84b55b07 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -2,11 +2,11 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 .byte 0 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_LEONARD, 0, Text_174315, Text_174348 - msgbox gUnknown_8174362, 6 + trainerbattle_single TRAINER_SAILOR_LEONARD, Text_174315, Text_174348 + msgbox gUnknown_8174362, MSGBOX_AUTOCLOSE end SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DUNCAN, 0, Text_174385, Text_1743B3 - msgbox gUnknown_81743C8, 6 + trainerbattle_single TRAINER_SAILOR_DUNCAN, Text_174385, Text_1743B3 + msgbox gUnknown_81743C8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 6313e108a..835107344 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room5_EventScript_1BE69F", + "script": "SSAnne_B1F_Room5_EventScript_ItemSuperPotion", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM5_SUPER_POTION" } ], diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc index c449d1164..37d26661b 100644 --- a/data/maps/SSAnne_B1F_Room5/scripts.inc +++ b/data/maps/SSAnne_B1F_Room5/scripts.inc @@ -2,7 +2,7 @@ SSAnne_B1F_Room5_MapScripts:: @ 8160DD5 .byte 0 SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6 - msgbox gUnknown_81743F8, 2 + msgbox gUnknown_81743F8, MSGBOX_NPC end SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 114ba084a..7171cae6d 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -3,8 +3,7 @@ SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A lock - checkflag FLAG_GOT_HM01 - goto_if TRUE, EventScript_160BB5 + goto_if_set FLAG_GOT_HM01, EventScript_160BB5 msgbox gUnknown_8173646 textcolor 3 message Text_173676 @@ -13,11 +12,10 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A waitfanfare call EventScript_1A6675 delay 50 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81736A6 - additem ITEM_HM01, 1 - giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5 + giveitem_msg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5 msgbox gUnknown_81737D2 setflag FLAG_GOT_HM01 setvar VAR_MAP_SCENE_VERMILION_CITY, 1 @@ -27,22 +25,22 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A EventScript_160BA0:: @ 8160BA0 msgbox gUnknown_81738C3 closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end EventScript_160BB5:: @ 8160BB5 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_8173831 release end SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9 - msgbox gUnknown_81738E6, 3 + msgbox gUnknown_81738E6, MSGBOX_SIGN end SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2 - msgbox gUnknown_8173903, 3 + msgbox gUnknown_8173903, MSGBOX_SIGN end diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index 955625e2e..d61b65d87 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -2,23 +2,23 @@ SSAnne_Deck_MapScripts:: @ 8160A68 .byte 0 SSAnne_Deck_EventScript_160A69:: @ 8160A69 - msgbox gUnknown_817326F, 2 + msgbox gUnknown_817326F, MSGBOX_NPC end SSAnne_Deck_EventScript_160A72:: @ 8160A72 - msgbox gUnknown_81732C6, 2 + msgbox gUnknown_81732C6, MSGBOX_NPC end SSAnne_Deck_EventScript_160A7B:: @ 8160A7B - msgbox gUnknown_81732A2, 2 + msgbox gUnknown_81732A2, MSGBOX_NPC end SSAnne_Deck_EventScript_160A84:: @ 8160A84 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_EDMOND, 0, Text_173308, Text_17332B - msgbox gUnknown_817333E, 6 + trainerbattle_single TRAINER_SAILOR_EDMOND, Text_173308, Text_17332B + msgbox gUnknown_817333E, MSGBOX_AUTOCLOSE end SSAnne_Deck_EventScript_160A9B:: @ 8160A9B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_TREVOR, 0, Text_173382, Text_1733A0 - msgbox gUnknown_81733B5, 6 + trainerbattle_single TRAINER_SAILOR_TREVOR, Text_173382, Text_1733A0 + msgbox gUnknown_81733B5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 15cc43b1f..a8ad24173 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -1,29 +1,29 @@ SSAnne_Exterior_MapScripts:: @ 8160840 - map_script 3, SSAnne_Exterior_MapScript1_16084B - map_script 2, SSAnne_Exterior_MapScript2_16084F + map_script MAP_SCRIPT_ON_TRANSITION, SSAnne_Exterior_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSAnne_Exterior_OnFrame .byte 0 -SSAnne_Exterior_MapScript1_16084B:: @ 816084B +SSAnne_Exterior_OnTransition:: @ 816084B setworldmapflag FLAG_WORLD_MAP_SSANNE_EXTERIOR end -SSAnne_Exterior_MapScript2_16084F:: @ 816084F +SSAnne_Exterior_OnFrame:: @ 816084F map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_160859 .2byte 0 SSAnne_Exterior_160859:: @ 8160859 lockall getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8005, 6 - call_if le, EventScript_1608A1 - compare_var_to_value VAR_0x8005, 7 - call_if ge, EventScript_1608AC + compare VAR_0x8005, 6 + call_if_le EventScript_1608A1 + compare VAR_0x8005, 7 + call_if_ge EventScript_1608AC fadenewbgm MUS_NAMINORI delay 50 special Special_SSAnneDepartureCutscene waitstate removeobject 1 - applymovement 255, Movement_1608B7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1608B7 waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 2 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 @@ -33,35 +33,35 @@ SSAnne_Exterior_160859:: @ 8160859 end EventScript_1608A1:: @ 81608A1 - applymovement 255, Movement_1608C1 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1608C1 waitmovement 0 return EventScript_1608AC:: @ 81608AC - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return Movement_1608B7:: @ 81608B7 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1608C1:: @ 81608C1 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 968d87938..cb062a8fd 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_1BE6AC", + "script": "SSAnne_Kitchen_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_SSANNE_KITCHEN_GREAT_BALL" } ], diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 8ab022028..565efd607 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -2,15 +2,15 @@ SSAnne_Kitchen_MapScripts:: @ 8160AB2 .byte 0 SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 - msgbox gUnknown_81733F8, 2 + msgbox gUnknown_81733F8, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC - msgbox gUnknown_8173429, 2 + msgbox gUnknown_8173429, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5 - msgbox gUnknown_8173462, 2 + msgbox gUnknown_8173462, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE @@ -19,12 +19,12 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE msgbox gUnknown_8173570 random 3 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 - call_if eq, EventScript_160B03 - compare_var_to_value VAR_0x8008, 1 - call_if eq, EventScript_160B0C - compare_var_to_value VAR_0x8008, 2 - call_if eq, EventScript_160B15 + compare VAR_0x8008, 0 + call_if_eq EventScript_160B03 + compare VAR_0x8008, 1 + call_if_eq EventScript_160B0C + compare VAR_0x8008, 2 + call_if_eq EventScript_160B15 release end @@ -41,13 +41,13 @@ EventScript_160B15:: @ 8160B15 return SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E - msgbox gUnknown_81734A0, 2 + msgbox gUnknown_81734A0, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 - msgbox gUnknown_81734D3, 2 + msgbox gUnknown_81734D3, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 - msgbox gUnknown_817353E, 2 + msgbox gUnknown_817353E, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building1/scripts.inc b/data/maps/SafariZone_Building1/scripts.inc index 668e92250..6aaeac452 100644 --- a/data/maps/SafariZone_Building1/scripts.inc +++ b/data/maps/SafariZone_Building1/scripts.inc @@ -2,9 +2,9 @@ SafariZone_Building1_MapScripts:: @ 81623EB .byte 0 SafariZone_Building1_EventScript_1623EC:: @ 81623EC - msgbox gUnknown_8177A5A, 2 + msgbox gUnknown_8177A5A, MSGBOX_NPC end SafariZone_Building1_EventScript_1623F5:: @ 81623F5 - msgbox gUnknown_8177A82, 2 + msgbox gUnknown_8177A82, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building2/scripts.inc b/data/maps/SafariZone_Building2/scripts.inc index 717ccf36b..ff870464a 100644 --- a/data/maps/SafariZone_Building2/scripts.inc +++ b/data/maps/SafariZone_Building2/scripts.inc @@ -2,13 +2,13 @@ SafariZone_Building2_MapScripts:: @ 81623FE .byte 0 SafariZone_Building2_EventScript_1623FF:: @ 81623FF - msgbox gUnknown_8177AE2, 2 + msgbox gUnknown_8177AE2, MSGBOX_NPC end SafariZone_Building2_EventScript_162408:: @ 8162408 - msgbox gUnknown_8177AAE, 2 + msgbox gUnknown_8177AAE, MSGBOX_NPC end SafariZone_Building2_EventScript_162411:: @ 8162411 - msgbox gUnknown_8177B16, 2 + msgbox gUnknown_8177B16, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building3/scripts.inc b/data/maps/SafariZone_Building3/scripts.inc index a4dc55062..4b328da88 100644 --- a/data/maps/SafariZone_Building3/scripts.inc +++ b/data/maps/SafariZone_Building3/scripts.inc @@ -2,13 +2,13 @@ SafariZone_Building3_MapScripts:: @ 816241A .byte 0 SafariZone_Building3_EventScript_16241B:: @ 816241B - msgbox gUnknown_8177BAB, 2 + msgbox gUnknown_8177BAB, MSGBOX_NPC end SafariZone_Building3_EventScript_162424:: @ 8162424 - msgbox gUnknown_8177B38, 2 + msgbox gUnknown_8177B38, MSGBOX_NPC end SafariZone_Building3_EventScript_16242D:: @ 816242D - msgbox gUnknown_8177BEC, 2 + msgbox gUnknown_8177BEC, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building4/scripts.inc b/data/maps/SafariZone_Building4/scripts.inc index 8f589cd8f..1c3e52bd3 100644 --- a/data/maps/SafariZone_Building4/scripts.inc +++ b/data/maps/SafariZone_Building4/scripts.inc @@ -2,13 +2,13 @@ SafariZone_Building4_MapScripts:: @ 8162436 .byte 0 SafariZone_Building4_EventScript_162437:: @ 8162437 - msgbox gUnknown_8177D39, 2 + msgbox gUnknown_8177D39, MSGBOX_NPC end SafariZone_Building4_EventScript_162440:: @ 8162440 - msgbox gUnknown_8177CEB, 2 + msgbox gUnknown_8177CEB, MSGBOX_NPC end SafariZone_Building4_EventScript_162449:: @ 8162449 - msgbox gUnknown_8177D8B, 2 + msgbox gUnknown_8177D8B, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index e40c94cee..5e592724f 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_Center_EventScript_1BE7D7", + "script": "SafariZone_Center_EventScript_ItemNugget", "flag": "FLAG_HIDE_SAFARI_ZONE_CENTER_NUGGET" } ], diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc index 9f887910a..70599b024 100644 --- a/data/maps/SafariZone_Center/scripts.inc +++ b/data/maps/SafariZone_Center/scripts.inc @@ -1,19 +1,19 @@ SafariZone_Center_MapScripts:: @ 8162357 - map_script 3, SafariZone_Center_MapScript1_16235D + map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_Center_OnTransition .byte 0 -SafariZone_Center_MapScript1_16235D:: @ 816235D +SafariZone_Center_OnTransition:: @ 816235D setworldmapflag FLAG_WORLD_MAP_SAFARI_ZONE_CENTER end SafariZone_Center_EventScript_162361:: @ 8162361 - msgbox gUnknown_81777F2, 3 + msgbox gUnknown_81777F2, MSGBOX_SIGN end SafariZone_Center_EventScript_16236A:: @ 816236A - msgbox gUnknown_81777FD, 3 + msgbox gUnknown_81777FD, MSGBOX_SIGN end SafariZone_Center_EventScript_162373:: @ 8162373 - msgbox gUnknown_817782F, 3 + msgbox gUnknown_817782F, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 17f951070..59e9da99c 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE7E4", + "script": "SafariZone_East_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE7F1", + "script": "SafariZone_East_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE7FE", + "script": "SafariZone_East_EventScript_ItemTM11", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE80B", + "script": "SafariZone_East_EventScript_ItemLeafStone", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_LEAF_STONE" } ], diff --git a/data/maps/SafariZone_East/scripts.inc b/data/maps/SafariZone_East/scripts.inc index b38039b36..e37be0d00 100644 --- a/data/maps/SafariZone_East/scripts.inc +++ b/data/maps/SafariZone_East/scripts.inc @@ -2,13 +2,13 @@ SafariZone_East_MapScripts:: @ 816237C .byte 0 SafariZone_East_EventScript_16237D:: @ 816237D - msgbox gUnknown_817783B, 3 + msgbox gUnknown_817783B, MSGBOX_SIGN end SafariZone_East_EventScript_162386:: @ 8162386 - msgbox gUnknown_8177846, 3 + msgbox gUnknown_8177846, MSGBOX_SIGN end SafariZone_East_EventScript_16238F:: @ 816238F - msgbox gUnknown_8177884, 3 + msgbox gUnknown_8177884, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 0e47573f6..df7ce163a 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_North_EventScript_1BE818", + "script": "SafariZone_North_EventScript_ItemProtein", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_North_EventScript_1BE825", + "script": "SafariZone_North_EventScript_ItemTM47", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_North_EventScript_1BEBDA", + "script": "SafariZone_North_EventScript_ItemQuickClaw", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_QUICK_CLAW" } ], diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index f45988629..65a8ad4dd 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -2,21 +2,21 @@ SafariZone_North_MapScripts:: @ 8162398 .byte 0 SafariZone_North_EventScript_162399:: @ 8162399 - msgbox gUnknown_817789D, 3 + msgbox gUnknown_817789D, MSGBOX_SIGN end SafariZone_North_EventScript_1623A2:: @ 81623A2 - msgbox gUnknown_81778A8, 3 + msgbox gUnknown_81778A8, MSGBOX_SIGN end SafariZone_North_EventScript_1623AB:: @ 81623AB - msgbox gUnknown_81778D6, 3 + msgbox gUnknown_81778D6, MSGBOX_SIGN end SafariZone_North_EventScript_1623B4:: @ 81623B4 - msgbox gUnknown_81778DD, 3 + msgbox gUnknown_81778DD, MSGBOX_SIGN end SafariZone_North_EventScript_1623BD:: @ 81623BD - msgbox gUnknown_8177935, 3 + msgbox gUnknown_8177935, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index a4b3b1910..a61a99525 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -4,14 +4,12 @@ SafariZone_SecretHouse_MapScripts:: @ 8162452 SafariZone_SecretHouse_EventScript_162453:: @ 8162453 lock faceplayer - checkflag FLAG_GOT_HM03 - goto_if TRUE, EventScript_1624A9 + goto_if_set FLAG_GOT_HM03, EventScript_1624A9 msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16249F - additem ITEM_HM03, 1 - giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16249F + giveitem_msg gUnknown_8177E92, ITEM_HM03 msgbox gUnknown_8177EB7 setflag FLAG_GOT_HM03 release diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index cdccbbe45..02c576e4b 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE83F", + "script": "SafariZone_West_EventScript_ItemGoldTeeth", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE832", + "script": "SafariZone_West_EventScript_ItemTM32", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE84C", + "script": "SafariZone_West_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE859", + "script": "SafariZone_West_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_REVIVE" } ], diff --git a/data/maps/SafariZone_West/scripts.inc b/data/maps/SafariZone_West/scripts.inc index 2b8357334..3d6e0bbf7 100644 --- a/data/maps/SafariZone_West/scripts.inc +++ b/data/maps/SafariZone_West/scripts.inc @@ -2,17 +2,17 @@ SafariZone_West_MapScripts:: @ 81623C6 .byte 0 SafariZone_West_EventScript_1623C7:: @ 81623C7 - msgbox gUnknown_817796E, 3 + msgbox gUnknown_817796E, MSGBOX_SIGN end SafariZone_West_EventScript_1623D0:: @ 81623D0 - msgbox gUnknown_8177979, 3 + msgbox gUnknown_8177979, MSGBOX_SIGN end SafariZone_West_EventScript_1623D9:: @ 81623D9 - msgbox gUnknown_81779F8, 3 + msgbox gUnknown_81779F8, MSGBOX_SIGN end SafariZone_West_EventScript_1623E2:: @ 81623E2 - msgbox gUnknown_8177A41, 3 + msgbox gUnknown_8177A41, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 498557ddb..53d697ff0 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -1,11 +1,10 @@ SaffronCity_MapScripts:: @ 816735F - map_script 3, SaffronCity_MapScript1_167365 + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_OnTransition .byte 0 -SaffronCity_MapScript1_167365:: @ 8167365 +SaffronCity_OnTransition:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY - checkflag FLAG_RESCUED_MR_FUJI - call_if FALSE, EventScript_167372 + call_if_unset FLAG_RESCUED_MR_FUJI, EventScript_167372 end EventScript_167372:: @ 8167372 @@ -13,38 +12,37 @@ EventScript_167372:: @ 8167372 return SaffronCity_EventScript_16737A:: @ 816737A - msgbox gUnknown_8181003, 2 + msgbox gUnknown_8181003, MSGBOX_NPC end SaffronCity_EventScript_167383:: @ 8167383 - msgbox gUnknown_818101F, 2 + msgbox gUnknown_818101F, MSGBOX_NPC end SaffronCity_EventScript_16738C:: @ 816738C - msgbox gUnknown_818105A, 2 + msgbox gUnknown_818105A, MSGBOX_NPC end SaffronCity_EventScript_167395:: @ 8167395 - msgbox gUnknown_8181087, 2 + msgbox gUnknown_8181087, MSGBOX_NPC end SaffronCity_EventScript_16739E:: @ 816739E - msgbox gUnknown_81810A7, 2 + msgbox gUnknown_81810A7, MSGBOX_NPC end SaffronCity_EventScript_1673A7:: @ 81673A7 - msgbox gUnknown_81810D5, 2 + msgbox gUnknown_81810D5, MSGBOX_NPC end SaffronCity_EventScript_1673B0:: @ 81673B0 - msgbox gUnknown_81810F5, 2 + msgbox gUnknown_81810F5, MSGBOX_NPC end SaffronCity_EventScript_1673B9:: @ 81673B9 lock - checkflag FLAG_RESCUED_MR_FUJI - goto_if TRUE, EventScript_1673D7 - applymovement 6, Movement_1A75E1 + goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_1673D7 + applymovement 6, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81812CA release @@ -57,19 +55,19 @@ EventScript_1673D7:: @ 81673D7 end SaffronCity_EventScript_1673E3:: @ 81673E3 - msgbox gUnknown_8181159, 2 + msgbox gUnknown_8181159, MSGBOX_NPC end SaffronCity_EventScript_1673EC:: @ 81673EC - msgbox gUnknown_8181189, 2 + msgbox gUnknown_8181189, MSGBOX_NPC end SaffronCity_EventScript_1673F5:: @ 81673F5 - msgbox gUnknown_81811BF, 2 + msgbox gUnknown_81811BF, MSGBOX_NPC end SaffronCity_EventScript_1673FE:: @ 81673FE - msgbox gUnknown_8181225, 2 + msgbox gUnknown_8181225, MSGBOX_NPC end SaffronCity_EventScript_167407:: @ 8167407 @@ -83,15 +81,15 @@ SaffronCity_EventScript_167407:: @ 8167407 end SaffronCity_EventScript_16741A:: @ 816741A - msgbox gUnknown_8181299, 2 + msgbox gUnknown_8181299, MSGBOX_NPC end SaffronCity_EventScript_167423:: @ 8167423 - msgbox gUnknown_8181326, 3 + msgbox gUnknown_8181326, MSGBOX_SIGN end SaffronCity_EventScript_16742C:: @ 816742C - msgbox gUnknown_8181354, 3 + msgbox gUnknown_8181354, MSGBOX_SIGN end SaffronCity_EventScript_167435:: @ 8167435 @@ -102,25 +100,25 @@ SaffronCity_EventScript_167435:: @ 8167435 end SaffronCity_EventScript_16744D:: @ 816744D - msgbox gUnknown_81813AA, 3 + msgbox gUnknown_81813AA, MSGBOX_SIGN end SaffronCity_EventScript_167456:: @ 8167456 - msgbox gUnknown_8181452, 3 + msgbox gUnknown_8181452, MSGBOX_SIGN end SaffronCity_EventScript_16745F:: @ 816745F - msgbox gUnknown_81814B9, 3 + msgbox gUnknown_81814B9, MSGBOX_SIGN end SaffronCity_EventScript_167468:: @ 8167468 - msgbox gUnknown_81814D3, 3 + msgbox gUnknown_81814D3, MSGBOX_SIGN end SaffronCity_EventScript_167471:: @ 8167471 - msgbox gUnknown_81814E7, 3 + msgbox gUnknown_81814E7, MSGBOX_SIGN end SaffronCity_EventScript_16747A:: @ 816747A - msgbox gUnknown_8181519, 3 + msgbox gUnknown_8181519, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 8481db66c..2994fabdd 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -4,7 +4,7 @@ SaffronCity_Dojo_MapScripts:: @ 816EBDB SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_1A75E7 + applymovement 5, Movement_WalkInPlaceFastestLeft waitmovement 0 releaseall end @@ -12,7 +12,7 @@ SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_1A75EB + applymovement 5, Movement_WalkInPlaceFastestRight waitmovement 0 releaseall end @@ -20,17 +20,16 @@ SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 lock faceplayer - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 - setvar VAR_0x4001, SPECIES_HITMONLEE - applymovement 5, Movement_1A75E9 + setvar VAR_TEMP_1, SPECIES_HITMONLEE + applymovement 5, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16EC82 + compare VAR_RESULT, YES + goto_if_eq EventScript_16EC82 erasemonpic release end @@ -43,44 +42,43 @@ EventScript_16EC3C:: @ 816EC3C SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 lock faceplayer - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 - setvar VAR_0x4001, SPECIES_HITMONCHAN - applymovement 5, Movement_1A75E9 + setvar VAR_TEMP_1, SPECIES_HITMONCHAN + applymovement 5, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16EC82 + compare VAR_RESULT, YES + goto_if_eq EventScript_16EC82 erasemonpic release end EventScript_16EC82:: @ 816EC82 erasemonpic - givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16ECB5 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16ECEC - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + givemon VAR_TEMP_1, 25, ITEM_NONE + compare VAR_RESULT, 0 + goto_if_eq EventScript_16ECB5 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16ECEC + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A927C release end EventScript_16ECB5:: @ 816ECB5 removeobject VAR_LAST_TALKED - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_19B473 waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16ED29 + compare VAR_RESULT, NO + goto_if_eq EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16ED29 @@ -88,15 +86,15 @@ EventScript_16ECB5:: @ 816ECB5 EventScript_16ECEC:: @ 816ECEC removeobject VAR_LAST_TALKED - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_19B473 waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16ED1E + compare VAR_RESULT, NO + goto_if_eq EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E end @@ -111,42 +109,41 @@ EventScript_16ED29:: @ 816ED29 end SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B - msgbox gUnknown_819B52E, 3 + msgbox gUnknown_819B52E, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34 - msgbox gUnknown_819B4F8, 3 + msgbox gUnknown_819B4F8, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D - msgbox gUnknown_819B50F, 3 + msgbox gUnknown_819B50F, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HITOSHI, 0, Text_19B3DF, Text_19B40F - msgbox gUnknown_819B41F, 6 + trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F + msgbox gUnknown_819B41F, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HIDEKI, 0, Text_19B2E0, Text_19B2FD - msgbox gUnknown_819B30F, 6 + trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD + msgbox gUnknown_819B30F, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_AARON, 0, Text_19B341, Text_19B396 - msgbox gUnknown_819B3AC, 6 + trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396 + msgbox gUnknown_819B3AC, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_MIKE, 0, Text_19B275, Text_19B292 - msgbox gUnknown_819B29D, 6 + trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292 + msgbox gUnknown_819B29D, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EDC6 - msgbox gUnknown_819B1A7, 6 + trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0 + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6 + msgbox gUnknown_819B1A7, MSGBOX_AUTOCLOSE end EventScript_16EDC6:: @ 816EDC6 diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 159cb1729..afe863e89 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -3,9 +3,8 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7 SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A - checkflag FLAG_GOT_TM04_FROM_SABRINA - goto_if FALSE, EventScript_16EE3D + trainerbattle_single TRAINER_LEADER_SABRINA, Text_19B53C, Text_19B602, EventScript_16EE0A, NO_MUSIC + goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, EventScript_16EE3D msgbox gUnknown_819B7F2 release end @@ -23,10 +22,9 @@ EventScript_16EE0A:: @ 816EE0A EventScript_16EE3D:: @ 816EE3D msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16EE7E - additem ITEM_TM04, 1 - giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16EE7E + giveitem_msg gUnknown_819B7D3, ITEM_TM04 setflag FLAG_GOT_TM04_FROM_SABRINA msgbox gUnknown_819B685 release @@ -38,46 +36,45 @@ EventScript_16EE7E:: @ 816EE7E end SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_JOHAN, 0, Text_19B936, Text_19B957 - msgbox gUnknown_819B96D, 6 + trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957 + msgbox gUnknown_819B96D, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_TYRON, 0, Text_19BA45, Text_19BA9E + trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E famechecker FAMECHECKER_SABRINA, 5 - msgbox gUnknown_819BAB4, 6 + msgbox gUnknown_819BAB4, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_CAMERON, 0, Text_19BB49, Text_19BBA1 - msgbox gUnknown_819BBB3, 6 + trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1 + msgbox gUnknown_819BBB3, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_PRESTON, 0, Text_19BC57, Text_19BCBC - msgbox gUnknown_819BCC4, 6 + trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC + msgbox gUnknown_819BCC4, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_AMANDA, 0, Text_19B86A, Text_19B8A8 - msgbox gUnknown_819B8B9, 6 + trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8 + msgbox gUnknown_819B8B9, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_STACY, 0, Text_19B998, Text_19B9EC - msgbox gUnknown_819B9F7, 6 + trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC + msgbox gUnknown_819B9F7, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_TASHA, 0, Text_19BAE8, Text_19BB0D - msgbox gUnknown_819BB1F, 6 + trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D + msgbox gUnknown_819BB1F, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 lock faceplayer - checkflag FLAG_DEFEATED_SABRINA - goto_if TRUE, EventScript_16EF4B + goto_if_set FLAG_DEFEATED_SABRINA, EventScript_16EF4B msgbox gUnknown_819BCF6 release end @@ -89,8 +86,7 @@ EventScript_16EF4B:: @ 816EF4B SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 lockall - checkflag FLAG_BADGE06_GET - goto_if TRUE, EventScript_16EF69 + goto_if_set FLAG_BADGE06_GET, EventScript_16EF69 msgbox gUnknown_819BDFE releaseall end diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc index eb0bcd429..2f4e435fa 100644 --- a/data/maps/SaffronCity_House1_1F/scripts.inc +++ b/data/maps/SaffronCity_House1_1F/scripts.inc @@ -2,11 +2,11 @@ SaffronCity_House1_1F_MapScripts:: @ 816EB36 .byte 0 SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37 - msgbox gUnknown_819AB9B, 2 + msgbox gUnknown_819AB9B, MSGBOX_NPC end SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40 - msgbox gUnknown_819ABD7, 2 + msgbox gUnknown_819ABD7, MSGBOX_NPC end SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 54b0a5a65..f7efeddb1 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -19,19 +19,19 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B 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 lock faceplayer checkitem ITEM_POKE_DOLL, 1 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_1C4CF6 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_MimicTutor checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16EBB7 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16EBC0 + compare VAR_RESULT, MALE + call_if_eq EventScript_16EBB7 + compare VAR_RESULT, FEMALE + call_if_eq EventScript_16EBC0 release end @@ -44,9 +44,9 @@ EventScript_16EBC0:: @ 816EBC0 return SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9 - msgbox gUnknown_819B0D0, 3 + msgbox gUnknown_819B0D0, MSGBOX_SIGN end SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2 - msgbox gUnknown_819B0A0, 3 + msgbox gUnknown_819B0A0, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_House1_2F/text.inc b/data/maps/SaffronCity_House1_2F/text.inc index d9fc46f7c..32a666e18 100644 --- a/data/maps/SaffronCity_House1_2F/text.inc +++ b/data/maps/SaffronCity_House1_2F/text.inc @@ -18,7 +18,7 @@ gUnknown_819ACF1:: @ 819ACF1 .string "COPYCAT: Hmm? Quit mimicking?\l" .string "But that's my favorite hobby!$" -Text_19AD85:: @ 819AD85 +Text_MimicTeach:: @ 819AD85 .string "Oh wow!\n" .string "A POKé DOLL!\p" .string "For me?\n" @@ -26,14 +26,14 @@ Text_19AD85:: @ 819AD85 .string "You know what?\n" .string "I can teach the move MIMIC.$" -Text_19ADD8:: @ 819ADD8 +Text_MimicDeclined:: @ 819ADD8 .string "Don't you like MIMIC?$" -Text_19ADEE:: @ 819ADEE +Text_MimicWhichMon:: @ 819ADEE .string "I really love MIMIC!\n" .string "Who's going to learn it?$" -Text_19AE1C:: @ 819AE1C +Text_MimicTaughtMale:: @ 819AE1C .string "{PLAYER}: Hi!\n" .string "Thanks for earlier!\p" .string "{PLAYER}: Pardon?\p" @@ -42,7 +42,7 @@ Text_19AE1C:: @ 819AE1C .string "COPYCAT: You bet!\n" .string "It's a scream!$" -Text_19AE90:: @ 819AE90 +Text_MimicTaughtFemale:: @ 819AE90 .string "{PLAYER}: Hi!\n" .string "Thanks for what you did for us.\p" .string "{PLAYER}: Pardon?\p" diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc index 9cc63072c..03afb1a4c 100644 --- a/data/maps/SaffronCity_House2/scripts.inc +++ b/data/maps/SaffronCity_House2/scripts.inc @@ -2,11 +2,11 @@ SaffronCity_House2_MapScripts:: @ 816EF73 .byte 0 SaffronCity_House2_EventScript_16EF74:: @ 816EF74 - msgbox gUnknown_819BE74, 2 + msgbox gUnknown_819BE74, MSGBOX_NPC end SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D - msgbox gUnknown_819BED5, 2 + msgbox gUnknown_819BED5, MSGBOX_NPC end SaffronCity_House2_EventScript_16EF86:: @ 816EF86 @@ -20,5 +20,5 @@ SaffronCity_House2_EventScript_16EF86:: @ 816EF86 end SaffronCity_House2_EventScript_16EF99:: @ 816EF99 - msgbox gUnknown_819BF07, 3 + msgbox gUnknown_819BF07, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 8a1ec97b5..9e177cccb 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -4,14 +4,12 @@ SaffronCity_House3_MapScripts:: @ 816F05E SaffronCity_House3_EventScript_16F05F:: @ 816F05F lock faceplayer - checkflag FLAG_GOT_TM29_FROM_MR_PSYCHIC - goto_if TRUE, EventScript_16F0B5 + goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5 msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16F0AB - additem ITEM_TM29, 1 - giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16F0AB + giveitem_msg gUnknown_819C16C, ITEM_TM29 msgbox gUnknown_819C18F setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC release diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 5b77e5864..78452151b 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -2,23 +2,23 @@ SaffronCity_Mart_MapScripts:: @ 816EFA2 .byte 0 SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3 - msgbox gUnknown_819BFF1, 2 + msgbox gUnknown_819BFF1, MSGBOX_NPC end SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC - msgbox gUnknown_819BF8F, 2 + msgbox gUnknown_819BF8F, MSGBOX_NPC end SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16EFDC - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 0f2b92262..8639de5af 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -1,32 +1,32 @@ SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC - map_script 3, SaffronCity_PokemonCenter_1F_MapScript1_16EFF7 - map_script 5, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -SaffronCity_PokemonCenter_1F_MapScript1_16EFF7:: @ 816EFF7 +SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 setrespawn SPAWN_SAFFRON_CITY end SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004 - msgbox gUnknown_819C058, 2 + msgbox gUnknown_819C058, MSGBOX_NPC end SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D - msgbox gUnknown_819C023, 2 + msgbox gUnknown_819C023, MSGBOX_NPC end SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if eq, EventScript_16F02D + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_eq EventScript_16F02D msgbox gUnknown_819C0B4 release end diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index fd1021732..b6ae61450 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc index 7ebc68fb5..5a62223a3 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 - map_script 2, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SaffronCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SaffronCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816F04C + call CableClub_EventScript_Colosseum end -EventScript_16F052:: @ 816F052 - call EventScript_1BB6AB +SaffronCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F052 + call CableClub_EventScript_TradeCenter end -EventScript_16F058:: @ 816F058 - call EventScript_1BB7DE +SaffronCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F058 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 426226422..ad839b0ad 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -1,27 +1,27 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF - map_script 2, SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA - map_script 3, SaffronCity_PokemonTrainerFanClub_MapScript2_16F144 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonTrainerFanClub_OnFrame + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonTrainerFanClub_OnTransition .byte 0 -SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA:: @ 816F0CA +SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4 .2byte 0 EventScript_16F0D4:: @ 816F0D4 lockall textcolor 1 - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_819C22B closemessage applymovement 1, Movement_16F124 waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_819C235 setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 @@ -29,88 +29,88 @@ EventScript_16F0D4:: @ 816F0D4 end Movement_16F124:: @ 816F124 - step_1c - step_1b - step_10 - step_1c - step_10 - step_1b - step_12 + delay_16 + delay_8 + walk_down + delay_16 + walk_down + delay_8 + walk_left step_end Movement_16F12C:: @ 816F12C - step_1b - step_2d - step_10 - step_10 - step_10 - step_12 - step_12 + delay_8 + walk_in_place_fastest_down + walk_down + walk_down + walk_down + walk_left + walk_left step_end Movement_16F134:: @ 816F134 - step_1f - step_1f - step_1d - step_1d - step_1f - step_1d + walk_fast_left + walk_fast_left + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down step_end Movement_16F13B:: @ 816F13B - step_10 - step_30 + walk_down + walk_in_place_fastest_right step_end Movement_16F13E:: @ 816F13E - step_55 - step_1e - step_1e - step_20 - step_2d + jump_in_place_right + walk_fast_up + walk_fast_up + walk_fast_right + walk_in_place_fastest_down step_end -SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 - goto_if eq, EventScript_16F267 - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 - goto_if eq, EventScript_16F15B +SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 + goto_if_eq EventScript_16F267 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 + goto_if_eq EventScript_16F15B end EventScript_16F15B:: @ 816F15B special UpdateMovedSaffronFanClubMembers setvar VAR_0x8004, 0 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16F207 + compare VAR_RESULT, 0 + call_if_eq EventScript_16F207 setvar VAR_0x8004, 1 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16F213 + compare VAR_RESULT, 0 + call_if_eq EventScript_16F213 setvar VAR_0x8004, 2 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16F21F + compare VAR_RESULT, 0 + call_if_eq EventScript_16F21F setvar VAR_0x8004, 3 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16F22B + compare VAR_RESULT, 0 + call_if_eq EventScript_16F22B setvar VAR_0x8004, 4 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16F237 + compare VAR_RESULT, 0 + call_if_eq EventScript_16F237 setvar VAR_0x8004, 5 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16F243 + compare VAR_RESULT, 0 + call_if_eq EventScript_16F243 setvar VAR_0x8004, 6 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16F24F + compare VAR_RESULT, 0 + call_if_eq EventScript_16F24F setvar VAR_0x8004, 7 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_16F25B + compare VAR_RESULT, 0 + call_if_eq EventScript_16F25B end EventScript_16F207:: @ 816F207 @@ -166,22 +166,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 faceplayer setvar VAR_0x8004, 0 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F2EE + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + goto_if_eq EventScript_16F2EE specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F2C0 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F2C0 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 - goto_if eq, EventScript_16F2E4 + compare VAR_RESULT, 7 + goto_if_eq EventScript_16F2E4 msgbox gUnknown_819C420 release end EventScript_16F2C0:: @ 816F2C0 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F2DA + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F2DA msgbox gUnknown_819C390 release end @@ -206,22 +206,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 faceplayer setvar VAR_0x8004, 3 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F365 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + goto_if_eq EventScript_16F365 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F337 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F337 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 - goto_if eq, EventScript_16F35B + compare VAR_RESULT, 7 + goto_if_eq EventScript_16F35B msgbox gUnknown_819CBD3 release end EventScript_16F337:: @ 816F337 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F351 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F351 msgbox gUnknown_819CB32 release end @@ -246,22 +246,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F faceplayer setvar VAR_0x8004, 1 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F3DC + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + goto_if_eq EventScript_16F3DC specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F3AE + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F3AE specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 - goto_if eq, EventScript_16F3D2 + compare VAR_RESULT, 7 + goto_if_eq EventScript_16F3D2 msgbox gUnknown_819C6BA release end EventScript_16F3AE:: @ 816F3AE specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F3C8 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F3C8 msgbox gUnknown_819C5A9 release end @@ -286,22 +286,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 faceplayer setvar VAR_0x8004, 2 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F453 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + goto_if_eq EventScript_16F453 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F425 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F425 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 - goto_if eq, EventScript_16F449 + compare VAR_RESULT, 7 + goto_if_eq EventScript_16F449 msgbox gUnknown_819C986 release end EventScript_16F425:: @ 816F425 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F43F + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F43F msgbox gUnknown_819C81E release end @@ -327,19 +327,19 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D setvar VAR_0x8004, 5 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F491 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F491 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 - goto_if eq, EventScript_16F4B5 + compare VAR_RESULT, 7 + goto_if_eq EventScript_16F4B5 msgbox gUnknown_819D01F release end EventScript_16F491:: @ 816F491 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F4AB + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F4AB msgbox gUnknown_819CEDF release end @@ -360,19 +360,19 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF setvar VAR_0x8004, 4 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F4F3 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F4F3 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 - goto_if eq, EventScript_16F517 + compare VAR_RESULT, 7 + goto_if_eq EventScript_16F517 msgbox gUnknown_819CDDA release end EventScript_16F4F3:: @ 816F4F3 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F50D + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F50D msgbox gUnknown_819CCF3 release end @@ -393,19 +393,19 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 setvar VAR_0x8004, 6 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F555 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F555 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 - goto_if eq, EventScript_16F579 + compare VAR_RESULT, 7 + goto_if_eq EventScript_16F579 msgbox gUnknown_819D1AE release end EventScript_16F555:: @ 816F555 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F56F + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F56F msgbox gUnknown_819D0E3 release end @@ -426,19 +426,19 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 setvar VAR_0x8004, 7 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F5B7 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F5B7 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 - goto_if eq, EventScript_16F5DB + compare VAR_RESULT, 7 + goto_if_eq EventScript_16F5DB msgbox gUnknown_819D3D2 release end EventScript_16F5B7:: @ 816F5B7 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16F5D1 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16F5D1 msgbox gUnknown_819D2B4 release end diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index ac46adf1f..49986cd0f 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_1F_EventScript_1BEBE7", + "script": "SeafoamIslands_1F_EventScript_ItemIceHeal", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_1F_ICE_HEAL" } ], diff --git a/data/maps/SeafoamIslands_1F/scripts.inc b/data/maps/SeafoamIslands_1F/scripts.inc index 336c75f9f..5cb6d2208 100644 --- a/data/maps/SeafoamIslands_1F/scripts.inc +++ b/data/maps/SeafoamIslands_1F/scripts.inc @@ -1,7 +1,7 @@ SeafoamIslands_1F_MapScripts:: @ 8162F43 - map_script 3, SeafoamIslands_1F_MapScript1_162F49 + map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_1F_OnTransition .byte 0 -SeafoamIslands_1F_MapScript1_162F49:: @ 8162F49 +SeafoamIslands_1F_OnTransition:: @ 8162F49 setworldmapflag FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F end diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 113bfe865..1444996be 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B1F_EventScript_1BEBF4", + "script": "SeafoamIslands_B1F_EventScript_ItemWaterStone", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B1F_EventScript_1BEC01", + "script": "SeafoamIslands_B1F_EventScript_ItemRevive", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_REVIVE" } ], diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index f1a234d05..b24e1ae17 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B2F_EventScript_1BEC0E", + "script": "SeafoamIslands_B2F_EventScript_ItemBigPearl", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B2F_BIG_PEARL" } ], diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index c566ab522..13c6b606a 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -1,23 +1,19 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F - map_script 3, SeafoamIslands_B3F_MapScript1_162F5A - map_script 2, SeafoamIslands_B3F_MapScript2_162F98 + map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B3F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B3F_OnFrame .byte 0 -SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if FALSE, EventScript_162F6D - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if TRUE, EventScript_162F94 +SeafoamIslands_B3F_OnTransition:: @ 8162F5A + call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F6D + call_if_set FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F94 end EventScript_162F6D:: @ 8162F6D - setvar VAR_0x4002, 0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if FALSE, EventScript_162FF0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if FALSE, EventScript_162FF0 - compare_var_to_value VAR_0x4002, 2 - call_if eq, EventScript_162F90 + setvar VAR_TEMP_2, 0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0 + compare VAR_TEMP_2, 2 + call_if_eq EventScript_162F90 return EventScript_162F90:: @ 8162F90 @@ -28,24 +24,22 @@ EventScript_162F94:: @ 8162F94 setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC return -SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 - map_script_2 VAR_0x4001, 1, EventScript_162FA2 +SeafoamIslands_B3F_OnFrame:: @ 8162F98 + map_script_2 VAR_TEMP_1, 1, EventScript_162FA2 .2byte 0 EventScript_162FA2:: @ 8162FA2 lockall - setvar VAR_0x4002, 0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if FALSE, EventScript_162FF0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if FALSE, EventScript_162FF0 - compare_var_to_value VAR_0x4002, 2 - goto_if eq, EventScript_16300C + setvar VAR_TEMP_2, 0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0 + compare VAR_TEMP_2, 2 + goto_if_eq EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 24 - call_if lt, EventScript_162FF6 - compare_var_to_value VAR_0x8008, 24 - call_if ge, EventScript_163001 + compare VAR_0x8008, 24 + call_if_lt EventScript_162FF6 + compare VAR_0x8008, 24 + call_if_ge EventScript_163001 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate @@ -53,51 +47,51 @@ EventScript_162FA2:: @ 8162FA2 end EventScript_162FF0:: @ 8162FF0 - addvar VAR_0x4002, 1 + addvar VAR_TEMP_2, 1 return EventScript_162FF6:: @ 8162FF6 - applymovement 255, Movement_163013 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163013 waitmovement 0 return EventScript_163001:: @ 8163001 - applymovement 255, Movement_163021 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163021 waitmovement 0 return EventScript_16300C:: @ 816300C - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end Movement_163013:: @ 8163013 - step_1d - step_1d - step_1d - step_1d - step_20 - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Movement_163021:: @ 8163021 - step_1d - step_1d - step_1d - step_1d - step_20 - step_20 - step_1d - step_1d - step_1d - step_1d - step_1d - step_1d + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index edd644634..08001aa58 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B4F_EventScript_1BEC1B", + "script": "SeafoamIslands_B4F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B4F_ULTRA_BALL" } ], diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 8d69a4808..c18472399 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -1,40 +1,34 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E - map_script 3, SeafoamIslands_B4F_MapScript1_163066 - map_script 5, SeafoamIslands_B4F_MapScript2_163048 - map_script 1, SeafoamIslands_B4F_MapScript3_1630B1 - map_script 4, SeafoamIslands_B4F_MapScript4_1630E7 - map_script 2, SeafoamIslands_B4F_MapScript5_1630F9 + map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B4F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, SeafoamIslands_B4F_OnResume + map_script MAP_SCRIPT_ON_LOAD, SeafoamIslands_B4F_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SeafoamIslands_B4F_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B4F_OnFrame .byte 0 -SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_163052 +SeafoamIslands_B4F_OnResume:: @ 8163048 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163052 end EventScript_163052:: @ 8163052 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + compare VAR_RESULT, B_OUTCOME_CAUGHT + goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return -SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 - checkflag FLAG_FOUGHT_ARTICUNO - call_if FALSE, EventScript_1630AD - checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT - call_if FALSE, EventScript_163082 - checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT - call_if TRUE, EventScript_1630A9 +SeafoamIslands_B4F_OnTransition:: @ 8163066 + call_if_unset FLAG_FOUGHT_ARTICUNO, EventScript_1630AD + call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_163082 + call_if_set FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_1630A9 end EventScript_163082:: @ 8163082 - setvar VAR_0x4002, 0 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if FALSE, EventScript_163169 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if FALSE, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 - call_if eq, EventScript_1630A5 + setvar VAR_TEMP_2, 0 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169 + compare VAR_TEMP_2, 2 + call_if_eq EventScript_1630A5 return EventScript_1630A5:: @ 81630A5 @@ -49,14 +43,12 @@ EventScript_1630AD:: @ 81630AD clearflag FLAG_HIDE_ARTICUNO return -SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 - setvar VAR_0x4002, 0 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if FALSE, EventScript_163169 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if FALSE, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 - goto_if eq, EventScript_1630D4 +SeafoamIslands_B4F_OnLoad:: @ 81630B1 + setvar VAR_TEMP_2, 0 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169 + compare VAR_TEMP_2, 2 + goto_if_eq EventScript_1630D4 end EventScript_1630D4:: @ 81630D4 @@ -64,108 +56,106 @@ EventScript_1630D4:: @ 81630D4 setmetatile 13, 14, 299, 0 end -SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7 +SeafoamIslands_B4F_OnWarp:: @ 81630E7 map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_1630F1 .2byte 0 EventScript_1630F1:: @ 81630F1 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH special Special_ForcePlayerToStartSurfing end -SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9 +SeafoamIslands_B4F_OnFrame:: @ 81630F9 map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B - map_script_2 VAR_0x4001, 1, EventScript_163121 + map_script_2 VAR_TEMP_1, 1, EventScript_163121 .2byte 0 EventScript_16310B:: @ 816310B lockall - applymovement 255, Movement_16311D + applymovement OBJ_EVENT_ID_PLAYER, Movement_16311D waitmovement 0 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0 releaseall end Movement_16311D:: @ 816311D - step_1e - step_1e - step_1e + walk_fast_up + walk_fast_up + walk_fast_up step_end EventScript_163121:: @ 8163121 lockall - setvar VAR_0x4002, 0 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if FALSE, EventScript_163169 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if FALSE, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 - goto_if eq, EventScript_163185 + setvar VAR_TEMP_2, 0 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169 + compare VAR_TEMP_2, 2 + goto_if_eq EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 9 - call_if lt, EventScript_16316F - compare_var_to_value VAR_0x8008, 9 - call_if ge, EventScript_16317A + compare VAR_0x8008, 9 + call_if_lt EventScript_16316F + compare VAR_0x8008, 9 + call_if_ge EventScript_16317A special sub_805D1A8 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end EventScript_163169:: @ 8163169 - addvar VAR_0x4002, 1 + addvar VAR_TEMP_2, 1 return EventScript_16316F:: @ 816316F - applymovement 255, Movement_16318C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16318C waitmovement 0 return EventScript_16317A:: @ 816317A - applymovement 255, Movement_163195 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163195 waitmovement 0 return EventScript_163185:: @ 8163185 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end Movement_16318C:: @ 816318C - step_11 - step_11 - step_11 - step_13 - step_13 - step_13 - step_13 - step_11 + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up step_end Movement_163195:: @ 8163195 - step_11 - step_11 - step_11 - step_13 - step_13 - step_13 - step_11 + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_up step_end SeafoamIslands_B4F_EventScript_16319D:: @ 816319D lockall - applymovement 255, Movement_1631AA + applymovement OBJ_EVENT_ID_PLAYER, Movement_1631AA waitmovement 0 releaseall end Movement_1631AA:: @ 81631AA - step_11 + walk_up step_end SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC 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 lock faceplayer @@ -183,34 +173,34 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16320F - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163218 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163218 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq EventScript_16320F + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq EventScript_163218 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq EventScript_163218 setflag FLAG_FOUGHT_ARTICUNO release end EventScript_16320F:: @ 816320F setflag FLAG_FOUGHT_ARTICUNO - goto EventScript_1A922D + goto EventScript_RemoveStaticMon EventScript_163217:: @ 8163217 end EventScript_163218:: @ 8163218 setvar VAR_0x8004, SPECIES_ARTICUNO - goto EventScript_1A9236 + goto EventScript_MonFlewAway EventScript_163222:: @ 8163222 end SeafoamIslands_B4F_EventScript_163223:: @ 8163223 - msgbox gUnknown_8179B36, 3 + msgbox gUnknown_8179B36, MSGBOX_SIGN end SeafoamIslands_B4F_EventScript_16322C:: @ 816322C - msgbox gUnknown_8179B65, 3 + msgbox gUnknown_8179B65, MSGBOX_SIGN end diff --git a/data/maps/SeafoamIslands_B4F/text.inc b/data/maps/SeafoamIslands_B4F/text.inc index b2ef7d7e5..708828c74 100644 --- a/data/maps/SeafoamIslands_B4F/text.inc +++ b/data/maps/SeafoamIslands_B4F/text.inc @@ -1,4 +1,4 @@ -Text_1799E0:: @ 81799E0 +Text_RockSlideTeach:: @ 81799E0 .string "When you're up on a rocky mountain\n" .string "like this, rockslides are a threat.\p" .string "Can you imagine?\n" @@ -8,14 +8,14 @@ Text_1799E0:: @ 81799E0 .string "You don't seem to be scared.\n" .string "Want to try using ROCK SLIDE?$" -Text_179AC0:: @ 8179AC0 +Text_RockSlideDeclined:: @ 8179AC0 .string "Oh, so you are scared after all.$" -Text_179AE1:: @ 8179AE1 +Text_RockSlideWhichMon:: @ 8179AE1 .string "Which POKéMON should I teach\n" .string "ROCK SLIDE?$" -Text_179B0A:: @ 8179B0A +Text_RockSlideTaught:: @ 8179B0A .string "It might be scary to use it in this\n" .string "tunnel…$" diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index d83f81ed4..9f7d5692c 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_EventScript_1C4B56", + "script": "SevenIsland_EventScript_SwordsDanceTutor", "flag": "0" }, { diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index 92a3ceaf4..f7debbf02 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -1,19 +1,19 @@ SevenIsland_MapScripts:: @ 8167EB3 - map_script 3, SevenIsland_MapScript1_167EB9 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_OnTransition .byte 0 -SevenIsland_MapScript1_167EB9:: @ 8167EB9 +SevenIsland_OnTransition:: @ 8167EB9 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND end SevenIsland_EventScript_167EBD:: @ 8167EBD - msgbox gUnknown_8183046, 3 + msgbox gUnknown_8183046, MSGBOX_SIGN end SevenIsland_EventScript_167EC6:: @ 8167EC6 - msgbox gUnknown_818306C, 2 + msgbox gUnknown_818306C, MSGBOX_NPC end SevenIsland_EventScript_167ECF:: @ 8167ECF - msgbox gUnknown_8183143, 2 + msgbox gUnknown_8183143, MSGBOX_NPC end diff --git a/data/maps/SevenIsland/text.inc b/data/maps/SevenIsland/text.inc index 2795443a2..995752422 100644 --- a/data/maps/SevenIsland/text.inc +++ b/data/maps/SevenIsland/text.inc @@ -1,4 +1,4 @@ -Text_182F01:: @ 8182F01 +Text_SwordsDanceTeach:: @ 8182F01 .string "Not many people come out here.\p" .string "If I train here, I'm convinced that\n" .string "I'll get stronger and stronger.\p" @@ -6,14 +6,14 @@ Text_182F01:: @ 8182F01 .string "How would you like to learn a move\n" .string "like that? It's SWORDS DANCE.$" -Text_182FC1:: @ 8182FC1 +Text_SwordsDanceDeclined:: @ 8182FC1 .string "Well, that's fine, too.$" -Text_182FD9:: @ 8182FD9 +Text_SwordsDanceWhichMon:: @ 8182FD9 .string "All right, pick which POKéMON\n" .string "I should teach it to.$" -Text_18300D:: @ 818300D +Text_SwordsDanceTaught:: @ 818300D .string "If only we could keep getting\n" .string "stronger and stronger, eh?$" diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc index 8fa30cfa5..dfa2da755 100644 --- a/data/maps/SevenIsland_Harbor/scripts.inc +++ b/data/maps/SevenIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_Harbor_MapScripts:: @ 8170BE4 SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_SEVEN_ISLAND goto EventScript_1A900F diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index f136b8de2..60183ed13 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -1,18 +1,18 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A - map_script 3, SevenIsland_House_Room1_MapScript1_170895 - map_script 2, SevenIsland_House_Room1_MapScript2_1708CF + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room1_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room1_OnFrame .byte 0 -SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 +SevenIsland_House_Room1_OnTransition:: @ 8170895 special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_1708AF - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 - call_if ne, EventScript_1708C3 + compare VAR_RESULT, 0 + call_if_eq EventScript_1708AF + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 + call_if_ne EventScript_1708C3 end EventScript_1708AF:: @ 81708AF - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 4, 2 setobjectmovementtype 1, 8 setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C @@ -23,7 +23,7 @@ EventScript_1708C3:: @ 81708C3 setobjectmovementtype 1, 10 return -SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF +SevenIsland_House_Room1_OnFrame:: @ 81708CF map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, EventScript_1708E9 map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, EventScript_1708E9 map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, EventScript_1708E9 @@ -32,19 +32,19 @@ SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF EventScript_1708E9:: @ 1708E9 lockall textcolor 1 - applymovement 255, Movement_170953 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170953 waitmovement 0 applymovement 1, Movement_170955 waitmovement 0 moveobjectoffscreen 1 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - call_if eq, EventScript_170938 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - call_if eq, EventScript_170941 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 - call_if eq, EventScript_17094A + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 + call_if_eq EventScript_170938 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 + call_if_eq EventScript_170941 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 + call_if_eq EventScript_17094A special LoadPlayerParty setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 releaseall @@ -63,22 +63,22 @@ EventScript_17094A:: @ 817094A return Movement_170953:: @ 8170953 - step_10 + walk_down step_end Movement_170955:: @ 8170955 - step_13 - step_2d + walk_right + walk_in_place_fastest_down step_end SevenIsland_House_Room1_EventScript_170958:: @ 8170958 lock faceplayer special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_17097D - compare_var_to_value VAR_0x4001, 1 - goto_if eq, EventScript_170987 + compare VAR_RESULT, 1 + call_if_eq EventScript_17097D + compare VAR_TEMP_1, 1 + goto_if_eq EventScript_170987 msgbox gUnknown_81A049B release end @@ -92,28 +92,28 @@ EventScript_170987:: @ 8170987 special SavePlayerParty special Special_BufferEReaderTrainerName5 msgbox gUnknown_81A0598, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + compare VAR_RESULT, NO + goto_if_eq EventScript_170A11 call EventScript_170A1E - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + compare VAR_RESULT, 0 + goto_if_eq EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + compare VAR_RESULT, NO + goto_if_eq EventScript_170A11 special LoadPlayerParty - call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + call EventScript_AskSaveGame + compare VAR_RESULT, 0 + goto_if_eq EventScript_170A11 special SavePlayerParty special ReducePlayerPartyToThree msgbox gUnknown_81A07C4 closemessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_170A2D - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_170A3F - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_170A51 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_170A2D + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_170A3F + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate release @@ -127,57 +127,57 @@ EventScript_170A11:: @ 8170A11 EventScript_170A1E:: @ 8170A1E msgbox gUnknown_81A06AB - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate return EventScript_170A2D:: @ 8170A2D applymovement VAR_LAST_TALKED, Movement_170A6F - applymovement 255, Movement_170A63 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170A63 waitmovement 0 return EventScript_170A3F:: @ 8170A3F applymovement VAR_LAST_TALKED, Movement_170A72 - applymovement 255, Movement_170A67 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170A67 waitmovement 0 return EventScript_170A51:: @ 8170A51 applymovement VAR_LAST_TALKED, Movement_170A6F - applymovement 255, Movement_170A6B + applymovement OBJ_EVENT_ID_PLAYER, Movement_170A6B waitmovement 0 return Movement_170A63:: @ 8170A63 - step_1c - step_11 - step_11 + delay_16 + walk_up + walk_up step_end Movement_170A67:: @ 8170A67 - step_1c - step_13 - step_11 + delay_16 + walk_right + walk_up step_end Movement_170A6B:: @ 8170A6B - step_1c - step_12 - step_11 + delay_16 + walk_left + walk_up step_end Movement_170A6F:: @ 8170A6F - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end Movement_170A72:: @ 8170A72 - step_13 - step_2f + walk_right + walk_in_place_fastest_left step_end SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75 - msgbox gUnknown_81A0567, 3 + msgbox gUnknown_81A0567, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 0ca956c55..8d0ef3475 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -1,19 +1,19 @@ SevenIsland_House_Room2_MapScripts:: @ 8170A7E - map_script 3, SevenIsland_House_Room2_MapScript1_170A89 - map_script 2, SevenIsland_House_Room2_MapScript2_170A8D + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room2_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room2_OnFrame .byte 0 -SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89 +SevenIsland_House_Room2_OnTransition:: @ 8170A89 special SetEReaderTrainerGfxId end -SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D - map_script_2 VAR_0x4001, 0, EventScript_170A97 +SevenIsland_House_Room2_OnFrame:: @ 8170A8D + map_script_2 VAR_TEMP_1, 0, EventScript_170A97 .2byte 0 EventScript_170A97:: @ 8170A97 lockall - applymovement 255, Movement_170B22 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170B22 waitmovement 0 special PrintEReaderTrainerGreeting msgbox gStringVar4 @@ -22,18 +22,18 @@ EventScript_170A97:: @ 8170A97 setvar VAR_0x8005, 0 special StartSpecialBattle waitstate - compare_var_to_value VAR_RESULT, 3 - call_if eq, EventScript_170AFE - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_170B0C - compare_var_to_value VAR_RESULT, 2 - call_if eq, EventScript_170B17 + compare VAR_RESULT, 3 + call_if_eq EventScript_170AFE + compare VAR_RESULT, 1 + call_if_eq EventScript_170B0C + compare VAR_RESULT, 2 + call_if_eq EventScript_170B17 closemessage special HealPlayerParty - applymovement 255, Movement_170B28 + applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 waitmovement 0 special LoadPlayerParty - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 255, 4, 1 waitstate releaseall @@ -59,19 +59,19 @@ EventScript_170B17:: @ 8170B17 return Movement_170B22:: @ 8170B22 - step_10 - step_10 - step_10 - step_13 - step_13 + walk_down + walk_down + walk_down + walk_right + walk_right step_end Movement_170B28:: @ 8170B28 - step_12 - step_12 - step_11 - step_11 - step_11 - step_11 - step_1b + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + delay_8 step_end diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index 58312009f..0fc710d8a 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -3,14 +3,14 @@ SevenIsland_Mart_MapScripts:: @ 8170B30 SevenIsland_Mart_EventScript_170B31:: @ 8170B31 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_170B58 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -30,13 +30,13 @@ Items_170B58:: @ 8170B58 end SevenIsland_Mart_EventScript_170B6E:: @ 8170B6E - msgbox gUnknown_81A0A4F, 2 + msgbox gUnknown_81A0A4F, MSGBOX_NPC end SevenIsland_Mart_EventScript_170B77:: @ 8170B77 - msgbox gUnknown_81A0ACC, 2 + msgbox gUnknown_81A0ACC, MSGBOX_NPC end SevenIsland_Mart_EventScript_170B80:: @ 8170B80 - msgbox gUnknown_81A0B09, 2 + msgbox gUnknown_81A0B09, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 170459099..459806f32 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 - map_script 3, SevenIsland_PokemonCenter_1F_MapScript1_170B94 - map_script 5, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94 +SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94 setrespawn SPAWN_SEVEN_ISLAND end SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1 - msgbox gUnknown_81A0B98, 2 + msgbox gUnknown_81A0B98, MSGBOX_NPC end SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA - msgbox gUnknown_81A0C1F, 2 + msgbox gUnknown_81A0C1F, MSGBOX_NPC end SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3 - msgbox gUnknown_81A0CA5, 2 + msgbox gUnknown_81A0CA5, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index bcd215d25..c44ce8385 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc index 89d97e0db..7aa713902 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC - map_script 2, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SevenIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SevenIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8170BD1 + call CableClub_EventScript_Colosseum end -EventScript_170BD7:: @ 8170BD7 - call EventScript_1BB6AB +SevenIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8170BD7 + call CableClub_EventScript_TradeCenter end -EventScript_170BDD:: @ 8170BDD - call EventScript_1BB7DE +SevenIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8170BDD + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 350cb0060..50884dd2a 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -242,7 +242,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BECDE", + "script": "SevenIsland_SevaultCanyon_EventScript_ItemKingsRock", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK" }, { @@ -255,7 +255,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BECEB", + "script": "SevenIsland_SevaultCanyon_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR" }, { @@ -268,7 +268,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BECF8", + "script": "SevenIsland_SevaultCanyon_EventScript_ItemNugget", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET" }, { diff --git a/data/maps/SevenIsland_SevaultCanyon/scripts.inc b/data/maps/SevenIsland_SevaultCanyon/scripts.inc index f0122ffbf..8c906d3f2 100644 --- a/data/maps/SevenIsland_SevaultCanyon/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon/scripts.inc @@ -2,5 +2,5 @@ SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD .byte 0 SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE - msgbox gUnknown_818CF2B, 3 + msgbox gUnknown_818CF2B, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc index 7fcda3492..617055d66 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc @@ -2,5 +2,5 @@ SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3 .byte 0 SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4 - msgbox gUnknown_818C82D, 3 + msgbox gUnknown_818C82D, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 09447abbf..3803d3200 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_House_EventScript_1BEDFC", + "script": "SevenIsland_SevaultCanyon_House_EventScript_ItemLuckyPunch", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE_LUCKY_PUNCH" } ], diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index dcf37028d..975444645 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -3,44 +3,43 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 lock - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_172211 + goto_if_set FLAG_TEMP_2, EventScript_172211 playbgm MUS_P_SCHOOL, 0 applymovement 1, Movement_172231 waitmovement 0 fadedefaultbgm delay 30 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A4D72 textcolor 3 msgbox gUnknown_81A4DAF, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_172225 + compare VAR_RESULT, NO + goto_if_eq EventScript_172225 msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 - compare_var_to_value VAR_FACING, 1 - call_if ne, EventScript_172206 + compare VAR_FACING, DIR_SOUTH + call_if_ne EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 - applymovement 255, Movement_172231 + applymovement OBJ_EVENT_ID_PLAYER, Movement_172231 waitmovement 0 fadedefaultbgm delay 30 - call EventScript_FadeOut_Heal_FadeIn + call EventScript_OutOfCenterPartyHeal msgbox gUnknown_81A4DF5 setflag FLAG_TEMP_2 release end EventScript_172206:: @ 8172206 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_172211:: @ 8172211 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A4D72 release @@ -53,22 +52,22 @@ EventScript_172225:: @ 8172225 end Movement_172231:: @ 8172231 - step_25 - step_1c - step_25 - step_1c - step_25 - step_1c - step_25 - step_1c - step_30 - step_1a - step_2e - step_1a - step_2f - step_1a - step_2d - step_1a + walk_in_place_down + delay_16 + walk_in_place_down + delay_16 + walk_in_place_down + delay_16 + walk_in_place_down + delay_16 + walk_in_place_fastest_right + delay_4 + walk_in_place_fastest_up + delay_4 + walk_in_place_fastest_left + delay_4 + walk_in_place_fastest_down + delay_4 step_end SevenIsland_SevaultCanyon_House_EventScript_172242:: @ 8172242 diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index c1b70fd2d..cbb2f2b76 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -120,7 +120,7 @@ "x": 7, "y": 2, "elevation": 3, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39" }, @@ -129,7 +129,7 @@ "x": 9, "y": 8, "elevation": 3, - "var": "VAR_0x4007", + "var": "VAR_TEMP_7", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B" }, @@ -138,7 +138,7 @@ "x": 5, "y": 8, "elevation": 3, - "var": "VAR_0x4006", + "var": "VAR_TEMP_6", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8" }, @@ -147,7 +147,7 @@ "x": 9, "y": 6, "elevation": 3, - "var": "VAR_0x4005", + "var": "VAR_TEMP_5", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5" }, @@ -156,7 +156,7 @@ "x": 5, "y": 6, "elevation": 3, - "var": "VAR_0x4004", + "var": "VAR_TEMP_4", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2" }, @@ -165,7 +165,7 @@ "x": 10, "y": 4, "elevation": 3, - "var": "VAR_0x4003", + "var": "VAR_TEMP_3", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F" }, @@ -174,7 +174,7 @@ "x": 4, "y": 4, "elevation": 3, - "var": "VAR_0x4002", + "var": "VAR_TEMP_2", "var_value": 99, "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C" } diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 442e13942..8758f8517 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,19 +1,18 @@ SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC - map_script 3, SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition .byte 0 -SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 +SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY - checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS - call_if TRUE, EventScript_164E07 - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 0 - setvar VAR_0x4003, 0 - setvar VAR_0x4004, 0 - setvar VAR_0x4005, 0 - setvar VAR_0x4006, 0 - setvar VAR_0x4007, 0 - setvar VAR_0x4008, 0 + call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_164E07 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 end EventScript_164E07:: @ 8164E07 @@ -28,83 +27,83 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall - compare_var_to_value VAR_0x4001, 100 - goto_if eq, EventScript_164F8A + compare VAR_TEMP_1, 100 + goto_if_eq EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4001, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if eq, EventScript_164F8C + setvar VAR_TEMP_1, 100 + compare VAR_TEMP_8, 7 + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall - compare_var_to_value VAR_0x4002, 100 - goto_if eq, EventScript_164F8A + compare VAR_TEMP_2, 100 + goto_if_eq EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4002, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if eq, EventScript_164F8C + setvar VAR_TEMP_2, 100 + compare VAR_TEMP_8, 7 + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall - compare_var_to_value VAR_0x4003, 100 - goto_if eq, EventScript_164F8A + compare VAR_TEMP_3, 100 + goto_if_eq EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4003, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if eq, EventScript_164F8C + setvar VAR_TEMP_3, 100 + compare VAR_TEMP_8, 7 + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall - compare_var_to_value VAR_0x4004, 100 - goto_if eq, EventScript_164F8A + compare VAR_TEMP_4, 100 + goto_if_eq EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4004, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if eq, EventScript_164F8C + setvar VAR_TEMP_4, 100 + compare VAR_TEMP_8, 7 + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall - compare_var_to_value VAR_0x4005, 100 - goto_if eq, EventScript_164F8A + compare VAR_TEMP_5, 100 + goto_if_eq EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4005, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if eq, EventScript_164F8C + setvar VAR_TEMP_5, 100 + compare VAR_TEMP_8, 7 + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall - compare_var_to_value VAR_0x4006, 100 - goto_if eq, EventScript_164F8A + compare VAR_TEMP_6, 100 + goto_if_eq EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4006, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if eq, EventScript_164F8C + setvar VAR_TEMP_6, 100 + compare VAR_TEMP_8, 7 + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall - compare_var_to_value VAR_0x4007, 100 - goto_if eq, EventScript_164F8A + compare VAR_TEMP_7, 100 + goto_if_eq EventScript_164F8A call EventScript_164F2E - setvar VAR_0x4007, 100 - compare_var_to_value VAR_0x4008, 7 - goto_if eq, EventScript_164F8C + setvar VAR_TEMP_7, 100 + compare VAR_TEMP_8, 7 + goto_if_eq EventScript_164F8C releaseall end EventScript_164F2E:: @ 8164F2E - addvar VAR_0x4008, 1 + addvar VAR_TEMP_8, 1 playse SE_TRACK_MOVE setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc index f0b8a602e..847ae472a 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6 - map_script 3, SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_DilfordChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC:: @ 8164CFC +SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: @ 8164CFC call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc index 2a9d64e42..b982b77dd 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE - map_script 3, SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_LiptooChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4:: @ 8164CE4 +SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: @ 8164CE4 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc index 391a45a95..d467f79ef 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF - map_script 3, SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_MoneanChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5:: @ 8164CD5 +SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: @ 8164CD5 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc index de1c0cd97..2f3d604c3 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E - map_script 3, SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_RixyChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14:: @ 8164D14 +SevenIsland_TanobyRuins_RixyChamber_OnTransition:: @ 8164D14 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc index 2cbb2d08d..dd1a73f83 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02 - map_script 3, SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_ScufibChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08:: @ 8164D08 +SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: @ 8164D08 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc index ea63fa0ea..131a6ecca 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A - map_script 3, SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_ViapoisChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20:: @ 8164D20 +SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: @ 8164D20 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc index ae8294f89..ff6c851ee 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA - map_script 3, SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_WeepthChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0:: @ 8164CF0 +SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: @ 8164CF0 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index e0b5f78c0..56716493a 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -1,15 +1,15 @@ SevenIsland_TrainerTower_MapScripts:: @ 8168BD5 - map_script 3, SevenIsland_TrainerTower_MapScript1_168BDB + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_OnTransition .byte 0 -SevenIsland_TrainerTower_MapScript1_168BDB:: @ 8168BDB +SevenIsland_TrainerTower_OnTransition:: @ 8168BDB setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 end SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1 - msgbox gUnknown_818C338, 3 + msgbox gUnknown_818C338, MSGBOX_SIGN end SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA - msgbox gUnknown_818C370, 3 + msgbox gUnknown_818C370, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index 524654792..ef0339b63 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -101,7 +101,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF" }, @@ -110,7 +110,7 @@ "x": 9, "y": 12, "elevation": 0, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4" }, @@ -119,7 +119,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc index eb9475260..4987c1142 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8 - map_script 5, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_1F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_1F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8 diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index dde2e99ac..fe3329368 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc index 91107975b..9e61d0dfd 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6 - map_script 5, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_2F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_2F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6 diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index ddc7e3009..b241536b6 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc index c4ecde9a0..e9afcff6c 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714 - map_script 5, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_3F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_3F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724 diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index 010f213de..d32447db2 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc index 32d17a844..cfa0be11b 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742 - map_script 5, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_4F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_4F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752 diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index 933e07d80..f9d032e87 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc index 5c461c0e8..35ccdf129 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770 - map_script 5, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_5F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_5F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780 diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index 522d796dd..4ec4b1e45 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc index 5dd711203..361c92749 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E - map_script 5, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_6F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_6F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index 55ca3f1b7..4e28edf5b 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc index 2a74cfb91..be0036605 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC - map_script 5, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_7F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_7F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index 78e1fe89d..4e8fb9db3 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -108,7 +108,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x400E", + "var": "VAR_TEMP_E", "var_value": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF" }, @@ -117,7 +117,7 @@ "x": 9, "y": 12, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4" }, @@ -126,7 +126,7 @@ "x": 9, "y": 13, "elevation": 3, - "var": "VAR_0x400F", + "var": "VAR_TEMP_F", "var_value": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA" } diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc index 1219425d0..b51982f48 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA - map_script 5, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_8F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_8F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index e8ee2450f..f84c67295 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -1,16 +1,15 @@ SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 - map_script 5, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 - map_script 2, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 .byte 0 SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 lockall setvar VAR_0x8004, 6 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow - message Text_1A535C + message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 6 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos @@ -40,13 +39,13 @@ EventScript_164B5E:: @ 8164B5E EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - compare_var_to_value VAR_ELEVATOR_FLOOR, 3 - goto_if eq, EventScript_164BD3 + compare VAR_ELEVATOR_FLOOR, 3 + goto_if_eq EventScript_164BD3 call EventScript_164BD8 setvar VAR_ELEVATOR_FLOOR, 3 special Special_CloseElevatorCurrentFloorWindow delay 25 - applymovement 255, Movement_164BE5 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164BE5 waitmovement 0 warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 waitstate @@ -72,10 +71,10 @@ EventScript_164BD8:: @ 8164BD8 return Movement_164BE5:: @ 8164BE5 - step_2d - step_1c - step_10 - step_13 - step_13 - step_10 + walk_in_place_fastest_down + delay_16 + walk_down + walk_right + walk_right + walk_down step_end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index b0074f4b3..713400e2a 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -1,27 +1,27 @@ SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 - map_script 5, SevenIsland_TrainerTower_Lobby_MapScript1_164853 - map_script 7, SevenIsland_TrainerTower_Lobby_MapScript2_164887 - map_script 3, SevenIsland_TrainerTower_Lobby_MapScript3_1648AD - map_script 1, SevenIsland_TrainerTower_Lobby_MapScript4_164897 - map_script 2, SevenIsland_TrainerTower_Lobby_MapScript5_1648B6 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Lobby_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, SevenIsland_TrainerTower_Lobby_OnReturnToField + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_Lobby_OnTransition + map_script MAP_SCRIPT_ON_LOAD, SevenIsland_TrainerTower_Lobby_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Lobby_OnFrame .byte 0 -SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853 - setvar VAR_0x4002, 0 +SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 + setvar VAR_TEMP_2, 0 setvar VAR_0x8004, 10 special sub_815D9E8 setvar VAR_0x8004, 18 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_164886 - setvar VAR_0x4000, 0 - setobjectxy 255, 9, 7 - applymovement 255, Movement_164AD4 + compare VAR_RESULT, 0 + goto_if_eq EventScript_164886 + setvar VAR_TEMP_0, 0 + setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 EventScript_164886:: @ 8164886 end -SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 +SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887 addobject 1 addobject 2 addobject 3 @@ -29,44 +29,44 @@ SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 addobject 5 end -SevenIsland_TrainerTower_Lobby_MapScript4_164897:: @ 8164897 - compare_var_to_value VAR_0x400D, 17 - call_if eq, EventScript_1648A3 +SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897 + compare VAR_TEMP_D, 17 + call_if_eq EventScript_1648A3 end EventScript_1648A3:: @ 81648A3 setmetatile 17, 10, 647, 0 return -SevenIsland_TrainerTower_Lobby_MapScript3_1648AD:: @ 81648AD +SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY - getplayerxy VAR_0x400D, VAR_RESULT + getplayerxy VAR_TEMP_D, VAR_RESULT end -SevenIsland_TrainerTower_Lobby_MapScript5_1648B6:: @ 81648B6 - map_script_2 VAR_0x4000, 0, EventScript_1648ED - map_script_2 VAR_0x400D, 0x11, EventScript_1648C8 +SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6 + map_script_2 VAR_TEMP_0, 0, EventScript_1648ED + map_script_2 VAR_TEMP_D, 0x11, EventScript_1648C8 .2byte 0 EventScript_1648C8:: @ 81648C8 lockall - applymovement 255, Movement_1648EA + applymovement OBJ_EVENT_ID_PLAYER, Movement_1648EA waitmovement 0 setmetatile 17, 10, 692, 1 special DrawWholeMapView playse SE_TK_KASYA waitse - setvar VAR_0x400D, 0 + setvar VAR_TEMP_D, 0 releaseall end Movement_1648EA:: @ 81648EA - step_10 - step_10 + walk_down + walk_down step_end EventScript_1648ED:: @ 81648ED - setvar VAR_0x4000, 1 + setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 12 special sub_815D9E8 switch VAR_RESULT @@ -77,7 +77,7 @@ EventScript_1648ED:: @ 81648ED EventScript_164920:: @ 8164920 lock faceplayer - applymovement 255, Movement_164AD4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 textcolor 1 msgbox gUnknown_817C937 goto EventScript_16494B @@ -85,13 +85,13 @@ EventScript_164920:: @ 8164920 EventScript_164938:: @ 8164938 lock faceplayer - applymovement 255, Movement_164AD4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 textcolor 1 msgbox gUnknown_817C9C0 EventScript_16494B:: @ 816494B closemessage - applymovement 255, Movement_164AD6 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6 waitmovement 0 setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 release @@ -102,7 +102,7 @@ EventScript_16495C:: @ 816495C SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end @@ -111,8 +111,8 @@ SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 faceplayer setvar VAR_0x8004, 20 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_164988 + compare VAR_RESULT, 1 + goto_if_eq EventScript_164988 msgbox gUnknown_817C9A2 goto EventScript_164990 @@ -125,14 +125,14 @@ EventScript_164990:: @ 8164990 SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_1649B8 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -153,13 +153,13 @@ Items_1649B8:: @ 81649B8 SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE lockall - applymovement 255, Movement_164AD4 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 textcolor 1 msgbox gUnknown_817C794 setvar VAR_0x8004, 17 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_164A00 + compare VAR_RESULT, 0 + goto_if_eq EventScript_164A00 msgbox gUnknown_817C7D9 goto EventScript_164A08 @@ -206,22 +206,22 @@ EventScript_164AA0:: @ 8164AA0 EventScript_164ABF:: @ 8164ABF msgbox gUnknown_817C91D closemessage - applymovement 255, Movement_164AD6 + applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6 waitmovement 0 releaseall end Movement_164AD4:: @ 8164AD4 - step_03 + face_right step_end Movement_164AD6:: @ 8164AD6 - step_10 + walk_down step_end SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_0x8004, 1 special Special_BattleRecords waitstate @@ -229,9 +229,9 @@ SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 end SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6 - msgbox gUnknown_817CE38, 2 + msgbox gUnknown_817CE38, MSGBOX_NPC end SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF - msgbox gUnknown_817CE9F, 2 + msgbox gUnknown_817CE9F, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc index af451e565..6ae4ed2be 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc @@ -1,6 +1,6 @@ SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828 - map_script 5, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 - map_script 2, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 .byte 0 SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833 diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index f3e5abafe..da9f835e2 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_1BE8F5", + "script": "SilphCo_10F_EventScript_ItemCarbos", "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_1BE902", + "script": "SilphCo_10F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_1BE90F", + "script": "SilphCo_10F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_SILPH_CO_10F_RARE_CANDY" } ], @@ -143,28 +143,28 @@ "x": 12, "y": 11, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 13, "y": 11, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 12, "y": 12, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 13, "y": 12, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 0b8e0e2cb..a0ab7219b 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -1,17 +1,16 @@ SilphCo_10F_MapScripts:: @ 8161D86 - map_script 1, SilphCo_10F_MapScript1_161D8C + map_script MAP_SCRIPT_ON_LOAD, SilphCo_10F_OnLoad .byte 0 -SilphCo_10F_MapScript1_161D8C:: @ 8161D8C - checkflag FLAG_SILPH_10F_DOOR - call_if FALSE, EventScript_1A84D6 +SilphCo_10F_OnLoad:: @ 8161D8C + call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor end SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161DAD + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_161DAD msgbox gUnknown_8176DBA release end @@ -22,15 +21,15 @@ EventScript_161DAD:: @ 8161DAD end SilphCo_10F_EventScript_161DB7:: @ 8161DB7 - msgbox gUnknown_8176DF8, 3 + msgbox gUnknown_8176DF8, MSGBOX_SIGN end SilphCo_10F_EventScript_161DC0:: @ 8161DC0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TRAVIS, 0, Text_176D57, Text_176D73 - msgbox gUnknown_8176D86, 6 + trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73 + msgbox gUnknown_8176D86, MSGBOX_AUTOCLOSE end SilphCo_10F_EventScript_161DD7:: @ 8161DD7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_39, 0, Text_176CED, Text_176D18 - msgbox gUnknown_8176D25, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18 + msgbox gUnknown_8176D25, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index bd9d83597..ec99fdfe9 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_11F_EventScript_1BEB58", + "script": "SilphCo_11F_EventScript_ItemZinc", "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { @@ -141,28 +141,28 @@ "x": 5, "y": 16, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 17, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 16, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 17, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 292498c7b..05f52646e 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -1,27 +1,24 @@ SilphCo_11F_MapScripts:: @ 8161DEE - map_script 1, SilphCo_11F_MapScript1_161DF4 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_11F_OnLoad .byte 0 -SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 - checkflag FLAG_SILPH_11F_DOOR - call_if FALSE, EventScript_1A8504 +SilphCo_11F_OnLoad:: @ 8161DF4 + call_if_unset FLAG_SILPH_11F_DOOR, EventScript_Close11FDoor end SilphCo_11F_EventScript_161DFE:: @ 8161DFE lock faceplayer - checkflag FLAG_GOT_MASTER_BALL_FROM_SILPH - goto_if TRUE, EventScript_161E75 + goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, EventScript_161E75 checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_161E59 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_161E62 + compare VAR_RESULT, MALE + call_if_eq EventScript_161E59 + compare VAR_RESULT, FEMALE + call_if_eq EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_161E6B - additem ITEM_MASTER_BALL, 1 - giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_161E6B + giveitem_msg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 msgbox gUnknown_8176FEB setflag FLAG_GOT_MASTER_BALL_FROM_SILPH release @@ -46,12 +43,12 @@ EventScript_161E75:: @ 8161E75 end SilphCo_11F_EventScript_161E7F:: @ 8161E7F - msgbox gUnknown_81770A9, 2 + msgbox gUnknown_81770A9, MSGBOX_NPC end SilphCo_11F_EventScript_161E88:: @ 8161E88 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_161EA0 EventScript_161E93:: @ 8161E93 @@ -59,7 +56,7 @@ EventScript_161E93:: @ 8161E93 SilphCo_11F_EventScript_161E94:: @ 8161E94 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_161EA0 EventScript_161E9F:: @ 8161E9F @@ -67,24 +64,24 @@ EventScript_161E9F:: @ 8161E9F EventScript_161EA0:: @ 8161EA0 textcolor 0 - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 delay 25 msgbox gUnknown_8177108 closemessage - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_161F00 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_161F12 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_161F00 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_161F12 setvar VAR_LAST_TALKED, 3 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB + trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, Text_1771AB msgbox gUnknown_81771C2 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 3 removeobject 4 removeobject 6 - fadescreen 0 + fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_SILPH_CO_11F, 1 setflag FLAG_HIDE_SAFFRON_ROCKETS clearflag FLAG_HIDE_SAFFRON_CIVILIANS @@ -93,7 +90,7 @@ EventScript_161EA0:: @ 8161EA0 EventScript_161F00:: @ 8161F00 applymovement 3, Movement_161F1D - applymovement 255, Movement_161F27 + applymovement OBJ_EVENT_ID_PLAYER, Movement_161F27 waitmovement 0 return @@ -103,42 +100,42 @@ EventScript_161F12:: @ 8161F12 return Movement_161F1D:: @ 8161F1D - step_10 - step_10 - step_10 - step_10 - step_2f + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end Movement_161F23:: @ 8161F23 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down step_end Movement_161F27:: @ 8161F27 - step_1c - step_1c - step_1c - step_1b - step_1a - step_30 + delay_16 + delay_16 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_right step_end EventScript_161F2E:: @ 8161F2E - msgbox gUnknown_817732B, 3 + msgbox gUnknown_817732B, MSGBOX_SIGN end SilphCo_11F_EventScript_161F37:: @ 8161F37 - msgbox gUnknown_817734A, 3 + msgbox gUnknown_817734A, MSGBOX_SIGN end SilphCo_11F_EventScript_161F40:: @ 8161F40 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_40, 0, Text_1772B8, Text_1772E7 - msgbox gUnknown_81772F9, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, Text_1772B8, Text_1772E7 + msgbox gUnknown_81772F9, MSGBOX_AUTOCLOSE end SilphCo_11F_EventScript_161F57:: @ 8161F57 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_41, 0, Text_17726A, Text_17728C - msgbox gUnknown_817729B, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, Text_17726A, Text_17728C + msgbox gUnknown_817729B, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index ffb126808..f10c4d8b3 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -1,15 +1,15 @@ SilphCo_1F_MapScripts:: @ 8161625 - map_script 3, SilphCo_1F_MapScript1_16162B + map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_1F_OnTransition .byte 0 -SilphCo_1F_MapScript1_16162B:: @ 816162B +SilphCo_1F_OnTransition:: @ 816162B setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F end SilphCo_1F_EventScript_16162F:: @ 816162F - msgbox gUnknown_81754F7, 2 + msgbox gUnknown_81754F7, MSGBOX_NPC end SilphCo_1F_EventScript_161638:: @ 8161638 - msgbox gUnknown_8175549, 3 + msgbox gUnknown_8175549, MSGBOX_SIGN end diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index a2d405b3a..4529535b2 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_2F_EventScript_16165A", + "script": "SilphCo_2F_EventScript_ThunderWaveTutor", "flag": "0" } ], @@ -137,56 +137,56 @@ "x": 5, "y": 8, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 6, "y": 8, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 5, "y": 9, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 6, "y": 9, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 5, "y": 15, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 6, "y": 15, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 5, "y": 16, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 6, "y": 16, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 1d08e777b..6f800bbd0 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -1,40 +1,38 @@ SilphCo_2F_MapScripts:: @ 8161641 - map_script 1, SilphCo_2F_MapScript1_161647 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_2F_OnLoad .byte 0 -SilphCo_2F_MapScript1_161647:: @ 8161647 - checkflag FLAG_SILPH_2F_DOOR_1 - call_if FALSE, EventScript_1A8149 - checkflag FLAG_SILPH_2F_DOOR_2 - call_if FALSE, EventScript_1A8177 +SilphCo_2F_OnLoad:: @ 8161647 + call_if_unset FLAG_SILPH_2F_DOOR_1, EventScript_Close2FDoor1 + call_if_unset FLAG_SILPH_2F_DOOR_2, EventScript_Close2FDoor2 end -SilphCo_2F_EventScript_16165A:: @ 816165A - goto EventScript_1C4816 +SilphCo_2F_EventScript_ThunderWaveTutor:: @ 816165A + goto EventScript_ThunderWaveTutor EventScript_16165F:: @ 816165F end SilphCo_2F_EventScript_161660:: @ 8161660 - msgbox gUnknown_8175894, 3 + msgbox gUnknown_8175894, MSGBOX_SIGN end SilphCo_2F_EventScript_161669:: @ 8161669 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_CONNOR, 0, Text_175562, Text_17557E - msgbox gUnknown_817559F, 6 + trainerbattle_single TRAINER_SCIENTIST_CONNOR, Text_175562, Text_17557E + msgbox gUnknown_817559F, MSGBOX_AUTOCLOSE end SilphCo_2F_EventScript_161680:: @ 8161680 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JERRY, 0, Text_1755C6, Text_1755E5 - msgbox gUnknown_81755F2, 6 + trainerbattle_single TRAINER_SCIENTIST_JERRY, Text_1755C6, Text_1755E5 + msgbox gUnknown_81755F2, MSGBOX_AUTOCLOSE end SilphCo_2F_EventScript_161697:: @ 8161697 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_23, 0, Text_17562D, Text_17564A - msgbox gUnknown_8175651, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, Text_17562D, Text_17564A + msgbox gUnknown_8175651, MSGBOX_AUTOCLOSE end SilphCo_2F_EventScript_1616AE:: @ 81616AE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_24, 0, Text_1756AD, Text_1756D8 - msgbox gUnknown_81756E2, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, Text_1756AD, Text_1756D8 + msgbox gUnknown_81756E2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_2F/text.inc b/data/maps/SilphCo_2F/text.inc index ee3fbc0b0..3dc65664d 100644 --- a/data/maps/SilphCo_2F/text.inc +++ b/data/maps/SilphCo_2F/text.inc @@ -44,7 +44,7 @@ gUnknown_81756E2:: @ 81756E2 .string "SILPH CO. will be associated with\n" .string "TEAM ROCKET!$" -Text_175711:: @ 8175711 +Text_ThunderWaveTeach:: @ 8175711 .string "Eeek!\n" .string "No! Stop! Help!\p" .string "Oh, you're not with TEAM ROCKET.\n" @@ -52,15 +52,15 @@ Text_175711:: @ 8175711 .string "Will you forgive me if I teach\n" .string "you the THUNDER WAVE technique?$" -Text_17579D:: @ 817579D +Text_ThunderWaveDeclined:: @ 817579D .string "Oh…\n" .string "But THUNDER WAVE is convenient…$" -Text_1757C1:: @ 81757C1 +Text_ThunderWaveWhichMon:: @ 81757C1 .string "Which POKéMON should I teach\n" .string "THUNDER WAVE?$" -Text_1757EC:: @ 81757EC +Text_ThunderWaveTaught:: @ 81757EC .string "THUNDER WAVE causes paralysis in\n" .string "the target POKéMON.\p" .string "A paralyzed POKéMON may be unable\n" diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 5581d6926..3f7e3590b 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_3F_EventScript_1BE866", + "script": "SilphCo_3F_EventScript_ItemHyperPotion", "flag": "FLAG_HIDE_SILPH_CO_3F_HYPER_POTION" } ], @@ -145,56 +145,56 @@ "x": 10, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 10, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 21, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 21, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 9, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 9, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 20, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 20, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 8187e8e45..a5e62b667 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -1,19 +1,17 @@ SilphCo_3F_MapScripts:: @ 81616C5 - map_script 1, SilphCo_3F_MapScript1_1616CB + map_script MAP_SCRIPT_ON_LOAD, SilphCo_3F_OnLoad .byte 0 -SilphCo_3F_MapScript1_1616CB:: @ 81616CB - checkflag FLAG_SILPH_3F_DOOR_1 - call_if FALSE, EventScript_1A81A5 - checkflag FLAG_SILPH_3F_DOOR_2 - call_if FALSE, EventScript_1A81DC +SilphCo_3F_OnLoad:: @ 81616CB + call_if_unset FLAG_SILPH_3F_DOOR_1, EventScript_Close3FDoor1 + call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2 end SilphCo_3F_EventScript_1616DE:: @ 81616DE lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1616F5 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_1616F5 msgbox gUnknown_81758AD release end @@ -24,15 +22,15 @@ EventScript_1616F5:: @ 81616F5 end SilphCo_3F_EventScript_1616FF:: @ 81616FF - msgbox gUnknown_81759DC, 3 + msgbox gUnknown_81759DC, MSGBOX_SIGN end SilphCo_3F_EventScript_161708:: @ 8161708 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSE, 0, Text_175948, Text_17597D - msgbox gUnknown_8175990, 6 + trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D + msgbox gUnknown_8175990, MSGBOX_AUTOCLOSE end SilphCo_3F_EventScript_16171F:: @ 816171F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_25, 0, Text_1758F6, Text_175911 - msgbox gUnknown_817591C, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911 + msgbox gUnknown_817591C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 2bfb46286..6390f880b 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BE873", + "script": "SilphCo_4F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BE880", + "script": "SilphCo_4F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BE88D", + "script": "SilphCo_4F_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BEE09", + "script": "SilphCo_4F_EventScript_ItemTM41", "flag": "FLAG_HIDE_SILPH_CO_4F_TM41" } ], @@ -176,56 +176,56 @@ "x": 3, "y": 16, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 4, "y": 16, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 3, "y": 17, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 4, "y": 17, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 15, "y": 11, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 14, "y": 11, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 14, "y": 12, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 15, "y": 12, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 176b6a4d3..406e394f1 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -1,19 +1,17 @@ SilphCo_4F_MapScripts:: @ 8161736 - map_script 1, SilphCo_4F_MapScript1_16173C + map_script MAP_SCRIPT_ON_LOAD, SilphCo_4F_OnLoad .byte 0 -SilphCo_4F_MapScript1_16173C:: @ 816173C - checkflag FLAG_SILPH_4F_DOOR_1 - call_if FALSE, EventScript_1A8213 - checkflag FLAG_SILPH_4F_DOOR_2 - call_if FALSE, EventScript_1A8241 +SilphCo_4F_OnLoad:: @ 816173C + call_if_unset FLAG_SILPH_4F_DOOR_1, EventScript_Close4FDoor1 + call_if_unset FLAG_SILPH_4F_DOOR_2, EventScript_Close4FDoor2 end SilphCo_4F_EventScript_16174F:: @ 816174F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161766 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_161766 msgbox gUnknown_81759F5 release end @@ -24,20 +22,20 @@ EventScript_161766:: @ 8161766 end SilphCo_4F_EventScript_161770:: @ 8161770 - msgbox gUnknown_8175B57, 3 + msgbox gUnknown_8175B57, MSGBOX_SIGN end SilphCo_4F_EventScript_161779:: @ 8161779 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_RODNEY, 0, Text_175A90, Text_175AB0 - msgbox gUnknown_8175AC8, 6 + trainerbattle_single TRAINER_SCIENTIST_RODNEY, Text_175A90, Text_175AB0 + msgbox gUnknown_8175AC8, MSGBOX_AUTOCLOSE end SilphCo_4F_EventScript_161790:: @ 8161790 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_26, 0, Text_175A2F, Text_175A5B - msgbox gUnknown_8175A62, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, Text_175A2F, Text_175A5B + msgbox gUnknown_8175A62, MSGBOX_AUTOCLOSE end SilphCo_4F_EventScript_1617A7:: @ 81617A7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_27, 0, Text_175B19, Text_175B2B - msgbox gUnknown_8175B38, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, Text_175B19, Text_175B2B + msgbox gUnknown_8175B38, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index a59f7836b..be2d202e8 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1BE89A", + "script": "SilphCo_5F_EventScript_ItemProtein", "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1BE8A7", + "script": "SilphCo_5F_EventScript_ItemTM01", "flag": "FLAG_HIDE_SILPH_CO_5F_TM01" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1BE8B4", + "script": "SilphCo_5F_EventScript_ItemCardKey", "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY" }, { @@ -199,84 +199,84 @@ "x": 8, "y": 9, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 8, "y": 10, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 8, "y": 18, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 8, "y": 19, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 19, "y": 13, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 19, "y": 14, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 7, "y": 9, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 7, "y": 10, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 7, "y": 19, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 7, "y": 18, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 18, "y": 13, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 18, "y": 14, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index a87e88d33..1a17e3b44 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -1,21 +1,18 @@ SilphCo_5F_MapScripts:: @ 81617BE - map_script 1, SilphCo_5F_MapScript1_1617C4 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_5F_OnLoad .byte 0 -SilphCo_5F_MapScript1_1617C4:: @ 81617C4 - checkflag FLAG_SILPH_5F_DOOR_1 - call_if FALSE, EventScript_1A826F - checkflag FLAG_SILPH_5F_DOOR_2 - call_if FALSE, EventScript_1A82A6 - checkflag FLAG_SILPH_5F_DOOR_3 - call_if FALSE, EventScript_1A82DD +SilphCo_5F_OnLoad:: @ 81617C4 + call_if_unset FLAG_SILPH_5F_DOOR_1, EventScript_Close5FDoor1 + call_if_unset FLAG_SILPH_5F_DOOR_2, EventScript_Close5FDoor2 + call_if_unset FLAG_SILPH_5F_DOOR_3, EventScript_Close5FDoor3 end SilphCo_5F_EventScript_1617E0:: @ 81617E0 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1617F7 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_1617F7 msgbox gUnknown_8175B70 release end @@ -26,37 +23,37 @@ EventScript_1617F7:: @ 81617F7 end SilphCo_5F_EventScript_161801:: @ 8161801 - msgbox gUnknown_8175D89, 3 + msgbox gUnknown_8175D89, MSGBOX_SIGN end SilphCo_5F_EventScript_16180A:: @ 816180A - msgbox gUnknown_8175DE0, 3 + msgbox gUnknown_8175DE0, MSGBOX_SIGN end SilphCo_5F_EventScript_161813:: @ 8161813 - msgbox gUnknown_8175E28, 3 + msgbox gUnknown_8175E28, MSGBOX_SIGN end SilphCo_5F_EventScript_16181C:: @ 816181C - msgbox gUnknown_8175E80, 3 + msgbox gUnknown_8175E80, MSGBOX_SIGN end SilphCo_5F_EventScript_161825:: @ 8161825 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_BEAU, 0, Text_175C40, Text_175C6D - msgbox gUnknown_8175C7D, 6 + trainerbattle_single TRAINER_SCIENTIST_BEAU, Text_175C40, Text_175C6D + msgbox gUnknown_8175C7D, MSGBOX_AUTOCLOSE end SilphCo_5F_EventScript_16183C:: @ 816183C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_28, 0, Text_175BE5, Text_175C09 - msgbox gUnknown_8175C0F, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, Text_175BE5, Text_175C09 + msgbox gUnknown_8175C0F, MSGBOX_AUTOCLOSE end SilphCo_5F_EventScript_161853:: @ 8161853 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_29, 0, Text_175D28, Text_175D4B - msgbox gUnknown_8175D59, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, Text_175D28, Text_175D4B + msgbox gUnknown_8175D59, MSGBOX_AUTOCLOSE end SilphCo_5F_EventScript_16186A:: @ 816186A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_DALTON, 0, Text_175CBD, Text_175CEB - msgbox gUnknown_8175CF9, 6 + trainerbattle_single TRAINER_JUGGLER_DALTON, Text_175CBD, Text_175CEB + msgbox gUnknown_8175CF9, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 82eda6e92..d1a65f4f3 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1BE8C1", + "script": "SilphCo_6F_EventScript_ItemHPUp", "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1BE8CE", + "script": "SilphCo_6F_EventScript_ItemXSpecial", "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL" }, { @@ -188,28 +188,28 @@ "x": 6, "y": 15, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 16, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 15, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 16, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index fd4d470eb..6bc5cd545 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -1,17 +1,16 @@ SilphCo_6F_MapScripts:: @ 8161881 - map_script 1, SilphCo_6F_MapScript1_161887 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_6F_OnLoad .byte 0 -SilphCo_6F_MapScript1_161887:: @ 8161887 - checkflag FLAG_SILPH_6F_DOOR - call_if FALSE, EventScript_1A8314 +SilphCo_6F_OnLoad:: @ 8161887 + call_if_unset FLAG_SILPH_6F_DOOR, EventScript_Close6FDoor end SilphCo_6F_EventScript_161891:: @ 8161891 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618A8 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_1618A8 msgbox gUnknown_817607E release end @@ -24,8 +23,8 @@ EventScript_1618A8:: @ 81618A8 SilphCo_6F_EventScript_1618B2:: @ 81618B2 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618C9 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_1618C9 msgbox gUnknown_8175F24 release end @@ -38,8 +37,8 @@ EventScript_1618C9:: @ 81618C9 SilphCo_6F_EventScript_1618D3:: @ 81618D3 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618EA + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_1618EA msgbox gUnknown_8175F70 release end @@ -52,8 +51,8 @@ EventScript_1618EA:: @ 81618EA SilphCo_6F_EventScript_1618F4:: @ 81618F4 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_16190B + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_16190B msgbox gUnknown_8175FAA release end @@ -66,8 +65,8 @@ EventScript_16190B:: @ 816190B SilphCo_6F_EventScript_161915:: @ 8161915 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_16192C + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_16192C msgbox gUnknown_8176012 release end @@ -78,20 +77,20 @@ EventScript_16192C:: @ 816192C end SilphCo_6F_EventScript_161936:: @ 8161936 - msgbox gUnknown_817624D, 3 + msgbox gUnknown_817624D, MSGBOX_SIGN end SilphCo_6F_EventScript_16193F:: @ 816193F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TAYLOR, 0, Text_176136, Text_1761BD - msgbox gUnknown_81761C4, 6 + trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD + msgbox gUnknown_81761C4, MSGBOX_AUTOCLOSE end SilphCo_6F_EventScript_161956:: @ 8161956 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_30, 0, Text_1760DE, Text_176104 - msgbox gUnknown_817610F, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104 + msgbox gUnknown_817610F, MSGBOX_AUTOCLOSE end SilphCo_6F_EventScript_16196D:: @ 816196D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_31, 0, Text_1761F1, Text_17620E - msgbox gUnknown_817621B, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E + msgbox gUnknown_817621B, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index ec2735f05..b0f6a8e12 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_1BE8DB", + "script": "SilphCo_7F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_1BE8E8", + "script": "SilphCo_7F_EventScript_ItemTM08", "flag": "FLAG_HIDE_SILPH_CO_7F_TM08" } ], @@ -227,84 +227,84 @@ "x": 11, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 12, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 11, "y": 9, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 12, "y": 9, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 24, "y": 7, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 25, "y": 7, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 25, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 24, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 25, "y": 13, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 26, "y": 13, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 25, "y": 14, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 26, "y": 14, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 8f1fa6648..5e7a0ea89 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -1,20 +1,17 @@ SilphCo_7F_MapScripts:: @ 8161984 - map_script 1, SilphCo_7F_MapScript1_16198F - map_script 3, SilphCo_7F_MapScript2_1619AB + map_script MAP_SCRIPT_ON_LOAD, SilphCo_7F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_7F_OnTransition .byte 0 -SilphCo_7F_MapScript1_16198F:: @ 816198F - checkflag FLAG_SILPH_7F_DOOR_1 - call_if FALSE, EventScript_1A834B - checkflag FLAG_SILPH_7F_DOOR_2 - call_if FALSE, EventScript_1A8379 - checkflag FLAG_SILPH_7F_DOOR_3 - call_if FALSE, EventScript_1A83A7 +SilphCo_7F_OnLoad:: @ 816198F + call_if_unset FLAG_SILPH_7F_DOOR_1, EventScript_Close7FDoor1 + call_if_unset FLAG_SILPH_7F_DOOR_2, EventScript_Close7FDoor2 + call_if_unset FLAG_SILPH_7F_DOOR_3, EventScript_Close7FDoor3 end -SilphCo_7F_MapScript2_1619AB:: @ 81619AB - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - call_if ge, EventScript_1619B7 +SilphCo_7F_OnTransition:: @ 81619AB + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + call_if_ge EventScript_1619B7 end EventScript_1619B7:: @ 81619B7 @@ -23,7 +20,7 @@ EventScript_1619B7:: @ 81619B7 SilphCo_7F_EventScript_1619BC:: @ 81619BC lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1619D4 EventScript_1619C7:: @ 81619C7 @@ -31,7 +28,7 @@ EventScript_1619C7:: @ 81619C7 SilphCo_7F_EventScript_1619C8:: @ 81619C8 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1619D4 EventScript_1619D3:: @ 81619D3 @@ -40,31 +37,31 @@ EventScript_1619D3:: @ 81619D3 EventScript_1619D4:: @ 81619D4 textcolor 0 playbgm MUS_RIVAL1, 0 - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 255, Movement_1A75ED - applymovement 1, Movement_1A75DD + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_8176710 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_161A73 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_161A7F + compare VAR_TEMP_1, 0 + call_if_eq EventScript_161A73 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_161A7F msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_161A80 - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_161A8B - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_161A96 + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_161A80 + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_161A8B + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_161A96 msgbox gUnknown_8176827 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_161AA1 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_161AAC + compare VAR_TEMP_1, 0 + call_if_eq EventScript_161AA1 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_161AAC playse SE_TK_WARPIN fadedefaultbgm removeobject 1 @@ -83,15 +80,15 @@ EventScript_161A7F:: @ 8161A7F return EventScript_161A80:: @ 8161A80 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_SQUIRTLE, 0, Text_1767D0 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, Text_1767D0 return EventScript_161A8B:: @ 8161A8B - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_BULBASAUR, 0, Text_1767D0 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, Text_1767D0 return EventScript_161A96:: @ 8161A96 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_CHARMANDER, 0, Text_1767D0 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, Text_1767D0 return EventScript_161AA1:: @ 8161AA1 @@ -105,42 +102,41 @@ EventScript_161AAC:: @ 8161AAC return Movement_161AB7:: @ 8161AB7 - step_11 + walk_up step_end Movement_161AB9:: @ 8161AB9 - step_13 - step_13 - step_13 - step_11 - step_1c + walk_right + walk_right + walk_right + walk_up + delay_16 step_end Movement_161ABF:: @ 8161ABF - step_12 - step_11 - step_11 - step_13 - step_13 - step_13 - step_13 - step_1c + walk_left + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + delay_16 step_end SilphCo_7F_EventScript_161AC8:: @ 8161AC8 lock faceplayer - checkflag FLAG_GOT_LAPRAS_FROM_SILPH - goto_if TRUE, EventScript_161B8D + goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, EventScript_161B8D msgbox gUnknown_8176266 - setvar VAR_0x4001, SPECIES_LAPRAS - givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_161B12 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_161B45 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + setvar VAR_TEMP_1, SPECIES_LAPRAS + givemon SPECIES_LAPRAS, 25, ITEM_NONE + compare VAR_RESULT, 0 + goto_if_eq EventScript_161B12 + compare VAR_RESULT, 1 + goto_if_eq EventScript_161B45 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A927C release end @@ -152,8 +148,8 @@ EventScript_161B12:: @ 8161B12 waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_161B7E + compare VAR_RESULT, NO + goto_if_eq EventScript_161B7E call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_161B7E @@ -169,8 +165,8 @@ EventScript_161B45:: @ 8161B45 waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_161B73 + compare VAR_RESULT, NO + goto_if_eq EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 @@ -199,8 +195,8 @@ EventScript_161B8D:: @ 8161B8D SilphCo_7F_EventScript_161B97:: @ 8161B97 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161BAE + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_161BAE msgbox gUnknown_8176444 release end @@ -213,8 +209,8 @@ EventScript_161BAE:: @ 8161BAE SilphCo_7F_EventScript_161BB8:: @ 8161BB8 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161BCF + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_161BCF msgbox gUnknown_81764C2 release end @@ -227,8 +223,8 @@ EventScript_161BCF:: @ 8161BCF SilphCo_7F_EventScript_161BD9:: @ 8161BD9 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161BF0 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_161BF0 msgbox gUnknown_8176532 release end @@ -239,25 +235,25 @@ EventScript_161BF0:: @ 8161BF0 end SilphCo_7F_EventScript_161BFA:: @ 8161BFA - msgbox gUnknown_8176954, 3 + msgbox gUnknown_8176954, MSGBOX_SIGN end SilphCo_7F_EventScript_161C03:: @ 8161C03 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSHUA, 0, Text_1765E2, Text_17660C - msgbox gUnknown_8176616, 6 + trainerbattle_single TRAINER_SCIENTIST_JOSHUA, Text_1765E2, Text_17660C + msgbox gUnknown_8176616, MSGBOX_AUTOCLOSE end SilphCo_7F_EventScript_161C1A:: @ 8161C1A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_33, 0, Text_176643, Text_176669 - msgbox gUnknown_8176681, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, Text_176643, Text_176669 + msgbox gUnknown_8176681, MSGBOX_AUTOCLOSE end SilphCo_7F_EventScript_161C31:: @ 8161C31 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_34, 0, Text_1766B3, Text_1766D7 - msgbox gUnknown_81766E5, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, Text_1766B3, Text_1766D7 + msgbox gUnknown_81766E5, MSGBOX_AUTOCLOSE end SilphCo_7F_EventScript_161C48:: @ 8161C48 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_35, 0, Text_176586, Text_1765A5 - msgbox gUnknown_81765B1, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, Text_176586, Text_1765A5 + msgbox gUnknown_81765B1, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 7d1f410dc..aba6cfb3f 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_8F_EventScript_1BEB4B", + "script": "SilphCo_8F_EventScript_ItemIron", "flag": "FLAG_HIDE_SILPH_CO_8F_IRON" }, { @@ -150,28 +150,28 @@ "x": 6, "y": 10, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 11, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 11, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 10, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 30b19804b..f96188c3f 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -1,17 +1,16 @@ SilphCo_8F_MapScripts:: @ 8161C5F - map_script 1, SilphCo_8F_MapScript1_161C65 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_8F_OnLoad .byte 0 -SilphCo_8F_MapScript1_161C65:: @ 8161C65 - checkflag FLAG_SILPH_8F_DOOR - call_if FALSE, EventScript_1A83D5 +SilphCo_8F_OnLoad:: @ 8161C65 + call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor end SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161C86 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_161C86 msgbox gUnknown_817696D release end @@ -22,20 +21,20 @@ EventScript_161C86:: @ 8161C86 end SilphCo_8F_EventScript_161C90:: @ 8161C90 - msgbox gUnknown_8176AB2, 3 + msgbox gUnknown_8176AB2, MSGBOX_SIGN end SilphCo_8F_EventScript_161C99:: @ 8161C99 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_PARKER, 0, Text_1769FD, Text_176A19 - msgbox gUnknown_8176A26, 6 + trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19 + msgbox gUnknown_8176A26, MSGBOX_AUTOCLOSE end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_32, 0, Text_1769A2, Text_1769BE - msgbox gUnknown_81769CF, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE + msgbox gUnknown_81769CF, MSGBOX_AUTOCLOSE end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_36, 0, Text_176A56, Text_176A7C - msgbox gUnknown_8176A90, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C + msgbox gUnknown_8176A90, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index b350f620c..722ca91e7 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -120,112 +120,112 @@ "x": 3, "y": 10, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 3, "y": 11, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 13, "y": 16, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 13, "y": 17, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 21, "y": 6, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 22, "y": 6, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 22, "y": 7, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 21, "y": 7, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 21, "y": 13, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 21, "y": 12, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 22, "y": 12, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 22, "y": 13, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 2, "y": 11, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 2, "y": 10, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 12, "y": 16, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 12, "y": 17, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index b19f5a182..7f4258b5d 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -1,26 +1,22 @@ SilphCo_9F_MapScripts:: @ 8161CDE - map_script 1, SilphCo_9F_MapScript1_161CE4 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_9F_OnLoad .byte 0 -SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 - checkflag FLAG_SILPH_9F_DOOR_1 - call_if FALSE, EventScript_1A840C - checkflag FLAG_SILPH_9F_DOOR_2 - call_if FALSE, EventScript_1A8443 - checkflag FLAG_SILPH_9F_DOOR_3 - call_if FALSE, EventScript_1A847A - checkflag FLAG_SILPH_9F_DOOR_4 - call_if FALSE, EventScript_1A84A8 +SilphCo_9F_OnLoad:: @ 8161CE4 + call_if_unset FLAG_SILPH_9F_DOOR_1, EventScript_Close9FDoor1 + call_if_unset FLAG_SILPH_9F_DOOR_2, EventScript_Close9FDoor2 + call_if_unset FLAG_SILPH_9F_DOOR_3, EventScript_Close9FDoor3 + call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4 end SilphCo_9F_EventScript_161D09:: @ 8161D09 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161D2E + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if_ge EventScript_161D2E msgbox gUnknown_8176B54 closemessage - call EventScript_FadeOut_Heal_FadeIn + call EventScript_OutOfCenterPartyHeal msgbox gUnknown_8176B81 release end @@ -31,20 +27,20 @@ EventScript_161D2E:: @ 8161D2E end SilphCo_9F_EventScript_161D38:: @ 8161D38 - msgbox gUnknown_8176CD4, 3 + msgbox gUnknown_8176CD4, MSGBOX_SIGN end SilphCo_9F_EventScript_161D41:: @ 8161D41 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_ED, 0, Text_176BFB, Text_176C2B - msgbox gUnknown_8176C3C, 6 + trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B + msgbox gUnknown_8176C3C, MSGBOX_AUTOCLOSE end SilphCo_9F_EventScript_161D58:: @ 8161D58 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_37, 0, Text_176BA3, Text_176BC8 - msgbox gUnknown_8176BD0, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8 + msgbox gUnknown_8176BD0, MSGBOX_AUTOCLOSE end SilphCo_9F_EventScript_161D6F:: @ 8161D6F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_38, 0, Text_176C7A, Text_176CA0 - msgbox gUnknown_8176CB8, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0 + msgbox gUnknown_8176CB8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 4d75eec38..df0a390ee 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -4,11 +4,10 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F lockall setvar VAR_0x8004, 1 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow - message Text_1A535C + message Text_WantWhichFloor waitmessage setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos @@ -33,8 +32,8 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 4 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 4 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 4 goto EventScript_1621E7 @@ -45,8 +44,8 @@ EventScript_162056:: @ 8162056 EventScript_162057:: @ 8162057 setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 5 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 5 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 5 goto EventScript_1621E7 @@ -57,8 +56,8 @@ EventScript_16207E:: @ 816207E EventScript_16207F:: @ 816207F setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 6 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 6 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 6 goto EventScript_1621E7 @@ -69,8 +68,8 @@ EventScript_1620A6:: @ 81620A6 EventScript_1620A7:: @ 81620A7 setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 7 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 7 goto EventScript_1621E7 @@ -81,8 +80,8 @@ EventScript_1620CE:: @ 81620CE EventScript_1620CF:: @ 81620CF setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 8 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 8 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 8 goto EventScript_1621E7 @@ -93,8 +92,8 @@ EventScript_1620F6:: @ 81620F6 EventScript_1620F7:: @ 81620F7 setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 9 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 9 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 9 goto EventScript_1621E7 @@ -105,8 +104,8 @@ EventScript_16211E:: @ 816211E EventScript_16211F:: @ 816211F setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 10 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 10 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 10 goto EventScript_1621E7 @@ -117,8 +116,8 @@ EventScript_162146:: @ 8162146 EventScript_162147:: @ 8162147 setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 11 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 11 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 11 goto EventScript_1621E7 @@ -129,8 +128,8 @@ EventScript_16216E:: @ 816216E EventScript_16216F:: @ 816216F setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 12 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 12 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 12 goto EventScript_1621E7 @@ -141,8 +140,8 @@ EventScript_162196:: @ 8162196 EventScript_162197:: @ 8162197 setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 13 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 13 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 13 goto EventScript_1621E7 @@ -153,8 +152,8 @@ EventScript_1621BE:: @ 81621BE EventScript_1621BF:: @ 81621BF setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 14 - goto_if eq, EventScript_1621E7 + compare VAR_ELEVATOR_FLOOR, 14 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 14 goto EventScript_1621E7 diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index 3a36d37b1..01d373654 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -1,19 +1,19 @@ SixIsland_MapScripts:: @ 8167ED8 - map_script 3, SixIsland_MapScript1_167EDE + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_OnTransition .byte 0 -SixIsland_MapScript1_167EDE:: @ 8167EDE +SixIsland_OnTransition:: @ 8167EDE setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND end SixIsland_EventScript_167EE2:: @ 8167EE2 - msgbox gUnknown_81831EF, 2 + msgbox gUnknown_81831EF, MSGBOX_NPC end SixIsland_EventScript_167EEB:: @ 8167EEB - msgbox gUnknown_8183255, 2 + msgbox gUnknown_8183255, MSGBOX_NPC end SixIsland_EventScript_167EF4:: @ 8167EF4 - msgbox gUnknown_81831C6, 3 + msgbox gUnknown_81831C6, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc index 6733f94b3..bf34536f1 100644 --- a/data/maps/SixIsland_AlteringCave/scripts.inc +++ b/data/maps/SixIsland_AlteringCave/scripts.inc @@ -1,7 +1,7 @@ SixIsland_AlteringCave_MapScripts:: @ 81646A4 - map_script 3, SixIsland_AlteringCave_MapScript1_1646AA + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_AlteringCave_OnTransition .byte 0 -SixIsland_AlteringCave_MapScript1_1646AA:: @ 81646AA +SixIsland_AlteringCave_OnTransition:: @ 81646AA setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index 2d9e52209..0dae8d853 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -1,8 +1,8 @@ SixIsland_DottedHole_1F_MapScripts:: @ 8164182 - map_script 3, SixIsland_DottedHole_1F_MapScript1_164188 + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_DottedHole_1F_OnTransition .byte 0 -SixIsland_DottedHole_1F_MapScript1_164188:: @ 8164188 +SixIsland_DottedHole_1F_OnTransition:: @ 8164188 setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F end diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 64ef24b72..24106d3ac 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -16,58 +16,58 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 applymovement 2, Movement_16440F waitmovement 0 playse SE_W070 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_16430F - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_16430F - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_16431A - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_16431A + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_16430F + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_16430F + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_16431A + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_16431A setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 setvar VAR_0x8007, 3 special Special_ShakeScreen delay 60 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_164325 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_164330 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_16433B - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_164346 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_164325 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_164330 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_16433B + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_164346 textcolor 0 msgbox gUnknown_817BD97 closemessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_164351 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_164366 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_16437B - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_164390 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_164351 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_164366 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_16437B + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_164390 removeobject 1 - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_1642F9 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_1642F9 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_164304 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_164304 + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_1642F9 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_1642F9 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_164304 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_164304 msgbox gUnknown_817BDD4 closemessage - compare_var_to_value VAR_FACING, 2 - call_if eq, EventScript_1643A5 - compare_var_to_value VAR_FACING, 1 - call_if eq, EventScript_1643B7 - compare_var_to_value VAR_FACING, 4 - call_if eq, EventScript_1643C9 - compare_var_to_value VAR_FACING, 3 - call_if eq, EventScript_1643DB + compare VAR_FACING, DIR_NORTH + call_if_eq EventScript_1643A5 + compare VAR_FACING, DIR_SOUTH + call_if_eq EventScript_1643B7 + compare VAR_FACING, DIR_EAST + call_if_eq EventScript_1643C9 + compare VAR_FACING, DIR_WEST + call_if_eq EventScript_1643DB playse SE_KAIDAN delay 35 removeobject 2 @@ -76,22 +76,22 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 end EventScript_1642F9:: @ 81642F9 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_164304:: @ 8164304 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_16430F:: @ 816430F - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_16431A:: @ 816431A - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -118,121 +118,121 @@ EventScript_164346:: @ 8164346 EventScript_164351:: @ 8164351 applymovement 2, Movement_1643F5 waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_164366:: @ 8164366 applymovement 2, Movement_1643F5 waitmovement 0 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_16437B:: @ 816437B applymovement 2, Movement_1643F7 waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return EventScript_164390:: @ 8164390 applymovement 2, Movement_1643F7 waitmovement 0 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_1643A5:: @ 81643A5 - applymovement 255, Movement_16441C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C applymovement 2, Movement_1643F9 waitmovement 0 return EventScript_1643B7:: @ 81643B7 - applymovement 255, Movement_16441C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C applymovement 2, Movement_164401 waitmovement 0 return EventScript_1643C9:: @ 81643C9 - applymovement 255, Movement_16441C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C applymovement 2, Movement_164409 waitmovement 0 return EventScript_1643DB:: @ 81643DB - applymovement 255, Movement_16441C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C applymovement 2, Movement_164409 waitmovement 0 return Movement_1643ED:: @ 81643ED - step_11 - step_11 - step_30 + walk_up + walk_up + walk_in_place_fastest_right step_end Movement_1643F1:: @ 81643F1 - step_13 - step_13 - step_2e + walk_right + walk_right + walk_in_place_fastest_up step_end Movement_1643F5:: @ 81643F5 - step_13 + walk_right step_end Movement_1643F7:: @ 81643F7 - step_11 + walk_up step_end Movement_1643F9:: @ 81643F9 - step_1e - step_20 - step_20 - step_20 - step_1d - step_20 - step_20 + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_right + walk_fast_right step_end Movement_164401:: @ 8164401 - step_1d - step_20 - step_20 - step_20 - step_1e - step_20 - step_20 + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_right + walk_fast_right step_end Movement_164409:: @ 8164409 - step_20 - step_20 - step_20 - step_20 - step_1e + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up step_end Movement_16440F:: @ 816440F - step_00 - step_5e - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_39 - step_5f + face_down + disable_anim + slide_down + slide_down + slide_down + slide_down + slide_down + slide_down + slide_down + slide_down + slide_down + restore_anim step_end Movement_16441C:: @ 816441C - step_1c - step_30 + delay_16 + walk_in_place_fastest_right step_end SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F diff --git a/data/maps/SixIsland_GreenPath/scripts.inc b/data/maps/SixIsland_GreenPath/scripts.inc index c2822ccca..acc4336d2 100644 --- a/data/maps/SixIsland_GreenPath/scripts.inc +++ b/data/maps/SixIsland_GreenPath/scripts.inc @@ -2,9 +2,9 @@ SixIsland_GreenPath_MapScripts:: @ 8168B2D .byte 0 SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E - msgbox gUnknown_818B84D, 3 + msgbox gUnknown_818B84D, MSGBOX_SIGN end SixIsland_GreenPath_EventScript_168B37:: @ 8168B37 - msgbox gUnknown_818B86B, 3 + msgbox gUnknown_818B86B, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_Harbor/scripts.inc b/data/maps/SixIsland_Harbor/scripts.inc index 0730e3b72..8db4500ca 100644 --- a/data/maps/SixIsland_Harbor/scripts.inc +++ b/data/maps/SixIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ SixIsland_Harbor_MapScripts:: @ 8171E47 SixIsland_Harbor_EventScript_171E48:: @ 8171E48 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_SIX_ISLAND goto EventScript_1A900F diff --git a/data/maps/SixIsland_House/scripts.inc b/data/maps/SixIsland_House/scripts.inc index bc6753abb..1ad94906f 100644 --- a/data/maps/SixIsland_House/scripts.inc +++ b/data/maps/SixIsland_House/scripts.inc @@ -2,5 +2,5 @@ SixIsland_House_MapScripts:: @ 8171E5B .byte 0 SixIsland_House_EventScript_171E5C:: @ 8171E5C - msgbox gUnknown_81A412E, 2 + msgbox gUnknown_81A412E, MSGBOX_NPC end diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 1bdf7756b..1edcae092 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -3,14 +3,14 @@ SixIsland_Mart_MapScripts:: @ 8171E65 SixIsland_Mart_EventScript_171E66:: @ 8171E66 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_171E8C - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -29,5 +29,5 @@ Items_171E8C:: @ 8171E8C end SixIsland_Mart_EventScript_171EA0:: @ 8171EA0 - msgbox gUnknown_81A4271, 2 + msgbox gUnknown_81A4271, MSGBOX_NPC end diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 0997aafc7..bc785bd6b 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -107,7 +107,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_OutcastIsland_EventScript_1BEC90", + "script": "SixIsland_OutcastIsland_EventScript_ItemPPUp", "flag": "FLAG_HIDE_SIX_ISLAND_OUTCAST_ISLAND_PP_UP" } ], diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index 3d7069cc8..fb4ec0217 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -2,6 +2,6 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15 .byte 0 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_46, 0, Text_18B35A, Text_18B3C2 - msgbox gUnknown_818B3C8, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, Text_18B35A, Text_18B3C2 + msgbox gUnknown_818B3C8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 11192b895..97a8a0a30 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -1,14 +1,14 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 - map_script 3, SixIsland_PatternBush_MapScript1_16455F + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PatternBush_OnTransition .byte 0 -SixIsland_PatternBush_MapScript1_16455F:: @ 816455F +SixIsland_PatternBush_OnTransition:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH - getplayerxy VAR_0x4001, VAR_0x4002 - compare_var_to_value VAR_0x4001, 50 - call_if ge, EventScript_16457E - compare_var_to_value VAR_0x4001, 49 - call_if le, EventScript_164587 + getplayerxy VAR_TEMP_1, VAR_TEMP_2 + compare VAR_TEMP_1, 50 + call_if_ge EventScript_16457E + compare VAR_TEMP_1, 49 + call_if_le EventScript_164587 end EventScript_16457E:: @ 816457E @@ -20,61 +20,61 @@ EventScript_164587:: @ 8164587 return SixIsland_PatternBush_EventScript_164590:: @ 8164590 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_BETHANY, 0, Text_17BF3A, Text_17BF66 - msgbox gUnknown_817BF97, 6 + trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, Text_17BF3A, Text_17BF66 + msgbox gUnknown_817BF97, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_ALLISON, 0, Text_17BFEB, Text_17C028 - msgbox gUnknown_817C056, 6 + trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, Text_17BFEB, Text_17C028 + msgbox gUnknown_817C056, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_GARRET, 0, Text_17C0BE, Text_17C0F2 - msgbox gUnknown_817C113, 6 + trainerbattle_single TRAINER_BUG_CATCHER_GARRET, Text_17C0BE, Text_17C0F2 + msgbox gUnknown_817C113, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_JONAH, 0, Text_17C155, Text_17C196 - msgbox gUnknown_817C1D0, 6 + trainerbattle_single TRAINER_BUG_CATCHER_JONAH, Text_17C155, Text_17C196 + msgbox gUnknown_817C1D0, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_VANCE, 0, Text_17C246, Text_17C275 - msgbox gUnknown_817C2A4, 6 + trainerbattle_single TRAINER_BUG_CATCHER_VANCE, Text_17C246, Text_17C275 + msgbox gUnknown_817C2A4, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164603:: @ 8164603 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_NASH, 0, Text_17C2D9, Text_17C30D - msgbox gUnknown_817C31C, 6 + trainerbattle_single TRAINER_YOUNGSTER_NASH, Text_17C2D9, Text_17C30D + msgbox gUnknown_817C31C, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_16461A:: @ 816461A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CORDELL, 0, Text_17C373, Text_17C3A5 - msgbox gUnknown_817C3CE, 6 + trainerbattle_single TRAINER_YOUNGSTER_CORDELL, Text_17C373, Text_17C3A5 + msgbox gUnknown_817C3CE, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164631:: @ 8164631 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_DALIA, 0, Text_17C42B, Text_17C458 - msgbox gUnknown_817C490, 6 + trainerbattle_single TRAINER_LASS_DALIA, Text_17C42B, Text_17C458 + msgbox gUnknown_817C490, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164648:: @ 8164648 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JOANA, 0, Text_17C4FE, Text_17C552 - msgbox gUnknown_817C590, 6 + trainerbattle_single TRAINER_LASS_JOANA, Text_17C4FE, Text_17C552 + msgbox gUnknown_817C590, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_16465F:: @ 816465F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_RILEY, 0, Text_17C5DB, Text_17C609 - msgbox gUnknown_817C615, 6 + trainerbattle_single TRAINER_CAMPER_RILEY, Text_17C5DB, Text_17C609 + msgbox gUnknown_817C615, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164676:: @ 8164676 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MARCY, 0, Text_17C63E, Text_17C660 - msgbox gUnknown_817C68E, 6 + trainerbattle_single TRAINER_PICNICKER_MARCY, Text_17C63E, Text_17C660 + msgbox gUnknown_817C68E, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_16468D:: @ 816468D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAYTON, 0, Text_17C6C9, Text_17C6FB - msgbox gUnknown_817C728, 6 + trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, Text_17C6C9, Text_17C6FB + msgbox gUnknown_817C728, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 1ad4df1ed..6bde430ab 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,39 +1,39 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A - map_script 3, SixIsland_PokemonCenter_1F_MapScript1_171D7A - map_script 5, SixIsland_PokemonCenter_1F_MapScript2_1BC05C - map_script 2, SixIsland_PokemonCenter_1F_MapScript3_171D8D + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_1F_OnFrame .byte 0 -SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A +SixIsland_PokemonCenter_1F_OnTransition:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND - compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 - call_if eq, EventScript_171D89 + compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 + call_if_eq EventScript_171D89 end EventScript_171D89:: @ 8171D89 clearflag FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL return -SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D +SixIsland_PokemonCenter_1F_OnFrame:: @ 8171D8D map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, EventScript_171D97 .2byte 0 EventScript_171D97:: @ 8171D97 lockall textcolor 0 - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 playbgm MUS_RIVAL1, 0 - applymovement 2, Movement_1A75DB + applymovement 2, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_1A75DD + applymovement 2, Movement_Delay48 waitmovement 0 delay 25 applymovement 2, Movement_171DF9 waitmovement 0 msgbox gUnknown_81A3F30 closemessage - applymovement 255, Movement_171E02 + applymovement OBJ_EVENT_ID_PLAYER, Movement_171E02 applymovement 2, Movement_171DFE waitmovement 0 fadedefaultbgm @@ -46,34 +46,34 @@ EventScript_171D97:: @ 8171D97 end Movement_171DF9:: @ 8171DF9 - step_13 - step_13 - step_10 - step_10 + walk_right + walk_right + walk_down + walk_down step_end Movement_171DFE:: @ 8171DFE - step_1c - step_1a - step_10 + delay_16 + delay_4 + walk_down step_end Movement_171E02:: @ 8171E02 - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E - msgbox gUnknown_81A3E02, 2 + msgbox gUnknown_81A3E02, MSGBOX_NPC end SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17 - msgbox gUnknown_81A3E87, 2 + msgbox gUnknown_81A3E87, MSGBOX_NPC end diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 2c1c53efb..9966343f0 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc index a261c9269..05555c8d1 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 - map_script 2, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SixIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SixIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171E35 + call CableClub_EventScript_Colosseum end -EventScript_171E3B:: @ 8171E3B - call EventScript_1BB6AB +SixIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171E3B + call CableClub_EventScript_TradeCenter end -EventScript_171E41:: @ 8171E41 - call EventScript_1BB7DE +SixIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171E41 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index c3be304c9..26f0ccdf5 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -211,7 +211,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BECC4", + "script": "SixIsland_RuinValley_EventScript_ItemHPUp", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP" }, { @@ -224,7 +224,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BECB7", + "script": "SixIsland_RuinValley_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE" }, { @@ -237,7 +237,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BECD1", + "script": "SixIsland_RuinValley_EventScript_ItemSunStone", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_SUN_STONE" } ], diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 2b7ecf655..582503ed8 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -1,10 +1,9 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53 - map_script 1, SixIsland_RuinValley_MapScript1_168B59 + map_script MAP_SCRIPT_ON_LOAD, SixIsland_RuinValley_OnLoad .byte 0 -SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59 - checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE - call_if TRUE, EventScript_168B63 +SixIsland_RuinValley_OnLoad:: @ 8168B59 + call_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168B63 end EventScript_168B63:: @ 8168B63 @@ -14,21 +13,20 @@ EventScript_168B63:: @ 8168B63 SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D lock msgbox gUnknown_818BD47 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_818BD7A - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall - checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE - goto_if TRUE, EventScript_168BC1 + goto_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_168BCB + compare VAR_RESULT, NO + goto_if_eq EventScript_168BCB msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B waitbuttonpress diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index f1bd689c9..5a0f111c8 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -130,7 +130,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_WaterPath_EventScript_1BEC9D", + "script": "SixIsland_WaterPath_EventScript_ItemElixir", "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR" }, { @@ -143,7 +143,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_WaterPath_EventScript_1BECAA", + "script": "SixIsland_WaterPath_EventScript_ItemDragonScale", "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_DRAGON_SCALE" } ], diff --git a/data/maps/SixIsland_WaterPath/scripts.inc b/data/maps/SixIsland_WaterPath/scripts.inc index 2b410f112..27f49d4aa 100644 --- a/data/maps/SixIsland_WaterPath/scripts.inc +++ b/data/maps/SixIsland_WaterPath/scripts.inc @@ -2,9 +2,9 @@ SixIsland_WaterPath_MapScripts:: @ 8168B40 .byte 0 SixIsland_WaterPath_EventScript_168B41:: @ 8168B41 - msgbox gUnknown_818BD0C, 3 + msgbox gUnknown_818BD0C, MSGBOX_SIGN end SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A - msgbox gUnknown_818BD27, 3 + msgbox gUnknown_818BD27, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index d38e40aac..e8784d75c 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -5,29 +5,29 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D lock faceplayer 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 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1720E5 + compare VAR_RESULT, 0 + goto_if_eq EventScript_1720E5 special GetHeracrossSizeRecordInfo msgbox gUnknown_81A4A3F special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 6 - goto_if ge, EventScript_1720EF + compare VAR_RESULT, 6 + goto_if_ge EventScript_1720EF special CompareHeracrossSize - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_1720F1 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1720FB - compare_var_to_value VAR_RESULT, 3 - goto_if eq, EventScript_172121 - compare_var_to_value VAR_RESULT, 4 - goto_if eq, EventScript_17210E + compare VAR_RESULT, 1 + goto_if_eq EventScript_1720F1 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1720FB + compare VAR_RESULT, 3 + goto_if_eq EventScript_172121 + compare VAR_RESULT, 4 + goto_if_eq EventScript_17210E release end @@ -46,15 +46,13 @@ EventScript_1720F1:: @ 81720F1 end EventScript_1720FB:: @ 81720FB - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if FALSE, EventScript_172121 + goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121 msgbox gUnknown_81A4B7A release end EventScript_17210E:: @ 817210E - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if FALSE, EventScript_172121 + goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121 msgbox gUnknown_81A4B39 release end @@ -63,8 +61,8 @@ EventScript_172121:: @ 8172121 setflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 msgbox gUnknown_81A4A88 giveitem ITEM_NEST_BALL - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_17214D + compare VAR_RESULT, 0 + goto_if_eq EventScript_17214D msgbox gUnknown_81A4AD9 release end @@ -76,8 +74,7 @@ EventScript_17214D:: @ 817214D SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 lockall - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if TRUE, EventScript_17216B + goto_if_set FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_17216B msgbox gUnknown_81A4CB9 releaseall end diff --git a/data/maps/SixIsland_WaterPath_House1/text.inc b/data/maps/SixIsland_WaterPath_House1/text.inc index 71ecedc96..4c32a80ff 100644 --- a/data/maps/SixIsland_WaterPath_House1/text.inc +++ b/data/maps/SixIsland_WaterPath_House1/text.inc @@ -1,4 +1,4 @@ -Text_1A46C6:: @ 81A46C6 +Text_UltimateMoveThatMon:: @ 81A46C6 .string "I perfected the ultimate move of\n" .string "its type…\p" .string "But will no one take it for\n" @@ -7,11 +7,11 @@ Text_1A46C6:: @ 81A46C6 .string "Y-you…\n" .string "Th-that {STR_VAR_1}…$" -Text_1A4737:: @ 81A4737 +Text_JustMistaken:: @ 81A4737 .string "…No…\n" .string "I was just mistaken.$" -Text_1A4751:: @ 81A4751 +Text_AllowMeToTeachMonUltimateMove:: @ 81A4751 .string "Oh! This is the one!\n" .string "This is the POKéMON!\p" .string "This {STR_VAR_1} is worthy of\n" @@ -20,33 +20,33 @@ Text_1A4751:: @ 81A4751 .string "Will you allow your {STR_VAR_1} to\n" .string "learn my {STR_VAR_2}?$" -Text_1A47E5:: @ 81A47E5 +Text_YouRejectIt:: @ 81A47E5 .string "Gaah! You reject it?\n" .string "No, I won't be dissuaded!$" -Text_1A4814:: @ 81A4814 +Text_LetMeConferUltimateMove:: @ 81A4814 .string "You will allow it?\p" .string "Then, let me confer my ultimate\n" .string "{STR_VAR_2} on your {STR_VAR_1}.\p" .string "Ggggrah-awooo!$" -Text_1A4865:: @ 81A4865 +Text_TaughtMove:: @ 81A4865 .string "Gasp, gasp, gasp…\p" .string "I didn't think I could teach that\n" .string "move while I still lived…$" -Text_1A48B3:: @ 81A48B3 +Text_MakeBestUseOfMove:: @ 81A48B3 .string "I implore you to make the best\n" .string "use of that move and gain power!$" -Text_1A48F3:: @ 81A48F3 +Text_PassedOnEverythingIKnow:: @ 81A48F3 .string "Gasp, gasp, gasp…\p" .string "I have no regrets now.\n" .string "I've passed on everything I know.\p" .string "Now I can live out my life knowing\n" .string "my work is done.$" -Text_1A4972:: @ 81A4972 +Text_FeelRejuvenated:: @ 81A4972 .string "After I passed on my knowledge to\n" .string "you, I felt so much relief.\p" .string "In fact, I feel rejuvenated,\n" diff --git a/data/maps/SixIsland_WaterPath_House2/scripts.inc b/data/maps/SixIsland_WaterPath_House2/scripts.inc index ed5e24c7f..4cb8e9827 100644 --- a/data/maps/SixIsland_WaterPath_House2/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House2/scripts.inc @@ -2,5 +2,5 @@ SixIsland_WaterPath_House2_MapScripts:: @ 8172178 .byte 0 SixIsland_WaterPath_House2_EventScript_172179:: @ 8172179 - msgbox gUnknown_81A4D0D, 2 + msgbox gUnknown_81A4D0D, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index fc30c5a41..9607ba491 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1BEABC", + "script": "ThreeIsland_EventScript_ItemZinc", "flag": "FLAG_HIDE_THREE_ISLAND_ZINC" }, { diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 93fdc39a5..a92ad452a 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -1,13 +1,12 @@ ThreeIsland_MapScripts:: @ 81677AD - map_script 3, ThreeIsland_MapScript1_1677B3 + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_OnTransition .byte 0 -ThreeIsland_MapScript1_1677B3:: @ 81677B3 +ThreeIsland_OnTransition:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND - checkflag FLAG_RESCUED_LOSTELLE - call_if TRUE, EventScript_1677CB - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 - call_if eq, EventScript_1677CF + call_if_set FLAG_RESCUED_LOSTELLE, EventScript_1677CB + compare VAR_MAP_SCENE_THREE_ISLAND, 4 + call_if_eq EventScript_1677CF end EventScript_1677CB:: @ 81677CB @@ -21,38 +20,37 @@ EventScript_1677CF:: @ 81677CF ThreeIsland_EventScript_1677D8:: @ 81677D8 lock - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 call EventScript_16786F release end ThreeIsland_EventScript_1677E5:: @ 81677E5 lock - checkflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER - goto_if TRUE, EventScript_167806 - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if eq, EventScript_16781A - setvar VAR_0x4001, 0 + goto_if_set FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER, EventScript_167806 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 + goto_if_eq EventScript_16781A + setvar VAR_TEMP_1, 0 call EventScript_16786F release end EventScript_167806:: @ 8167806 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81827F1 release end EventScript_16781A:: @ 816781A - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_167865 - giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE - additem ITEM_FULL_RESTORE, 1 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_167865 + msgreceiveditem gUnknown_81827BE, ITEM_FULL_RESTORE + additem ITEM_FULL_RESTORE setflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER msgbox gUnknown_81827F1 release @@ -64,87 +62,87 @@ EventScript_167865:: @ 8167865 end EventScript_16786F:: @ 816786F - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_167947 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_167947 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_167947 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81820C0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16795D + compare VAR_TEMP_1, 0 + call_if_eq EventScript_167952 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_167952 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 msgbox gUnknown_8182125 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_167931 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_167931 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_167973 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_167931 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_167931 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 msgbox gUnknown_81821A9 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16795D + compare VAR_TEMP_1, 0 + call_if_eq EventScript_167952 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_167952 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 msgbox gUnknown_81821DC return EventScript_167931:: @ 8167931 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_16793C:: @ 816793C - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return EventScript_167947:: @ 8167947 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_167952:: @ 8167952 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return EventScript_16795D:: @ 816795D getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 9 - goto_if ge, EventScript_167931 + compare VAR_0x8004, 9 + goto_if_ge EventScript_167931 goto EventScript_167952 end EventScript_167973:: @ 8167973 getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 9 - goto_if ge, EventScript_167947 + compare VAR_0x8004, 9 + goto_if_ge EventScript_167947 goto EventScript_167931 end ThreeIsland_EventScript_167989:: @ 8167989 lock - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if eq, EventScript_1679A1 - setvar VAR_0x4001, 1 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 + goto_if_eq EventScript_1679A1 + setvar VAR_TEMP_1, 1 call EventScript_16786F release end EventScript_1679A1:: @ 81679A1 - applymovement 2, Movement_1A75E1 + applymovement 2, Movement_FacePlayer waitmovement 0 msgbox gUnknown_8182823 release @@ -173,61 +171,61 @@ ThreeIsland_EventScript_1679B5:: @ 81679B5 end Movement_167A19:: @ 8167A19 - step_27 + walk_in_place_left step_end Movement_167A1B:: @ 8167A1B - step_28 + walk_in_place_right step_end ThreeIsland_EventScript_167A1D:: @ 8167A1D lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_167A59 end ThreeIsland_EventScript_167A29:: @ 8167A29 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_167A59 end ThreeIsland_EventScript_167A35:: @ 8167A35 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 goto EventScript_167A59 end ThreeIsland_EventScript_167A41:: @ 8167A41 lockall - setvar VAR_0x4001, 3 + setvar VAR_TEMP_1, 3 goto EventScript_167A59 end ThreeIsland_EventScript_167A4D:: @ 8167A4D lockall - setvar VAR_0x4001, 4 + setvar VAR_TEMP_1, 4 goto EventScript_167A59 end EventScript_167A59:: @ 8167A59 textcolor 0 - applymovement 5, Movement_1A75ED + applymovement 5, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 5, Movement_1A75DB + applymovement 5, Movement_ExclamationMark waitmovement 0 - applymovement 5, Movement_1A75DD + applymovement 5, Movement_Delay48 waitmovement 0 applymovement 5, Movement_167C57 waitmovement 0 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_167C35 + compare VAR_RESULT, NO + goto_if_eq EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON, 0, Text_1824B7 + trainerbattle_no_intro TRAINER_BIKER_GOON, Text_1824B7 applymovement 5, Movement_167C5C waitmovement 0 msgbox gUnknown_81824CF @@ -237,7 +235,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81824EF setvar VAR_LAST_TALKED, 7 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON_2, 0, Text_182521 + trainerbattle_no_intro TRAINER_BIKER_GOON_2, Text_182521 applymovement 7, Movement_167C5C waitmovement 0 msgbox gUnknown_8182536 @@ -247,32 +245,32 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182582 setvar VAR_LAST_TALKED, 4 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON_3, 0, Text_1825D4 - applymovement 4, Movement_1A75E7 + trainerbattle_no_intro TRAINER_BIKER_GOON_3, Text_1825D4 + applymovement 4, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 6, Movement_1A75ED - applymovement 8, Movement_1A75ED + applymovement 6, Movement_WalkInPlaceFastestDown + applymovement 8, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81825E2 closemessage delay 45 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_167BC6 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_167BD8 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_167BEA - compare_var_to_value VAR_0x4001, 3 - call_if eq, EventScript_167C03 - compare_var_to_value VAR_0x4001, 4 - call_if eq, EventScript_167C1C + compare VAR_TEMP_1, 0 + call_if_eq EventScript_167BC6 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_167BD8 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_167BEA + compare VAR_TEMP_1, 3 + call_if_eq EventScript_167C03 + compare VAR_TEMP_1, 4 + call_if_eq EventScript_167C1C playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 setvar VAR_LAST_TALKED, 3 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CUE_BALL_PAXTON, 0, Text_1826B7 + trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, Text_1826B7 msgbox gUnknown_818271D closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 3 removeobject 5 removeobject 7 @@ -280,40 +278,40 @@ EventScript_167A59:: @ 8167A59 removeobject 6 removeobject 8 removeobject 14 - fadescreen 0 + fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_THREE_ISLAND, 4 releaseall end EventScript_167BC6:: @ 8167BC6 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement 3, Movement_167C5E waitmovement 0 return EventScript_167BD8:: @ 8167BD8 - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement 3, Movement_167C62 waitmovement 0 return EventScript_167BEA:: @ 8167BEA - applymovement 4, Movement_1A75ED + applymovement 4, Movement_WalkInPlaceFastestDown applymovement 3, Movement_167C64 - applymovement 255, Movement_167C68 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 waitmovement 0 return EventScript_167C03:: @ 8167C03 - applymovement 4, Movement_1A75ED - applymovement 255, Movement_167C68 + applymovement 4, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 applymovement 3, Movement_167C6C waitmovement 0 return EventScript_167C1C:: @ 8167C1C - applymovement 4, Movement_1A75ED - applymovement 255, Movement_167C68 + applymovement 4, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 applymovement 3, Movement_167C71 waitmovement 0 return @@ -321,7 +319,7 @@ EventScript_167C1C:: @ 8167C1C EventScript_167C35:: @ 8167C35 msgbox gUnknown_8182453 closemessage - applymovement 255, Movement_167C55 + applymovement OBJ_EVENT_ID_PLAYER, Movement_167C55 waitmovement 0 applymovement 5, Movement_167C59 waitmovement 0 @@ -330,65 +328,65 @@ EventScript_167C35:: @ 8167C35 end Movement_167C55:: @ 8167C55 - step_10 + walk_down step_end Movement_167C57:: @ 8167C57 - step_10 + walk_down step_end Movement_167C59:: @ 8167C59 - step_11 - step_2f + walk_up + walk_in_place_fastest_left step_end Movement_167C5C:: @ 8167C5C - step_25 + walk_in_place_down step_end Movement_167C5E:: @ 8167C5E - step_10 - step_12 - step_2d + walk_down + walk_left + walk_in_place_fastest_down step_end Movement_167C62:: @ 8167C62 - step_10 + walk_down step_end Movement_167C64:: @ 8167C64 - step_10 - step_10 - step_30 + walk_down + walk_down + walk_in_place_fastest_right step_end Movement_167C68:: @ 8167C68 - step_1c - step_1c - step_2f + delay_16 + delay_16 + walk_in_place_fastest_left step_end Movement_167C6C:: @ 8167C6C - step_10 - step_10 - step_13 - step_30 + walk_down + walk_down + walk_right + walk_in_place_fastest_right step_end Movement_167C71:: @ 8167C71 - step_10 - step_10 - step_13 - step_13 - step_30 + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_right step_end ThreeIsland_EventScript_167C77:: @ 8167C77 - msgbox gUnknown_81828EB, 2 + msgbox gUnknown_81828EB, MSGBOX_NPC end ThreeIsland_EventScript_167C80:: @ 8167C80 - msgbox gUnknown_818298A, 2 + msgbox gUnknown_818298A, MSGBOX_NPC end ThreeIsland_EventScript_167C89:: @ 8167C89 @@ -402,9 +400,9 @@ ThreeIsland_EventScript_167C89:: @ 8167C89 end ThreeIsland_EventScript_167C9C:: @ 8167C9C - msgbox gUnknown_8182061, 3 + msgbox gUnknown_8182061, MSGBOX_SIGN end ThreeIsland_EventScript_167CA5:: @ 8167CA5 - msgbox gUnknown_818208B, 2 + msgbox gUnknown_818208B, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index a9a72b4ae..502289c81 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BED05", + "script": "ThreeIsland_BerryForest_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BED12", + "script": "ThreeIsland_BerryForest_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BED1F", + "script": "ThreeIsland_BerryForest_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ELIXIR" } ], diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 3119a1d44..9ac90a4c4 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 - map_script 3, ThreeIsland_BerryForest_MapScript1_163C77 + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_BerryForest_OnTransition .byte 0 -ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 +ThreeIsland_BerryForest_OnTransition:: @ 8163C77 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end @@ -12,26 +12,26 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 faceplayer msgbox gUnknown_817ADD6 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 applymovement 1, Movement_163D22 waitmovement 0 msgbox gUnknown_817AE8E special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 waitse playmoncry SPECIES_HYPNO, 2 waitmoncry setwildbattle SPECIES_HYPNO, 30, ITEM_NONE dowildbattle special sub_8112364 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_817AEE1 giveitem ITEM_IAPAPA_BERRY - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_163D19 + compare VAR_RESULT, 0 + call_if_eq EventScript_163D19 special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_817AF3B closemessage @@ -49,17 +49,17 @@ EventScript_163D19:: @ 8163D19 return Movement_163D22:: @ 8163D22 - step_2f - step_1c - step_30 - step_1b - step_2f + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_left step_end ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 - msgbox gUnknown_817AFD6, 3 + msgbox gUnknown_817AFD6, MSGBOX_SIGN end ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31 - msgbox gUnknown_817B029, 3 + msgbox gUnknown_817B029, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_BondBridge/scripts.inc b/data/maps/ThreeIsland_BondBridge/scripts.inc index 008e748d7..f36889d04 100644 --- a/data/maps/ThreeIsland_BondBridge/scripts.inc +++ b/data/maps/ThreeIsland_BondBridge/scripts.inc @@ -2,9 +2,9 @@ ThreeIsland_BondBridge_MapScripts:: @ 8168776 .byte 0 ThreeIsland_BondBridge_EventScript_168777:: @ 8168777 - msgbox gUnknown_818A210, 3 + msgbox gUnknown_818A210, MSGBOX_SIGN end ThreeIsland_BondBridge_EventScript_168780:: @ 8168780 - msgbox gUnknown_818A223, 3 + msgbox gUnknown_818A223, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 8d5b37ed7..46e8e15f8 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -1,15 +1,15 @@ ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 - map_script 3, ThreeIsland_DunsparceTunnel_MapScript1_164D2C + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_DunsparceTunnel_OnTransition .byte 0 -ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C +ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 1 - call_if eq, EventScript_164D50 - compare_var_to_value VAR_0x8008, 0 - call_if eq, EventScript_164D54 + compare VAR_0x8008, TRUE + call_if_eq EventScript_164D50 + compare VAR_0x8008, FALSE + call_if_eq EventScript_164D54 end EventScript_164D50:: @ 8164D50 @@ -24,14 +24,13 @@ EventScript_164D54:: @ 8164D54 ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 lock faceplayer - checkflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL - goto_if TRUE, EventScript_164DC2 + goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_164D90 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_164D90 msgbox gUnknown_817D13B closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -39,8 +38,8 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 EventScript_164D90:: @ 8164D90 msgbox gUnknown_817D1C9 giveitem ITEM_NUGGET - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_164DB8 + compare VAR_RESULT, 0 + goto_if_eq EventScript_164DB8 setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL goto EventScript_164DC2 end diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc index 9fd44c116..0edd8cac9 100644 --- a/data/maps/ThreeIsland_Harbor/scripts.inc +++ b/data/maps/ThreeIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_Harbor_MapScripts:: @ 8171EA9 ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_THREE_ISLAND goto EventScript_1A900F diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index 7738d2e5c..007f7d4be 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -10,5 +10,5 @@ ThreeIsland_House1_EventScript_17181A:: @ 817181A end ThreeIsland_House1_EventScript_171829:: @ 8171829 - msgbox gUnknown_81A2F92, 3 + msgbox gUnknown_81A2F92, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc index 6c45d3f2f..a9fd52298 100644 --- a/data/maps/ThreeIsland_House2/scripts.inc +++ b/data/maps/ThreeIsland_House2/scripts.inc @@ -10,5 +10,5 @@ ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 end ThreeIsland_House2_EventScript_1718F9:: @ 81718F9 - msgbox gUnknown_81A3245, 2 + msgbox gUnknown_81A3245, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House3/scripts.inc b/data/maps/ThreeIsland_House3/scripts.inc index 7ad4b0da0..b1c336d79 100644 --- a/data/maps/ThreeIsland_House3/scripts.inc +++ b/data/maps/ThreeIsland_House3/scripts.inc @@ -2,5 +2,5 @@ ThreeIsland_House3_MapScripts:: @ 8171902 .byte 0 ThreeIsland_House3_EventScript_171903:: @ 8171903 - msgbox gUnknown_81A3379, 2 + msgbox gUnknown_81A3379, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House4/scripts.inc b/data/maps/ThreeIsland_House4/scripts.inc index 6bb77d0bc..d0facf443 100644 --- a/data/maps/ThreeIsland_House4/scripts.inc +++ b/data/maps/ThreeIsland_House4/scripts.inc @@ -2,9 +2,9 @@ ThreeIsland_House4_MapScripts:: @ 817190C .byte 0 ThreeIsland_House4_EventScript_17190D:: @ 817190D - msgbox gUnknown_81A33DB, 2 + msgbox gUnknown_81A33DB, MSGBOX_NPC end ThreeIsland_House4_EventScript_171916:: @ 8171916 - msgbox gUnknown_81A342F, 2 + msgbox gUnknown_81A342F, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index 3dee5e153..4a2b4f370 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -4,8 +4,7 @@ ThreeIsland_House5_MapScripts:: @ 817191F ThreeIsland_House5_EventScript_171920:: @ 8171920 lock faceplayer - checkflag FLAG_RESCUED_LOSTELLE - goto_if TRUE, EventScript_171935 + goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171935 msgbox gUnknown_81A3469 release end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index ec0caa100..074d78cd9 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -3,14 +3,14 @@ ThreeIsland_Mart_MapScripts:: @ 817188C ThreeIsland_Mart_EventScript_17188D:: @ 817188D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_1718B4 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -27,13 +27,13 @@ Items_1718B4:: @ 81718B4 end ThreeIsland_Mart_EventScript_1718C4:: @ 81718C4 - msgbox gUnknown_81A3114, 2 + msgbox gUnknown_81A3114, MSGBOX_NPC end ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD - msgbox gUnknown_81A315C, 2 + msgbox gUnknown_81A315C, MSGBOX_NPC end ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6 - msgbox gUnknown_81A31F0, 2 + msgbox gUnknown_81A31F0, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 559b2a03c..15d568a6f 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 - map_script 3, ThreeIsland_PokemonCenter_1F_MapScript1_17183D - map_script 5, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D +ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D setrespawn SPAWN_THREE_ISLAND end ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A - msgbox gUnknown_81A303B, 2 + msgbox gUnknown_81A303B, MSGBOX_NPC end ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 - msgbox gUnknown_81A30A3, 2 + msgbox gUnknown_81A30A3, MSGBOX_NPC end ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C - msgbox gUnknown_81A2FB5, 2 + msgbox gUnknown_81A2FB5, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index af562f042..7ee8e0316 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc index dfb7db871..83b97c22d 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 - map_script 2, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +ThreeIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 817187A + call CableClub_EventScript_Colosseum end -EventScript_171880:: @ 8171880 - call EventScript_1BB6AB +ThreeIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171880 + call CableClub_EventScript_TradeCenter end -EventScript_171886:: @ 8171886 - call EventScript_1BB7DE +ThreeIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171886 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 1aff12731..f7aa40e76 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_Port_MapScripts:: @ 8168789 - map_script 3, ThreeIsland_Port_MapScript1_16878F + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_Port_OnTransition .byte 0 -ThreeIsland_Port_MapScript1_16878F:: @ 816878F +ThreeIsland_Port_OnTransition:: @ 816878F clearflag FLAG_SYS_PC_STORAGE_DISABLED setflag FLAG_SEVII_DETOUR_FINISHED end @@ -10,10 +10,10 @@ ThreeIsland_Port_MapScript1_16878F:: @ 816878F ThreeIsland_Port_EventScript_168796:: @ 8168796 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 - goto_if ge, EventScript_1687B8 - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if ge, EventScript_1687C2 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 + goto_if_ge EventScript_1687B8 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 + goto_if_ge EventScript_1687C2 msgbox gUnknown_818A307 release end @@ -29,7 +29,7 @@ EventScript_1687C2:: @ 81687C2 end ThreeIsland_Port_EventScript_1687CC:: @ 81687CC - msgbox gUnknown_818A261, 2 + msgbox gUnknown_818A261, MSGBOX_NPC end ThreeIsland_Port_EventScript_1687D5:: @ 81687D5 diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/TradeCenter/map.json index a427bdc14..71310c57f 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/TradeCenter/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_01", - "name": "UnknownMap_00_01", - "layout": "LAYOUT_UNKNOWN_MAP_00_01", + "id": "MAP_TRADE_CENTER", + "name": "TradeCenter", + "layout": "LAYOUT_TRADE_CENTER", "music": "MUS_POKECEN", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_01_EventScript_1BB9C1", + "script": "TradeCenter_EventScript_Attendant", "flag": "0" } ], @@ -49,18 +49,18 @@ "x": 4, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_01_EventScript_1BB950" + "script": "TradeCenter_EventScript_Chair0" }, { "type": "trigger", "x": 7, "y": 5, "elevation": 3, - "var": "VAR_0x4000", + "var": "VAR_TEMP_0", "var_value": 0, - "script": "UnknownMap_00_01_EventScript_1BB95C" + "script": "TradeCenter_EventScript_Chair1" } ], "bg_events": [] diff --git a/data/maps/TradeCenter/scripts.inc b/data/maps/TradeCenter/scripts.inc new file mode 100644 index 000000000..fa3ed8869 --- /dev/null +++ b/data/maps/TradeCenter/scripts.inc @@ -0,0 +1,2 @@ +TradeCenter_MapScripts:: @ 8160479 + .byte 0 diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 24db68596..34f5bbfce 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -107,7 +107,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_1BEAAF", + "script": "TwoIsland_EventScript_ItemRevive", "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" }, { diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 3d35a89c1..59c4ca6f9 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -1,46 +1,36 @@ TwoIsland_MapScripts:: @ 8167564 - map_script 3, TwoIsland_MapScript1_16756A + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_OnTransition .byte 0 -TwoIsland_MapScript1_16756A:: @ 816756A +TwoIsland_OnTransition:: @ 816756A setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND setflag FLAG_VISITED_TWO_ISLAND call EventScript_167576 end EventScript_167576:: @ 8167576 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_167597 - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_1675B8 - checkflag FLAG_RESCUED_LOSTELLE - goto_if TRUE, EventScript_1675D9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167597 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1675B8 + goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_1675D9 goto EventScript_1675E8 end EventScript_167597:: @ 8167597 - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if FALSE, EventScript_1675EE - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - goto_if FALSE, EventScript_1675F4 - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 - goto_if FALSE, EventScript_1675FD + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4 + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1675FD goto EventScript_167606 end EventScript_1675B8:: @ 81675B8 - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if FALSE, EventScript_1675EE - checkflag FLAG_RESCUED_LOSTELLE - goto_if FALSE, EventScript_1675EE - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - goto_if FALSE, EventScript_1675F4 + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE + goto_if_unset FLAG_RESCUED_LOSTELLE, EventScript_1675EE + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4 goto EventScript_1675FD end EventScript_1675D9:: @ 81675D9 - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if FALSE, EventScript_1675EE + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE goto EventScript_1675F4 end @@ -69,22 +59,21 @@ EventScript_167606:: @ 8167606 TwoIsland_EventScript_16760F:: @ 816760F special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if eq, EventScript_167646 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if eq, EventScript_16765E - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if eq, EventScript_167676 + compare VAR_MAP_SCENE_TWO_ISLAND, 4 + goto_if_eq EventScript_167646 + compare VAR_MAP_SCENE_TWO_ISLAND, 3 + goto_if_eq EventScript_16765E + compare VAR_MAP_SCENE_TWO_ISLAND, 2 + goto_if_eq EventScript_167676 goto EventScript_16768E end EventScript_167646:: @ 8167646 - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 message Text_181CAE waitmessage @@ -92,8 +81,7 @@ EventScript_167646:: @ 8167646 end EventScript_16765E:: @ 816765E - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 message Text_181C77 waitmessage @@ -101,8 +89,7 @@ EventScript_16765E:: @ 816765E end EventScript_167676:: @ 8167676 - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 message Text_181B7C waitmessage @@ -110,8 +97,7 @@ EventScript_167676:: @ 8167676 end EventScript_16768E:: @ 816768E - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED message Text_181AFE waitmessage @@ -119,20 +105,20 @@ EventScript_16768E:: @ 816768E end EventScript_1676A6:: @ 81676A6 - message Text_1A6211 + message Text_MayIHelpYou waitmessage - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if eq, EventScript_167728 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if eq, EventScript_167708 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if eq, EventScript_1676EC + compare VAR_MAP_SCENE_TWO_ISLAND, 4 + goto_if_eq EventScript_167728 + compare VAR_MAP_SCENE_TWO_ISLAND, 3 + goto_if_eq EventScript_167708 + compare VAR_MAP_SCENE_TWO_ISLAND, 2 + goto_if_eq EventScript_1676EC goto EventScript_1676D3 end EventScript_1676D3:: @ 81676D3 pokemart Items_1676E4 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -146,7 +132,7 @@ Items_1676E4:: @ 81676E4 EventScript_1676EC:: @ 81676EC pokemart Items_1676FC - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -162,7 +148,7 @@ Items_1676FC:: @ 81676FC EventScript_167708:: @ 8167708 pokemart Items_167718 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -180,7 +166,7 @@ Items_167718:: @ 8167718 EventScript_167728:: @ 8167728 pokemart Items_167738 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -199,11 +185,11 @@ Items_167738:: @ 8167738 end TwoIsland_EventScript_16774C:: @ 816774C - msgbox gUnknown_8181D2F, 2 + msgbox gUnknown_8181D2F, MSGBOX_NPC end TwoIsland_EventScript_167755:: @ 8167755 - msgbox gUnknown_8181DCA, 2 + msgbox gUnknown_8181DCA, MSGBOX_NPC end TwoIsland_EventScript_16775E:: @ 816775E @@ -215,25 +201,25 @@ TwoIsland_EventScript_16775E:: @ 816775E end TwoIsland_EventScript_167777:: @ 8167777 - msgbox gUnknown_8181F28, 2 + msgbox gUnknown_8181F28, MSGBOX_NPC end TwoIsland_EventScript_167780:: @ 8167780 - msgbox gUnknown_8181F5D, 2 + msgbox gUnknown_8181F5D, MSGBOX_NPC end TwoIsland_EventScript_167789:: @ 8167789 - msgbox gUnknown_8181FCE, 2 + msgbox gUnknown_8181FCE, MSGBOX_NPC end TwoIsland_EventScript_167792:: @ 8167792 - msgbox gUnknown_8181A88, 3 + msgbox gUnknown_8181A88, MSGBOX_SIGN end TwoIsland_EventScript_16779B:: @ 816779B - msgbox gUnknown_8181AA7, 3 + msgbox gUnknown_8181AA7, MSGBOX_SIGN end TwoIsland_EventScript_1677A4:: @ 81677A4 - msgbox gUnknown_8181AC8, 3 + msgbox gUnknown_8181AC8, MSGBOX_SIGN end diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 4aa63fd0b..9d13a0086 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_CapeBrink_House_EventScript_1C4DEC", + "script": "TwoIsland_CapeBrink_House_EventScript_StarterTutor", "flag": "0" } ], diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc index 919239a0b..ff1bb82bf 100644 --- a/data/maps/TwoIsland_Harbor/scripts.inc +++ b/data/maps/TwoIsland_Harbor/scripts.inc @@ -4,7 +4,7 @@ TwoIsland_Harbor_MapScripts:: @ 8171805 TwoIsland_Harbor_EventScript_171806:: @ 8171806 lock faceplayer - message Text_181726 + message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_TWO_ISLAND goto EventScript_1A8F54 diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 3841620b0..f6268567d 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -3,16 +3,15 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_171619:: @ 8171619 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 lock faceplayer clearflag FLAG_TEMP_2 clearflag FLAG_TEMP_3 clearflag FLAG_TEMP_4 - checkflag FLAG_TEMP_1 - goto_if TRUE, EventScript_17164F + goto_if_set FLAG_TEMP_1, EventScript_17164F msgbox gUnknown_81A2B88 setflag FLAG_TEMP_1 goto EventScript_17164F @@ -20,34 +19,30 @@ TwoIsland_House_EventScript_171619:: @ 8171619 EventScript_17164F:: @ 817164F checkitem ITEM_BIG_MUSHROOM, 1 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_1717A8 + compare VAR_RESULT, TRUE + call_if_eq EventScript_1717A8 checkitem ITEM_TINY_MUSHROOM, 2 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_1717AC - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_171687 - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_171696 + compare VAR_RESULT, TRUE + call_if_eq EventScript_1717AC + goto_if_set FLAG_TEMP_2, EventScript_171687 + goto_if_set FLAG_TEMP_3, EventScript_171696 goto EventScript_17179E end EventScript_171687:: @ 8171687 - checkflag FLAG_TEMP_3 - call_if TRUE, EventScript_1717B0 + call_if_set FLAG_TEMP_3, EventScript_1717B0 goto EventScript_1716A5 end EventScript_171696:: @ 8171696 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_1717B0 + call_if_set FLAG_TEMP_2, EventScript_1717B0 goto EventScript_1716A5 end EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_17179E + compare VAR_RESULT, NO + goto_if_eq EventScript_17179E goto EventScript_1716BE end @@ -55,13 +50,13 @@ EventScript_1716BE:: @ 81716BE msgbox gUnknown_81A2CC3 special Special_SelectMoveTutorMon waitstate - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_17179E + compare VAR_0x8004, 6 + goto_if_ge EventScript_17179E special Special_IsSelectedMonEgg - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_171790 - compare_var_to_value VAR_0x8005, 0 - goto_if eq, EventScript_171782 + compare VAR_RESULT, 1 + goto_if_eq EventScript_171790 + compare VAR_0x8005, 0 + goto_if_eq EventScript_171782 goto EventScript_1716F4 end @@ -69,14 +64,11 @@ EventScript_1716F4:: @ 81716F4 msgbox gUnknown_81A2CE1 special DisplayMoveTutorMenu waitstate - compare_var_to_value VAR_0x8004, 0 - goto_if eq, EventScript_1716BE - checkflag FLAG_TEMP_4 - goto_if TRUE, EventScript_17175B - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_171727 - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_171741 + compare VAR_0x8004, 0 + goto_if_eq EventScript_1716BE + goto_if_set FLAG_TEMP_4, EventScript_17175B + goto_if_set FLAG_TEMP_2, EventScript_171727 + goto_if_set FLAG_TEMP_3, EventScript_171741 end EventScript_171727:: @ 8171727 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 4caef4f41..bb927734e 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -82,14 +82,14 @@ "x": 1, "y": 1, "elevation": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2E7" + "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords" }, { "type": "bg_event_type_0", "x": 0, "y": 1, "elevation": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC" + "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords" } ] } diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 798435eaf..0bbb24423 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -1,13 +1,12 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 - map_script 3, TwoIsland_JoyfulGameCorner_MapScript1_1713E5 - map_script 4, TwoIsland_JoyfulGameCorner_MapScript2_171404 - map_script 2, TwoIsland_JoyfulGameCorner_MapScript3_17141B - map_script 1, TwoIsland_JoyfulGameCorner_MapScript4_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_JoyfulGameCorner_OnFrame + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad .byte 0 -TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5 - checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER - call_if TRUE, EventScript_1713EF +TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5 + call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1713EF end EventScript_1713EF:: @ 81713EF @@ -17,19 +16,19 @@ EventScript_1713EF:: @ 81713EF setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 return -TwoIsland_JoyfulGameCorner_MapScript2_171404:: @ 8171404 +TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404 map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416 - map_script_2 VAR_0x406F, 8, EventScript_1BB227 + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, EventScript_CheckTurnAttendant .2byte 0 EventScript_171416:: @ 8171416 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -TwoIsland_JoyfulGameCorner_MapScript3_17141B:: @ 817141B +TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435 - map_script_2 VAR_0x406F, 8, EventScript_1BB2FD + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom .2byte 0 EventScript_171435:: @ 8171435 @@ -40,7 +39,7 @@ EventScript_171435:: @ 8171435 special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_81A2931 closemessage - applymovement 3, Movement_1A75ED + applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 releaseall @@ -53,34 +52,34 @@ EventScript_17145F:: @ 817145F waitmovement 0 msgbox gUnknown_81A2408 closemessage - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 applymovement 1, Movement_171527 waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_81A2465 closemessage playse SE_DOOR waitse - applymovement 255, Movement_17152C + applymovement OBJ_EVENT_ID_PLAYER, Movement_17152C waitmovement 0 playbgm MUS_SHOUNEN, 0 addobject 2 applymovement 2, Movement_17152F waitmovement 0 msgbox gUnknown_81A259A - applymovement 2, Movement_1A75EB + applymovement 2, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_81A2658 msgbox gUnknown_81A26D5 closemessage - applymovement 2, Movement_1A75ED + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_KAIDAN removeobject 2 @@ -94,41 +93,40 @@ EventScript_17145F:: @ 817145F end Movement_171520:: @ 8171520 - step_12 - step_13 - step_13 - step_1b - step_2e - step_1c + walk_left + walk_right + walk_right + delay_8 + walk_in_place_fastest_up + delay_16 step_end Movement_171527:: @ 8171527 - step_10 - step_10 - step_10 - step_2f + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end Movement_17152C:: @ 817152C - step_12 - step_30 + walk_left + walk_in_place_fastest_right step_end Movement_17152F:: @ 817152F - step_2f - step_1b - step_30 - step_1b - step_2e + walk_in_place_fastest_left + delay_8 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_up step_end TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if eq, EventScript_1BC060 - checkflag FLAG_RESCUED_LOSTELLE - goto_if TRUE, EventScript_171555 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 + goto_if_eq JoyfulGameCorner_EventScript_InfoMan2 + goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171555 msgbox gUnknown_81A285C release end @@ -141,19 +139,17 @@ EventScript_171555:: @ 8171555 TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if eq, EventScript_1BC0CE - checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER - goto_if TRUE, EventScript_1715F5 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 - goto_if eq, EventScript_17158A + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 + goto_if_eq JoyfulGameCorner_EventScript_MinigameAttendant + goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1715F5 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 + goto_if_eq EventScript_17158A msgbox gUnknown_81A2743 release end EventScript_17158A:: @ 817158A - checkflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE - goto_if TRUE, EventScript_1715C4 + goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, EventScript_1715C4 msgbox gUnknown_81A296A setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 @@ -169,11 +165,11 @@ EventScript_17158A:: @ 817158A EventScript_1715C4:: @ 81715C4 checkitemspace ITEM_MOON_STONE, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1715FF - additem ITEM_MOON_STONE, 1 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1715FF + additem ITEM_MOON_STONE setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER - giveitemfanfaremsg gUnknown_81A2A9A, ITEM_MOON_STONE + msgreceiveditem gUnknown_81A2A9A, ITEM_MOON_STONE release end diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index 813b5d595..6661a61eb 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -1,23 +1,23 @@ TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 - map_script 3, TwoIsland_PokemonCenter_1F_MapScript1_1717BF - map_script 5, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -TwoIsland_PokemonCenter_1F_MapScript1_1717BF:: @ 81717BF +TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF setrespawn SPAWN_TWO_ISLAND end TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC - msgbox gUnknown_81A2E59, 2 + msgbox gUnknown_81A2E59, MSGBOX_NPC end TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5 - msgbox gUnknown_81A2EBE, 2 + msgbox gUnknown_81A2EBE, MSGBOX_NPC end diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index a9c4b0c27..ba3815e00 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 01954808c..f8e803ccb 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE - map_script 2, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +TwoIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 81717F3 + call CableClub_EventScript_Colosseum end -EventScript_1717F9:: @ 81717F9 - call EventScript_1BB6AB +TwoIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 81717F9 + call CableClub_EventScript_TradeCenter end -EventScript_1717FF:: @ 81717FF - call EventScript_1BB7DE +TwoIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 81717FF + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/UndergroundPath_EastEntrance/scripts.inc b/data/maps/UndergroundPath_EastEntrance/scripts.inc index 31ee9f7af..28a211c6f 100644 --- a/data/maps/UndergroundPath_EastEntrance/scripts.inc +++ b/data/maps/UndergroundPath_EastEntrance/scripts.inc @@ -2,5 +2,5 @@ UndergroundPath_EastEntrance_MapScripts:: @ 8160EDD .byte 0 UndergroundPath_EastEntrance_EventScript_160EDE:: @ 8160EDE - msgbox gUnknown_81745D9, 2 + msgbox gUnknown_81745D9, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc index 9137a8ad1..0604a7712 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc +++ b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_EastWestTunnel_MapScripts:: @ 8160ED3 - map_script 3, UndergroundPath_EastWestTunnel_MapScript1_160ED9 + map_script MAP_SCRIPT_ON_TRANSITION, UndergroundPath_EastWestTunnel_OnTransition .byte 0 -UndergroundPath_EastWestTunnel_MapScript1_160ED9:: @ 8160ED9 +UndergroundPath_EastWestTunnel_OnTransition:: @ 8160ED9 setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL end diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 4d5a806e2..2a1e4ed4f 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -6,17 +6,16 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 faceplayer setvar VAR_0x8008, 2 call EventScript_1A8CAD - checkflag FLAG_DID_MS_NIDO_TRADE - goto_if TRUE, EventScript_160EAB + goto_if_set FLAG_DID_MS_NIDO_TRADE, EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_160E93 + compare VAR_RESULT, NO + goto_if_eq EventScript_160E93 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_160E93 + compare VAR_0x8004, 6 + goto_if_ge EventScript_160E93 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_160E9D + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_160E9D call EventScript_1A8CD9 msgbox gUnknown_81A5B4A setflag FLAG_DID_MS_NIDO_TRADE diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc index 408a60fee..d5c9a4ad5 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc +++ b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_NorthSouthTunnel_MapScripts:: @ 8160EB5 - map_script 3, UndergroundPath_NorthSouthTunnel_MapScript1_160EBB + map_script MAP_SCRIPT_ON_TRANSITION, UndergroundPath_NorthSouthTunnel_OnTransition .byte 0 -UndergroundPath_NorthSouthTunnel_MapScript1_160EBB:: @ 8160EBB +UndergroundPath_NorthSouthTunnel_OnTransition:: @ 8160EBB setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL end diff --git a/data/maps/UndergroundPath_SouthEntrance/scripts.inc b/data/maps/UndergroundPath_SouthEntrance/scripts.inc index 1e3d2e6e3..1623d16d7 100644 --- a/data/maps/UndergroundPath_SouthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_SouthEntrance/scripts.inc @@ -2,5 +2,5 @@ UndergroundPath_SouthEntrance_MapScripts:: @ 8160EBF .byte 0 UndergroundPath_SouthEntrance_EventScript_160EC0:: @ 8160EC0 - msgbox gUnknown_8174559, 2 + msgbox gUnknown_8174559, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_WestEntrance/scripts.inc b/data/maps/UndergroundPath_WestEntrance/scripts.inc index f56217bce..6b1c60710 100644 --- a/data/maps/UndergroundPath_WestEntrance/scripts.inc +++ b/data/maps/UndergroundPath_WestEntrance/scripts.inc @@ -2,5 +2,5 @@ UndergroundPath_WestEntrance_MapScripts:: @ 8160EC9 .byte 0 UndergroundPath_WestEntrance_EventScript_160ECA:: @ 8160ECA - msgbox gUnknown_817459B, 2 + msgbox gUnknown_817459B, MSGBOX_NPC end diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnionRoom/map.json index b18296b2c..05afe6e01 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnionRoom/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_UNKNOWN_MAP_00_04", - "name": "UnknownMap_00_04", - "layout": "LAYOUT_UNKNOWN_MAP_00_04", + "id": "MAP_UNION_ROOM", + "name": "UnionRoom", + "layout": "LAYOUT_UNION_ROOM", "music": "MUS_UNION", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_16050C", + "script": "UnionRoom_EventScript_16050C", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604DA", + "script": "UnionRoom_EventScript_1604DA", "flag": "FLAG_HIDE_UNION_ROOM_4" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_160502", + "script": "UnionRoom_EventScript_160502", "flag": "FLAG_HIDE_UNION_ROOM_8" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604F8", + "script": "UnionRoom_EventScript_1604F8", "flag": "FLAG_HIDE_UNION_ROOM_7" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604EE", + "script": "UnionRoom_EventScript_1604EE", "flag": "FLAG_HIDE_UNION_ROOM_6" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604E4", + "script": "UnionRoom_EventScript_1604E4", "flag": "FLAG_HIDE_UNION_ROOM_5" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604D0", + "script": "UnionRoom_EventScript_1604D0", "flag": "FLAG_HIDE_UNION_ROOM_3" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604C6", + "script": "UnionRoom_EventScript_1604C6", "flag": "FLAG_HIDE_UNION_ROOM_2" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604BC", + "script": "UnionRoom_EventScript_1604BC", "flag": "FLAG_HIDE_UNION_ROOM_1" } ], diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnionRoom/scripts.inc index 0358b7d8a..c948682ce 100644 --- a/data/maps/UnknownMap_00_04/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,9 +1,9 @@ -UnknownMap_00_04_MapScripts:: @ 816047C - map_script 5, UnknownMap_00_04_MapScript1_160487 - map_script 3, UnknownMap_00_04_MapScript2_1604BB +UnionRoom_MapScripts:: @ 816047C + map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition .byte 0 -UnknownMap_00_04_MapScript1_160487:: @ 8160487 +UnionRoom_OnResume:: @ 8160487 setflag FLAG_HIDE_UNION_ROOM_1 setflag FLAG_HIDE_UNION_ROOM_2 setflag FLAG_HIDE_UNION_ROOM_3 @@ -23,10 +23,10 @@ UnknownMap_00_04_MapScript1_160487:: @ 8160487 special UnionRoomSpecial end -UnknownMap_00_04_MapScript2_1604BB:: @ 81604BB +UnionRoom_OnTransition:: @ 81604BB end -UnknownMap_00_04_EventScript_1604BC:: @ 81604BC +UnionRoom_EventScript_1604BC:: @ 81604BC lock faceplayer setvar VAR_RESULT, 1 @@ -34,7 +34,7 @@ UnknownMap_00_04_EventScript_1604BC:: @ 81604BC release end -UnknownMap_00_04_EventScript_1604C6:: @ 81604C6 +UnionRoom_EventScript_1604C6:: @ 81604C6 lock faceplayer setvar VAR_RESULT, 2 @@ -42,7 +42,7 @@ UnknownMap_00_04_EventScript_1604C6:: @ 81604C6 release end -UnknownMap_00_04_EventScript_1604D0:: @ 81604D0 +UnionRoom_EventScript_1604D0:: @ 81604D0 lock faceplayer setvar VAR_RESULT, 3 @@ -50,7 +50,7 @@ UnknownMap_00_04_EventScript_1604D0:: @ 81604D0 release end -UnknownMap_00_04_EventScript_1604DA:: @ 81604DA +UnionRoom_EventScript_1604DA:: @ 81604DA lock faceplayer setvar VAR_RESULT, 4 @@ -58,7 +58,7 @@ UnknownMap_00_04_EventScript_1604DA:: @ 81604DA release end -UnknownMap_00_04_EventScript_1604E4:: @ 81604E4 +UnionRoom_EventScript_1604E4:: @ 81604E4 lock faceplayer setvar VAR_RESULT, 5 @@ -66,7 +66,7 @@ UnknownMap_00_04_EventScript_1604E4:: @ 81604E4 release end -UnknownMap_00_04_EventScript_1604EE:: @ 81604EE +UnionRoom_EventScript_1604EE:: @ 81604EE lock faceplayer setvar VAR_RESULT, 6 @@ -74,7 +74,7 @@ UnknownMap_00_04_EventScript_1604EE:: @ 81604EE release end -UnknownMap_00_04_EventScript_1604F8:: @ 81604F8 +UnionRoom_EventScript_1604F8:: @ 81604F8 lock faceplayer setvar VAR_RESULT, 7 @@ -82,7 +82,7 @@ UnknownMap_00_04_EventScript_1604F8:: @ 81604F8 release end -UnknownMap_00_04_EventScript_160502:: @ 8160502 +UnionRoom_EventScript_160502:: @ 8160502 lock faceplayer setvar VAR_RESULT, 8 @@ -90,7 +90,7 @@ UnknownMap_00_04_EventScript_160502:: @ 8160502 release end -UnknownMap_00_04_EventScript_16050C:: @ 816050C +UnionRoom_EventScript_16050C:: @ 816050C lock faceplayer setvar VAR_RESULT, 9 @@ -98,7 +98,7 @@ UnknownMap_00_04_EventScript_16050C:: @ 816050C release end -UnknownMap_00_04_EventScript_160516:: @ 8160516 +UnionRoom_EventScript_160516:: @ 8160516 lockall setvar VAR_RESULT, 10 waitstate diff --git a/data/maps/UnknownMap_00_00/scripts.inc b/data/maps/UnknownMap_00_00/scripts.inc deleted file mode 100644 index bd155a889..000000000 --- a/data/maps/UnknownMap_00_00/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_00_MapScripts:: @ 8160478 - .byte 0 diff --git a/data/maps/UnknownMap_00_01/scripts.inc b/data/maps/UnknownMap_00_01/scripts.inc deleted file mode 100644 index 0c05ea80d..000000000 --- a/data/maps/UnknownMap_00_01/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_01_MapScripts:: @ 8160479 - .byte 0 diff --git a/data/maps/UnknownMap_00_02/scripts.inc b/data/maps/UnknownMap_00_02/scripts.inc deleted file mode 100644 index d12ac4304..000000000 --- a/data/maps/UnknownMap_00_02/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_02_MapScripts:: @ 816047A - .byte 0 diff --git a/data/maps/UnknownMap_00_03/scripts.inc b/data/maps/UnknownMap_00_03/scripts.inc deleted file mode 100644 index 60c25bf54..000000000 --- a/data/maps/UnknownMap_00_03/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_03_MapScripts:: @ 816047B - .byte 0 diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 216206ad1..7398ea10b 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -225,7 +225,7 @@ "x": 22, "y": 32, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "VermilionCity_EventScript_166B98" }, @@ -234,7 +234,7 @@ "x": 23, "y": 32, "elevation": 0, - "var": "VAR_0x4001", + "var": "VAR_TEMP_1", "var_value": 0, "script": "VermilionCity_EventScript_166B98" } diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index fcacff2e3..7767bbb2b 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -1,29 +1,28 @@ VermilionCity_MapScripts:: @ 81668DC - map_script 3, VermilionCity_MapScript1_166906 - map_script 2, VermilionCity_MapScript2_1668E7 + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_OnFrame .byte 0 -VermilionCity_MapScript2_1668E7:: @ 81668E7 +VermilionCity_OnFrame:: @ 81668E7 map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, EventScript_1668F1 .2byte 0 EventScript_1668F1:: @ 81668F1 lockall - applymovement 255, Movement_166903 + applymovement OBJ_EVENT_ID_PLAYER, Movement_166903 waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 3 releaseall end Movement_166903:: @ 8166903 - step_11 - step_11 + walk_up + walk_up step_end -VermilionCity_MapScript1_166906:: @ 8166906 +VermilionCity_OnTransition:: @ 8166906 setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY - checkflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION - call_if TRUE, EventScript_166913 + call_if_set FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION, EventScript_166913 end EventScript_166913:: @ 8166913 @@ -31,14 +30,14 @@ EventScript_166913:: @ 8166913 return VermilionCity_EventScript_166917:: @ 8166917 - msgbox gUnknown_817F723, 2 + msgbox gUnknown_817F723, MSGBOX_NPC end VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if eq, EventScript_166937 + compare VAR_MAP_SCENE_VERMILION_CITY, 3 + goto_if_eq EventScript_166937 msgbox gUnknown_817F776 release end @@ -51,51 +50,49 @@ EventScript_166937:: @ 8166937 VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if eq, EventScript_166996 + compare VAR_MAP_SCENE_VERMILION_CITY, 3 + goto_if_eq EventScript_166996 msgbox gUnknown_817FA22 release end EventScript_166958:: @ 8166958 - checkflag FLAG_SYS_GOT_MYSTIC_TICKET - goto_if FALSE, EventScript_1A77B0 + goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_SetResultFalse checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A77B0 - goto EventScript_1A77AA + compare VAR_RESULT, FALSE + goto_if_eq EventScript_SetResultFalse + goto EventScript_SetResultTrue end EventScript_166977:: @ 8166977 - checkflag FLAG_SYS_GOT_AURORA_TICKET - goto_if FALSE, EventScript_1A77B0 + goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_SetResultFalse checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A77B0 - goto EventScript_1A77AA + compare VAR_RESULT, FALSE + goto_if_eq EventScript_SetResultFalse + goto EventScript_SetResultTrue end EventScript_166996:: @ 8166996 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1669BB - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if ge, EventScript_166B3B + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + goto_if_ge EventScript_1669BB + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 + goto_if_ge EventScript_166B3B msgbox gUnknown_817FB10 release end EventScript_1669BB:: @ 81669BB 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 call EventScript_166958 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_1669FD + compare VAR_RESULT, 1 + goto_if_eq EventScript_1669FD call EventScript_166977 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_166A5F + compare VAR_RESULT, 1 + goto_if_eq EventScript_166A5F setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY message Text_17FBB8 waitmessage @@ -104,18 +101,17 @@ EventScript_1669BB:: @ 81669BB EventScript_1669FD:: @ 81669FD call EventScript_166977 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_166AB1 - checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN - call_if FALSE, EventScript_166A53 + compare VAR_RESULT, 1 + goto_if_eq EventScript_166AB1 + call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, EventScript_166A53 message Text_17FCC1 waitmessage multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE switch VAR_RESULT case 0, EventScript_1A911E case 1, EventScript_166B0B - case 2, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 2, EventScript_CancelSail + case 127, EventScript_CancelSail end EventScript_166A53:: @ 8166A53 @@ -124,16 +120,15 @@ EventScript_166A53:: @ 8166A53 return EventScript_166A5F:: @ 8166A5F - checkflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN - call_if FALSE, EventScript_166AA5 + call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE switch VAR_RESULT case 0, EventScript_1A911E case 1, EventScript_166B23 - case 2, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 2, EventScript_CancelSail + case 127, EventScript_CancelSail end EventScript_166AA5:: @ 8166AA5 @@ -142,10 +137,8 @@ EventScript_166AA5:: @ 8166AA5 return EventScript_166AB1:: @ 8166AB1 - checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN - call_if FALSE, EventScript_166A53 - checkflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN - call_if FALSE, EventScript_166AA5 + call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, EventScript_166A53 + call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE @@ -153,8 +146,8 @@ EventScript_166AB1:: @ 8166AB1 case 0, EventScript_1A911E case 1, EventScript_166B0B case 2, EventScript_166B23 - case 3, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 3, EventScript_CancelSail + case 127, EventScript_CancelSail end EventScript_166B0B:: @ 8166B0B @@ -180,8 +173,8 @@ EventScript_166B3B:: @ 8166B3B case 0, EventScript_1A8FEE case 1, EventScript_1A8FF9 case 2, EventScript_1A9004 - case 3, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case 3, EventScript_CancelSail + case 127, EventScript_CancelSail end EventScript_166B88:: @ 8166B88 @@ -206,14 +199,13 @@ VermilionCity_EventScript_166B98:: @ 8166B98 EventScript_166BA0:: @ 8166BA0 textcolor 0 - applymovement 6, Movement_1A75E7 - applymovement 255, Movement_1A75EB + applymovement 6, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if eq, EventScript_166BED + compare VAR_MAP_SCENE_VERMILION_CITY, 3 + goto_if_eq EventScript_166BED msgbox gUnknown_817FA3C - checkflag FLAG_GOT_SS_TICKET - goto_if FALSE, EventScript_166BDE + goto_if_unset FLAG_GOT_SS_TICKET, EventScript_166BDE msgbox gUnknown_817FA77 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1 releaseall @@ -227,17 +219,17 @@ EventScript_166BDE:: @ 8166BDE EventScript_166BED:: @ 8166BED setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1669BB - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if ge, EventScript_166B3B + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + goto_if_ge EventScript_1669BB + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 + goto_if_ge EventScript_166B3B msgbox gUnknown_817FB10 closemessage goto EventScript_1A9108 end VermilionCity_EventScript_166C17:: @ 8166C17 - msgbox gUnknown_817F8AC, 2 + msgbox gUnknown_817F8AC, MSGBOX_NPC end VermilionCity_EventScript_166C20:: @ 8166C20 @@ -249,7 +241,7 @@ VermilionCity_EventScript_166C20:: @ 8166C20 end VermilionCity_EventScript_166C2F:: @ 8166C2F - msgbox gUnknown_817F7FD, 2 + msgbox gUnknown_817F7FD, MSGBOX_NPC end VermilionCity_EventScript_166C38:: @ 8166C38 @@ -264,15 +256,15 @@ VermilionCity_EventScript_166C38:: @ 8166C38 end VermilionCity_EventScript_166C53:: @ 8166C53 - msgbox gUnknown_817F8FB, 3 + msgbox gUnknown_817F8FB, MSGBOX_SIGN end VermilionCity_EventScript_166C5C:: @ 8166C5C - msgbox gUnknown_817F928, 3 + msgbox gUnknown_817F928, MSGBOX_SIGN end VermilionCity_EventScript_166C65:: @ 8166C65 - msgbox gUnknown_817F9A1, 3 + msgbox gUnknown_817F9A1, MSGBOX_SIGN end VermilionCity_EventScript_166C6E:: @ 8166C6E @@ -283,5 +275,5 @@ VermilionCity_EventScript_166C6E:: @ 8166C6E end VermilionCity_EventScript_166C86:: @ 8166C86 - msgbox gUnknown_817FA11, 3 + msgbox gUnknown_817FA11, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 5d08e2b3a..baf3d82df 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -1,13 +1,11 @@ VermilionCity_Gym_MapScripts:: @ 816B69E - map_script 1, VermilionCity_Gym_MapScript1_16B6A9 - map_script 3, VermilionCity_Gym_MapScript2_16B772 + map_script MAP_SCRIPT_ON_LOAD, VermilionCity_Gym_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_Gym_OnTransition .byte 0 -VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9 - checkflag FLAG_TEMP_1 - call_if TRUE, EventScript_16B6BC - checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES - call_if TRUE, EventScript_16B717 +VermilionCity_Gym_OnLoad:: @ 816B6A9 + call_if_set FLAG_TEMP_1, EventScript_16B6BC + call_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_16B717 end EventScript_16B6BC:: @ 816B6BC @@ -36,16 +34,15 @@ EventScript_16B717:: @ 816B717 setmetatile 7, 7, 670, 1 return -VermilionCity_Gym_MapScript2_16B772:: @ 816B772 +VermilionCity_Gym_OnTransition:: @ 816B772 call EventScript_16B778 end EventScript_16B778:: @ 816B778 - checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_Return special Special_SetVermilionTrashCans - copyvar VAR_0x4000, VAR_0x8004 - copyvar VAR_0x4001, VAR_0x8005 + copyvar VAR_TEMP_0, VAR_0x8004 + copyvar VAR_TEMP_1, VAR_0x8005 return VermilionCity_Gym_EventScript_16B78F:: @ 816B78F @@ -140,17 +137,15 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 EventScript_16B843:: @ 816B843 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 - copyvar VAR_0x8004, VAR_0x4000 - copyvar VAR_0x8005, VAR_0x4001 - checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES - goto_if TRUE, EventScript_16B8E5 - checkflag FLAG_TEMP_1 - goto_if TRUE, EventScript_16B89E - compare_var_to_var VAR_0x8004, VAR_0x8008 - goto_if eq, EventScript_16B885 + copyvar VAR_0x8004, VAR_TEMP_0 + copyvar VAR_0x8005, VAR_TEMP_1 + goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_16B8E5 + goto_if_set FLAG_TEMP_1, EventScript_16B89E + compare VAR_0x8004, VAR_0x8008 + goto_if_eq EventScript_16B885 msgbox gUnknown_8195289 releaseall end @@ -166,13 +161,13 @@ EventScript_16B885:: @ 816B885 end EventScript_16B89E:: @ 816B89E - compare_var_to_var VAR_0x8005, VAR_0x8008 - goto_if eq, EventScript_16B8CB + compare VAR_0x8005, VAR_0x8008 + goto_if_eq EventScript_16B8CB msgbox gUnknown_819536C clearflag FLAG_TEMP_1 special Special_SetVermilionTrashCans - copyvar VAR_0x4000, VAR_0x8004 - copyvar VAR_0x4001, VAR_0x8005 + copyvar VAR_TEMP_0, VAR_0x8004 + copyvar VAR_TEMP_1, VAR_0x8005 call EventScript_16B8EF special DrawWholeMapView releaseall @@ -209,17 +204,15 @@ EventScript_16B8EF:: @ 816B8EF VermilionCity_Gym_EventScript_16B94A:: @ 816B94A famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C - checkflag FLAG_GOT_TM34_FROM_SURGE - goto_if FALSE, EventScript_16B9AF + trainerbattle_single TRAINER_LEADER_LT_SURGE, Text_194BA4, Text_194E03, EventScript_16B97C, NO_MUSIC + goto_if_unset FLAG_GOT_TM34_FROM_SURGE, EventScript_16B9AF msgbox gUnknown_8194C8E release end EventScript_16B97C:: @ 816B97C famechecker FAMECHECKER_LTSURGE, 1 - checkflag FLAG_GOT_HM05 - call_if FALSE, EventScript_16B9AB + call_if_unset FLAG_GOT_HM05, EventScript_16B9AB clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL setflag FLAG_DEFEATED_LT_SURGE setflag FLAG_BADGE03_GET @@ -234,10 +227,9 @@ EventScript_16B9AB:: @ 816B9AB EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B9F0 - additem ITEM_TM34, 1 - giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16B9F0 + giveitem_msg gUnknown_8194D87, ITEM_TM34 setflag FLAG_GOT_TM34_FROM_SURGE msgbox gUnknown_8194DA8 release @@ -249,20 +241,20 @@ EventScript_16B9F0:: @ 816B9F0 end VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DWAYNE, 0, Text_194FBD, Text_194FF1 + trainerbattle_single TRAINER_SAILOR_DWAYNE, Text_194FBD, Text_194FF1 famechecker FAMECHECKER_LTSURGE, 4 - msgbox gUnknown_8195004, 6 + msgbox gUnknown_8195004, MSGBOX_AUTOCLOSE end VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BAILY, 0, Text_194F1F, Text_194F6F - msgbox gUnknown_8194F76, 6 + trainerbattle_single TRAINER_ENGINEER_BAILY, Text_194F1F, Text_194F6F + msgbox gUnknown_8194F76, MSGBOX_AUTOCLOSE end VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GENTLEMAN_TUCKER, 0, Text_194E57, Text_194EA5, EventScript_16BA5D + trainerbattle_single TRAINER_GENTLEMAN_TUCKER, Text_194E57, Text_194EA5, EventScript_16BA5D famechecker FAMECHECKER_LTSURGE, 3 - msgbox gUnknown_8194EBD, 6 + msgbox gUnknown_8194EBD, MSGBOX_AUTOCLOSE end EventScript_16BA5D:: @ 816BA5D @@ -273,8 +265,7 @@ EventScript_16BA5D:: @ 816BA5D VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C lock faceplayer - checkflag FLAG_DEFEATED_LT_SURGE - goto_if TRUE, EventScript_16BA81 + goto_if_set FLAG_DEFEATED_LT_SURGE, EventScript_16BA81 msgbox gUnknown_81950B4 release end @@ -286,8 +277,7 @@ EventScript_16BA81:: @ 816BA81 VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B lockall - checkflag FLAG_BADGE03_GET - goto_if TRUE, EventScript_16BA9F + goto_if_set FLAG_BADGE03_GET, EventScript_16BA9F msgbox gUnknown_819520B releaseall end diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 6020f9cb0..3fb54afee 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -4,11 +4,10 @@ VermilionCity_House1_MapScripts:: @ 816B3A6 VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 lock faceplayer - checkflag FLAG_GOT_OLD_ROD - goto_if TRUE, EventScript_16B3CF + goto_if_set FLAG_GOT_OLD_ROD, EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16B3D9 + compare VAR_RESULT, YES + goto_if_eq EventScript_16B3D9 msgbox gUnknown_8194028 release end @@ -20,11 +19,11 @@ EventScript_16B3CF:: @ 816B3CF EventScript_16B3D9:: @ 816B3D9 checkitemspace ITEM_OLD_ROD, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B41A - additem ITEM_OLD_ROD, 1 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16B41A + additem ITEM_OLD_ROD msgbox gUnknown_8193F2A - giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD + msgreceiveditem gUnknown_8193F81, ITEM_OLD_ROD setflag FLAG_GOT_OLD_ROD msgbox gUnknown_8193FAF release diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index fa9fd6453..6b647952e 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -6,17 +6,16 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 faceplayer setvar VAR_0x8008, 3 call EventScript_1A8CAD - checkflag FLAG_DID_CH_DING_TRADE - goto_if TRUE, EventScript_16B649 + goto_if_set FLAG_DID_CH_DING_TRADE, EventScript_16B649 msgbox gUnknown_81949CB, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B631 + compare VAR_RESULT, NO + goto_if_eq EventScript_16B631 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if ge, EventScript_16B631 + compare VAR_0x8004, 6 + goto_if_ge EventScript_16B631 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16B63B + compare VAR_RESULT, VAR_0x8009 + goto_if_ne EventScript_16B63B call EventScript_1A8CD9 msgbox gUnknown_8194A44 setflag FLAG_DID_CH_DING_TRADE diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc index 1344aac52..8f9de55e0 100644 --- a/data/maps/VermilionCity_House3/scripts.inc +++ b/data/maps/VermilionCity_House3/scripts.inc @@ -2,11 +2,11 @@ VermilionCity_House3_MapScripts:: @ 816BAA9 .byte 0 VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA - msgbox gUnknown_81953AF, 2 + msgbox gUnknown_81953AF, MSGBOX_NPC end VermilionCity_House3_EventScript_16BAB3:: @ 816BAB3 - msgbox gUnknown_8195471, 2 + msgbox gUnknown_8195471, MSGBOX_NPC end VermilionCity_House3_EventScript_16BABC:: @ 816BABC @@ -20,5 +20,5 @@ VermilionCity_House3_EventScript_16BABC:: @ 816BABC end VermilionCity_House3_EventScript_16BACF:: @ 816BACF - msgbox gUnknown_8195400, 3 + msgbox gUnknown_8195400, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index d7beb6e7e..ccb50f313 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -2,23 +2,23 @@ VermilionCity_Mart_MapScripts:: @ 816B653 .byte 0 VermilionCity_Mart_EventScript_16B654:: @ 816B654 - msgbox gUnknown_8194B65, 2 + msgbox gUnknown_8194B65, MSGBOX_NPC end VermilionCity_Mart_EventScript_16B65D:: @ 816B65D - msgbox gUnknown_8194A77, 2 + msgbox gUnknown_8194A77, MSGBOX_NPC end VermilionCity_Mart_EventScript_16B666:: @ 816B666 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16B68C - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index f65681dc3..ad7e02455 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 - map_script 3, VermilionCity_PokemonCenter_1F_MapScript1_16B42F - map_script 5, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F +VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F setrespawn SPAWN_VERMILION_CITY end VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end VermilionCity_PokemonCenter_1F_EventScript_16B43C:: @ 816B43C - msgbox gUnknown_8194145, 2 + msgbox gUnknown_8194145, MSGBOX_NPC end VermilionCity_PokemonCenter_1F_EventScript_16B445:: @ 816B445 - msgbox gUnknown_81940AF, 2 + msgbox gUnknown_81940AF, MSGBOX_NPC end VermilionCity_PokemonCenter_1F_EventScript_16B44E:: @ 816B44E - msgbox gUnknown_8194180, 2 + msgbox gUnknown_8194180, MSGBOX_NPC end diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 9edc3d8bf..4a9190f0f 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc index b64ac0660..66539b9b6 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 - map_script 2, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, VermilionCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +VermilionCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816B46C + call CableClub_EventScript_Colosseum end -EventScript_16B472:: @ 816B472 - call EventScript_1BB6AB +VermilionCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B472 + call CableClub_EventScript_TradeCenter end -EventScript_16B478:: @ 816B478 - call EventScript_1BB7DE +VermilionCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B478 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 397c174ea..23b24b9a2 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -4,11 +4,10 @@ VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F lock faceplayer - checkflag FLAG_GOT_BIKE_VOUCHER - goto_if TRUE, EventScript_16B4A7 + goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16B4B1 + compare VAR_RESULT, YES + goto_if_eq EventScript_16B4B1 msgbox gUnknown_8194860 release end @@ -21,11 +20,10 @@ EventScript_16B4A7:: @ 816B4A7 EventScript_16B4B1:: @ 816B4B1 msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16B4F2 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16B4F2 setflag FLAG_GOT_BIKE_VOUCHER - additem ITEM_BIKE_VOUCHER, 1 - giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 + giveitem_msg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 msgbox gUnknown_819477C release end @@ -38,8 +36,7 @@ EventScript_16B4F2:: @ 816B4F2 VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_16B511 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16B511 msgbox gUnknown_81948E6 release end @@ -53,11 +50,10 @@ EventScript_16B511:: @ 816B511 VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 lock faceplayer - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_16B54B + goto_if_set FLAG_TEMP_3, EventScript_16B54B msgbox gUnknown_81944CC closemessage - applymovement 5, Movement_1A75E5 + applymovement 5, Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_TEMP_2 release @@ -66,7 +62,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 EventScript_16B54B:: @ 816B54B msgbox gUnknown_8194518 closemessage - applymovement 5, Movement_1A75E5 + applymovement 5, Movement_FaceOriginalDirection waitmovement 0 clearflag FLAG_TEMP_3 release @@ -75,11 +71,10 @@ EventScript_16B54B:: @ 816B54B VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_16B586 + goto_if_set FLAG_TEMP_2, EventScript_16B586 msgbox gUnknown_819446F closemessage - applymovement 6, Movement_1A75E5 + applymovement 6, Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_TEMP_3 release @@ -88,7 +83,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 EventScript_16B586:: @ 816B586 msgbox gUnknown_819449C closemessage - applymovement 6, Movement_1A75E5 + applymovement 6, Movement_FaceOriginalDirection waitmovement 0 clearflag FLAG_TEMP_2 release @@ -115,9 +110,9 @@ VermilionCity_PokemonFanClub_EventScript_16B5B1:: @ 816B5B1 end VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4 - msgbox gUnknown_8194910, 3 + msgbox gUnknown_8194910, MSGBOX_SIGN end VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD - msgbox gUnknown_819493D, 3 + msgbox gUnknown_819493D, MSGBOX_SIGN end diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 2f1147e86..906c2a3d7 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE9D2", + "script": "VictoryRoad_1F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE9DF", + "script": "VictoryRoad_1F_EventScript_ItemTM02", "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 20759c714..79d01278f 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,11 +1,11 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 - map_script 1, VictoryRoad_1F_MapScript1_160F10 - map_script 3, VictoryRoad_1F_MapScript2_160F2F + map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition .byte 0 -VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - call_if ne, EventScript_160F1C +VictoryRoad_1F_OnLoad:: @ 8160F10 + compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 + call_if_ne EventScript_160F1C end EventScript_160F1C:: @ 8160F1C @@ -13,14 +13,14 @@ EventScript_160F1C:: @ 8160F1C setmetatile 12, 15, 791, 1 return -VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F +VictoryRoad_1F_OnTransition:: @ 8160F2F setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F end VictoryRoad_1F_EventScript_160F33:: @ 8160F33 lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - goto_if eq, EventScript_160F62 + compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 + goto_if_eq EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 playse SE_RU_GASYAN @@ -36,11 +36,11 @@ EventScript_160F62:: @ 8160F62 end VictoryRoad_1F_EventScript_160F64:: @ 8160F64 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_NAOMI, 0, Text_174710, Text_174738 - msgbox gUnknown_8174744, 6 + trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738 + msgbox gUnknown_8174744, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_ROLANDO, 0, Text_174784, Text_1747B8 - msgbox gUnknown_81747C8, 6 + trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8 + msgbox gUnknown_81747C8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 02d2c8369..454659d7e 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE9EC", + "script": "VictoryRoad_2F_EventScript_ItemGuardSpec", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE9F9", + "script": "VictoryRoad_2F_EventScript_ItemTM07", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BEA06", + "script": "VictoryRoad_2F_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BEA13", + "script": "VictoryRoad_2F_EventScript_ItemTM37", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1C47AE", + "script": "VictoryRoad_2F_EventScript_DoubleEdgeTutor", "flag": "0" } ], diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index d2fa2e8b4..49d21b7de 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -1,12 +1,12 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 - map_script 1, VictoryRoad_2F_MapScript1_160F98 + map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_2F_OnLoad .byte 0 -VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - call_if ne, EventScript_160FAF - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - call_if ne, EventScript_160FC2 +VictoryRoad_2F_OnLoad:: @ 8160F98 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 + call_if_ne EventScript_160FAF + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 + call_if_ne EventScript_160FC2 end EventScript_160FAF:: @ 8160FAF @@ -21,8 +21,8 @@ EventScript_160FC2:: @ 8160FC2 VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - goto_if eq, EventScript_161004 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 + goto_if_eq EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 playse SE_RU_GASYAN @@ -39,8 +39,8 @@ EventScript_161004:: @ 8161004 VictoryRoad_2F_EventScript_161006:: @ 8161006 lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - goto_if eq, EventScript_161035 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 + goto_if_eq EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 playse SE_RU_GASYAN @@ -56,26 +56,26 @@ EventScript_161035:: @ 8161035 end VictoryRoad_2F_EventScript_161037:: @ 8161037 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_DAWSON, 0, Text_1747EF, Text_17482C - msgbox gUnknown_817483E, 6 + trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C + msgbox gUnknown_817483E, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_16104E:: @ 816104E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_DAISUKE, 0, Text_174877, Text_1748B4 - msgbox gUnknown_81748BB, 6 + trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4 + msgbox gUnknown_81748BB, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_161065:: @ 8161065 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NELSON, 0, Text_1748EE, Text_17491B - msgbox gUnknown_8174927, 6 + trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B + msgbox gUnknown_8174927, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_16107C:: @ 816107C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_GREGORY, 0, Text_174995, Text_1749B0 - msgbox gUnknown_81749BB, 6 + trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0 + msgbox gUnknown_81749BB, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_161093:: @ 8161093 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_VINCENT, 0, Text_174942, Text_17495A - msgbox gUnknown_8174969, 6 + trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A + msgbox gUnknown_8174969, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index f9bbe5bc2..f98654fe8 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BEA20", + "script": "VictoryRoad_3F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BEA2D", + "script": "VictoryRoad_3F_EventScript_ItemTM50", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index fe77da24d..4cd011f92 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -1,10 +1,10 @@ VictoryRoad_3F_MapScripts:: @ 81610AA - map_script 1, VictoryRoad_3F_MapScript1_1610B0 + map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_3F_OnLoad .byte 0 -VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - call_if ne, EventScript_1610BC +VictoryRoad_3F_OnLoad:: @ 81610B0 + compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 + call_if_ne EventScript_1610BC end EventScript_1610BC:: @ 81610BC @@ -14,8 +14,8 @@ EventScript_1610BC:: @ 81610BC VictoryRoad_3F_EventScript_1610CF:: @ 81610CF lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - goto_if eq, EventScript_161101 + compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 + goto_if_eq EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 playse SE_RU_GASYAN @@ -32,31 +32,31 @@ EventScript_161101:: @ 8161101 end VictoryRoad_3F_EventScript_161103:: @ 8161103 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_GEORGE, 0, Text_174B60, Text_174B83 - msgbox gUnknown_8174B99, 6 + trainerbattle_single TRAINER_COOLTRAINER_GEORGE, Text_174B60, Text_174B83 + msgbox gUnknown_8174B99, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_16111A:: @ 816111A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_COLBY, 0, Text_174C8A, Text_174CA9 - msgbox gUnknown_8174CBD, 6 + trainerbattle_single TRAINER_COOLTRAINER_COLBY, Text_174C8A, Text_174CA9 + msgbox gUnknown_8174CBD, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_161131:: @ 8161131 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_CAROLINE, 0, Text_174C30, Text_174C5A - msgbox gUnknown_8174C67, 6 + trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, Text_174C30, Text_174C5A + msgbox gUnknown_8174C67, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_161148:: @ 8161148 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_ALEXA, 0, Text_174BCA, Text_174BF4 - msgbox gUnknown_8174C03, 6 + trainerbattle_single TRAINER_COOLTRAINER_ALEXA, Text_174BCA, Text_174BF4 + msgbox gUnknown_8174C03, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_16115F:: @ 816115F - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174D0C, Text_174D45, Text_174D96 - msgbox gUnknown_8174D64, 6 + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174D0C, Text_174D45, Text_174D96 + msgbox gUnknown_8174D64, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_16117A:: @ 816117A - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174E08, Text_174E39, Text_174E8D - msgbox gUnknown_8174E48, 6 + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174E08, Text_174E39, Text_174E8D + msgbox gUnknown_8174E48, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_3F/text.inc b/data/maps/VictoryRoad_3F/text.inc index fbda3b739..22c42342a 100644 --- a/data/maps/VictoryRoad_3F/text.inc +++ b/data/maps/VictoryRoad_3F/text.inc @@ -1,7 +1,7 @@ Text_1749F3:: @ 81749F3 .string "ギヤーオ！$" -Text_1749F9:: @ 81749F9 +Text_DoubleEdgeTeach:: @ 81749F9 .string "You should be proud of yourself,\n" .string "having battled your way through\l" .string "VICTORY ROAD so courageously.\p" @@ -10,15 +10,15 @@ Text_1749F9:: @ 81749F9 .string "Would you like me to teach that\n" .string "technique?$" -Text_174ABC:: @ 8174ABC +Text_DoubleEdgeDeclined:: @ 8174ABC .string "I'll teach you the technique\n" .string "anytime.$" -Text_174AE2:: @ 8174AE2 +Text_DoubleEdgeWhichMon:: @ 8174AE2 .string "Which POKéMON should I teach\n" .string "DOUBLE-EDGE?$" -Text_174B0C:: @ 8174B0C +Text_DoubleEdgeTaught:: @ 8174B0C .string "Keep that drive going for the\n" .string "POKéMON LEAGUE!\p" .string "Take a run at them and knock 'em\n" diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 4e1b2cd0e..b984008d5 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -39,7 +39,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_165AF0", + "script": "ViridianCity_EventScript_DreamEaterTutor", "flag": "0" }, { @@ -143,7 +143,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_1BEB8C", + "script": "ViridianCity_EventScript_ItemPotion", "flag": "FLAG_HIDE_VIRIDIAN_CITY_POTION" } ], diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 070c162c6..cbd813d03 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -1,17 +1,17 @@ ViridianCity_MapScripts:: @ 81658D3 - map_script 3, ViridianCity_MapScript1_1658D9 + map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition .byte 0 -ViridianCity_MapScript1_1658D9:: @ 81658D9 +ViridianCity_OnTransition:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - call_if eq, EventScript_165920 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - call_if eq, EventScript_16590F - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - call_if ge, EventScript_165909 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 - call_if eq, EventScript_165931 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + call_if_eq EventScript_165920 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 + call_if_eq EventScript_16590F + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 + call_if_ge EventScript_165909 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 + call_if_eq EventScript_165931 end EventScript_165909:: @ 8165909 @@ -31,70 +31,64 @@ EventScript_165920:: @ 8165920 return EventScript_165931:: @ 8165931 - checkflag FLAG_BADGE02_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE03_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE04_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE05_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE06_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE07_GET - goto_if FALSE, EventScript_1A77A9 + goto_if_unset FLAG_BADGE02_GET, EventScript_Return + goto_if_unset FLAG_BADGE03_GET, EventScript_Return + goto_if_unset FLAG_BADGE04_GET, EventScript_Return + goto_if_unset FLAG_BADGE05_GET, EventScript_Return + goto_if_unset FLAG_BADGE06_GET, EventScript_Return + goto_if_unset FLAG_BADGE07_GET, EventScript_Return setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return ViridianCity_EventScript_16596D:: @ 816596D lockall textcolor 3 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 msgbox gUnknown_817E2F5 closemessage - applymovement 255, Movement_165992 + applymovement OBJ_EVENT_ID_PLAYER, Movement_165992 waitmovement 0 releaseall end Movement_165992:: @ 8165992 - step_14 + jump_2_down step_end ViridianCity_EventScript_165994:: @ 8165994 - msgbox gUnknown_817E1BB, 3 + msgbox gUnknown_817E1BB, MSGBOX_SIGN end ViridianCity_EventScript_16599D:: @ 816599D - msgbox gUnknown_817E1E7, 3 + msgbox gUnknown_817E1E7, MSGBOX_SIGN end ViridianCity_EventScript_1659A6:: @ 81659A6 - msgbox gUnknown_817E24D, 3 + msgbox gUnknown_817E24D, MSGBOX_SIGN end ViridianCity_EventScript_1659AF:: @ 81659AF - msgbox gUnknown_817E2DB, 3 + msgbox gUnknown_817E2DB, MSGBOX_SIGN end ViridianCity_EventScript_1659B8:: @ 81659B8 - msgbox gUnknown_817E2F5, 3 + msgbox gUnknown_817E2F5, MSGBOX_SIGN end ViridianCity_EventScript_1659C1:: @ 81659C1 - msgbox gUnknown_817DABB, 2 + msgbox gUnknown_817DABB, MSGBOX_NPC end ViridianCity_EventScript_1659CA:: @ 81659CA lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 - goto_if eq, EventScript_1659EC + compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 + goto_if_eq EventScript_1659EC msgbox gUnknown_817DB39 closemessage - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end @@ -107,20 +101,19 @@ EventScript_1659EC:: @ 81659EC ViridianCity_EventScript_1659F6:: @ 81659F6 lock faceplayer - checkflag FLAG_BADGE01_GET - goto_if TRUE, EventScript_165A23 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - goto_if ge, EventScript_165A4A - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - goto_if eq, EventScript_165A54 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - goto_if eq, EventScript_165A84 + goto_if_set FLAG_BADGE01_GET, EventScript_165A23 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 + goto_if_ge EventScript_165A4A + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 + goto_if_eq EventScript_165A54 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + goto_if_eq EventScript_165A84 end EventScript_165A23:: @ 8165A23 msgbox gUnknown_817E046, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_165A40 + compare VAR_RESULT, NO + goto_if_eq EventScript_165A40 msgbox gUnknown_817E0EA release end @@ -148,8 +141,8 @@ EventScript_165A5B:: @ 8165A5B EventScript_165A65:: @ 8165A65 msgbox gUnknown_817DE9B 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 special ScrSpecial_StartOldManTutorialBattle waitstate @@ -166,10 +159,10 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F lock faceplayer msgbox gUnknown_817DB98, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_165AB0 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_165ABA + compare VAR_RESULT, YES + goto_if_eq EventScript_165AB0 + compare VAR_RESULT, NO + goto_if_eq EventScript_165ABA end EventScript_165AB0:: @ 8165AB0 @@ -185,8 +178,8 @@ EventScript_165ABA:: @ 8165ABA ViridianCity_EventScript_165AC4:: @ 8165AC4 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - goto_if eq, EventScript_165ADB + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + goto_if_eq EventScript_165ADB msgbox gUnknown_817DC99 release end @@ -194,13 +187,13 @@ ViridianCity_EventScript_165AC4:: @ 8165AC4 EventScript_165ADB:: @ 8165ADB msgbox gUnknown_817DC4E closemessage - applymovement 5, Movement_1A75E5 + applymovement 5, Movement_FaceOriginalDirection waitmovement 0 release end -ViridianCity_EventScript_165AF0:: @ 8165AF0 - goto EventScript_1C4A1E +ViridianCity_EventScript_DreamEaterTutor:: @ 8165AF0 + goto EventScript_DreamEaterTutor end ViridianCity_EventScript_165AF6:: @ 8165AF6 @@ -208,21 +201,21 @@ ViridianCity_EventScript_165AF6:: @ 8165AF6 textcolor 0 msgbox gUnknown_817DD03 closemessage - applymovement 255, Movement_165B0E + applymovement OBJ_EVENT_ID_PLAYER, Movement_165B0E waitmovement 0 releaseall end Movement_165B0E:: @ 8165B0E - step_10 + walk_down step_end ViridianCity_EventScript_165B10:: @ 8165B10 lockall textcolor 0 - applymovement 4, Movement_1A75E7 + applymovement 4, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 call EventScript_165B4C release @@ -231,9 +224,9 @@ ViridianCity_EventScript_165B10:: @ 8165B10 ViridianCity_EventScript_165B2E:: @ 8165B2E lockall textcolor 0 - applymovement 4, Movement_1A75EB + applymovement 4, Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 255, Movement_1A75E7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 call EventScript_165B4C release @@ -243,8 +236,8 @@ EventScript_165B4C:: @ 8165B4C msgbox gUnknown_817DD4E closemessage 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 special ScrSpecial_StartOldManTutorialBattle waitstate diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index f3d9bfe10..0579e9e32 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -3,14 +3,13 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9 ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04 - checkflag FLAG_GOT_TM26_FROM_GIOVANNI - goto_if FALSE, EventScript_169F2F + trainerbattle_single TRAINER_LEADER_GIOVANNI, Text_18F352, Text_18F43F, EventScript_169F04, NO_MUSIC + goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, EventScript_169F2F msgbox gUnknown_818F4A2 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 8 - fadescreen 0 + fadescreen FADE_FROM_BLACK release end @@ -27,10 +26,9 @@ EventScript_169F04:: @ 8169F04 EventScript_169F2F:: @ 8169F2F msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_169F70 - additem ITEM_TM26, 1 - giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_169F70 + giveitem_msg gUnknown_818F675, ITEM_TM26 setflag FLAG_GOT_TM26_FROM_GIOVANNI msgbox gUnknown_818F695 release @@ -42,50 +40,49 @@ EventScript_169F70:: @ 8169F70 end ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_JASON, 0, Text_18F7F3, Text_18F824 - msgbox gUnknown_818F840, 6 + trainerbattle_single TRAINER_TAMER_JASON, Text_18F7F3, Text_18F824 + msgbox gUnknown_818F840, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169F91:: @ 8169F91 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_COLE, 0, Text_18F98A, Text_18F9BB - msgbox gUnknown_818F9CC, 6 + trainerbattle_single TRAINER_TAMER_COLE, Text_18F98A, Text_18F9BB + msgbox gUnknown_818F9CC, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_ATSUSHI, 0, Text_18F7AD, Text_18F7D6 - msgbox gUnknown_818F7DD, 6 + trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, Text_18F7AD, Text_18F7D6 + msgbox gUnknown_818F7DD, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_KIYO, 0, Text_18F86C, Text_18F899 - msgbox gUnknown_818F8A0, 6 + trainerbattle_single TRAINER_BLACK_BELT_KIYO, Text_18F86C, Text_18F899 + msgbox gUnknown_818F8A0, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_TAKASHI, 0, Text_18F92C, Text_18F95A - msgbox gUnknown_818F960, 6 + trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, Text_18F92C, Text_18F95A + msgbox gUnknown_818F960, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FED:: @ 8169FED - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_SAMUEL, 0, Text_18F9E7, Text_18FA2D - msgbox gUnknown_818FA3B, 6 + trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, Text_18F9E7, Text_18FA2D + msgbox gUnknown_818FA3B, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_16A004:: @ 816A004 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_YUJI, 0, Text_18F73B, Text_18F769 - msgbox gUnknown_818F77B, 6 + trainerbattle_single TRAINER_COOLTRAINER_YUJI, Text_18F73B, Text_18F769 + msgbox gUnknown_818F77B, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_16A01B:: @ 816A01B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_WARREN, 0, Text_18F8CB, Text_18F8EE - msgbox gUnknown_818F8FE, 6 + trainerbattle_single TRAINER_COOLTRAINER_WARREN, Text_18F8CB, Text_18F8EE + msgbox gUnknown_818F8FE, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_16A032:: @ 816A032 lock faceplayer - checkflag FLAG_DEFEATED_LEADER_GIOVANNI - goto_if TRUE, EventScript_16A047 + goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, EventScript_16A047 msgbox gUnknown_818FA81 release end @@ -98,8 +95,7 @@ EventScript_16A047:: @ 816A047 ViridianCity_Gym_EventScript_16A05E:: @ 816A05E lockall - checkflag FLAG_BADGE08_GET - goto_if TRUE, EventScript_16A072 + goto_if_set FLAG_BADGE08_GET, EventScript_16A072 msgbox gUnknown_818FB8D releaseall end diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc index b82b0ed2f..446035efe 100644 --- a/data/maps/ViridianCity_House1/scripts.inc +++ b/data/maps/ViridianCity_House1/scripts.inc @@ -2,11 +2,11 @@ ViridianCity_House1_MapScripts:: @ 8169E9A .byte 0 ViridianCity_House1_EventScript_169E9B:: @ 8169E9B - msgbox gUnknown_818F292, 2 + msgbox gUnknown_818F292, MSGBOX_NPC end ViridianCity_House1_EventScript_169EA4:: @ 8169EA4 - msgbox gUnknown_818F30F, 2 + msgbox gUnknown_818F30F, MSGBOX_NPC end ViridianCity_House1_EventScript_169EAD:: @ 8169EAD @@ -20,5 +20,5 @@ ViridianCity_House1_EventScript_169EAD:: @ 8169EAD end ViridianCity_House1_EventScript_169EC0:: @ 8169EC0 - msgbox gUnknown_818F33D, 3 + msgbox gUnknown_818F33D, MSGBOX_SIGN end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 1c25dd3e4..6a0845622 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -6,7 +6,7 @@ ViridianCity_House2_EventScript_16A07D:: @ 816A07D faceplayer msgbox gUnknown_818FC00 closemessage - applymovement 2, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -16,7 +16,7 @@ ViridianCity_House2_EventScript_16A094:: @ 816A094 faceplayer msgbox gUnknown_818FC2B closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -25,18 +25,18 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB lockall msgbox gUnknown_818FC65 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16A11B + compare VAR_RESULT, NO + goto_if_eq EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16A11B + compare VAR_RESULT, NO + goto_if_eq EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16A11B + compare VAR_RESULT, NO + goto_if_eq EventScript_16A11B msgbox gUnknown_818FE5C - applymovement 2, Movement_1A75E9 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 1 msgbox gUnknown_818FF28 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 95c45ea7d..fb77b7924 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -1,11 +1,10 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 - map_script 1, ViridianCity_Mart_MapScript1_16A1DE - map_script 2, ViridianCity_Mart_MapScript2_16A1FB + map_script MAP_SCRIPT_ON_LOAD, ViridianCity_Mart_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_Mart_OnFrame .byte 0 -ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_16A1E8 +ViridianCity_Mart_OnLoad:: @ 816A1DE + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_16A1E8 end EventScript_16A1E8:: @ 816A1E8 @@ -13,56 +12,55 @@ EventScript_16A1E8:: @ 816A1E8 setmetatile 1, 4, 704, 1 end -ViridianCity_Mart_MapScript2_16A1FB:: @ 816A1FB +ViridianCity_Mart_OnFrame:: @ 816A1FB map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, EventScript_16A205 .2byte 0 EventScript_16A205:: @ 816A205 lockall textcolor 0 - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_819021A closemessage applymovement 1, Movement_16A262 - applymovement 255, Movement_16A25C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A25C waitmovement 0 msgbox gUnknown_819023A setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - additem ITEM_OAKS_PARCEL, 1 - giveitemfanfaremsg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5 + giveitem_msg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5 setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end Movement_16A25C:: @ 816A25C - step_11 - step_11 - step_11 - step_11 - step_2f + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_left step_end Movement_16A262:: @ 816A262 - step_1c - step_1c - step_1c - step_1c - step_30 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_right step_end ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if eq, EventScript_16A2A4 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 + goto_if_eq EventScript_16A2A4 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - message Text_1A6211 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 + message Text_MayIHelpYou waitmessage pokemart Items_16A298 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -82,9 +80,9 @@ EventScript_16A2A4:: @ 816A2A4 end ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE - msgbox gUnknown_81902F5, 2 + msgbox gUnknown_81902F5, MSGBOX_NPC end ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7 - msgbox gUnknown_819032C, 2 + msgbox gUnknown_819032C, MSGBOX_NPC end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 507b2bfe4..43e74ef4c 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 - map_script 3, ViridianCity_PokemonCenter_1F_MapScript1_16A2CB - map_script 5, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -ViridianCity_PokemonCenter_1F_MapScript1_16A2CB:: @ 816A2CB +ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB setrespawn SPAWN_VIRIDIAN_CITY end ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end ViridianCity_PokemonCenter_1F_EventScript_16A2D8:: @ 816A2D8 - msgbox gUnknown_81903E5, 2 + msgbox gUnknown_81903E5, MSGBOX_NPC end ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1 - msgbox gUnknown_8190384, 2 + msgbox gUnknown_8190384, MSGBOX_NPC end ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA - msgbox gUnknown_8190450, 2 + msgbox gUnknown_8190450, MSGBOX_NPC end diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index cf764b446..c46d275cf 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_PokemonCenter_2F_EventScript_1BB1D2", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc index 18e0018ba..58ada3f9f 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc @@ -1,18 +1,19 @@ ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 - map_script 2, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, ViridianCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +ViridianCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A308 + call CableClub_EventScript_Colosseum end -EventScript_16A30E:: @ 816A30E - call EventScript_1BB6AB +ViridianCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A30E + call CableClub_EventScript_TradeCenter end -EventScript_16A314:: @ 816A314 - call EventScript_1BB7DE +ViridianCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A314 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index af19f7f56..8dbe5c5a5 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BE5A8", + "script": "ViridianForest_EventScript_ItemPokeBall", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BE5B5", + "script": "ViridianForest_EventScript_ItemAntidote", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BE5C2", + "script": "ViridianForest_EventScript_ItemPotion", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BEAC9", + "script": "ViridianForest_EventScript_ItemPotion2", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION_2" } ], diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index 84c22e5fb..6fb97d075 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -1,64 +1,64 @@ ViridianForest_MapScripts:: @ 816051F - map_script 3, ViridianForest_MapScript1_160525 + map_script MAP_SCRIPT_ON_TRANSITION, ViridianForest_OnTransition .byte 0 -ViridianForest_MapScript1_160525:: @ 8160525 +ViridianForest_OnTransition:: @ 8160525 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_FOREST end ViridianForest_EventScript_160529:: @ 8160529 - msgbox gUnknown_8172255, 2 + msgbox gUnknown_8172255, MSGBOX_NPC end ViridianForest_EventScript_160532:: @ 8160532 - msgbox gUnknown_8172559, 2 + msgbox gUnknown_8172559, MSGBOX_NPC end ViridianForest_EventScript_16053B:: @ 816053B - msgbox gUnknown_81725C7, 3 + msgbox gUnknown_81725C7, MSGBOX_SIGN end ViridianForest_EventScript_160544:: @ 8160544 - msgbox gUnknown_8172629, 3 + msgbox gUnknown_8172629, MSGBOX_SIGN end ViridianForest_EventScript_16054D:: @ 816054D - msgbox gUnknown_817265C, 3 + msgbox gUnknown_817265C, MSGBOX_SIGN end ViridianForest_EventScript_160556:: @ 8160556 - msgbox gUnknown_81726A3, 3 + msgbox gUnknown_81726A3, MSGBOX_SIGN end ViridianForest_EventScript_16055F:: @ 816055F - msgbox gUnknown_817271D, 3 + msgbox gUnknown_817271D, MSGBOX_SIGN end ViridianForest_EventScript_160568:: @ 8160568 - msgbox gUnknown_8172773, 3 + msgbox gUnknown_8172773, MSGBOX_SIGN end ViridianForest_EventScript_160571:: @ 8160571 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_RICK, 0, Text_1722C7, Text_1722F9 - msgbox gUnknown_8172315, 6 + trainerbattle_single TRAINER_BUG_CATCHER_RICK, Text_1722C7, Text_1722F9 + msgbox gUnknown_8172315, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_160588:: @ 8160588 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_DOUG, 0, Text_17234A, Text_17237D - msgbox gUnknown_8172398, 6 + trainerbattle_single TRAINER_BUG_CATCHER_DOUG, Text_17234A, Text_17237D + msgbox gUnknown_8172398, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_16059F:: @ 816059F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_SAMMY, 0, Text_1723D4, Text_172402 - msgbox gUnknown_817241F, 6 + trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, Text_1723D4, Text_172402 + msgbox gUnknown_817241F, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_1605B6:: @ 81605B6 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ANTHONY, 0, Text_172482, Text_1724BF - msgbox gUnknown_81724DC, 6 + trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, Text_172482, Text_1724BF + msgbox gUnknown_81724DC, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_1605CD:: @ 81605CD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CHARLIE, 0, Text_1724F9, Text_17251B - msgbox gUnknown_8172527, 6 + trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, Text_1724F9, Text_17251B + msgbox gUnknown_8172527, MSGBOX_AUTOCLOSE end diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 8619c19ad..0ff365eae 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -45,11 +45,11 @@ "gMapGroup42" ], "gMapGroup0": [ - "UnknownMap_00_00", - "UnknownMap_00_01", - "UnknownMap_00_02", - "UnknownMap_00_03", - "UnknownMap_00_04" + "BattleColosseum2P", + "TradeCenter", + "RecordCenter", + "BattleColosseum4P", + "UnionRoom" ], "gMapGroup1": [ "ViridianForest", |