From 8854eaa88039ad973d6d15327d14d081bdcae1d4 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 28 May 2024 14:16:34 -0400 Subject: [PATCH] Removed duplicated object event tags --- include/constants/event_objects.h | 1 + include/constants/field_effects.h | 6 ------ src/contest_util.c | 6 ------ src/data/field_effects/field_effect_objects.h | 2 +- src/event_object_movement.c | 4 ++-- src/field_specials.c | 3 --- src/mirage_tower.c | 3 --- src/rotating_gate.c | 3 +-- src/trainer_see.c | 2 +- 9 files changed, 6 insertions(+), 24 deletions(-) diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 16a1c1bf46..7480a49daf 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -335,6 +335,7 @@ #define LOCALID_BATTLE_FRONTIER_MART_CLERK 1 #define LOCALID_SLATEPORT_ENERGY_GURU 25 +// Moved from src/event_object_movement.c so that they're accesible from other files. #define OBJ_EVENT_PAL_TAG_BRENDAN 0x1100 #define OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION 0x1101 #define OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION 0x1102 diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index a6a883c92f..f6e6106d90 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -130,10 +130,4 @@ #define FLDEFF_PAL_TAG_HOF_MONITOR 0x1010 #define FLDEFF_PAL_TAG_UNKNOWN 0x1011 -// Duplicates of event_object_movement tags -#define FLDEFF_PAL_TAG_MAY 0x1110 // OBJ_EVENT_PAL_TAG_MAY -#define FLDEFF_PAL_TAG_BRENDAN 0x1100 // OBJ_EVENT_PAL_TAG_BRENDAN -#define FLDEFF_PAL_TAG_NPC_1 0x1103 // OBJ_EVENT_PAL_TAG_NPC_1 -#define FLDEFF_PAL_TAG_NPC_2 0x1104 // OBJ_EVENT_PAL_TAG_NPC_2 - #endif // GUARD_FIELD_EFFECT_CONSTANTS_H diff --git a/src/contest_util.c b/src/contest_util.c index 90af687008..3938fcd382 100644 --- a/src/contest_util.c +++ b/src/contest_util.c @@ -2493,12 +2493,6 @@ void SetLinkContestPlayerGfx(void) } } -// copied from event_object_movement -#define OBJ_EVENT_PAL_TAG_BRENDAN 0x1100 -#define OBJ_EVENT_PAL_TAG_MAY 0x1110 -#define OBJ_EVENT_PAL_TAG_RS_BRENDAN 0x1122 -#define OBJ_EVENT_PAL_TAG_RS_MAY 0x1123 - void LoadLinkContestPlayerPalettes(void) { int i; diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index dcd16ef19a..3b9dafd2cb 100755 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -980,7 +980,7 @@ static const union AnimCmd *const sAnimTable_Sparkle[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = { .tileTag = TAG_NONE, - .paletteTag = FLDEFF_PAL_TAG_NPC_2, + .paletteTag = OBJ_EVENT_PAL_TAG_NPC_2, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_Sparkle, .images = sPicTable_Sparkle, diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 02718c9547..e04c5d0924 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -2861,10 +2861,10 @@ u8 LoadPlayerObjectEventPalette(u8 gender) { default: case MALE: - paletteTag = FLDEFF_PAL_TAG_BRENDAN; + paletteTag = OBJ_EVENT_PAL_TAG_BRENDAN; break; case FEMALE: - paletteTag = FLDEFF_PAL_TAG_MAY; + paletteTag = OBJ_EVENT_PAL_TAG_MAY; break; } return LoadObjectEventPalette(paletteTag); diff --git a/src/field_specials.c b/src/field_specials.c index c2d3d180e6..6ac110b7c5 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3282,9 +3282,6 @@ static void Task_DeoxysRockInteraction(u8 taskId) } } -// duplicate of event_object_movement -#define OBJ_EVENT_PAL_TAG_BIRTH_ISLAND_STONE 0x111F - static void ChangeDeoxysRockLevel(u8 rockLevel) { u8 paletteNum = IndexOfSpritePaletteTag(OBJ_EVENT_PAL_TAG_BIRTH_ISLAND_STONE); diff --git a/src/mirage_tower.c b/src/mirage_tower.c index 6ebefd22f2..6b541e37ac 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -152,9 +152,6 @@ static const union AnimCmd *const sAnims_FallingFossil[] = sAnim_FallingFossil, }; -// Duplicate of event_object_movement -#define OBJ_EVENT_PAL_TAG_NPC_1 0x1103 - static const struct SpriteTemplate sSpriteTemplate_FallingFossil = { .tileTag = TAG_NONE, diff --git a/src/rotating_gate.c b/src/rotating_gate.c index f989b4e595..57cb9fa7eb 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -6,6 +6,7 @@ #include "sound.h" #include "sprite.h" #include "constants/songs.h" +#include "constants/event_objects.h" #define ROTATING_GATE_TILE_TAG 0x1300 #define ROTATING_GATE_PUZZLE_MAX 12 @@ -461,8 +462,6 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_RotatingGate[] = sSpriteAffineAnim_RotatingClockwise270to360Faster, }; -#define OBJ_EVENT_PAL_TAG_NPC_1 0x1103 - static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge = { .tileTag = ROTATING_GATE_TILE_TAG, diff --git a/src/trainer_see.c b/src/trainer_see.c index 1a50ceb777..694a93993b 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -339,7 +339,7 @@ static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark = static const struct SpriteTemplate sSpriteTemplate_HeartIcon = { .tileTag = TAG_NONE, - .paletteTag = FLDEFF_PAL_TAG_NPC_1, + .paletteTag = OBJ_EVENT_PAL_TAG_NPC_1, .oam = &sOamData_Icons, .anims = sSpriteAnimTable_Icons, .images = sSpriteImageTable_HeartIcon,