diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-22 13:27:24 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-24 10:14:52 -0600 |
| commit | e696b89ff2902c283207e5f712ccc6c59f174555 (patch) | |
| tree | 4f2608c22855b97461f9fecb5f09b69dccd0e389 /data/scripts/maps | |
| parent | 4b5ad9de049a63b101b2bf5f2f2cb92beb26e5fb (diff) | |
Name and use dynamic object gfx id vars
Diffstat (limited to 'data/scripts/maps')
| -rw-r--r-- | data/scripts/maps/SlateportCity.inc | 8 | ||||
| -rw-r--r-- | data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc | 8 | ||||
| -rw-r--r-- | data/scripts/maps/SouthernIsland_Interior.inc | 8 | ||||
| -rw-r--r-- | data/scripts/maps/UnknownMap_25_34.inc | 18 |
4 files changed, 21 insertions, 21 deletions
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 56fc0e59b..796775aa2 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36 SlateportCity_MapScript1_14BA3C:: @ 814BA3C .ifdef SAPPHIRE - setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 9e002e61e..98d2160a8 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .ifdef SAPPHIRE - setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index ea2f852f4..6386c3b82 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -14,9 +14,9 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C .ifdef SAPPHIRE - setvar 0x4011, 188 + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIOS .else - setvar 0x4011, 187 + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIAS .endif call SouthernIsland_Interior_EventScript_160B77 end @@ -30,11 +30,11 @@ SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 end SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F - setvar 0x4010, 100 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL return SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 - setvar 0x4010, 105 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL return SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index c31eef6ba..6c25c34c5 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -91,37 +91,37 @@ LinkContestRoom1_EventScript_15F646:: @ 815F646 end LinkContestRoom1_EventScript_15F699:: @ 815F699 - copyvar 0x4014, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4 - copyvar 0x4015, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF - copyvar 0x4016, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA - copyvar 0x4017, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5 - copyvar 0x4018, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0 - copyvar 0x4019, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB - copyvar 0x401a, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return @@ -421,9 +421,9 @@ VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB return FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 - setvar 0x4013, 100 + setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL return FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9 - setvar 0x4013, 105 + setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_NORMAL return |