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_80118A4.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_80118A4.c')
| -rw-r--r-- | src/code_80118A4.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/code_80118A4.c b/src/code_80118A4.c index e8c4aad..a427dea 100644 --- a/src/code_80118A4.c +++ b/src/code_80118A4.c @@ -35,8 +35,8 @@ struct UnkBgStruct u8 padding2[0x17A]; u32 *unk4dcc; u32 unk4dd0; - s16 unk4dd4; - s16 unk4dd6; + s16 xoffset; + s16 yoffset; }; extern struct UnkBgStruct *gUnknown_203B0E4; @@ -68,8 +68,8 @@ void sub_801169C(void) { u8 return_var; - SetBG2RegOffsets(gUnknown_203B0E4->unk4dd4, gUnknown_203B0E4->unk4dd6); - SetBG3RegOffsets(gUnknown_203B0E4->unk4dd4, gUnknown_203B0E4->unk4dd6); + SetBG2RegOffsets(gUnknown_203B0E4->xoffset, gUnknown_203B0E4->yoffset); + SetBG3RegOffsets(gUnknown_203B0E4->xoffset, gUnknown_203B0E4->yoffset); sub_8010F28(); return_var = sub_80111C4(); sub_8004AF0(return_var, &(gUnknown_203B0E4->unk4c4c), 0xB0, 0x10, (gUnknown_203B0E4->unk4dcc), 0); @@ -109,12 +109,12 @@ void sub_801178C(void) void sub_80117AC(void) { if(sub_80023E4(0xD) == 0) - sub_800BFD0(0x1E); + FadeOutBGM(0x1E); } void sub_80117C4(void) { - sub_800BFD0(0x1E); + FadeOutBGM(0x1E); } // Some sound effect @@ -181,7 +181,7 @@ void sub_80118A4(void) void sub_80118C4(u16 r0) { - sub_800BFD0(r0); + FadeOutBGM(r0); sub_800C3F8(0x3e6, r0); sub_800C3F8(0x3e5, r0); } @@ -208,7 +208,7 @@ void sub_8011924() void sub_8011930(u16 speed) { - sub_800BFD0(speed); + FadeOutBGM(speed); } u32 IsEqualtoBGTrack(u16 songIndex) |