diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-11 15:39:43 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-11 15:39:43 -0500 |
| commit | b6f9e2178088f31d8cfea38a97b01c988f36ebe5 (patch) | |
| tree | 41ce7bf8eeeb0dc73c34a5cc93419ab1ec98c3fd /include | |
| parent | 9974fd77611d0321ebe51750427e1ec273c1c7af (diff) | |
| parent | ca8275a362d8f00c681ca3b0ace7ef472560de2a (diff) | |
merge
Diffstat (limited to 'include')
| -rwxr-xr-x | include/ewram.h | 1 | ||||
| -rw-r--r-- | include/field_weather.h | 7 | ||||
| -rw-r--r-- | include/songs.h | 20 |
3 files changed, 15 insertions, 13 deletions
diff --git a/include/ewram.h b/include/ewram.h index ed7ceea16..b02799f1e 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -25,6 +25,7 @@ extern u8 gSharedMem[]; #define eVoidSharedArr2 (u32)(ewram_addr) // ew(ram) #define ewram0_8 ((struct UnkStruct2000000 *)(gSharedMem + 0x0)) #define ewram0_9(i) (u8 *)(ewram_addr + (i * 0x20)) +#define ewram0_10 (*(struct Struct2000000_2 *)(gSharedMem + 0x0)) #define ewram4 (*(struct UnknownStruct8 *)(gSharedMem + 0x4)) #define ewram520 ((struct UnknownStruct7 *)(gSharedMem + 0x00520)) #define ewram520_2 (u8 *)(ewram_addr + 0x520) diff --git a/include/field_weather.h b/include/field_weather.h index 409f76028..b711f91d6 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -20,8 +20,9 @@ void nullsub_39(void); // ASM void sub_807CEBC(u8, u8, s8); -void sub_807D1BC(u8, u8, u8, u8, u16); -void sub_807D304(int, u8, u16); +//void sub_807D1BC(u8, u8, u8, u8, u16); +void sub_807D1BC(u8 a, u8 a2, s8 c, u8 d, u16 e); +void sub_807D304(s8 a, u8 arg2, u16 c); void sub_807D424(u8, u16); // ... void fade_screen(u8, u8); @@ -42,7 +43,7 @@ void sub_80806E4(void); void DoCurrentWeather(void); void sub_8080750(); -u8 sub_807D770(void); +bool8 sub_807D770(void); bool8 sub_807DDFC(void); void SetWeather(u32); void UpdateWeatherPerDay(u16); diff --git a/include/songs.h b/include/songs.h index afd26d683..d22d311ab 100644 --- a/include/songs.h +++ b/include/songs.h @@ -83,16 +83,16 @@ enum SE_TOY_KABE, SE_TOY_DANGO, SE_DOKU, - SE_ESUKA, - SE_T_AME, - SE_T_AME_E, - SE_T_OOAME, - SE_T_OOAME_E, - SE_T_KOAME, - SE_T_KOAME_E, - SE_T_KAMI, - SE_T_KAMI2, - SE_ELEBETA, + /*0x50*/ SE_ESUKA, + /*0x51*/ SE_T_AME, + /*0x52*/ SE_T_AME_E, + /*0x53*/ SE_T_OOAME, + /*0x54*/ SE_T_OOAME_E, + /*0x55*/ SE_T_KOAME, + /*0x56*/ SE_T_KOAME_E, + /*0x57*/ SE_T_KAMI, + /*0x58*/ SE_T_KAMI2, + /*0x59*/ SE_ELEBETA, /*0x5A*/ SE_HINSI, /*0x5B*/ SE_EXPMAX, /*0x5C*/ SE_TAMAKORO, |