diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-06-17 03:39:03 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-06-17 03:39:03 -0400 |
| commit | 76f6d05173e134d9cea3df0deb65f93804617c0f (patch) | |
| tree | 3cf5cd9da257e2806a062e4615f97d8304490b94 /include | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Document confetti
Diffstat (limited to 'include')
| -rw-r--r-- | include/graphics.h | 4 | ||||
| -rw-r--r-- | include/hall_of_fame.h | 1 | ||||
| -rw-r--r-- | include/rom_81520A8.h | 28 |
3 files changed, 16 insertions, 17 deletions
diff --git a/include/graphics.h b/include/graphics.h index b41a43095..99d396df2 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4082,8 +4082,8 @@ extern const u8 gNamingScreenUnderscoreTiles[]; extern const u32 gUnknown_08D9BA44[]; -extern const u32 gContestConfetti_Gfx[]; -extern const u32 gContestConfetti_Pal[]; +extern const u32 gConfetti_Gfx[]; +extern const u32 gConfetti_Pal[]; extern const u32 gUnknown_08C093F0[]; extern const u32 gSubstituteDollTilemap[]; diff --git a/include/hall_of_fame.h b/include/hall_of_fame.h index a83fad2fc..f1f456713 100644 --- a/include/hall_of_fame.h +++ b/include/hall_of_fame.h @@ -4,7 +4,6 @@ void CB2_DoHallOfFameScreen(void); void CB2_DoHallOfFameScreenDontSaveData(void); void CB2_DoHallOfFamePC(void); -void DoConfettiEffect(void); // hof_pc.c void ReturnFromHallOfFamePC(void); diff --git a/include/rom_81520A8.h b/include/rom_81520A8.h index 2be12200f..9ad299197 100644 --- a/include/rom_81520A8.h +++ b/include/rom_81520A8.h @@ -1,7 +1,7 @@ #ifndef GUARD_ROM_81520A8_H #define GUARD_ROM_81520A8_H -struct UnkStruct_81520A8 +struct OamUtil { struct OamData oam; s16 x; @@ -12,22 +12,22 @@ struct UnkStruct_81520A8 u16 palTag; u16 tileNum; u8 id; - u8 filler17; // Unused. - u8 unk18; - u8 unk19_0:1; - u8 unk19_1:1; - u8 unk19_2:1; + u8 filler; + u8 animNum; + u8 active:1; + u8 allowUpdates:1; + u8 dummied:1; u8 priority:2; s16 data[8]; - void (*callback)(struct UnkStruct_81520A8 *); + void (*callback)(struct OamUtil *); }; -bool32 sub_81521C0(u8 count); -bool32 sub_8152254(void); -bool32 sub_81522D4(void); -u8 sub_8152438(u8 id, void (*func)(struct UnkStruct_81520A8 *)); -u8 sub_8152474(u8 id, u8 dataArrayId, s16 dataValue); -u8 sub_81524C4(const struct OamData *oam, u16 tileTag, u16 palTag, s16 x, s16 y, u8 arg5, u8 priority); -u8 sub_81525D0(u8 id); +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_ROM_81520A8_H |