From f402e46cd3c8b7236673d6edbae77903a7cc0618 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 15 May 2021 16:59:55 -0700 Subject: Sese's April/May Dump (#37) * splitting lots of pokemon square and labeling lots of other things * actually commit this stuff * more moving data and things * more screen work * split out some pokemon dungeon data * lots of data work * push more data work * split kecleon, decomp another kanghaskhan func, and try to doc UpdateBGControl more * lots of item work * label more item things * subtype -> category and doc types/category --- src/code_8041AD0.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/code_8041AD0.c') diff --git a/src/code_8041AD0.c b/src/code_8041AD0.c index 6c9c55c..738b881 100644 --- a/src/code_8041AD0.c +++ b/src/code_8041AD0.c @@ -18,7 +18,7 @@ extern u8 sub_8042768(struct unkDungeon_8041D5C *r0); extern void sub_806CDD4(struct unkDungeon_8041D5C *r0, u8, u32); extern u8 sub_8071858(struct unkDungeon_8041D5C *r0, u8); extern u32 sub_806F62C(u32); -extern void sub_8083E38(u32); +extern void PlaySoundEffect(u32); extern u8 sub_803F428(struct unkDungeon_8041D5C *r0); extern void sub_8041550(struct unkDungeon_8041D5C *r0, u32, u32, u32, u32, u32); @@ -650,32 +650,32 @@ void sub_80421AC(u32 r0, struct unkDungeon_8041D5C * r1) void sub_80421C0(struct unkDungeon_8041D5C *r0, u16 r1) { if(r0 == NULL) - sub_8083E38(r1); + PlaySoundEffect(r1); else if(sub_8042768(r0) != 0) - sub_8083E38(r1); + PlaySoundEffect(r1); } void sub_80421EC(struct unkDungeon_8041D5C *r0, u16 r1) { if(sub_803F428(r0) != 0) - sub_8083E38(r1); + PlaySoundEffect(r1); } void sub_8042208(struct unkDungeon_8041D5C *r0, u8 r1) { if(r1 == 0) - sub_8083E38(0xA9 << 1); + PlaySoundEffect(0x152); else if(r1 == 1) - sub_8083E38(0x151); + PlaySoundEffect(0x151); else - sub_8083E38(0xA8 << 1); + PlaySoundEffect(0x150); } void sub_8042238(u32 r0, struct unkDungeon_8041D5C *r1) { if(r1->unk70->unk6 != 0) - sub_8083E38(0x157); + PlaySoundEffect(0x157); else - sub_8083E38(0xAB << 1); + PlaySoundEffect(0x156); } -- cgit v1.2.3