summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data-de/event_scripts.s40
-rw-r--r--data/event_scripts.s40
-rw-r--r--data/scripts/maps/SlateportCity.inc8
-rw-r--r--data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc8
-rw-r--r--data/scripts/maps/SouthernIsland_Interior.inc8
-rw-r--r--data/scripts/maps/UnknownMap_25_34.inc18
-rw-r--r--include/constants/vars.h22
-rw-r--r--src/field/battle_tower.c6
-rw-r--r--src/field/event_data.c2
-rw-r--r--src/field/mauville_man.c3
-rw-r--r--src/field/secret_base.c2
-rw-r--r--src/script_pokemon_util_80C4BF0.c8
12 files changed, 93 insertions, 72 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 1a2237705..fcab8dc1d 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -1859,11 +1859,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E
end
RustboroCity_EventScript_1A0166:: @ 81A0166
- setvar 0x4010, 105
+ setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
return
RustboroCity_EventScript_1A016C:: @ 81A016C
- setvar 0x4010, 100
+ setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
LavaridgeTown_EventScript_1A0172:: @ 81A0172
@@ -1877,11 +1877,11 @@ Route119_EventScript_1A0172:: @ 81A0172
end
LavaridgeTown_EventScript_1A018A:: @ 81A018A
- setvar 0x4013, 106
+ setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE
return
LavaridgeTown_EventScript_1A0190:: @ 81A0190
- setvar 0x4013, 101
+ setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
return
AquaHideout_1F_EventScript_1A0196:: @ 81A0196
@@ -1908,30 +1908,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196
SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196
SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196
.ifdef SAPPHIRE
- setvar 0x4011, 117
- setvar 0x4012, 118
- setvar 0x4014, 119
- setvar 0x4015, 120
- setvar 0x4016, 195
- setvar 0x4017, 196
+ setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
+ setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_AQUA_MEMBER_F
+ setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_MAGMA_MEMBER_M
+ setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_MAGMA_MEMBER_F
+ setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_ARCHIE
+ setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_MAXIE
.else
- setvar 0x4011, 119
- setvar 0x4012, 120
- setvar 0x4014, 117
- setvar 0x4015, 118
- setvar 0x4016, 196
- setvar 0x4017, 195
+ setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
+ setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_MAGMA_MEMBER_F
+ setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_AQUA_MEMBER_M
+ setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_AQUA_MEMBER_F
+ setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_MAXIE
+ setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_ARCHIE
.endif
return
CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5
SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5
.ifdef SAPPHIRE
- setvar 0x4018, 197
- setvar 0x4019, 205
+ setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_KYOGRE_1
+ setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_KYOGRE_2
.else
- setvar 0x4018, 198
- setvar 0x4019, 206
+ setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_GROUDON_1
+ setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_GROUDON_2
.endif
return
diff --git a/data/event_scripts.s b/data/event_scripts.s
index b18e4eb1a..d66ec1eb3 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1854,11 +1854,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E
end
RustboroCity_EventScript_1A0166:: @ 81A0166
- setvar 0x4010, 105
+ setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
return
RustboroCity_EventScript_1A016C:: @ 81A016C
- setvar 0x4010, 100
+ setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
LavaridgeTown_EventScript_1A0172:: @ 81A0172
@@ -1872,11 +1872,11 @@ Route119_EventScript_1A0172:: @ 81A0172
end
LavaridgeTown_EventScript_1A018A:: @ 81A018A
- setvar 0x4013, 106
+ setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE
return
LavaridgeTown_EventScript_1A0190:: @ 81A0190
- setvar 0x4013, 101
+ setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
return
AquaHideout_1F_EventScript_1A0196:: @ 81A0196
@@ -1903,30 +1903,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196
SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196
SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196
.ifdef SAPPHIRE
- setvar 0x4011, 117
- setvar 0x4012, 118
- setvar 0x4014, 119
- setvar 0x4015, 120
- setvar 0x4016, 195
- setvar 0x4017, 196
+ setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
+ setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_AQUA_MEMBER_F
+ setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_MAGMA_MEMBER_M
+ setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_MAGMA_MEMBER_F
+ setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_ARCHIE
+ setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_MAXIE
.else
- setvar 0x4011, 119
- setvar 0x4012, 120
- setvar 0x4014, 117
- setvar 0x4015, 118
- setvar 0x4016, 196
- setvar 0x4017, 195
+ setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
+ setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_MAGMA_MEMBER_F
+ setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_AQUA_MEMBER_M
+ setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_AQUA_MEMBER_F
+ setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_MAXIE
+ setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_ARCHIE
.endif
return
CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5
SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5
.ifdef SAPPHIRE
- setvar 0x4018, 197
- setvar 0x4019, 205
+ setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_KYOGRE_1
+ setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_KYOGRE_2
.else
- setvar 0x4018, 198
- setvar 0x4019, 206
+ setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_GROUDON_1
+ setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_GROUDON_2
.endif
return
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
diff --git a/include/constants/vars.h b/include/constants/vars.h
index df265c551..4f80e5e26 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -22,7 +22,27 @@
#define VAR_TEMP_E 0x400E
#define VAR_TEMP_F 0x400F
-#define VAR_0x401F 0x401F
+// object gfx id vars
+// These 0x10 vars are used to dynamically control a map object's sprite.
+// For example, the rival's sprite id is dynamically set based on the player's gender.
+// See VarGetFieldObjectGraphicsId().
+#define VAR_OBJ_GFX_ID_0 0x4010
+#define VAR_OBJ_GFX_ID_1 0x4011
+#define VAR_OBJ_GFX_ID_2 0x4012
+#define VAR_OBJ_GFX_ID_3 0x4013
+#define VAR_OBJ_GFX_ID_4 0x4014
+#define VAR_OBJ_GFX_ID_5 0x4015
+#define VAR_OBJ_GFX_ID_6 0x4016
+#define VAR_OBJ_GFX_ID_7 0x4017
+#define VAR_OBJ_GFX_ID_8 0x4018
+#define VAR_OBJ_GFX_ID_9 0x4019
+#define VAR_OBJ_GFX_ID_A 0x401A
+#define VAR_OBJ_GFX_ID_B 0x401B
+#define VAR_OBJ_GFX_ID_C 0x401C
+#define VAR_OBJ_GFX_ID_D 0x401D
+#define VAR_OBJ_GFX_ID_E 0x401E
+#define VAR_OBJ_GFX_ID_F 0x401F
+
#define VAR_RECYCLE_GOODS 0x4020
#define VAR_REPEL_STEP_COUNT 0x4021
#define VAR_ICE_STEP_COUNT 0x4022
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index c4a94b172..12337631f 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -801,7 +801,7 @@ void SetBattleTowerTrainerGfxId(u8 trainerIndex)
if (i != 30)
{
u8 trainerObjectGfxId = sMaleTrainerGfxIds[i];
- VarSet(0x4010, trainerObjectGfxId);
+ VarSet(VAR_OBJ_GFX_ID_0, trainerObjectGfxId);
return;
}
@@ -809,11 +809,11 @@ void SetBattleTowerTrainerGfxId(u8 trainerIndex)
if (i != 20)
{
u8 trainerObjectGfxId = sFemaleTrainerGfxIds[i];
- VarSet(0x4010, trainerObjectGfxId);
+ VarSet(VAR_OBJ_GFX_ID_0, trainerObjectGfxId);
return;
}
- VarSet(0x4010, MAP_OBJ_GFX_BOY_1);
+ VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BOY_1);
}
void SetEReaderTrainerGfxId(void)
diff --git a/src/field/event_data.c b/src/field/event_data.c
index 587da8138..86045df15 100644
--- a/src/field/event_data.c
+++ b/src/field/event_data.c
@@ -138,7 +138,7 @@ bool8 VarSet(u16 id, u16 value)
u8 VarGetFieldObjectGraphicsId(u8 id)
{
- return VarGet(0x4010 + id);
+ return VarGet(VAR_OBJ_GFX_ID_0 + id);
}
u8 *GetFlagPointer(u16 id)
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index 30f6f5233..4db513f65 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -10,6 +10,7 @@
#include "overworld.h"
#include "random.h"
#include "script.h"
+#include "constants/map_objects.h"
#include "constants/songs.h"
#include "sound.h"
#include "string_util.h"
@@ -974,7 +975,7 @@ static void Task_BardSong(u8 taskId)
void sub_80F83D0(void)
{
- VarSet(0x4010, 0x45 + GetCurrentMauvilleOldMan());
+ VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD + GetCurrentMauvilleOldMan());
}
struct Story
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 7589ab1e3..19f8e18dc 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -479,7 +479,7 @@ void sub_80BBDD0(void)
void sub_80BBFA4(void)
{
int curBase = VarGet(VAR_0x4054);
- VarSet(VAR_0x401F, gUnknown_083D13EC[sub_80BCCA4(curBase)]);
+ VarSet(VAR_OBJ_GFX_ID_F, gUnknown_083D13EC[sub_80BCCA4(curBase)]);
}
void sub_80BBFD8(struct MapPosition *position, struct MapEvents *events)
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 0f409bfe1..fc94b1b01 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -249,10 +249,10 @@ void ShowContestWinner(void)
void sub_80C4F70(void)
{
- VarSet(0x4010, gContestMons[0].trainerGfxId);
- VarSet(0x4011, gContestMons[1].trainerGfxId);
- VarSet(0x4012, gContestMons[2].trainerGfxId);
- VarSet(0x4013, gContestMons[3].trainerGfxId);
+ VarSet(VAR_OBJ_GFX_ID_0, gContestMons[0].trainerGfxId);
+ VarSet(VAR_OBJ_GFX_ID_1, gContestMons[1].trainerGfxId);
+ VarSet(VAR_OBJ_GFX_ID_2, gContestMons[2].trainerGfxId);
+ VarSet(VAR_OBJ_GFX_ID_3, gContestMons[3].trainerGfxId);
}
bool8 GiveMonArtistRibbon(void)
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 19:37:58 +0000