diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/code_800558C.c | 8 | ||||
-rw-r--r-- | src/code_80118A4.c | 92 | ||||
-rw-r--r-- | src/save_mid.c | 17 |
3 files changed, 113 insertions, 4 deletions
diff --git a/src/code_800558C.c b/src/code_800558C.c index 773e773..4cc90e9 100644 --- a/src/code_800558C.c +++ b/src/code_800558C.c @@ -3,12 +3,12 @@ extern u32 gUnknown_203B47C; +extern u8 gUnknown_2026E38; extern u32 gUnknown_2026E3C; -extern u32 gUnknown_2026E58; -extern u32 gUnknown_2026E54; -extern u32 gUnknown_2026E50; extern u16 gUnknown_2026E4E; -extern u8 gUnknown_2026E38; +extern u32 gUnknown_2026E50; +extern u32 gUnknown_2026E54; +extern u32 gUnknown_2026E58; extern void sub_800CC44(u32 r0, u32 r1); diff --git a/src/code_80118A4.c b/src/code_80118A4.c index 85782d7..c809bdb 100644 --- a/src/code_80118A4.c +++ b/src/code_80118A4.c @@ -3,6 +3,7 @@ void sub_8011924(void); void nullsub_26(void); +extern u8 sub_80023E4(u8); extern void sub_800BDFC(u16 r0); extern void sub_800BE8C(u16 r0, u16 r1); extern void sub_800BF48(u16 r0); @@ -13,7 +14,9 @@ extern void sub_801199C(u16 r0); extern u16 sub_800C068(); extern void sub_800C074(u16 r0, u16 r1); extern void sub_800C298(u16 r0); +extern void sub_800C93C(); extern u8 sub_800C5D0(u16 r0); +extern void sub_800C9CC(); extern void nullsub_27(void); extern void nullsub_29(void); @@ -31,9 +34,98 @@ struct UnkStructType extern u16 gUnknown_80D4144[]; extern struct UnkStructType gUnknown_202DE20; extern struct UnkStructType gUnknown_202DE22; +extern struct UnkStructType gUnknown_202DE24; extern u32 gUnknown_202DE1C; extern u32 gUnknown_203B14C; +void sub_8011760(void) +{ + if(sub_80023E4(0xD) != 0) + { + sub_800BDFC(0x13); + return; + } + if(sub_80023E4(0xC) != 0) + { + sub_800BDFC(0x7); + } +} + +void sub_801178C(void) +{ + if(sub_80023E4(0xD) != 0) + { + sub_800BDFC(0x13); + return; + } + sub_800BDFC(0x7); +} + +void sub_80117AC(void) +{ + if(sub_80023E4(0xD) == 0) + { + sub_800BFD0(0x1E); + } +} + +void sub_80117C4(void) +{ + sub_800BFD0(0x1E); +} + +void sub_80117D0(void) +{ + sub_800C074(0x97 << 1, 0x80 << 1); +} + +void sub_80117E4(void) +{ + sub_800C074(0x12f, 0x80 << 1); +} + +void sub_80117F8(void) +{ + sub_800C074(0x12d, 0x80 << 1); +} + +void sub_801180C(void) +{ + gUnknown_202DE1C = 0; + gUnknown_202DE20.unk0 = 0; + gUnknown_202DE22.unk0 = 0; + gUnknown_202DE24.unk0 = 0; +} + +void sub_8011830(void) +{ + sub_800C93C(); + gUnknown_202DE20.unk0 = 0; + gUnknown_202DE22.unk0 = 0; + gUnknown_202DE24.unk0 = 0; +} + +void sub_8011854(void) +{ + sub_800C9CC(); +} + +void sub_8011860(void) +{ + if(gUnknown_202DE20.unk0 > 0) + { + gUnknown_202DE20.unk0--; + } + if(gUnknown_202DE22.unk0 > 0) + { + gUnknown_202DE22.unk0--; + } + if(gUnknown_202DE24.unk0 > 0) + { + gUnknown_202DE24.unk0--; + } +} + void sub_80118A4(void) { sub_8011924(); diff --git a/src/save_mid.c b/src/save_mid.c index 67ad932..d401ec3 100644 --- a/src/save_mid.c +++ b/src/save_mid.c @@ -4,6 +4,14 @@ extern struct UnkStruct_203B184 *gUnknown_203B184; extern struct unkTimeStruct *gUnknown_203B47C; +struct unk_203B188 +{ + u32 unk0; + u32 unk4; +}; + +extern struct unk_203B188 *gUnknown_203B188; + extern u32 gUnknown_203B460; extern u32 gUnknown_203B45C; extern u32 gUnknown_203B480; @@ -50,6 +58,8 @@ extern void sub_8012240(); extern void sub_8094FA8(struct unkTimeStruct *Time); // defined in src/code_8094F88.c extern struct unkTimeStruct *sub_8094FA0(void); +extern void* MemoryAlloc(u32 a, u32 b); + void sub_80122D0(); void sub_80122F4(); void sub_8012300(); @@ -156,3 +166,10 @@ void sub_8012334(struct UnkStruct_203B184 *r0) gUnknown_203B47C = sub_8094FA0(); } + +void sub_8012468(void) +{ + gUnknown_203B188 = MemoryAlloc(sizeof(struct unk_203B188), 5); + gUnknown_203B188->unk0 = 1; + +} |