diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/ewram.h | 8 | ||||
| -rw-r--r-- | include/roulette.h | 53 | ||||
| -rw-r--r-- | include/roulette_util.h | 1 |
3 files changed, 32 insertions, 30 deletions
diff --git a/include/ewram.h b/include/ewram.h index 5a350840a..fbc010853 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -192,13 +192,14 @@ extern u8 gSharedMem[]; #define B_FUNCTION_STACK ((struct funcStack *) (gSharedMem + 0x17140)) #define ewram17160 (gSharedMem[0x17160]) #define ewram17800 ((struct Struct2017800 *) (gSharedMem + 0x17800)) +#define ewram17800_2 (&gSharedMem[0x17800]) #define EWRAM_17800 ((struct UnknownStruct1 *)(gSharedMem + 0x17800)) #define eTransformStatuses ((struct TransformStatus *)(gSharedMem + 0x17800)) -#define ewram17800_2 (&gSharedMem[0x17800]) #define ewram17810 ((struct Struct2017810 *) (gSharedMem + 0x17810)) #define EWRAM_17810 ((struct UnknownStruct3 *)(gSharedMem + 0x17810)) #define ewram17840 (*(struct Struct2017840 *) (gSharedMem + 0x17840)) #define ewram17850 ((struct UnknownStruct5 *)(gSharedMem + 0x17850)) +#define ewram17E00 ((u16 *)(gSharedMem + 0x17E00)) #define ewram_2018000 (*(struct PlayerRecords *)(gSharedMem + 0x18000)) #define EWRAM_18000 ((u16 *)(gSharedMem + 0x18000)) #define ewram18000 ((u16 *)(gSharedMem + 0x18000)) @@ -212,8 +213,13 @@ extern u8 gSharedMem[]; #define ewram18300 ((u16 *)(gSharedMem + 0x18300)) #define ewram18800 (&gSharedMem[0x18800]) #define ePokedexView2 (struct PokedexView *)(gSharedMem + 0x18800) +#define ewram189a0 ((u16 *)(gSharedMem + 0x189A0)) +#define ewram18a20 ((u16 *)(gSharedMem + 0x18A20)) +#define ewram18a32 ((u16 *)(gSharedMem + 0x18A32)) +#define ewram18a80 ((u16 *)(gSharedMem + 0x18a80)) #define ewram19000 (&gSharedMem[0x19000]) #define ePokedexView3 (struct PokedexView *)(gSharedMem + 0x19000) +#define eRoulette ((struct Roulette *)(gSharedMem + 0x19000)) #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) #define ewram19348 (*(struct Struct2019348 *)(gSharedMem + 0x19348)) #define ewram19800 (&gSharedMem[0x19800]) diff --git a/include/roulette.h b/include/roulette.h index 5bd2e5240..9cf0ba1d2 100644 --- a/include/roulette.h +++ b/include/roulette.h @@ -3,42 +3,39 @@ struct UnkStruct1 { - u16 val0; - u16 val1; - u8 val2; - u8 val3; - u8 val4; - s8 field0:5; - s8 field1:2; - s8 field2:1; + u16 var00; + u16 var02; + u8 var04; + u8 var05; + u8 var06; + s8 var07_0:5; + s8 var07_5:2; + s8 var07_7:1; }; struct UnkStruct3 { - u8 field0:7; - u8 field1:1; - u8 val1; - s8 val2; - s8 val3; - /* - u16 val4; - u16 val5; - u8 val6; - u8 val7; - u8 val8; - s8 field2:5; - s8 field3:2; - s8 field4:1; - */ - struct UnkStruct1 val4; + u8 var00_0:7; + u8 var00_7:1; + u8 var01; + s8 var02; + s8 var03; + struct UnkStruct1 var04; }; struct UnkStruct0 { - u8 val0; - u8 val1; - u16 val2; //flag for each UnkStruct3 - struct UnkStruct3 val3[0x10]; + u8 var00; + u8 var01; + u16 var02; //flag for each UnkStruct3 + struct UnkStruct3 var04[0x10]; }; +s16 sub_81174C4(s16, s16); +s16 sub_81174E0(s16); + +void PlayRoulette(void); + + + #endif diff --git a/include/roulette_util.h b/include/roulette_util.h index ed925b5bd..daeaeeeef 100644 --- a/include/roulette_util.h +++ b/include/roulette_util.h @@ -5,7 +5,6 @@ void sub_8124918(struct UnkStruct0 *); u8 sub_812492C(struct UnkStruct0 *, u8, struct UnkStruct1 *); -u8 unref_sub_81249B0(struct UnkStruct0 *, u8); void task_tutorial_controls_fadein(struct UnkStruct0 *); void sub_8124CE8(struct UnkStruct0 *, u16); void sub_8124D3C(struct UnkStruct0 *, u16); |