atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed duplicated object event tags

Browse source
This commit is contained in:
Eduardo Quezada 2024-05-28 14:16:34 -04:00
parent 1be5581f19
commit 8854eaa880
9 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/constants/event_objects.h
View file

@ -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

6
include/constants/field_effects.h
View file

@ -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

6
src/contest_util.c
View file

@ -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;

2
src/data/field_effects/field_effect_objects.h
View file

@ -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,

4
src/event_object_movement.c
View file

@ -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);

3
src/field_specials.c
View file

@ -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);

3
src/mirage_tower.c
View file

@ -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,

3
src/rotating_gate.c
View file

@ -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,

2
src/trainer_see.c
View file

@ -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,