diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-03-23 12:11:10 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-23 12:11:10 -0500 |
commit | 2fd4f339b42c010191c199772b09ac34c580de94 (patch) | |
tree | e562899f35861ece70c292602fe6aac2f50906bf /src/code_8040094.c | |
parent | 7b142311a7294c4c7a943870fa5f24f0fbea604a (diff) |
Miscellaneous Work (Again) (#31)
* move some personality data from asm to C
* combine personality_test files and add my close attempt at RedrawPartnerSelectionMenu
* decomp some more wonder mail funcs and label some more data
* lots of data splitting and move some to src
* split out more dungeon data
* continue splitting out more dungeon data
* doc rescue team rank/pts funcs/data and exclusive pokemon ewram
* doc more sound things and decomp a func
* decomp LoadTeamRankBadge and label some data members
* split out rescue team and text util stuff
* forgot a constant
* match a few funcs and clean up a few
* cleaned up sub_80A28B4
Diffstat (limited to 'src/code_8040094.c')
-rw-r--r-- | src/code_8040094.c | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/src/code_8040094.c b/src/code_8040094.c index a62671f..691f2df 100644 --- a/src/code_8040094.c +++ b/src/code_8040094.c @@ -4,11 +4,12 @@ struct unkStruct_203B418 { - u8 padding[0x181FB]; + u8 fill0[0x181FC]; u32 unk181FC; u32 unk18200; u32 unk18204; - u32 unk18208; + u8 unk18208[3]; + u8 unk1820B; u32 unk1820C; u32 unk18210; u8 padding2[3]; @@ -31,6 +32,47 @@ extern void xxx_call_update_bg_sound_input(void); extern void sub_8083F58(void); extern void sub_8011860(void); +extern void sub_803F580(u32); +extern void sub_8049ED4(); +extern void sub_8040A84(); +extern void sub_80522A8(u32, const char *); + +extern const char *gUnknown_80FD040; // It became brighter on the floor + +struct unk8049590 +{ + u32 unk0; + u16 unk4; +}; + +extern struct unk8049590 *sub_8049590(u32, u32); + +// Luminous Orb??? +void sub_804002C(u32 param_1) +{ + struct unk8049590 *iVar1; + int innerCounter; + int iVar3; + int iVar4; + + gUnknown_203B418->unk1820B = 1; + iVar3 = 0; + do { + innerCounter = 0; + iVar4 = iVar3 + 1; + do { + iVar1 = sub_8049590(innerCounter, iVar3); + iVar1->unk4 = iVar1->unk4 | 1; + innerCounter++; + } while (innerCounter < 0x38); + iVar3 = iVar4; + } while (iVar4 < 0x20); + sub_803F580(0); + sub_8049ED4(); + sub_8040A84(); + sub_80522A8(param_1, gUnknown_80FD040); +} + void sub_8040094(u8 r0) { gUnknown_203B418->unk18217 = r0; |