diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/gba/types.h | 4 | ||||
| -rw-r--r-- | include/graphics.h | 9 | ||||
| -rw-r--r-- | include/m4a.h | 3 | ||||
| -rw-r--r-- | include/menu_helpers.h | 2 | ||||
| -rw-r--r-- | include/roulette_util.h | 7 | ||||
| -rw-r--r-- | include/strings.h | 3 |
6 files changed, 24 insertions, 4 deletions
diff --git a/include/gba/types.h b/include/gba/types.h index fff48d437..3d78b5b5e 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -59,8 +59,8 @@ struct OamData u32 shape:2; // 0x40, 0x80 -> 0xC0 /*0x02*/ u32 x:9; - u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode - u32 size:2; + u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode + u32 size:2; // 0x4000, 0x8000 -> 0xC000 /*0x04*/ u16 tileNum:10; // 0x3FF u16 priority:2; // 0x400, 0x800 -> 0xC00 diff --git a/include/graphics.h b/include/graphics.h index ad2b39260..4563a7e99 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4818,4 +4818,13 @@ extern const u32 gStatusPal_Icons[]; extern const u32 gPartyMenuPokeball_Pal[]; extern const u32 gStatusPal_Icons[]; +// Roulette +extern const u32 gRouletteMenuTiles[]; +extern const u32 gRouletteWheelTiles[]; +extern const u32 gRouletteCenter_Gfx[]; +extern const u32 gRouletteHeadersTiles[]; +extern const u32 gRouletteCreditTiles[]; +extern const u32 gRouletteNumbersTiles[]; +extern const u32 gRouletteMultiplierTiles[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/m4a.h b/include/m4a.h index 595379495..4847c12cc 100644 --- a/include/m4a.h +++ b/include/m4a.h @@ -8,7 +8,8 @@ void m4aSoundVSyncOn(void); void m4aSoundInit(void); void m4aSoundMain(void); -void m4aSongNumStart(u16); +void m4aSongNumStart(u16 n); +void m4aSongNumStartOrChange(u16 n); void m4aSongNumStop(u16 n); void m4aMPlayAllStop(void); void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo); diff --git a/include/menu_helpers.h b/include/menu_helpers.h index ee8501d18..63af4c731 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -20,7 +20,7 @@ void ResetAllBgsCoordinates(void); void SetVBlankHBlankCallbacksToNull(void); void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc); bool16 RunTextPrintersRetIsActive(u8 textPrinterId); -void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data); +void DoYesNoFuncWithChoice(u8 taskId, const struct YesNoFuncTable *data); void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo); bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1); u8 GetLRKeysState(void); diff --git a/include/roulette_util.h b/include/roulette_util.h index 7f0b9cbf8..76752fe74 100644 --- a/include/roulette_util.h +++ b/include/roulette_util.h @@ -1,6 +1,8 @@ #ifndef GUARD_ROULETTE_UTIL_H #define GUARD_ROULETTE_UTIL_H +#include "roulette.h" + struct PulseBlendSettings { u16 blendColor; @@ -41,5 +43,10 @@ void UnmarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8); void UpdatePulseBlend(struct PulseBlend *); void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height); void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height); +void task_tutorial_controls_fadein(struct UnkStruct0 *r0); +void sub_8151678(struct UnkStruct0 *r0); +u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2); +void sub_8151A9C(struct UnkStruct0 *r0, u16 r1); +void sub_8151A48(struct UnkStruct0 *r0, u16 r1); #endif // GUARD_ROULETTE_UTIL_H diff --git a/include/strings.h b/include/strings.h index 7c6ca14ba..7a23e2e0f 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1990,4 +1990,7 @@ extern const u8 gText_XSentOverY[]; extern const u8 gText_TakeGoodCareOfX[]; extern const u8 gText_CommunicationStandby5[]; +// roulette +extern const u8 gUnknown_082A5B89[]; + #endif //GUARD_STRINGS_H |