From 8b462f3f6c30de55767808136861e892fc3f0356 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 18 Jun 2020 18:14:30 -0400 Subject: [PATCH] Specify confetti util name --- include/confetti_util.h | 33 ++++++++++++++++++++++++++ include/oam_util.h | 33 -------------------------- ld_script.txt | 2 +- src/{oam_util.c => confetti_util.c} | 28 +++++++++++----------- src/hall_of_fame.c | 36 ++++++++++++++--------------- sym_ewram.txt | 2 +- 6 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 include/confetti_util.h delete mode 100644 include/oam_util.h rename src/{oam_util.c => confetti_util.c} (86%) diff --git a/include/confetti_util.h b/include/confetti_util.h new file mode 100644 index 0000000000..ecc05a2209 --- /dev/null +++ b/include/confetti_util.h @@ -0,0 +1,33 @@ +#ifndef GUARD_CONFETTI_UTIL_H +#define GUARD_CONFETTI_UTIL_H + +struct ConfettiUtil +{ + struct OamData oam; + s16 x; + s16 y; + s16 xDelta; + s16 yDelta; + u16 tileTag; + u16 palTag; + u16 tileNum; + u8 id; + u8 filler; + u8 animNum; + u8 active:1; + u8 allowUpdates:1; + u8 dummied:1; + u8 priority:2; + s16 data[8]; + void (*callback)(struct ConfettiUtil *); +}; + +bool32 ConfettiUtil_Init(u8 count); +bool32 ConfettiUtil_Free(void); +bool32 ConfettiUtil_Update(void); +u8 ConfettiUtil_SetCallback(u8 id, void (*func)(struct ConfettiUtil *)); +u8 ConfettiUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue); +u8 ConfettiUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 animNum, u8 priority); +u8 ConfettiUtil_Remove(u8 id); + +#endif // GUARD_CONFETTI_UTIL_H diff --git a/include/oam_util.h b/include/oam_util.h deleted file mode 100644 index 24e166c930..0000000000 --- a/include/oam_util.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef GUARD_OAM_UTIL_H -#define GUARD_OAM_UTIL_H - -struct OamUtil -{ - struct OamData oam; - s16 x; - s16 y; - s16 xDelta; - s16 yDelta; - u16 tileTag; - u16 palTag; - u16 tileNum; - u8 id; - u8 filler; - u8 animNum; - u8 active:1; - u8 allowUpdates:1; - u8 dummied:1; - u8 priority:2; - s16 data[8]; - void (*callback)(struct OamUtil *); -}; - -bool32 OamUtil_Init(u8 count); -bool32 OamUtil_Free(void); -bool32 OamUtil_Update(void); -u8 OamUtil_SetCallback(u8 id, void (*func)(struct OamUtil *)); -u8 OamUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue); -u8 OamUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 animNum, u8 priority); -u8 OamUtil_Remove(u8 id); - -#endif // GUARD_OAM_UTIL_H diff --git a/ld_script.txt b/ld_script.txt index fb4d86300e..9ca6dabc81 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -237,7 +237,7 @@ SECTIONS { src/cable_car.o(.text); src/math_util.o(.text); src/roulette_util.o(.text); - src/oam_util.o(.text); + src/confetti_util.o(.text); src/save.o(.text); src/mystery_event_script.o(.text); src/field_effect_helpers.o(.text); diff --git a/src/oam_util.c b/src/confetti_util.c similarity index 86% rename from src/oam_util.c rename to src/confetti_util.c index bd1801a7df..3bda3ab539 100644 --- a/src/oam_util.c +++ b/src/confetti_util.c @@ -1,5 +1,5 @@ #include "global.h" -#include "oam_util.h" +#include "confetti_util.h" #include "malloc.h" #include "main.h" #include "digit_obj_util.h" @@ -7,7 +7,7 @@ static EWRAM_DATA struct { u8 count; - struct OamUtil *array; + struct ConfettiUtil *array; } *sWork = NULL; static void sub_81520A8(void *dest, u16 value, u8 left, u8 top, u8 width, u8 height) // Unused. @@ -47,7 +47,7 @@ static void sub_8152134(void *dest, const u16 *src, u8 left, u8 top, u8 width, u } } -bool32 OamUtil_Init(u8 count) +bool32 ConfettiUtil_Init(u8 count) { u8 i = 0; @@ -59,7 +59,7 @@ bool32 OamUtil_Init(u8 count) sWork = AllocZeroed(sizeof(*sWork)); if (sWork == NULL) return FALSE; - sWork->array = AllocZeroed(count * sizeof(struct OamUtil)); + sWork->array = AllocZeroed(count * sizeof(struct ConfettiUtil)); if (sWork->array == NULL) { FREE_AND_SET_NULL(sWork); @@ -76,7 +76,7 @@ bool32 OamUtil_Init(u8 count) return TRUE; } -bool32 OamUtil_Free(void) +bool32 ConfettiUtil_Free(void) { u8 i = 0; @@ -86,7 +86,7 @@ bool32 OamUtil_Free(void) for (i = 0; i < sWork->count; i++) memcpy(&gMain.oamBuffer[i + 64], &gDummyOamData, sizeof(struct OamData)); - memset(sWork->array, 0, sWork->count * sizeof(struct OamUtil)); + memset(sWork->array, 0, sWork->count * sizeof(struct ConfettiUtil)); FREE_AND_SET_NULL(sWork->array); memset(sWork, 0, sizeof(*sWork)); FREE_AND_SET_NULL(sWork); @@ -94,7 +94,7 @@ bool32 OamUtil_Free(void) return TRUE; } -bool32 OamUtil_Update(void) +bool32 ConfettiUtil_Update(void) { u8 i = 0; @@ -126,7 +126,7 @@ bool32 OamUtil_Update(void) return TRUE; } -static bool32 SetAnimAndTileNum(struct OamUtil *structPtr, u8 animNum) +static bool32 SetAnimAndTileNum(struct ConfettiUtil *structPtr, u8 animNum) { u16 tileStart; @@ -142,7 +142,7 @@ static bool32 SetAnimAndTileNum(struct OamUtil *structPtr, u8 animNum) return TRUE; } -u8 OamUtil_SetCallback(u8 id, void (*func)(struct OamUtil *)) +u8 ConfettiUtil_SetCallback(u8 id, void (*func)(struct ConfettiUtil *)) { if (sWork == NULL || id >= sWork->count) return 0xFF; @@ -153,7 +153,7 @@ u8 OamUtil_SetCallback(u8 id, void (*func)(struct OamUtil *)) return id; } -u8 OamUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue) +u8 ConfettiUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue) { if (sWork == NULL || id >= sWork->count) return 0xFF; @@ -164,9 +164,9 @@ u8 OamUtil_SetData(u8 id, u8 dataArrayId, s16 dataValue) return id; } -u8 OamUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 animNum, u8 priority) +u8 ConfettiUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 animNum, u8 priority) { - struct OamUtil *structPtr = NULL; + struct ConfettiUtil *structPtr = NULL; u8 i; if (sWork == NULL || oam == NULL) @@ -204,12 +204,12 @@ u8 OamUtil_AddNew(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 return structPtr->id; } -u8 OamUtil_Remove(u8 id) +u8 ConfettiUtil_Remove(u8 id) { if (sWork == NULL || !sWork->array[id].active) return 0xFF; - memset(&sWork->array[id], 0, sizeof(struct OamUtil)); + memset(&sWork->array[id], 0, sizeof(struct ConfettiUtil)); sWork->array[id].oam.y = 160; sWork->array[id].oam.x = 240; sWork->array[id].dummied = TRUE; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 30b170d8ef..bf9850deca 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -33,7 +33,7 @@ #include "fldeff_misc.h" #include "trainer_pokemon_sprites.h" #include "data.h" -#include "oam_util.h" +#include "confetti_util.h" #include "constants/rgb.h" #define HALL_OF_FAME_MAX_TEAMS 50 @@ -1423,7 +1423,7 @@ static bool8 CreateHofConfettiSprite(void) #define tTimer data[1] #define tConfettiCount data[15] -// Indexes into the data array of the struct OamUtil tracking confetti +// Indexes into the data array of the struct ConfettiUtil #define CONFETTI_SINE_IDX 0 #define CONFETTI_EXTRA_Y 1 #define CONFETTI_TASK_ID 7 @@ -1448,18 +1448,18 @@ static void StopDomeConfetti(void) if ((taskId = FindTaskIdByFunc(Task_DoDomeConfetti)) != 0xFF) DestroyTask(taskId); - OamUtil_Free(); + ConfettiUtil_Free(); FreeSpriteTilesByTag(TAG_CONFETTI); FreeSpritePaletteByTag(TAG_CONFETTI); } -static void UpdateDomeConfetti(struct OamUtil *oamUtil) +static void UpdateDomeConfetti(struct ConfettiUtil *util) { - if (oamUtil->yDelta > 110) + if (util->yDelta > 110) { // Destroy confetti after it falls far enough - gTasks[oamUtil->data[CONFETTI_TASK_ID]].tConfettiCount--; - OamUtil_Remove(oamUtil->id); + gTasks[util->data[CONFETTI_TASK_ID]].tConfettiCount--; + ConfettiUtil_Remove(util->id); } else { @@ -1467,16 +1467,16 @@ static void UpdateDomeConfetti(struct OamUtil *oamUtil) u8 sineIdx; s32 rand; - oamUtil->yDelta++; - oamUtil->yDelta += oamUtil->data[CONFETTI_EXTRA_Y]; + util->yDelta++; + util->yDelta += util->data[CONFETTI_EXTRA_Y]; - sineIdx = oamUtil->data[CONFETTI_SINE_IDX]; + sineIdx = util->data[CONFETTI_SINE_IDX]; rand = Random(); rand &= 3; rand += 8; - oamUtil->xDelta = (rand) * ((gSineTable[sineIdx])) / 256; + util->xDelta = (rand) * ((gSineTable[sineIdx])) / 256; - oamUtil->data[CONFETTI_SINE_IDX] += 4; + util->data[CONFETTI_SINE_IDX] += 4; } } @@ -1488,7 +1488,7 @@ static void Task_DoDomeConfetti(u8 taskId) switch (tState) { case 0: - if (!OamUtil_Init(64)) + if (!ConfettiUtil_Init(64)) { // Init failed DestroyTask(taskId); @@ -1503,7 +1503,7 @@ static void Task_DoDomeConfetti(u8 taskId) if (tTimer != 0 && tTimer % 3 == 0) { // Create new confetti every 3 frames - id = OamUtil_AddNew(&sOamData_Confetti, + id = ConfettiUtil_AddNew(&sOamData_Confetti, TAG_CONFETTI, TAG_CONFETTI, Random() % 240, @@ -1512,18 +1512,18 @@ static void Task_DoDomeConfetti(u8 taskId) id); if (id != 0xFF) { - OamUtil_SetCallback(id, UpdateDomeConfetti); + ConfettiUtil_SetCallback(id, UpdateDomeConfetti); // 1/4 of the confetti move an extra y coord every frame if ((Random() % 4) == 0) - OamUtil_SetData(id, CONFETTI_EXTRA_Y, 1); + ConfettiUtil_SetData(id, CONFETTI_EXTRA_Y, 1); - OamUtil_SetData(id, CONFETTI_TASK_ID, taskId); + ConfettiUtil_SetData(id, CONFETTI_TASK_ID, taskId); tConfettiCount++; } } - OamUtil_Update(); + ConfettiUtil_Update(); if (tTimer != 0) tTimer--; else if (tConfettiCount == 0) diff --git a/sym_ewram.txt b/sym_ewram.txt index e99d90a1d3..03b5d43b1c 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -103,7 +103,7 @@ .include "src/battle_transition.o" .include "src/battle_message.o" .include "src/cable_car.o" - .include "src/oam_util.o" + .include "src/confetti_util.o" .include "src/save.o" .include "src/mystery_event_script.o" .include "src/move_relearner.o"