diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-03-30 13:11:51 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-30 13:11:51 -0500 |
commit | a2d206665c6fffbd962375f262b7fbb05c7b7478 (patch) | |
tree | 6710109c4d9098b74da68ca8f18024d6c184ebc2 /src/code_8041AD0.c | |
parent | 2fd4f339b42c010191c199772b09ac34c580de94 (diff) |
Move some data and Splitting (#32)
* move friend area settings to src
* split out playtime into different C file and decomp a few more funcs
* time -> play_time
* fix include
* split out more wonder mail stuff
* unify 203B2C0 and unkDungeon structs. snuck in a decomp func too
* split out more menu screens
* work some more on trade items
* doc a few more things
* add a close nonmatch and decomp nullsub and small func
* rollback struct attempt since it causes nonmatchings
* only one func left in asm
* death to trade_item asm and unify into one C file
* more docing and cleanup
* label main menu and trade items menu global menu struct
* doc itemMode
Diffstat (limited to 'src/code_8041AD0.c')
-rw-r--r-- | src/code_8041AD0.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/code_8041AD0.c b/src/code_8041AD0.c index 9358ddb..f90ca13 100644 --- a/src/code_8041AD0.c +++ b/src/code_8041AD0.c @@ -1,10 +1,5 @@ #include "global.h" - -struct unkDungeon_8041D5C -{ - u8 padding[0x70]; - u8 *unk70[100]; -}; +#include "code_8041D5C.h" struct unk_struct_8041F08 { @@ -295,13 +290,11 @@ void nullsub_81(void) void sub_8041D5C(struct unkDungeon_8041D5C *r0) { - u8 *temp; if(sub_8042768(r0) == 0) { return; } - temp = *r0->unk70; - sub_803ED30(temp[0x89 << 1] , r0, 1, 0xB); + sub_803ED30(r0->unk70->unk112 , r0, 1, 0xB); } void sub_8041D84(struct unkDungeon_8041D5C * r0) @@ -687,9 +680,7 @@ void sub_8042208(struct unkDungeon_8041D5C *r0, u8 r1) void sub_8042238(u32 r0, struct unkDungeon_8041D5C *r1) { - u8 *temp; - temp = *r1->unk70; - if(temp[6] != 0) + if(r1->unk70->unk6 != 0) sub_8083E38(0x157); else sub_8083E38(0xAB << 1); |