diff options
Diffstat (limited to 'src/code_8048480.c')
-rw-r--r-- | src/code_8048480.c | 131 |
1 files changed, 114 insertions, 17 deletions
diff --git a/src/code_8048480.c b/src/code_8048480.c index 8ede564..4d403e1 100644 --- a/src/code_8048480.c +++ b/src/code_8048480.c @@ -9,43 +9,140 @@ struct unkDungeon_8041D5C extern u32 gUnknown_80F89F4; extern u32 gUnknown_202DF98; extern u32 gUnknown_80FB580; +extern s16 gUnknown_80F4FB6; +extern s16 gUnknown_80F4FB8; +extern s16 gUnknown_80F4FBA; +extern s16 gUnknown_80F4FBC; +extern s16 gUnknown_80F4FBE; -extern void sub_807D148(u32 r0, u32 r1, u32 r2, u32 r3); -extern void sub_8075FCC(void); -extern void sub_8077AE4(u32 r0, u32 r1, u32 r2); -extern void sub_8072008(u32 r0, u32 r1, u32 r2, u8 r3); -extern void sub_8076D10(void); -extern void sub_807232C(u32 r0, u32 r1, u32 r2); +extern void sub_807D148(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2, u32 r3); +extern void sub_8075FCC(u32 r0, struct unkDungeon_8041D5C *r1); +extern void sub_8077AE4(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2); +extern void sub_8072008(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2, u8 r3); +extern void sub_8076D10(u32 r0, struct unkDungeon_8041D5C *r1); +extern void sub_807232C(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2); extern void sub_8045B94(u32 *r0, struct unkDungeon_8041D5C *r1, u32); -extern void sub_807A290(u32); +extern void sub_807A290(u32, struct unkDungeon_8041D5C *r1); extern void sub_80522F4(u32 r0, struct unkDungeon_8041D5C *r1, u32); +extern void sub_8079270(u32 r0, struct unkDungeon_8041D5C *r1); +extern void sub_8077910(u32, struct unkDungeon_8041D5C *r1, u32, u32); +extern void sub_80791D8(u32, struct unkDungeon_8041D5C *r1); +extern void sub_8079140(u32, struct unkDungeon_8041D5C *r1); +extern void sub_8077C44(u32, struct unkDungeon_8041D5C *r1, s16, s16, u32); +extern void sub_80792F8(u32, struct unkDungeon_8041D5C *r1, u32); +extern void sub_8079F20(u32, struct unkDungeon_8041D5C *r1, u32, u8); +extern void sub_806F370(u32, struct unkDungeon_8041D5C *r1, u32, u32); -void sub_8048480(u32 r0, u32 r1) +void sub_8048340(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2) +{ + u32 temp[6]; + + temp[0] = 0; + temp[1] = 0; + temp[2] = 528; + temp[3] = 0; + temp[4] = 0; + temp[5] = 0; + sub_806F370(r0, r1, r2, 1); +} + +void sub_8048364(u32 r0, struct unkDungeon_8041D5C *r1, u8 r2) +{ + sub_8079F20(r0, r1, 1, r2); +} + +void sub_8048374(u32 r0, struct unkDungeon_8041D5C *r1) +{ + sub_8077C44(r0, r1, gUnknown_80F4FB6, gUnknown_80F4FB8, 1); +} + + +void sub_804839C(u32 r0, struct unkDungeon_8041D5C *r1) +{ + sub_8077C44(r0, r1, gUnknown_80F4FBA, gUnknown_80F4FBC, 1); +} + + +void sub_80483C4(u32 r0, struct unkDungeon_8041D5C *r1) +{ + sub_80792F8(r0, r1, 999); +} + +void sub_80483D4(u32 r0, struct unkDungeon_8041D5C *r1) +{ + sub_8077C44(r0, r1, 0, gUnknown_80F4FBE, 1); +} + +void sub_80483F4(u32 r0, struct unkDungeon_8041D5C *r1) +{ + sub_8079140(r0, r1); +} + +void sub_8048400(u32 r0, struct unkDungeon_8041D5C *r1) +{ + sub_80791D8(r0, r1); +} + +void sub_804840C(u32 r0, struct unkDungeon_8041D5C *r1) +{ + sub_8077910(r0, r1, 0, 1); +} + +void sub_804841C(u32 r0, struct unkDungeon_8041D5C *r1) +{ + sub_8079270(r0, r1); +} + +void sub_8048428(u32 r0, struct unkDungeon_8041D5C *r1) +{ + u8 *temp; + temp = r1->unk70[0]; + if(temp[0xAC] == 4) + { + sub_807A290(r0, r1); + return; + } + sub_80522F4(r0, r1, gUnknown_80F89F4); +} + +void sub_8048450(u32 r0, struct unkDungeon_8041D5C *r1) +{ + u8 *temp; + temp = r1->unk70[0]; + if((u8)(temp[0xAC] - 2) <= 1) + { + sub_807A290(r0, r1); + return; + } + sub_80522F4(r0, r1, gUnknown_80F89F4); +} + +void sub_8048480(u32 r0, struct unkDungeon_8041D5C *r1) { sub_807D148(r0, r1, 0, 0); } -void sub_8048490(void) +void sub_8048490(u32 r0, struct unkDungeon_8041D5C *r1) { - sub_8075FCC(); + sub_8075FCC(r0, r1); } -void sub_804849C(u32 r0, u32 r1) +void sub_804849C(u32 r0, struct unkDungeon_8041D5C *r1) { sub_8077AE4(r0, r1, 1); } -void sub_80484A8(u32 r0, u32 r1) -{ +void sub_80484A8(u32 r0, struct unkDungeon_8041D5C *r1) +{ volatile u32 temp; temp = 1; sub_8072008(r0, r1, 1, 1); } -void sub_80484BC(void) +void sub_80484BC(u32 r0, struct unkDungeon_8041D5C *r1) { - sub_8076D10(); + sub_8076D10(r0, r1); } void sub_80484C8(u32 r0, struct unkDungeon_8041D5C *r1) @@ -53,7 +150,7 @@ void sub_80484C8(u32 r0, struct unkDungeon_8041D5C *r1) sub_80522F4(r0, r1, gUnknown_80F89F4); } -void sub_80484DC(u32 r0, u32 r1) +void sub_80484DC(u32 r0, struct unkDungeon_8041D5C *r1) { sub_807232C(r0, r1, 1); } @@ -64,7 +161,7 @@ void sub_80484E8(u32 r0, struct unkDungeon_8041D5C *r1) temp = r1->unk70[0]; if(temp[0xAC] == 1) { - sub_807A290(r0); + sub_807A290(r0, r1); return; } sub_8045B94(&gUnknown_202DF98, r1, 0); |