diff options
15 files changed, 49 insertions, 49 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 5b15bf090..e3477c8b4 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1799,11 +1799,11 @@ RustboroCity_EventScript_271ED7:: @ 8271ED7 end RustboroCity_EventScript_271EEF:: @ 8271EEF - setvar VAR_OBJ_GFX_ID_0, 105 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return RustboroCity_EventScript_271EF5:: @ 8271EF5 - setvar VAR_OBJ_GFX_ID_0, 100 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return LavaridgeTown_EventScript_271EFB:: @ 8271EFB @@ -1817,11 +1817,11 @@ Route119_EventScript_271EFB:: @ 8271EFB end LavaridgeTown_EventScript_271F13:: @ 8271F13 - setvar VAR_OBJ_GFX_ID_3, 106 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE return LavaridgeTown_EventScript_271F19:: @ 8271F19 - setvar VAR_OBJ_GFX_ID_3, 101 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE return EventScript_271F1F:: @ 8271F1F @@ -1833,11 +1833,11 @@ EventScript_271F1F:: @ 8271F1F end EventScript_271F37:: @ 8271F37 - setvar VAR_OBJ_GFX_ID_0, 100 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return EventScript_271F3D:: @ 8271F3D - setvar VAR_OBJ_GFX_ID_0, 105 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return DewfordTown_Gym_EventScript_271F43:: @ 8271F43 @@ -8977,8 +8977,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE .2byte 0 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 - setvar VAR_OBJ_GFX_ID_1, 28 - setvar VAR_OBJ_GFX_ID_0, 28 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST setvar VAR_0x8004, 5 special CallBattlePikeFunction compare VAR_RESULT, 3 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 4e25289e6..c6f06631c 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -24,11 +24,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE return BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6 - setvar VAR_OBJ_GFX_ID_1, 100 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC - setvar VAR_OBJ_GFX_ID_1, 105 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 986d45073..ab0736581 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -27,11 +27,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC return BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4 - setvar VAR_OBJ_GFX_ID_1, 100 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA - setvar VAR_OBJ_GFX_ID_1, 105 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index f8511315b..794dd9d1e 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -39,11 +39,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 end BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25 - setvar VAR_OBJ_GFX_ID_F, 100 + setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B - setvar VAR_OBJ_GFX_ID_F, 105 + setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 086c55b17..c09c9e61c 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -19,13 +19,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 return BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B - setvar VAR_OBJ_GFX_ID_1, 100 - setvar VAR_OBJ_GFX_ID_0, 100 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856 - setvar VAR_OBJ_GFX_ID_1, 105 - setvar VAR_OBJ_GFX_ID_0, 105 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index ac3a81cec..2699fe9d6 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -17,11 +17,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F checkplayergender compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 - setvar VAR_OBJ_GFX_ID_F, 0 + setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL return BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29 - setvar VAR_OBJ_GFX_ID_F, 89 + setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL return BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 75282775f..73b14fc2e 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -17,11 +17,11 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 checkplayergender compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B - setvar VAR_OBJ_GFX_ID_F, 0 + setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL return BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B - setvar VAR_OBJ_GFX_ID_F, 89 + setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL return BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 99cbbb662..ee63e72a1 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -25,14 +25,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA - setvar VAR_OBJ_GFX_ID_0, 7 - setvar VAR_OBJ_GFX_ID_1, 7 - setvar VAR_OBJ_GFX_ID_2, 7 - setvar VAR_OBJ_GFX_ID_3, 7 - setvar VAR_OBJ_GFX_ID_4, 7 - setvar VAR_OBJ_GFX_ID_5, 7 - setvar VAR_OBJ_GFX_ID_6, 7 - setvar VAR_OBJ_GFX_ID_7, 7 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_BOY_1 setvar VAR_TEMP_1, 1 setvar VAR_TEMP_3, 1 setobjectxyperm 1, 10, 2 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index bdc548162..cb84a51bd 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -10,7 +10,7 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 setflag FLAG_0x8D3 - setvar VAR_OBJ_GFX_ID_0, 100 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_0x4034, 0 setvar VAR_0x4035, 0 call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index a81bf991c..a7bf0ae62 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -17,13 +17,13 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF return FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7 - setvar VAR_OBJ_GFX_ID_1, 100 - setvar VAR_OBJ_GFX_ID_0, 100 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2 - setvar VAR_OBJ_GFX_ID_1, 105 - setvar VAR_OBJ_GFX_ID_0, 105 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 98132b37f..ace1a26f0 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -60,11 +60,11 @@ Route111_EventScript_1F0DC2:: @ 81F0DC2 return Route111_EventScript_1F0DDA:: @ 81F0DDA - setvar VAR_OBJ_GFX_ID_0, 100 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return Route111_EventScript_1F0DE0:: @ 81F0DE0 - setvar VAR_OBJ_GFX_ID_0, 105 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return Route111_EventScript_1F0DE6:: @ 81F0DE6 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 10eb60cb7..74c64d0f2 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -17,11 +17,11 @@ SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 return SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E - setvar VAR_OBJ_GFX_ID_1, 100 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994 - setvar VAR_OBJ_GFX_ID_1, 105 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 49c893fa8..13b38c835 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -23,12 +23,12 @@ SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E end SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A - setvar VAR_OBJ_GFX_ID_1, 188 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS setvar VAR_TEMP_4, 408 return SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 - setvar VAR_OBJ_GFX_ID_1, 187 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS setvar VAR_TEMP_4, 407 return @@ -41,11 +41,11 @@ SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 end SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8 - setvar VAR_OBJ_GFX_ID_0, 100 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE - setvar VAR_OBJ_GFX_ID_0, 105 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc index 9bfdec2ac..efb82a907 100644 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -449,10 +449,10 @@ LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 return LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE - setvar VAR_OBJ_GFX_ID_3, 100 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4 - setvar VAR_OBJ_GFX_ID_3, 105 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 21494c8a6..e6a61184e 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -17,13 +17,13 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 return VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328 - setvar VAR_OBJ_GFX_ID_1, 100 - setvar VAR_OBJ_GFX_ID_0, 100 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333 - setvar VAR_OBJ_GFX_ID_1, 105 - setvar VAR_OBJ_GFX_ID_0, 105 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E |