diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-03-12 15:39:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-12 15:39:07 -0600 |
| commit | 7b142311a7294c4c7a943870fa5f24f0fbea604a (patch) | |
| tree | a1a9513c2f997cc8274af093803dd7d936e65ad0 /src/code_80118A4.c | |
| parent | d72e17b5f5d795bebda2f6dc78dccb5e80c432b5 (diff) | |
Miscellaneous Work (Again) (#30)
* work on debug menu and document that and main menu
* split, decomp, label more funcs
* split exclusive pokemon data out into C
* macro-ize exlusive pokemon data
* decomp 2 more funcs
* decomp a few more
* finally match PromptNewQuestion
* woot 7% aka more debug menu stuff
Diffstat (limited to 'src/code_80118A4.c')
| -rw-r--r-- | src/code_80118A4.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/code_80118A4.c b/src/code_80118A4.c index ef11fd4..e8c4aad 100644 --- a/src/code_80118A4.c +++ b/src/code_80118A4.c @@ -12,12 +12,8 @@ void sub_8011924(void); extern u8 sub_80023E4(u8); -extern void sub_800BF48(u16 r0); -extern void sub_800BF80(void); -extern void sub_800BFD0(u16 r0); extern void sub_800C3F8(u16 r0, u16 r1); extern void sub_801199C(u16 r0); -extern void sub_800C074(u16 r0, u16 r1); extern void sub_800C298(u16 r0); extern u8 sub_800C5D0(u16 r0); @@ -121,9 +117,10 @@ void sub_80117C4(void) sub_800BFD0(0x1E); } +// Some sound effect void sub_80117D0(void) { - sub_800C074(0x97 << 1, 256); + sub_800C074(302, 256); } // Some sound effect @@ -199,9 +196,9 @@ void xxx_call_fade_in_new_bgm(u16 songIndex, u16 speed) FadeInNewBGM(songIndex, speed); } -void sub_8011914(u16 r0) +void sub_8011914(u16 songIndex) { - sub_800BF48(r0); + sub_800BF48(songIndex); } void sub_8011924() @@ -209,9 +206,9 @@ void sub_8011924() sub_800BF80(); } -void sub_8011930(u16 r0) +void sub_8011930(u16 speed) { - sub_800BFD0(r0); + sub_800BFD0(speed); } u32 IsEqualtoBGTrack(u16 songIndex) @@ -232,7 +229,7 @@ void sub_8011974(u16 songIndex, u16 r1) void sub_8011988(u16 songIndex) { - sub_800C074(songIndex, 0x80 << 1); + sub_800C074(songIndex, 256); } void sub_801199C(u16 songIndex) @@ -250,11 +247,11 @@ u8 sub_80119C0(u16 songIndex) return sub_800C5D0(songIndex); } -void sub_80119D4(u32 r0) +void PlayMenuSoundEffect(u32 r0) { if(gUnknown_202DE20 > 0) return; - sub_800C074(gUnknown_80D4144[r0], 0x80 << 1); + sub_800C074(gUnknown_80D4144[r0], 256); gUnknown_202DE20 = 4; } @@ -263,7 +260,7 @@ void sub_8011A04(void) if(gUnknown_202DE22 > 0) return; gUnknown_202DE22 = 3; - sub_800C074(0x131, 0x80 << 1); + sub_800C074(0x131, 256); } void sub_8011A2C(u32 r0) |