diff options
Diffstat (limited to 'data/maps')
185 files changed, 918 insertions, 918 deletions
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 241cb50f1..9cc369fb4 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_EventScript_238FCD:: @ 8238FCD specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne AncientTomb_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 1763bcd5d..a74c7a33e 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne AquaHideout_B1F_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index ba20cb681..daa508d32 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -14,9 +14,9 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 lockall setvar VAR_0x8008, 1 playse SE_PIN - applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 setvar VAR_TEMP_1, 1 releaseall @@ -31,19 +31,19 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09 AquaHideout_B2F_EventScript_233E25:: @ 8233E25 setvar VAR_0x8008, 1 setvar VAR_0x8009, 4 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 waitmovement 0 removeobject VAR_0x8009 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 2c53b7ed6..9d588b666 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -199,7 +199,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleArenaLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 7dbeee042..e1c5991e7 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 random 2 copyvar VAR_TEMP_D, VAR_RESULT compare VAR_TEMP_D, 0 - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setobjectxyperm 6, 2, 0 setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 compare VAR_TEMP_D, 0 - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E return diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 35c32c3fa..8b01eba0a 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -248,7 +248,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleDomeLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 8c22a9bc9..5ed2e97da 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA end BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4 - applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 4, Common_Movement_WalkInPlaceRight + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 7, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 39d729846..956cede17 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 special CallFrontierUtilFunc closemessage delay 2 - call BattleFrontier_BattleFactoryLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 529bcd0c3..be11039df 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -280,8 +280,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 @@ -323,8 +323,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 56edda8ad..5d7f7aaf5 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -223,7 +223,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePalaceLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 70d7f3c6c..ab53d4c23 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -195,7 +195,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePikeLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 26 special CallBattlePikeFunction diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 686a1bfb2..14e1a5557 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -200,7 +200,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePyramidLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA @@ -260,7 +260,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE lockall - applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index b89d2e061..cf646a3d3 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -233,9 +233,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6 waitmovement 0 playse SE_PIN - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 73b14fc2e..545ea04b2 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 waitmovement 0 delay 40 - applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 - applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 7, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 53c3335c3..702c68642 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -300,7 +300,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 @@ -380,7 +380,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 @@ -461,7 +461,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 @@ -544,7 +544,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8161F74 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 7dbfbbc13..ce0c9b3a4 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 moveobjectoffscreen 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty @@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 10, 1 waitdooranim diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 6a817d50a..7977e75b4 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -198,7 +198,7 @@ BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1 BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1 closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_Lounge3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 725fce863..d84b2cb0a 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -36,7 +36,7 @@ BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B lock - applymovement 2, BattleFrontier_Mart_Movement_2725B0 + applymovement 2, Common_Movement_FaceDown waitmovement 0 msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT release diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index e119f89a0..341b20321 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -515,7 +515,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideEast_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -523,7 +523,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideEast_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] }
\ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 2016df74c..5958860eb 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index 6f97192ed..a2972e0b4 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -444,7 +444,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -452,7 +452,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] }
\ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index e1ff2d088..716d82b61 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST @@ -105,7 +105,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 faceplayer message BattleFrontier_OutsideWest_Text_23DA60 waitmessage - applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0 + applymovement 18, Common_Movement_FaceAwayPlayer waitmovement 0 waitbuttonpress release @@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D end BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4 + applymovement 10, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT closemessage delay 25 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6 - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 10, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F end BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA - applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 14, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -298,7 +298,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 faceplayer msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT closemessage - applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2 + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 5ed97bd60..89f0ee8e9 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -15,9 +15,9 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 lockall setvar VAR_0x40D0, 1 playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT closemessage @@ -38,14 +38,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 - applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark + applymovement 2, Common_Movement_ExclamationMark + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 6f8d6ee4b..9278252e6 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -181,7 +181,7 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 compare VAR_FACING, 3 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34 msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT - applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT compare VAR_0x40D1, 13 @@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 end BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 5bff32eb6..a7737654b 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -23,7 +23,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E return BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 - goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E + goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE clearflag FLAG_DEOXYS_ROCK_COMPLETE return @@ -35,7 +35,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne BirthIsland_Exterior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 2 return diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 1a5ef87ec..5f850ed7b 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -9,7 +9,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D goto_if_eq BirthIsland_Harbor_EventScript_2680A2 msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 371ea1ba5..c36b60111 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -6,16 +6,16 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 faceplayer msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT closemessage - applymovement 1, CaveOfOrigin_B1F_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 playse SE_PIN - applymovement 1, CaveOfOrigin_B1F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, CaveOfOrigin_B1F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 30 - applymovement 1, CaveOfOrigin_B1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 message CaveOfOrigin_B1F_Text_235ACE waitmessage diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 34ae21224..2ae1f9e2e 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -11,7 +11,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne DesertRuins_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 8cd863588..32fe0c313 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -152,7 +152,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -160,7 +160,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 4419dc28f..8b4214d0c 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -169,7 +169,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 call DewfordTown_Gym_EventScript_1FC75D message DewfordTown_Gym_Text_1FD07D waitmessage - call DewfordTown_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET @@ -195,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 return @@ -203,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 release diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 0d9cf514c..22bf5ed6a 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT closemessage - applymovement 4, DewfordTown_Hall_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT closemessage - applymovement 5, DewfordTown_Hall_Movement_2725A6 + applymovement 5, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B compare VAR_FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 return DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 compare VAR_FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT giveitem_std ITEM_TM36 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Hall_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM36 release end diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 502aae2fc..90175db1d 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -166,7 +166,7 @@ "y": 48, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EverGrandeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -190,7 +190,7 @@ "y": 48, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EverGrandeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] }
\ No newline at end of file diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 75327b839..99d5ab811 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B .byte 0 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 - call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 149c54cd8..31a9b91b8 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -5,7 +5,7 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF .byte 0 EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF - call EverGrandeCity_ChampionsRoom_EventScript_271ED7 + call Common_EventScript_SetupRivalGender end EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 @@ -78,9 +78,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT @@ -91,9 +91,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT @@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D - applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 waitmovement 0 delay 20 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index ddb9ade89..04134d30f 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 waitmovement 0 - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage @@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 dofieldeffect 62 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 0ec0acbb2..f63f636cd 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F end EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C - goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT return diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index ce4be66f8..4794fb99e 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -90,11 +90,11 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE end EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 4afffa73c..863319184 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -123,7 +123,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -131,7 +131,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -147,7 +147,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -163,7 +163,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 5d05570cc..1128540e9 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -191,7 +191,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 special LoadPlayerParty closemessage delay 2 - call FallarborTown_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index caf915e85..2255f90d3 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -20,7 +20,7 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House1_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 setflag FLAG_RECEIVED_TM27 diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 962c4f64e..2f2ec1b3f 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -3,7 +3,7 @@ FallarborTown_House2_MapScripts:: @ 8201382 FallarborTown_House2_EventScript_201383:: @ 8201383 lockall - applymovement 1, FallarborTown_House2_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8 msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 37c16885f..7c68dd246 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index a1038edac..fdb13d19d 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne FarawayIsland_Interior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -44,7 +44,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 end FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 - goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E + goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn clearflag FLAG_HIDE_MEW setvar VAR_TEMP_1, 0 return @@ -56,9 +56,9 @@ FarawayIsland_Interior_MapScript2_267D98: @ 8267D98 FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 lockall playse SE_PIN - applymovement 1, FarawayIsland_Interior_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, FarawayIsland_Interior_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, FarawayIsland_Interior_Movement_267DCE waitmovement 0 diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index d66ec1f4b..454fc34d3 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -198,7 +198,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -206,7 +206,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -222,7 +222,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -230,7 +230,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] }
\ No newline at end of file diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 17633c0d5..59cbfefa6 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -28,7 +28,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 FortreeCity_Gym_EventScript_2165FD:: @ 82165FD message FortreeCity_Gym_Text_216EEC waitmessage - call FortreeCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET @@ -51,7 +51,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 release @@ -60,7 +60,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 return diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index cebd18884..34344bca3 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -21,7 +21,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index fe4aefe5f..5dc9d769a 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -21,25 +21,25 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A end FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT releaseall end FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House4_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MENTAL_HERB releaseall end FortreeCity_House4_EventScript_217D06:: @ 8217D06 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT releaseall diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 3d0efa1ca..33ae51f8d 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -11,7 +11,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A IslandCave_EventScript_238E44:: @ 8238E44 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne IslandCave_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 630b04b33..348707c18 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -71,27 +71,27 @@ JaggedPass_EventScript_230718:: @ 8230718 goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766 waitse playse SE_PIN - applymovement 5, JaggedPass_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, JaggedPass_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end JaggedPass_EventScript_230766:: @ 8230766 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT closemessage - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 9bec14bd1..65a6a25d3 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -216,7 +216,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -232,7 +232,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -240,7 +240,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "hidden_item", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 84f04055f..d73a50d10 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -7,8 +7,8 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514 call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F - call LavaridgeTown_EventScript_271ED7 - call LavaridgeTown_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_LAVARIDGE_RIVAL_STATE, 1 call_if_eq LavaridgeTown_EventScript_1EA518 compare VAR_LAVARIDGE_RIVAL_STATE, 1 @@ -110,12 +110,12 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635 return LavaridgeTown_EventScript_1EA63A:: @ 81EA63A - applymovement 8, LavaridgeTown_Movement_2725A6 + applymovement 8, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 return @@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 closedoor 12, 15 waitdooranim - applymovement 8, LavaridgeTown_Movement_2725A4 + applymovement 8, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 0c3741f20..e10752548 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -71,7 +71,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 message LavaridgeTown_Gym_1F_Text_1FF32F waitmessage - call LavaridgeTown_Gym_1F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT setflag FLAG_FLANNERY_GIVES_BADGE_INFO setflag FLAG_DEFEATED_LAVARIDGE_GYM @@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 release @@ -107,7 +107,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 return diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index e57996318..f6ad8e26b 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_HerbShop_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLFLAG_RECEIVED_CHARCOAL release end diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 63c5925fd..ea771c3b5 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -428,7 +428,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -444,7 +444,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index a6ec91e62..7d305c37c 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -7,8 +7,8 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A - call LilycoveCity_EventScript_271ED7 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call Common_EventScript_SetupRivalGender end LilycoveCity_MapScript1_1E2B61: @ 81E2B61 @@ -40,7 +40,7 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT release @@ -134,13 +134,13 @@ LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD lockall msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC - applymovement 20, LilycoveCity_Movement_2725A2 + applymovement 20, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE lockall msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC - applymovement 19, LilycoveCity_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF @@ -197,10 +197,10 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0 msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_MET_WAILMER_TRAINER releaseall @@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD LilycoveCity_EventScript_1E3006:: @ 81E3006 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index f6a53cc5e..5823b6da4 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 faceplayer msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -32,7 +32,7 @@ LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 faceplayer msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT closemessage - applymovement 5, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -42,7 +42,7 @@ LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 faceplayer msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT closemessage - applymovement 6, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -52,7 +52,7 @@ LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE faceplayer msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT closemessage - applymovement 7, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -62,7 +62,7 @@ LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 faceplayer msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT closemessage - applymovement 8, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -72,7 +72,7 @@ LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C faceplayer msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT closemessage - applymovement 9, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 9, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -86,7 +86,7 @@ LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C faceplayer msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT closemessage - applymovement 12, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -96,7 +96,7 @@ LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 faceplayer msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT closemessage - applymovement 22, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 22, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -106,7 +106,7 @@ LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A faceplayer msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT closemessage - applymovement 11, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 11, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -116,7 +116,7 @@ LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 faceplayer msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT closemessage - applymovement 13, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -126,7 +126,7 @@ LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 faceplayer msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT closemessage - applymovement 14, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -136,7 +136,7 @@ LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF faceplayer msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT closemessage - applymovement 15, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -146,7 +146,7 @@ LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 faceplayer msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT closemessage - applymovement 16, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 16, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -156,7 +156,7 @@ LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD faceplayer msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT closemessage - applymovement 17, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 17, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -166,7 +166,7 @@ LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 faceplayer msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT closemessage - applymovement 18, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -176,7 +176,7 @@ LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B faceplayer msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT closemessage - applymovement 19, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -186,7 +186,7 @@ LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 faceplayer msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT closemessage - applymovement 21, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 21, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -196,7 +196,7 @@ LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 faceplayer msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT closemessage - applymovement 20, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 20, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -206,7 +206,7 @@ LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 faceplayer msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT closemessage - applymovement 23, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -216,7 +216,7 @@ LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 faceplayer msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT closemessage - applymovement 24, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 24, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -226,7 +226,7 @@ LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E faceplayer msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT closemessage - applymovement 25, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 25, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -236,7 +236,7 @@ LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 faceplayer msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT closemessage - applymovement 26, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -246,7 +246,7 @@ LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC faceplayer msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT closemessage - applymovement 27, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -256,18 +256,18 @@ LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 faceplayer msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT closemessage - applymovement 28, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA lockall - applymovement 29, LilycoveCity_ContestHall_Movement_27259E + applymovement 29, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT closemessage - applymovement 29, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 delay 25 msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT @@ -279,7 +279,7 @@ LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 faceplayer msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT closemessage - applymovement 31, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -289,7 +289,7 @@ LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C faceplayer msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT closemessage - applymovement 30, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 3d6ac6c4f..b2159b91e 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -86,7 +86,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_ContestLobby_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E waitmovement 0 @@ -259,7 +259,7 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A547 waitmovement 0 playse SE_PIN - applymovement 11, LilycoveCity_ContestLobby_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B waitmovement 0 @@ -614,7 +614,7 @@ LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -642,7 +642,7 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F - call LilycoveCity_ContestLobby_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 7ccc8b82f..87e4c0afd 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -6,33 +6,33 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -40,11 +40,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 lockall playse SE_PIN - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 03ac733f9..4a761a706 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -26,7 +26,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F message LilycoveCity_CoveLilyMotel_2F_Text_21881C waitmessage - call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare special Special_ShowDiploma waitstate release diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 80a93df47..18fc0404b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -114,7 +114,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 special sub_8139C10 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 waitse special ShakeScreenInElevator diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index ffa2244f4..ec1d89b66 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 playse SE_PC_ON special DoLotteryCornerComputerEffect @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C delay 220 special EndLotteryCornerComputerEffect delay 10 - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index b278d3e14..899ea98f0 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -123,7 +123,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 lockall - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E + applymovement 7, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 0 goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C @@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT closemessage - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6 + applymovement 7, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 5e9157826..ea70156aa 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -107,45 +107,45 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 setvar VAR_TEMP_E, 0 - goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_SYS_HAS_EON_TICKET, Common_EventScript_NopReturn checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_E, 1 - goto_if_set FLAG_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_EON_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_E, 2 return LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 setvar VAR_TEMP_D, 0 - goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, Common_EventScript_NopReturn checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_D, 1 - goto_if_set FLAG_HAS_AURORA_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_AURORA_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_D, 2 return LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 setvar VAR_TEMP_C, 0 - goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, Common_EventScript_NopReturn checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_C, 1 - goto_if_set FLAG_HAS_OLD_SEA_MAP, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_OLD_SEA_MAP, Common_EventScript_NopReturn setvar VAR_TEMP_C, 2 return LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A setvar VAR_TEMP_9, 0 - goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, Common_EventScript_NopReturn checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_9, 1 - goto_if_set FLAG_HAS_MYSTIC_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_MYSTIC_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_9, 2 return @@ -246,12 +246,12 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call LilycoveCity_Harbor_EventScript_21E4EE msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_Harbor_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LilycoveCity_Harbor_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_FACING, 2 call_if_eq LilycoveCity_Harbor_EventScript_21E656 @@ -328,12 +328,12 @@ LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 delay 30 - applymovement 1, LilycoveCity_Harbor_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 @@ -342,19 +342,19 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 end LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 - applymovement 4, LilycoveCity_Harbor_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 return LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 @@ -415,7 +415,7 @@ LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -494,22 +494,22 @@ LilycoveCity_Harbor_Movement_21E671: @ 821E671 step_end LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return LilycoveCity_Harbor_EventScript_21E680:: @ 821E680 - applymovement 5, LilycoveCity_Harbor_Movement_2725AA + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B - applymovement 5, LilycoveCity_Harbor_Movement_2725AA + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 92adafe5a..0a0792bfd 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT giveitem_std ITEM_TM44 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM44 msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 644c50113..3f5b349d2 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -15,7 +15,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B goto_if_eq LilycoveCity_House3_EventScript_21EE75 msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -23,7 +23,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -33,7 +33,7 @@ LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A faceplayer msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 89ac90dc6..8f2cdde28 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9 LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 lockall - applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E + applymovement 2, Common_Movement_FacePlayer message LilycoveCity_LilycoveMuseum_1F_Text_218EBC waitmessage multichoice 20, 8, 16, 1 @@ -154,7 +154,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B faceplayer msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT closemessage - applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 6d37e13c1..b73c06bf3 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -62,7 +62,7 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 lockall - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN @@ -71,7 +71,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 @@ -107,7 +107,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA end LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 @@ -116,7 +116,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 end LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT givedecoration_std 44 compare VAR_RESULT, 0 @@ -127,7 +127,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA end LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 - call LilycoveCity_LilycoveMuseum_2F_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT closemessage releaseall diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index c5c2188e5..e94fa43f1 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B lockall - applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO switch VAR_RESULT diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 77bc40635..698ef95f2 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall - applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 waitmovement 0 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 1487f999f..837cf0f74 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -6,7 +6,7 @@ LittlerootTown_MapScripts:: @ 81E7DCB LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN - call LittlerootTown_EventScript_271ED7 + call Common_EventScript_SetupRivalGender compare VAR_LITTLEROOT_INTRO_STATE, 2 call_if_eq LittlerootTown_EventScript_1E7E67 call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F @@ -186,7 +186,7 @@ LittlerootTown_Movement_1E7FAC: @ 81E7FAC LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 lockall playse SE_PIN - applymovement 8, LittlerootTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 delay 80 msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT @@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 release @@ -357,14 +357,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118 LittlerootTown_EventScript_1E811F:: @ 81E811F lockall - applymovement 1, LittlerootTown_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 releaseall @@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C return LittlerootTown_EventScript_1E8297:: @ 81E8297 - applymovement 4, LittlerootTown_Movement_2725A8 + applymovement 4, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_EventScript_1E82A2:: @ 81E82A2 - applymovement 4, LittlerootTown_Movement_2725A4 + applymovement 4, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85FE waitmovement 0 @@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 - applymovement 4, LittlerootTown_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 728cf099d..b31854f49 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -90,11 +90,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E lockall playse SE_PIN - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_292765 end @@ -146,9 +146,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 addobject 7 delay 30 playse SE_PIN - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement 7, Common_Movement_ExclamationMark waitmovement 0 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981 @@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 end LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index fc0a68a27..f1fc7ebab 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -67,9 +67,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC waitmovement 0 playse SE_PIN - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_BOY_SUP, 1 @@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -105,7 +105,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -307,7 +307,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F .string "Record your progress with SAVE.\p" .string "The remaining pages are blank…$" -LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820 +Common_Text_LookCloserAtMap: @ 81F8820 .string "{PLAYER} took a closer look at the\n" .string "HOENN region map.$" diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 185a1f6a3..33a1ff25e 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -90,11 +90,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE lockall playse SE_PIN - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_292765 end @@ -183,9 +183,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B addobject 7 delay 30 playse SE_PIN - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598 + applymovement 7, Common_Movement_ExclamationMark waitmovement 0 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A + applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A @@ -218,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B end LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 2217d12cd..19bc22999 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -68,9 +68,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F waitmovement 0 playse SE_PIN - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_GIRL_SUP, 1 @@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -106,7 +106,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -129,7 +129,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -268,7 +268,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED end LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index f03570243..985caea98 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -5,7 +5,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 .byte 0 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 - call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 @@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 setvar VAR_0x8004, 0 - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end @@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 10 playse SE_TK_KASYA delay 20 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 checkplayergender compare VAR_RESULT, MALE @@ -180,8 +180,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 20 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 waitmovement 0 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -286,7 +286,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO @@ -299,7 +299,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO @@ -312,7 +312,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO @@ -351,7 +351,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD end @@ -396,7 +396,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E end @@ -441,7 +441,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F end @@ -530,7 +530,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 1fc5e777b..77c339b11 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 150 removeobject 7 @@ -50,10 +50,10 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 - applymovement 6, MagmaHideout_4F_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index aae89cb8a..b66ab17c4 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -10,7 +10,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA MarineCave_End_EventScript_23AFF4:: @ 823AFF4 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne MarineCave_End_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return @@ -25,7 +25,7 @@ MarineCave_End_EventScript_23B012:: @ 823B012 MarineCave_End_EventScript_23B01B:: @ 823B01B lockall - applymovement EVENT_OBJ_ID_PLAYER, MarineCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, MarineCave_End_Movement_23B09D waitmovement 0 diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index f3bde6eb9..e44bc78dd 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -238,7 +238,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -254,7 +254,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -262,7 +262,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -270,7 +270,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 5274d40db..e92669cd9 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -70,7 +70,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -78,7 +78,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D MauvilleCity_EventScript_1DF43D:: @ 81DF43D msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -86,17 +86,17 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D MauvilleCity_EventScript_1DF452:: @ 81DF452 lockall goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 6, MauvilleCity_Movement_272598 + applymovement 6, Common_Movement_ExclamationMark waitmovement 0 - applymovement 6, MauvilleCity_Movement_27259A + applymovement 6, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD @@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 applymovement 6, MauvilleCity_Movement_1DF6A8 applymovement 7, MauvilleCity_Movement_1DF6E2 waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE @@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D applymovement 6, MauvilleCity_Movement_1DF6AE applymovement 7, MauvilleCity_Movement_1DF6E8 waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 applymovement 7, MauvilleCity_Movement_1DF6F7 @@ -164,7 +164,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 call_if_eq MauvilleCity_EventScript_1DF5F3 compare VAR_FACING, 4 call_if_eq MauvilleCity_EventScript_1DF601 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage @@ -205,13 +205,13 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628 MauvilleCity_EventScript_1DF63A:: @ 81DF63A msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT return @@ -223,7 +223,7 @@ MauvilleCity_EventScript_1DF683:: @ 81DF683 end MauvilleCity_EventScript_1DF690:: @ 81DF690 - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD @@ -440,7 +440,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784 msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT giveitem_std ITEM_TM24 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_GOT_TM24_FROM_WATTSON msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 34125b421..88b1ded16 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -215,7 +215,7 @@ MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 end MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 - call MauvilleCity_GameCorner_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -383,7 +383,7 @@ MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF end MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D - call MauvilleCity_GameCorner_EventScript_27205E + call Common_EventScript_BagIsFull goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -448,7 +448,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 end MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA - call MauvilleCity_GameCorner_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT release end @@ -513,7 +513,7 @@ MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 closemessage - applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 6611248e4..3ef834704 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -88,7 +88,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B message MauvilleCity_Gym_Text_20E77F waitmessage - call MauvilleCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT setvar VAR_0x40D2, 3 clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT @@ -117,7 +117,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 release @@ -126,7 +126,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 return diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index c49052914..b683b8c15 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -14,9 +14,9 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D MauvilleCity_House2_EventScript_210C82:: @ 8210C82 playse SE_PIN - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_272598 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO compare VAR_RESULT, 1 diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 07a0911b0..fc9a74e3a 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -16,20 +16,20 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F lockall playbgm MUS_MGM0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725B0 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_2725A6 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A6 + applymovement 5, Common_Movement_WalkInPlaceUp + applymovement 6, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 5, MeteorFalls_1F_1R_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT closemessage @@ -37,9 +37,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 addobject 7 addobject 8 @@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage @@ -68,10 +68,10 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_2725AA + applymovement 7, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 7, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index ba8d807c5..31baad43c 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -6,11 +6,11 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD waitse playse SE_PIN - applymovement 1, MeteorFalls_StevensCave_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D @@ -20,7 +20,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 end MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD - applymovement 1, MeteorFalls_StevensCave_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT release diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 767a99584..952ff253c 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -439,7 +439,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -447,7 +447,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -463,7 +463,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -471,7 +471,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index b504d7004..3e2bd4cf9 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 @@ -216,7 +216,7 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 lock faceplayer msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -231,7 +231,7 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_KINGS_ROCK release end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index fc1a73b4d..6e5b461cd 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -57,7 +57,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898 MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 message MossdeepCity_Gym_Text_22196A waitmessage - call MossdeepCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag FLAG_BADGE07_GET @@ -89,7 +89,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 release @@ -98,7 +98,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 return diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 6d9022065..662774d64 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -60,7 +60,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -82,7 +82,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -106,7 +106,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -120,7 +120,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release @@ -136,17 +136,17 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -186,7 +186,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -194,7 +194,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -203,7 +203,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 lock faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 9ee00e67c..de161a10c 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -32,9 +32,9 @@ MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 @@ -173,7 +173,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 lock faceplayer msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -231,20 +231,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF step_end MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 releaseall end MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 special SavePlayerParty fadescreen 1 @@ -277,12 +277,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT closemessage delay 20 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 8, Common_Movement_WalkInPlaceDown waitmovement 0 delay 60 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 8, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 0f6470de8..925202e17 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -28,12 +28,12 @@ MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA lockall - applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 1, MossdeepCity_StevensHouse_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MossdeepCity_StevensHouse_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_222833 waitmovement 0 @@ -99,7 +99,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 compare VAR_RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B - call MossdeepCity_StevensHouse_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto MossdeepCity_StevensHouse_EventScript_222901 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 65d1bf77d..a727a649e 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -17,7 +17,7 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5 call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9 call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02 closemessage - applymovement 1, MtChimney_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_EVIL_LEADER_PLEASE_STOP release @@ -35,12 +35,12 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B lockall playbgm MUS_MGM0, 0 msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT - applymovement 2, MtChimney_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 2, MtChimney_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, MtChimney_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF @@ -60,7 +60,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if_eq MtChimney_EventScript_22EEC7 compare VAR_FACING, 2 call_if_eq MtChimney_EventScript_22EED2 - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage @@ -121,7 +121,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 end MtChimney_EventScript_22EF51:: @ 822EF51 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop nop diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index 676df4aee..a06f34a29 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG compare VAR_RESULT, 0 - goto_if_eq MtPyre_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CLEANSE_TAG release end diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 8c83b1c56..107864c7e 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -32,9 +32,9 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 MtPyre_Summit_EventScript_23203C:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725AA + applymovement 2, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC MtPyre_Summit_EventScript_2320F7:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_23212C waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C MtPyre_Summit_EventScript_232117:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_232132 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204 end MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_2322F6 playse SE_PIN - applymovement 8, MtPyre_Summit_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, MtPyre_Summit_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 0 @@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323ED waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F3 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F8 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index cd26de91d..83185bc4d 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -13,7 +13,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273 return NavelRock_Bottom_EventScript_269277:: @ 8269277 - goto_if_set FLAG_DEFEATED_LUGIA, NavelRock_Bottom_EventScript_27374E + goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn clearflag FLAG_HIDE_LUGIA return @@ -24,7 +24,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284 NavelRock_Bottom_EventScript_26928E:: @ 826928E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NavelRock_Bottom_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 4df8343fb..332e6dbea 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -9,7 +9,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD goto_if_eq NavelRock_Harbor_EventScript_269102 msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_NAVEL_ROCK_HARBOR diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 423d998a7..795bcf0e5 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -15,7 +15,7 @@ NavelRock_Top_EventScript_269131:: @ 8269131 NavelRock_Top_EventScript_26913A:: @ 826913A setvar VAR_TEMP_1, 1 - goto_if_set FLAG_DEFEATED_HO_OH, NavelRock_Top_EventScript_27374E + goto_if_set FLAG_DEFEATED_HO_OH, Common_EventScript_NopReturn setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return @@ -27,7 +27,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151 NavelRock_Top_EventScript_26915B:: @ 826915B specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NavelRock_Top_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index cc64f9eea..775851449 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,7 +23,7 @@ NewMauville_Entrance_MapScript1_2372FB: @ 82372FB NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall - applymovement EVENT_OBJ_ID_PLAYER, NewMauville_Entrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 1736617e9..ae20c72b6 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -15,7 +15,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7 NewMauville_Inside_EventScript_237407:: @ 8237407 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NewMauville_Inside_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 98dcc9cf3..37b6105f2 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -166,7 +166,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -174,7 +174,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -182,7 +182,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -190,7 +190,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] }
\ No newline at end of file diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index c11289913..d0f799bce 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -3,7 +3,7 @@ OldaleTown_MapScripts:: @ 81E8EA2 .byte 0 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 - call OldaleTown_EventScript_271ED7 + call Common_EventScript_SetupRivalGender setflag FLAG_VISITED_OLDALE_TOWN call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2 call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE @@ -85,7 +85,7 @@ OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 end OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT fadedefaultbgm release end @@ -193,7 +193,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066 msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage - applymovement 3, OldaleTown_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -217,7 +217,7 @@ OldaleTown_EventScript_1E9066:: @ 81E9066 OldaleTown_EventScript_1E9070:: @ 81E9070 lockall - applymovement 4, OldaleTown_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 setvar VAR_0x8009, 0 goto OldaleTown_EventScript_1E90E6 @@ -227,7 +227,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086 lockall applymovement 4, OldaleTown_Movement_1E9170 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -237,7 +237,7 @@ OldaleTown_EventScript_1E90A6:: @ 81E90A6 lockall applymovement 4, OldaleTown_Movement_1E9173 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -247,7 +247,7 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 lockall applymovement 4, OldaleTown_Movement_1E9175 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 971bf5b86..3070d9c07 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -117,7 +117,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PacifidlogTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -133,7 +133,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PacifidlogTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] }
\ No newline at end of file diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index c7c04c0bd..4f646ff43 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -20,7 +20,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 end PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE - goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_27374E + goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 call_if_eq PacifidlogTown_House2_EventScript_203812 @@ -43,7 +43,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816 msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT @@ -59,7 +59,7 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 50e1a5561..3d09ae706 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -276,7 +276,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -284,7 +284,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -300,7 +300,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -308,7 +308,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 3d9c018b9..531759cf0 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -44,7 +44,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT - applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY + applymovement 2, Common_Movement_WalkInPlaceLeft, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage @@ -89,7 +89,7 @@ PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 faceplayer msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgCity_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -263,13 +263,13 @@ PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE end PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA - applymovement 8, PetalburgCity_Movement_27259E + applymovement 8, Common_Movement_FacePlayer waitmovement 0 playbgm MUS_TSURETEK, 0 playse SE_PIN - applymovement 8, PetalburgCity_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, PetalburgCity_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 call_if_eq PetalburgCity_EventScript_1DC57F @@ -290,8 +290,8 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_1DC5FF msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT - applymovement 8, PetalburgCity_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 + applymovement 8, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT closemessage @@ -304,7 +304,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA PetalburgCity_EventScript_1DC57F:: @ 81DC57F applymovement 8, PetalburgCity_Movement_1DC615 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -316,14 +316,14 @@ PetalburgCity_EventScript_1DC594:: @ 81DC594 PetalburgCity_EventScript_1DC59F:: @ 81DC59F applymovement 8, PetalburgCity_Movement_1DC61D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 applymovement 8, PetalburgCity_Movement_1DC622 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -543,23 +543,23 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 applymovement 9, PetalburgCity_Movement_1DC7D6 waitmovement 0 playse SE_PIN - applymovement 9, PetalburgCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, PetalburgCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, PetalburgCity_Movement_1DC7DB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x40D1, 1 msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 89eb7e51e..60d82fc53 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -90,14 +90,14 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2049EC waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT setvar VAR_PETALBURG_GYM_STATE, 2 @@ -228,7 +228,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC end PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return @@ -236,20 +236,20 @@ PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 applymovement 10, PetalburgCity_Gym_Movement_2050E1 waitmovement 0 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_205102 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 waitmovement 0 @@ -274,55 +274,55 @@ PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 return PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 - applymovement 1, PetalburgCity_Gym_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D34:: @ 8204D34 - applymovement 10, PetalburgCity_Gym_Movement_27259E + applymovement 10, Common_Movement_FacePlayer waitmovement 0 return PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F - applymovement 10, PetalburgCity_Gym_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -350,7 +350,7 @@ PetalburgCity_Gym_EventScript_204D72:: @ 8204D72 return PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -403,7 +403,7 @@ PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end @@ -413,7 +413,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107 message PetalburgCity_Gym_Text_206162 waitmessage - call PetalburgCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT setflag FLAG_DEFEATED_PETALBURG_GYM setvar VAR_PETALBURG_GYM_STATE, 7 @@ -444,7 +444,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 giveitem_std ITEM_TM42 compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT return @@ -465,9 +465,9 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 applymovement 11, PetalburgCity_Gym_Movement_2050BB waitmovement 0 playse SE_PIN - applymovement 11, PetalburgCity_Gym_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, PetalburgCity_Gym_Movement_27259A + applymovement 11, Common_Movement_Delay48 waitmovement 0 delay 10 compare VAR_0x8008, 1 @@ -504,47 +504,47 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 end PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC - applymovement 11, PetalburgCity_Gym_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 - applymovement 11, PetalburgCity_Gym_Movement_2725A8 + applymovement 11, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 - applymovement 11, PetalburgCity_Gym_Movement_2725A4 + applymovement 11, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204FED:: @ 8204FED applymovement 11, PetalburgCity_Gym_Movement_2050C3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_205009:: @ 8205009 applymovement 11, PetalburgCity_Gym_Movement_2050CA waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_205025:: @ 8205025 applymovement 11, PetalburgCity_Gym_Movement_2050D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_205041:: @ 8205041 applymovement 11, PetalburgCity_Gym_Movement_20507E - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 waitmovement 0 return diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 493800afc..423d4c432 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -15,7 +15,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 closemessage applymovement 3, PetalburgWoods_Movement_22E1F6 waitmovement 0 - applymovement 4, PetalburgWoods_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage @@ -41,7 +41,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 call PetalburgWoods_EventScript_22E124 applymovement 4, PetalburgWoods_Movement_22E1D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage @@ -52,14 +52,14 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 closemessage applymovement 3, PetalburgWoods_Movement_22E205 waitmovement 0 - applymovement 4, PetalburgWoods_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1EA waitmovement 0 msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 @@ -85,7 +85,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 applymovement 3, PetalburgWoods_Movement_22E1FD waitmovement 0 removeobject 3 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL @@ -253,7 +253,7 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 - goto_if_eq PetalburgWoods_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MIRACLE_SEED release end diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 06a9cd52e..5053f0fa3 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -30,7 +30,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE applymovement 4, Route101_Movement_1EBD96 applymovement 2, Route101_Movement_1EBDC8 waitmovement 0 - applymovement 2, Route101_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, Route101_Movement_1EBDBD applymovement 2, Route101_Movement_1EBDEF @@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 fadescreen 1 removeobject 4 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special ChooseStarter waitstate diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 94644f69b..9984caeeb 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -4,7 +4,7 @@ Route103_MapScripts:: @ 81EC38E .byte 0 Route103_MapScript1_1EC399: @ 81EC399 - call Route103_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call Route103_EventScript_2720AD end @@ -30,11 +30,11 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -47,11 +47,11 @@ Route103_EventScript_1EC434:: @ 81EC434 msgbox Route103_Text_1EC989, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT switch VAR_STARTER_MON diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 525b7d327..7341c1add 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -13,7 +13,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47 end Route104_MapScript1_1ECC4E: @ 81ECC4E - call Route104_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call Route104_EventScript_1ECC78 call Route104_EventScript_1ECC5E end @@ -42,7 +42,7 @@ Route104_EventScript_1ECC9D:: @ 81ECC9D Route104_EventScript_1ECC9E:: @ 81ECC9E lockall setvar VAR_0x8008, 1 - applymovement 34, Route104_Movement_27259E + applymovement 34, Common_Movement_FacePlayer waitmovement 0 goto Route104_EventScript_1ECD33 @@ -51,7 +51,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 10 addobject 34 @@ -64,9 +64,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setvar VAR_0x8008, 0 call Route104_EventScript_1E0DD1 playse SE_PIN - applymovement 34, Route104_Movement_272598 + applymovement 34, Common_Movement_ExclamationMark waitmovement 0 - applymovement 34, Route104_Movement_27259A + applymovement 34, Common_Movement_Delay48 waitmovement 0 goto Route104_EventScript_1ECD33 @@ -270,7 +270,7 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release @@ -288,7 +288,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WHITE_HERB release end @@ -341,7 +341,7 @@ Route104_EventScript_1ED057:: @ 81ED057 msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM09 release end diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 7f5e35287..a1f070651 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -91,7 +91,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 63c3bb629..a036296e3 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -319,7 +319,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E faceplayer msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -332,9 +332,9 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 - goto_if_eq Route109_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_RECEIVED_SOFT_SAND release @@ -342,7 +342,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 Route109_EventScript_1EE9F2:: @ 81EE9F2 msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 951356409..89e31d639 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -75,7 +75,7 @@ Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 end Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop nop diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 0446ac09e..054117c5f 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -9,8 +9,8 @@ Route110_MapScript1_1EF279: @ 81EF279 end Route110_MapScript1_1EF27D: @ 81EF27D - call Route110_EventScript_271ED7 - call Route110_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_CYCLING_CHALLENGE_STATE, 1 call_if_eq Route110_EventScript_1EF293 end @@ -32,7 +32,7 @@ Route110_EventScript_1EF2AA:: @ 81EF2AA lock faceplayer msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -41,7 +41,7 @@ Route110_EventScript_1EF2C0:: @ 81EF2C0 lock faceplayer msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -50,7 +50,7 @@ Route110_EventScript_1EF2D6:: @ 81EF2D6 lock faceplayer msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -59,7 +59,7 @@ Route110_EventScript_1EF2EC:: @ 81EF2EC lock faceplayer msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -307,7 +307,7 @@ Route110_EventScript_1EF64A:: @ 81EF64A Route110_EventScript_1EF661:: @ 81EF661 lockall - applymovement 21, Route110_Movement_2725A8 + applymovement 21, Common_Movement_WalkInPlaceRight waitmovement 0 call Route110_EventScript_1EF673 releaseall @@ -383,11 +383,11 @@ Route110_EventScript_1EF76E:: @ 81EF76E call_if_eq Route110_EventScript_1EF7E1 compare VAR_RESULT, FEMALE call_if_eq Route110_EventScript_1EF7E6 - applymovement 28, Route110_Movement_2725AA + applymovement 28, Common_Movement_WalkInPlaceDown waitmovement 0 - applymovement 28, Route110_Movement_272598 + applymovement 28, Common_Movement_ExclamationMark waitmovement 0 - applymovement 28, Route110_Movement_27259A + applymovement 28, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 1 @@ -616,9 +616,9 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Route110_Movement_1EFB30 waitmovement 0 playse SE_PIN - applymovement 36, Route110_Movement_272598 + applymovement 36, Common_Movement_ExclamationMark waitmovement 0 - applymovement 36, Route110_Movement_27259A + applymovement 36, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_eq Route110_EventScript_1EFAD8 @@ -631,13 +631,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 - applymovement 36, Route110_Movement_2725A4 + applymovement 36, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 36, Route110_Movement_2725A8 + applymovement 36, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 36, Route110_Movement_2725AA + applymovement 36, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 71766659a..f92f2a488 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -161,7 +161,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 delay 30 msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEnd_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT @@ -200,34 +200,34 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF return Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF - call Route110_TrickHouseEnd_EventScript_27205E + call Common_EventScript_BagIsFull msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 - call Route110_TrickHouseEnd_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 - applymovement 1, Route110_TrickHouseEnd_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B - applymovement 1, Route110_TrickHouseEnd_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -235,13 +235,13 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 lockall turnobject 1, 3 playse SE_PIN - applymovement 1, Route110_TrickHouseEnd_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_26B08B waitmovement 0 playse SE_W153 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 898d8d374..1fb237110 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -236,9 +236,9 @@ Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 compare VAR_0x4044, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE @@ -326,21 +326,21 @@ Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Route110_TrickHouseEntrance_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 @@ -364,7 +364,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -374,7 +374,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -384,7 +384,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -394,7 +394,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -404,7 +404,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -414,7 +414,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -424,7 +424,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -432,20 +432,20 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_272071 + call_if_eq Common_EventScript_NoRoomLeftForAnother msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index acdf1279d..8503e6786 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -25,7 +25,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27 Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 lockall - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_1, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -35,7 +35,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 lockall - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_2, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 lockall - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 3, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_3, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -55,7 +55,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 lockall - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_4, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -65,7 +65,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 lockall - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_5, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -215,9 +215,9 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 playse SE_PIN - applymovement 1, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -239,9 +239,9 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 playse SE_PIN - applymovement 2, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC @@ -265,9 +265,9 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 playse SE_PIN - applymovement 3, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 3, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -289,9 +289,9 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 playse SE_PIN - applymovement 4, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -313,9 +313,9 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 playse SE_PIN - applymovement 5, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT random 3 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 74ee42c64..c33dc6f11 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -164,7 +164,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT @@ -285,7 +285,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 Route111_EventScript_1F0FE7:: @ 81F0FE7 msgbox Route111_Text_1F1523, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 - applymovement 1, Route111_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F156F, MSGBOX_DEFAULT @@ -303,7 +303,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F159D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 - applymovement 2, Route111_Movement_2725A6 + applymovement 2, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F1645, MSGBOX_DEFAULT @@ -321,7 +321,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F167E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 - applymovement 3, Route111_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT @@ -341,7 +341,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage - applymovement 4, Route111_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C applymovement 4, Route111_Movement_1F114A @@ -437,11 +437,11 @@ Route111_EventScript_1F11DA:: @ 81F11DA Route111_EventScript_1F11E4:: @ 81F11E4 lockall - applymovement 46, Route111_Movement_27259E + applymovement 46, Common_Movement_FacePlayer waitmovement 0 msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT closemessage - applymovement 46, Route111_Movement_2725A2 + applymovement 46, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 5a89f40ed..23dca6f0b 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -19,7 +19,7 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT closemessage - call Route111_OldLadysRestStop_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index b54fe564e..312bf739f 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE compare VAR_RESULT, 0 - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MACHO_BRACE goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -52,7 +52,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C closemessage - applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_2725A2 + applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 787f680fb..256a09635 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -10,36 +10,36 @@ Route112_MapScript1_1F1DAE: @ 81F1DAE Route112_EventScript_1F1DB7:: @ 81F1DB7 lockall delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F2003, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index a42f92fc7..9854cf3c0 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -223,13 +223,13 @@ Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F return Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 - call Route113_GlassWorkshop_EventScript_27205E + call Common_EventScript_BagIsFull msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 - call Route113_GlassWorkshop_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index cccc8de5f..3c07facf3 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -35,7 +35,7 @@ Route114_EventScript_1F2582:: @ 81F2582 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release @@ -53,7 +53,7 @@ Route114_EventScript_1F25D1:: @ 81F25D1 msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index e229c756d..0d942e446 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT giveitem_std ITEM_TM28 compare VAR_RESULT, 0 - goto_if_eq Route114_FossilManiacsHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM28 release end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 96d591d2d..c36abfe3b 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -23,8 +23,8 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 lockall - applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, Route114_FossilManiacsTunnel_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_0x40CC, 2 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index fd1e77af1..62147025a 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -151,8 +151,8 @@ Route116_EventScript_1F2D84:: @ 81F2D84 Route116_EventScript_1F2D95:: @ 81F2D95 lockall - applymovement 11, Route116_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, Route116_Movement_2725A4 + applymovement 11, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index fac602f7e..39e2669d6 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -69,7 +69,7 @@ Route118_EventScript_1F3E85:: @ 81F3E85 Route118_EventScript_1F3E8E:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F61 waitmovement 0 @@ -79,7 +79,7 @@ Route118_EventScript_1F3E8E:: @ 81F3E8E Route118_EventScript_1F3EAE:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 goto Route118_EventScript_1F3EE4 end @@ -87,7 +87,7 @@ Route118_EventScript_1F3EAE:: @ 81F3EAE Route118_EventScript_1F3EC4:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F63 waitmovement 0 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 4a5e60ada..f8fac02a7 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -10,13 +10,13 @@ Route119_MapScript1_1F442F: @ 81F442F Route119_EventScript_1F4439:: @ 81F4439 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route119_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return Route119_MapScript1_1F444D: @ 81F444D - call Route119_EventScript_271ED7 - call Route119_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if_eq Route119_EventScript_1F4466 special SetRoute119Weather @@ -51,7 +51,7 @@ Route119_EventScript_1F4488:: @ 81F4488 call_if_eq Route119_EventScript_1F46C6 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1F46D1 - applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -459,7 +459,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3 faceplayer msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -469,7 +469,7 @@ Route119_EventScript_1F49BA:: @ 81F49BA faceplayer msgbox Route119_Text_1F5147, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index ae0fea259..8d57356fd 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -57,7 +57,7 @@ Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 lockall msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT closemessage - call Route119_WeatherInstitute_1F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal releaseall end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index bbee65df8..21d34eed1 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -55,9 +55,9 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT closemessage playse SE_PIN - applymovement 3, Route119_WeatherInstitute_2F_Movement_272598 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A + applymovement 3, Common_Movement_Delay48 waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT closemessage @@ -98,7 +98,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 compare VAR_RESULT, 0 goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B - call Route119_WeatherInstitute_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto Route119_WeatherInstitute_2F_EventScript_2700EA end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index a66026283..5a29c1bb7 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -26,7 +26,7 @@ Route120_EventScript_1F5406:: @ 81F5406 Route120_EventScript_1F5449:: @ 81F5449 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route120_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 30 removeobject 36 return @@ -34,7 +34,7 @@ Route120_EventScript_1F5449:: @ 81F5449 Route120_EventScript_1F5460:: @ 81F5460 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route120_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -147,7 +147,7 @@ Route120_EventScript_1F55F6:: @ 81F55F6 Route120_EventScript_1F5601:: @ 81F5601 giveitem_std VAR_0x8004 compare VAR_RESULT, 0 - goto_if_eq Route120_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT release @@ -196,12 +196,12 @@ Route120_EventScript_1F568B:: @ 81F568B call_if_eq Route120_EventScript_1F57A3 compare VAR_FACING, 3 call_if_eq Route120_EventScript_1F57AE - applymovement 31, Route120_Movement_2725A4 + applymovement 31, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT closemessage - applymovement 30, Route120_Movement_2725A8 + applymovement 30, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 30, Route120_Movement_2723C7 waitmovement 0 @@ -233,15 +233,15 @@ Route120_EventScript_1F571C:: @ 81F571C end Route120_EventScript_1F572C:: @ 81F572C - applymovement 31, Route120_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A6 + applymovement 31, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT closemessage - applymovement 31, Route120_Movement_2725AA + applymovement 31, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -258,7 +258,7 @@ Route120_EventScript_1F572C:: @ 81F572C end Route120_EventScript_1F57A3:: @ 81F57A3 - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index d5afabfff..62589c512 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 lockall - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 86a6e767e..132a068e3 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -17,7 +17,7 @@ Route123_EventScript_1F6151:: @ 81F6151 msgbox Route123_Text_1F645D, MSGBOX_DEFAULT giveitem_std ITEM_TM19 compare VAR_RESULT, 0 - goto_if_eq Route123_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index a7175e698..3500578ef 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT random 10 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT release end @@ -78,7 +78,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull goto Route123_BerryMastersHouse_EventScript_26FA79 release end @@ -88,7 +88,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -98,7 +98,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -108,7 +108,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -118,7 +118,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -128,7 +128,7 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 97aa6f4be..9968d3a04 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 81F656C .byte 0 Route124_MapScript1_1F6572: @ 81F6572 - call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route124_EventScript_1F657C:: @ 81F657C diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index e5ad32697..c979577d8 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -5,7 +5,7 @@ Route125_MapScripts:: @ 81F6748 .byte 0 Route125_MapScript1_1F6758: @ 81F6758 - call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route125_EventScript_273D13 compare VAR_0x4037, 11 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 4fa47e0bb..29846af22 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 81F68C6 .byte 0 Route126_MapScript1_1F68CC: @ 81F68CC - call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route126_EventScript_1F68D6:: @ 81F68D6 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 28f20bfb3..76ade14f3 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -5,7 +5,7 @@ Route127_MapScripts:: @ 81F69D9 .byte 0 Route127_MapScript1_1F69E9: @ 81F69E9 - call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route127_EventScript_273D13 compare VAR_0x4037, 13 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 19f0acdae..091e1fc96 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 81F6B38 .byte 0 Route128_MapScript1_1F6B43: @ 81F6B43 - call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route128_MapScript2_1F6B4D: @ 81F6B4D @@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 - applymovement 4, Route128_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 msgbox Route128_Text_1F704F, MSGBOX_DEFAULT @@ -53,19 +53,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_1F6C87 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 177dc626a..c1bd91f0a 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -23,7 +23,7 @@ Route129_MapScript1_1F72AB: @ 81F72AB end Route129_EventScript_1F72D8:: @ 81F72D8 - call_if_set FLAG_SYS_WEATHER_CTRL, Route129_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route129_MapScript2_1F72E2: @ 81F72E2 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 8ca9dcbb0..797cc302c 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -31,7 +31,7 @@ Route130_EventScript_1F73B1:: @ 81F73B1 end Route130_EventScript_1F73B5:: @ 81F73B5 - call_if_set FLAG_SYS_WEATHER_CTRL, Route130_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route130_EventScript_1F73BF:: @ 81F73BF diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index e709a14ef..9cbd6eb6d 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -13,7 +13,7 @@ Route131_EventScript_1F741B:: @ 81F741B return Route131_EventScript_1F741F:: @ 81F741F - call_if_set FLAG_SYS_WEATHER_CTRL, Route131_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route131_EventScript_1F7429:: @ 81F7429 diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 1dcaaa382..04c68baa3 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -539,7 +539,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -547,7 +547,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -563,7 +563,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -571,7 +571,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 8686bc18e..a98c9ae27 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -5,7 +5,7 @@ RustboroCity_MapScripts:: @ 81E06BD RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY - call RustboroCity_EventScript_271ED7 + call Common_EventScript_SetupRivalGender compare VAR_RUSTBORO_STATE, 6 call_if_eq RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 @@ -42,18 +42,18 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 applymovement 15, RustboroCity_Movement_1E0852 waitmovement 0 playse SE_PIN - applymovement 15, RustboroCity_Movement_272598 + applymovement 15, Common_Movement_ExclamationMark waitmovement 0 - applymovement 15, RustboroCity_Movement_27259A + applymovement 15, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL - applymovement 15, RustboroCity_Movement_2725A4 + applymovement 15, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_TK_KASYA delay 10 @@ -63,7 +63,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 10 playse SE_TK_KASYA delay 20 - applymovement 15, RustboroCity_Movement_2725AA + applymovement 15, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT closemessage @@ -221,7 +221,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922 lock faceplayer msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT - applymovement 7, RustboroCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -230,7 +230,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938 lock faceplayer msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT - applymovement 8, RustboroCity_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -344,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E RustboroCity_EventScript_1E0A79:: @ 81E0A79 applymovement 9, RustboroCity_Movement_1E0AD5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -500,52 +500,52 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E end RustboroCity_EventScript_1E0B6F:: @ 81E0B6F - applymovement 9, RustboroCity_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return RustboroCity_EventScript_1E0B9B:: @ 81E0B9B - applymovement 9, RustboroCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC waitmovement 0 return RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -608,69 +608,69 @@ RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 return RustboroCity_EventScript_1E0CDC:: @ 81E0CDC - applymovement 9, RustboroCity_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return RustboroCity_EventScript_1E0D08:: @ 81E0D08 - applymovement 9, RustboroCity_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE waitmovement 0 return RustboroCity_EventScript_1E0D34:: @ 81E0D34 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0D60:: @ 81E0D60 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0D96:: @ 81E0D96 - applymovement 9, RustboroCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 return RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 lockall call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -694,128 +694,128 @@ RustboroCity_EventScript_1E0DEE:: @ 81E0DEE RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E120E waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E33:: @ 81E0E33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1215 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E73:: @ 81E0E73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E121B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1220 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1224 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F33:: @ 81E0F33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1227 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F73:: @ 81E0F73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E122B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1230 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index d5f50c25f..466a9d7c6 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -79,9 +79,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 @@ -104,9 +104,9 @@ RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 @@ -171,7 +171,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B - call RustboroCity_DevonCorp_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto RustboroCity_DevonCorp_2F_EventScript_211AD7 end @@ -220,7 +220,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B - call RustboroCity_DevonCorp_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto RustboroCity_DevonCorp_2F_EventScript_211B7A end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 347871783..6b7b3defd 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -58,7 +58,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT closemessage - call RustboroCity_DevonCorp_3F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT setflag FLAG_HIDE_ROUTE_116_TUNNELER clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN @@ -154,7 +154,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_212595 msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -163,11 +163,11 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -175,7 +175,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 7798e72e6..ec59115ef 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -59,7 +59,7 @@ RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT - applymovement 6, RustboroCity_Flat1_2F_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index 639e93884..d4b940c9f 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Flat2_2F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO release end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 6e844b000..aaa3b3f0b 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -14,7 +14,7 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31 RustboroCity_Gym_EventScript_212F66:: @ 8212F66 message RustboroCity_Gym_Text_2137EC waitmessage - call RustboroCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET @@ -30,7 +30,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 giveitem_std ITEM_TM39 compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index c01e4a436..74394f9a5 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -85,9 +85,9 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 - goto_if_eq RustboroCity_PokemonSchool_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 setflag FLAG_RECEIVED_QUICK_CLAW release @@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index f10ae75ba..5b22520bf 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -23,7 +23,7 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F faceplayer msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -35,7 +35,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -43,7 +43,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 RusturfTunnel_EventScript_22CE99:: @ 822CE99 msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -94,7 +94,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, RusturfTunnel_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -102,14 +102,14 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, RusturfTunnel_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 - applymovement 1, RusturfTunnel_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -142,9 +142,9 @@ RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 RusturfTunnel_EventScript_22CFFF:: @ 822CFFF playse SE_PIN - applymovement 1, RusturfTunnel_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, RusturfTunnel_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 return @@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 applymovement 5, RusturfTunnel_Movement_22D1A4 waitmovement 0 msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT - applymovement 5, RusturfTunnel_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 message RusturfTunnel_Text_22D3BA waitmessage diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 204d70e14..20d0c72d4 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_23C26D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index a021f5272..3b8df90a3 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT giveitem_std ITEM_TM49 compare VAR_RESULT, 0 - goto_if_eq SSTidalRooms_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release @@ -23,7 +23,7 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33 lockall msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT closemessage - call SSTidalRooms_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal call SSTidalRooms_EventScript_23C0A7 releaseall end diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 9bbb9cbdc..13b65c722 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -13,9 +13,9 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN - applymovement 1, SeafloorCavern_Entrance_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, SeafloorCavern_Entrance_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_FACING, 3 @@ -29,7 +29,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 moveobjectoffscreen 1 msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end @@ -43,23 +43,23 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED call_if_eq SeafloorCavern_Entrance_EventScript_234539 msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 - applymovement 1, SeafloorCavern_Entrance_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E - applymovement 1, SeafloorCavern_Entrance_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 - applymovement 1, SeafloorCavern_Entrance_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index cc13e7dc6..7fe6386c3 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C waitmovement 0 @@ -15,15 +15,15 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC @@ -47,8 +47,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 150 removeobject 7 @@ -82,7 +82,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT closemessage @@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 closemessage playse SE_PC_OFF delay 20 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA + applymovement VAR_0x8004, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT closemessage @@ -103,13 +103,13 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598 + applymovement VAR_0x8004, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A + applymovement VAR_0x8004, Common_Movement_Delay48 waitmovement 0 msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 2874da963..fa2aca8e0 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -39,7 +39,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index c54aa1d4f..7a7c3e337 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -64,7 +64,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 20, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_1 @@ -81,7 +81,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 10, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_2 @@ -93,7 +93,7 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 6, 9, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_3 @@ -105,7 +105,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 16, 13, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_4 @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 31, 8, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_1 @@ -134,7 +134,7 @@ ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 14, 26, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_2 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 60a6039be..d493469fa 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -19,7 +19,7 @@ ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8 giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_4 @@ -38,7 +38,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FOCUS_BAND release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 40275d809..6e3bb63fe 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -19,7 +19,7 @@ ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 11, 11, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_3 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index eb57d1227..a6e7b05cc 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -16,7 +16,7 @@ SkyPillar_Outside_EventScript_2392CF:: @ 82392CF return SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 - call_if_set FLAG_SYS_WEATHER_CTRL, SkyPillar_Outside_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return SkyPillar_Outside_MapScript1_2392DD: @ 82392DD @@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_2393D3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage @@ -60,13 +60,13 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special sub_8139560 waitstate delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 1, SkyPillar_Outside_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 4ca4c4681..de4706f84 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8 SkyPillar_Top_EventScript_2396D2:: @ 82396D2 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne SkyPillar_Top_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -94,7 +94,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 SkyPillar_Top_EventScript_23979A:: @ 823979A lockall fadeoutbgm 1 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Top_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 special SpawnCameraObject applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_239858 diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index ee9f3c379..126519096 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -591,7 +591,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -599,7 +599,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -607,7 +607,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -623,7 +623,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index a19696ecf..f72c35c7d 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -61,11 +61,11 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitmovement 0 msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT closemessage - applymovement 35, SlateportCity_Movement_2725A4 + applymovement 35, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 60 msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT - applymovement 35, SlateportCity_Movement_2725A8 + applymovement 35, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT closemessage @@ -359,7 +359,7 @@ SlateportCity_EventScript_1DD009:: @ 81DD009 faceplayer msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT closemessage - applymovement 5, SlateportCity_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -369,7 +369,7 @@ SlateportCity_EventScript_1DD020:: @ 81DD020 faceplayer msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT closemessage - applymovement 18, SlateportCity_Movement_2725A2 + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -379,7 +379,7 @@ SlateportCity_EventScript_1DD037:: @ 81DD037 faceplayer msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT closemessage - applymovement 19, SlateportCity_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -389,7 +389,7 @@ SlateportCity_EventScript_1DD04E:: @ 81DD04E faceplayer msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT closemessage - applymovement 26, SlateportCity_Movement_2725A2 + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -399,7 +399,7 @@ SlateportCity_EventScript_1DD065:: @ 81DD065 faceplayer msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT closemessage - applymovement 27, SlateportCity_Movement_2725A2 + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -409,7 +409,7 @@ SlateportCity_EventScript_1DD07C:: @ 81DD07C faceplayer msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT closemessage - applymovement 28, SlateportCity_Movement_2725A2 + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -419,7 +419,7 @@ SlateportCity_EventScript_1DD093:: @ 81DD093 faceplayer msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT closemessage - applymovement 29, SlateportCity_Movement_2725A2 + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -429,7 +429,7 @@ SlateportCity_EventScript_1DD0AA:: @ 81DD0AA faceplayer msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT closemessage - applymovement 30, SlateportCity_Movement_2725A2 + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -438,31 +438,31 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 lock faceplayer playse SE_PIN - applymovement 31, SlateportCity_Movement_272598 + applymovement 31, Common_Movement_ExclamationMark waitmovement 0 - applymovement 31, SlateportCity_Movement_27259A + applymovement 31, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - applymovement 31, SlateportCity_Movement_27259E + applymovement 31, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_27259E + applymovement 31, Common_Movement_FacePlayer waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -481,7 +481,7 @@ SlateportCity_EventScript_1DD153:: @ 81DD153 faceplayer msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT closemessage - applymovement 33, SlateportCity_Movement_2725A2 + applymovement 33, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -563,10 +563,10 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT closemessage - applymovement 10, SlateportCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceRight waitmovement 0 delay 10 - applymovement 9, SlateportCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_1DD33C @@ -577,26 +577,26 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 removeobject 10 removeobject 9 msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT - applymovement 11, SlateportCity_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT - applymovement 6, SlateportCity_Movement_2725A4 - applymovement 1, SlateportCity_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 7, SlateportCity_Movement_1DD309 applymovement 3, SlateportCity_Movement_272596 applymovement 2, SlateportCity_Movement_1DD311 waitmovement 0 - applymovement 11, SlateportCity_Movement_2725AA + applymovement 11, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT playse SE_PIN - applymovement 11, SlateportCity_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, SlateportCity_Movement_27259A + applymovement 11, Common_Movement_Delay48 waitmovement 0 - applymovement 11, SlateportCity_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT @@ -885,7 +885,7 @@ SlateportCity_EventScript_1DD5CE:: @ 81DD5CE SlateportCity_EventScript_1DD5DC:: @ 81DD5DC lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 opendoor 10, 12 waitdooranim diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 4bd28996b..400146b3b 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -44,7 +44,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 2, 1 waitdooranim diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 8851c5fa8..bf8416295 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -165,7 +165,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 special CallFrontierUtilFunc closemessage delay 2 - call SlateportCity_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq SlateportCity_BattleTentLobby_EventScript_208A14 @@ -249,7 +249,7 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT giveitem_std ITEM_TM41 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_BattleTentLobby_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM41 msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 33f07f15b..60925f676 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -48,10 +48,10 @@ SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF end SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 - applymovement 7, SlateportCity_Harbor_Movement_2725AA + applymovement 7, Common_Movement_WalkInPlaceDown waitmovement 0 - applymovement 6, SlateportCity_Harbor_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A6 + applymovement 6, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage @@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 applymovement 4, SlateportCity_Harbor_Movement_20CAE0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_20CAE6 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_20CAEB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -226,7 +226,7 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR @@ -300,7 +300,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_if_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -358,7 +358,7 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER @@ -371,7 +371,7 @@ SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 2e973663b..155081a1b 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -57,7 +57,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50 SlateportCity_House1_EventScript_209B5A:: @ 8209B5A msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT - call SlateportCity_House1_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index a886905c0..5a4947c8a 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -7,14 +7,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end @@ -155,9 +155,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 faceplayer delay 8 playse SE_PIN - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_272598 + applymovement 13, Common_Movement_ExclamationMark waitmovement 0 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A + applymovement 13, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT giveitem_std ITEM_TM46 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 204ffb4eb..641c4dd86 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -43,8 +43,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT closemessage @@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 fadescreen 0 delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, 269 @@ -96,12 +96,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C return SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D - applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -268,7 +268,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index be411211a..866bf2963 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -211,14 +211,14 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 playse SE_PIN - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_272598 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SOOTHE_BELL release end diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index adf1bd3a2..6c554387a 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -8,11 +8,11 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FD9 goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FBA msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA @@ -20,31 +20,31 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 end SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT releaseall diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 76ababed8..183c3ce46 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -358,7 +358,7 @@ "y": 29, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -366,7 +366,7 @@ "y": 31, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -374,7 +374,7 @@ "y": 31, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -382,7 +382,7 @@ "y": 29, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index dd8514912..3f2d80e82 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -110,7 +110,7 @@ SootopolisCity_EventScript_1E5805:: @ 81E5805 compare VAR_0x40CA, 1 goto_if_eq SootopolisCity_EventScript_1E583E compare VAR_0x40CA, 1 - goto_if_le SootopolisCity_EventScript_27207A + goto_if_le Common_EventScript_SetWeather15 return SootopolisCity_EventScript_1E583D:: @ 81E583D @@ -219,8 +219,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 setvar VAR_0x8004, 0 special sub_813B7D8 waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 60 waitse @@ -319,8 +319,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 setvar VAR_0x8004, 0 special sub_813B7D8 waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 60 waitse @@ -730,7 +730,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 goto_if_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage - applymovement 3, SootopolisCity_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -751,7 +751,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT random 2 @@ -764,7 +764,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -772,7 +772,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -792,13 +792,13 @@ SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8 SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 lockall - applymovement 2, SootopolisCity_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage - applymovement 2, SootopolisCity_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -838,7 +838,7 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038 SootopolisCity_EventScript_1E6065:: @ 81E6065 msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT closemessage - applymovement 8, SootopolisCity_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -855,7 +855,7 @@ SootopolisCity_EventScript_1E6084:: @ 81E6084 SootopolisCity_EventScript_1E608E:: @ 81E608E lockall - applymovement 4, SootopolisCity_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E60D9 @@ -865,7 +865,7 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E goto_if_le SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage - applymovement 4, SootopolisCity_Movement_2725A2 + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -882,7 +882,7 @@ SootopolisCity_EventScript_1E60D9:: @ 81E60D9 SootopolisCity_EventScript_1E60E3:: @ 81E60E3 lockall - applymovement 5, SootopolisCity_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E612D @@ -893,7 +893,7 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 goto_if_le SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage - applymovement 5, SootopolisCity_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -927,7 +927,7 @@ EventScript_ClosedSootopolisDoor:: @ 81E615D SootopolisCity_EventScript_1E6166:: @ 81E6166 lockall - applymovement 7, SootopolisCity_Movement_27259E + applymovement 7, Common_Movement_FacePlayer waitmovement 0 call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC compare VAR_0x405E, 2 @@ -1261,13 +1261,13 @@ SootopolisCity_Movement_1E635A: @ 81E635A SootopolisCity_EventScript_1E635D:: @ 81E635D lockall - applymovement 15, SootopolisCity_Movement_27259E + applymovement 15, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage - applymovement 15, SootopolisCity_Movement_2725A2 + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1284,17 +1284,17 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 goto_if_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage - applymovement 14, SootopolisCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT closemessage - applymovement 14, SootopolisCity_Movement_2725A2 + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SootopolisCity_EventScript_1E63C7:: @ 81E63C7 - applymovement 14, SootopolisCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT releaseall @@ -1302,13 +1302,13 @@ SootopolisCity_EventScript_1E63C7:: @ 81E63C7 SootopolisCity_EventScript_1E63DB:: @ 81E63DB lockall - applymovement 13, SootopolisCity_Movement_27259E + applymovement 13, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage - applymovement 13, SootopolisCity_Movement_2725A2 + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1321,13 +1321,13 @@ SootopolisCity_EventScript_1E6406:: @ 81E6406 SootopolisCity_EventScript_1E6411:: @ 81E6411 lockall - applymovement 12, SootopolisCity_Movement_27259E + applymovement 12, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage - applymovement 12, SootopolisCity_Movement_2725A2 + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 22cd864cf..d5bb3d790 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -99,7 +99,7 @@ SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 message SootopolisCity_Gym_1F_Text_225598 waitmessage - call SootopolisCity_Gym_1F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET @@ -125,7 +125,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_Gym_1F_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 return @@ -133,7 +133,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_Gym_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 release diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index 9dcc1031d..13b581c71 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -8,7 +8,7 @@ SootopolisCity_House1_EventScript_22694D:: @ 822694D msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT giveitem_std ITEM_TM31 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_House1_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index efa197c8d..0f175478a 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3 SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD bufferdecorationname 1, 117 - msgbox gUnknown_08272B1A, MSGBOX_DEFAULT + msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 36e4ac18d..67e577759 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -37,7 +37,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 waitmovement 0 moveobjectoffscreen 1 - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 @@ -102,7 +102,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 compare VAR_RESULT, 0 goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special LoadPlayerParty - call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special SavePlayerParty diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 388410821..8eb00337f 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -14,7 +14,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 goto_if_eq SouthernIsland_Exterior_EventScript_242A17 msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 4f8dba7e5..c5cbe0f5e 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -10,7 +10,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne SouthernIsland_Interior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 2 return diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index a3164136d..9e88be494 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -10,7 +10,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB TerraCave_End_EventScript_23B0C5:: @ 823B0C5 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne TerraCave_End_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return @@ -25,7 +25,7 @@ TerraCave_End_EventScript_23B0E3:: @ 823B0E3 TerraCave_End_EventScript_23B0EC:: @ 823B0EC lockall - applymovement EVENT_OBJ_ID_PLAYER, TerraCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, TerraCave_End_Movement_23B16E waitmovement 0 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 846b7f6c3..57dbbe13d 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -194,7 +194,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E setvar VAR_0x8004, 14 special CallTrainerHillFunction setvar VAR_TEMP_5, 1 - call TrainerHill_Entrance_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26835C setvar VAR_0x8004, 14 diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 3f8f4fe45..7aef48724 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -137,7 +137,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -153,7 +153,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -169,7 +169,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -177,7 +177,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 5c3fe86db..81d95fb0f 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -12,14 +12,14 @@ VerdanturfTown_EventScript_1EB575:: @ 81EB575 faceplayer goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594 msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end VerdanturfTown_EventScript_1EB594:: @ 81EB594 msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 52aed7618..c5f318663 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -77,8 +77,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 waitmovement 0 removeobject 2 - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty @@ -121,8 +121,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 closemessage goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index df56f41ed..e699e6427 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -192,7 +192,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 special LoadPlayerParty closemessage delay 2 - call VerdanturfTown_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D @@ -281,7 +281,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT giveitem_std ITEM_TM45 compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM45 msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 20002c6c9..2a79ab134 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 end VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 - applymovement EVENT_OBJ_ID_PLAYER, VictoryRoad_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC |