diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/graphics.h | 8 | ||||
-rw-r--r-- | include/m4a.h | 4 | ||||
-rw-r--r-- | include/roulette.h | 137 | ||||
-rw-r--r-- | include/roulette_util.h | 2 | ||||
-rw-r--r-- | include/sprite.h | 1 |
5 files changed, 148 insertions, 4 deletions
diff --git a/include/graphics.h b/include/graphics.h index d66f46c92..e14aa72d5 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3431,4 +3431,12 @@ extern const u16 gAreaUnknownPalette[]; extern const u8 gUnknown_08E964B8[]; +extern const u8 gUnknown_08E8096C[]; +extern const u8 gRouletteWheelTiles[]; +extern const u8 gRouletteCenter_Gfx[]; +extern const u8 gRouletteHeadersTiles[]; +extern const u8 gRouletteCreditTiles[]; +extern const u8 gRouletteNumbersTiles[]; +extern const u8 gRouletteMultiplierTiles[]; + #endif // GUARD_GRAPHICS_H diff --git a/include/m4a.h b/include/m4a.h index 57a749a58..b7fb953bb 100644 --- a/include/m4a.h +++ b/include/m4a.h @@ -3,6 +3,10 @@ #include "gba/m4a_internal.h" +extern struct MusicPlayerInfo gMPlay_SE1; +extern struct MusicPlayerInfo gMPlay_SE2; +extern struct MusicPlayerInfo gMPlay_SE3; + void m4aSoundVSync(void); void m4aSoundInit(void); diff --git a/include/roulette.h b/include/roulette.h index 7d114a073..485a15fe3 100644 --- a/include/roulette.h +++ b/include/roulette.h @@ -1,6 +1,8 @@ #ifndef GUARD_ROULETTE_H #define GUARD_ROULETTE_H +#include "task.h" + struct UnkStruct1 { u16 var00; @@ -11,7 +13,7 @@ struct UnkStruct1 s8 var07_0:5; s8 var07_5:2; s8 var07_7:1; -}; +}; // size: 8 struct UnkStruct3 { @@ -21,18 +23,147 @@ struct UnkStruct3 s8 var02; s8 var03; struct UnkStruct1 var04; -}; +}; // size: 12 struct UnkStruct0 { u8 var00; u8 var01; u16 var02; //flag for each UnkStruct3 - struct UnkStruct3 var04[0x10]; + struct UnkStruct3 var04[16]; +}; // size: 196 + +struct Roulette /* ewram + 0x19000 */ +{ + u8 var00; + u8 var01; + u8 var02; + u8 var03_0:5; + u8 var03_5:1; + u8 var03_6:1; + u8 var03_7:1; + u8 var04_0:2; + u8 var04_2:5; + u8 var04_7:1; + u32 var08; + u8 var0C[6]; + u8 var12[4]; + u8 var16[3]; + u8 var19; + u8 var1A_0:4; + u8 var1A_4:4; + u8 var1B[6]; + u8 var21; + u8 var22; + u8 var23; + s16 var24; + s16 var26; + s16 var28; + s16 var2A; + struct OamMatrix var2C; + u16 var34; + struct Sprite *var38; + u8 var3C[0x40]; // Sprite IDs + u8 var7C; + u8 var7D; + u8 var7E; + u8 var7F; + s16 var80; + s16 var82; + s16 var84; + s16 var86; + float var88; + float var8C; + float var90; + float var94; + float var98; + float var9C; + float varA0; + u8 varA4; + u8 varA5; + u8 v51[2]; + u16 varA8; + u16 varAA; + TaskFunc varAC; + u8 v46[4]; + TaskFunc varB4; + struct UnkStruct0 varB8; +}; // size: 0x17C + +struct StructgUnknown_083F8DF4 +{ + u8 var00; + u8 var01; + u8 var02; + u8 var03; + u8 var04; + u8 v[3]; + u16 var08; + u16 var0A; + u16 var0C; + u16 v13[1]; + u16 var10; + u16 var12; + u16 var14; + u8 v1[2]; + u16 var18; + u16 var1A; + float var1C; }; +struct StructgUnknown_083F8C00 +{ + u8 var00; + u8 var01_0:4; + u8 var01_4:4; + u8 var02; + u8 var03; + u8 var04; + u8 var05; + u8 var06; + u8 var07; + u32 var08; + u32 var0C; + u16 var10; + u16 var12; +}; + +struct StructgUnknown_083F8D90 +{ + u8 var00; + u8 var01; + u8 var02; + u32 var04; +}; + +extern const struct StructgUnknown_083F8C00 gUnknown_083F8C00[]; +extern const struct StructgUnknown_083F8D90 gUnknown_083F8D90[]; +extern const struct StructgUnknown_083F8DF4 gUnknown_083F8DF4[]; + s16 sub_81174C4(s16, s16); s16 sub_81174E0(s16); void PlayRoulette(void); +void sub_8117838(u8); +u8 sub_8117890(const struct SpriteTemplate *, u8, u16 *); +void sub_8117900(void); +void unref_sub_8117A74(void); +void sub_8117AA8(u8, u8); +void sub_8117BBC(void); +void sub_8117C60(u8, u8); +void sub_8117D68(u8); +void sub_8117DF4(void); +void sub_8117E98(struct Sprite *); +void sub_8117F2C(void); +void sub_81180F4(u16); +u8 sub_81181E8(u8); +void sub_811829C(u8); +void sub_81182F8(u8); +void sub_81184CC(struct Sprite *); +void sub_81184D8(void); +void sub_8118554(struct Sprite *); +void sub_811857C(void); +void sub_81185E8(void); +void sub_81191F4(struct Sprite *); + #endif diff --git a/include/roulette_util.h b/include/roulette_util.h index daeaeeeef..1b731bc61 100644 --- a/include/roulette_util.h +++ b/include/roulette_util.h @@ -4,7 +4,7 @@ #include "roulette.h" void sub_8124918(struct UnkStruct0 *); -u8 sub_812492C(struct UnkStruct0 *, u8, struct UnkStruct1 *); +u8 sub_812492C(struct UnkStruct0 *, u8, const struct UnkStruct1 *); void task_tutorial_controls_fadein(struct UnkStruct0 *); void sub_8124CE8(struct UnkStruct0 *, u16); void sub_8124D3C(struct UnkStruct0 *, u16); diff --git a/include/sprite.h b/include/sprite.h index ff5493afe..e278f3c3d 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -251,6 +251,7 @@ extern u16 gReservedSpriteTileCount; extern u8 gOamLimit; extern struct Sprite gSprites[]; +extern struct OamMatrix gOamMatrices[]; void ResetSpriteData(void); void AnimateSprites(void); |