From aa2559d403a6bb4ea7978018709cfaede25552c1 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sat, 7 Jan 2017 20:08:40 +0100 Subject: First matching daycare_count_pokemon --- src/daycare.c | 72 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/daycare.c b/src/daycare.c index 1729efb2a..2d4782ea1 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -2,30 +2,66 @@ #include "pokemon.h" #include "string_util.h" -u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest) -{ - s8 nickname[POKEMON_NAME_LENGTH * 2]; +u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest){ + s8 nickname[POKEMON_NAME_LENGTH * 2]; - GetMonData(mon, MON_DATA_NICKNAME, nickname); - return StringCopy10(dest, nickname); + GetMonData(mon, MON_DATA_NICKNAME, nickname); + return StringCopy10(dest, nickname); } -u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest) -{ - s8 nickname[POKEMON_NAME_LENGTH * 2]; +u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest){ + s8 nickname[POKEMON_NAME_LENGTH * 2]; - GetBoxMonData(mon, MON_DATA_NICKNAME, nickname); - return StringCopy10(dest, nickname); + GetBoxMonData(mon, MON_DATA_NICKNAME, nickname); + return StringCopy10(dest, nickname); } -u8 daycare_count_pokemon(struct BoxPokemon *daycare_data) -{ - u8 i, count; - count = 0; +u8 daycare_count_pokemon(void *mon){ + u32 loop_counter; + u32 r5; - for (i = 0; i <= 1; i++) - if (GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) - count++; + r5 = 0; + loop_counter = 0; - return count; + while(loop_counter <= 1){ + if(GetBoxMonData(mon + loop_counter * 80, MON_DATA_SPECIES) != 0){ + r5 = ((r5 + 1) << 24) >> 24; + } + + loop_counter = ((loop_counter + 1) << 24) >> 24; + } + + return r5; } + +/*__attribute__((naked)) +void daycare_count_pokemon(){ + asm(".syntax unified\n\ + push {r4-r6,lr} + adds r6, r0, 0 + movs r5, 0 + movs r4, 0 +_080412F8: + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 4 + adds r0, r6, r0 + movs r1, 0xB + bl GetBoxMonData + cmp r0, 0 + beq _08041310 + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 +_08041310: + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x1 + bls _080412F8 + adds r0, r5, 0 + pop {r4-r6} + pop {r1} + bx r1 + .syntax divided\n"); +}*/ -- cgit v1.2.3 From 135bbb721e0b7e34ad19d818e097add64693ab15 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sat, 7 Jan 2017 20:38:50 +0100 Subject: Update the code style and tidy up daycare_count_pokemon --- src/daycare.c | 58 ++++++++++++---------------------------------------------- 1 file changed, 12 insertions(+), 46 deletions(-) (limited to 'src') diff --git a/src/daycare.c b/src/daycare.c index 2d4782ea1..23f0305d8 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -2,66 +2,32 @@ #include "pokemon.h" #include "string_util.h" -u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest){ +u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest) +{ s8 nickname[POKEMON_NAME_LENGTH * 2]; GetMonData(mon, MON_DATA_NICKNAME, nickname); return StringCopy10(dest, nickname); } -u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest){ +u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest) +{ s8 nickname[POKEMON_NAME_LENGTH * 2]; GetBoxMonData(mon, MON_DATA_NICKNAME, nickname); return StringCopy10(dest, nickname); } -u8 daycare_count_pokemon(void *mon){ - u32 loop_counter; - u32 r5; +u8 daycare_count_pokemon(struct BoxPokemon *daycare_data) +{ + u8 i, count; + count = 0; - r5 = 0; - loop_counter = 0; - - while(loop_counter <= 1){ - if(GetBoxMonData(mon + loop_counter * 80, MON_DATA_SPECIES) != 0){ - r5 = ((r5 + 1) << 24) >> 24; + for(i = 0;i <= 1;i++) { + if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) { + count++; } - - loop_counter = ((loop_counter + 1) << 24) >> 24; } - return r5; + return count; } - -/*__attribute__((naked)) -void daycare_count_pokemon(){ - asm(".syntax unified\n\ - push {r4-r6,lr} - adds r6, r0, 0 - movs r5, 0 - movs r4, 0 -_080412F8: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 4 - adds r0, r6, r0 - movs r1, 0xB - bl GetBoxMonData - cmp r0, 0 - beq _08041310 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_08041310: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1 - bls _080412F8 - adds r0, r5, 0 - pop {r4-r6} - pop {r1} - bx r1 - .syntax divided\n"); -}*/ -- cgit v1.2.3 From 4a9cb7aa4de9571f79c46e0df1733b26849c0904 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sat, 7 Jan 2017 23:08:51 +0100 Subject: Decompile daycare_empty_slot and unify the function prototype of daycare_count_pokemon. Presumably identify the daycare data in the save structure --- src/daycare.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) (limited to 'src') diff --git a/src/daycare.c b/src/daycare.c index 23f0305d8..864d86aa8 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1,6 +1,7 @@ #include "global.h" #include "pokemon.h" #include "string_util.h" +#include "asm.h" u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest) { @@ -31,3 +32,77 @@ u8 daycare_count_pokemon(struct BoxPokemon *daycare_data) return count; } + +__attribute__((naked)) +void sub_8041324(struct BoxPokemon * box_pokemon, void * void_pointer){ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + mov r9, r0\n\ + mov r10, r1\n\ + movs r7, 0\n\ + movs r5, 0\n\ + mov r6, r10\n\ + adds r6, 0x74\n\ + movs r0, 0x1\n\ + mov r8, r0\n\ +_0804133E:\n\ + lsls r0, r5, 2\n\ + adds r0, r5\n\ + lsls r0, 4\n\ + mov r1, r9\n\ + adds r4, r1, r0\n\ + adds r0, r4, 0\n\ + movs r1, 0xB\n\ + bl GetBoxMonData\n\ + cmp r0, 0\n\ + beq _0804136E\n\ + adds r0, r7, 0x1\n\ + lsls r0, 24\n\ + lsrs r7, r0, 24\n\ + adds r0, r4, 0\n\ + movs r1, 0xC\n\ + bl GetBoxMonData\n\ + adds r1, r0, 0\n\ + cmp r1, 0\n\ + bne _0804136E\n\ + lsls r0, r5, 1\n\ + adds r0, r6, r0\n\ + b _08041374\n\ +_0804136E:\n\ + lsls r0, r5, 1\n\ + adds r0, r6, r0\n\ + mov r1, r8\n\ +_08041374:\n\ + strh r1, [r0]\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + cmp r5, 0x1\n\ + bls _0804133E\n\ + mov r0, r10\n\ + str r7, [r0, 0x70]\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} + +s8 daycare_empty_slot(struct BoxPokemon * daycare_data){ + u8 i; + + for(i = 0;i <= 1;i++){ + if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0){ + return i; + } + } + + return -1; +} -- cgit v1.2.3 From 8252c797673ed04e64afafc59ebbc6a75f4764b9 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sat, 21 Jan 2017 16:40:54 +0100 Subject: Non-matching sub_804151C --- src/daycare.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 222 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/daycare.c b/src/daycare.c index 864d86aa8..9bc51a025 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -3,6 +3,8 @@ #include "string_util.h" #include "asm.h" +extern u8 gUnknown_03005CE0; + u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest) { s8 nickname[POKEMON_NAME_LENGTH * 2]; @@ -25,16 +27,17 @@ u8 daycare_count_pokemon(struct BoxPokemon *daycare_data) count = 0; for(i = 0;i <= 1;i++) { - if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) { - count++; - } + if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) { + count++; + } } return count; } __attribute__((naked)) -void sub_8041324(struct BoxPokemon * box_pokemon, void * void_pointer){ +void sub_8041324(struct BoxPokemon * box_pokemon, void * void_pointer) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r10\n\ @@ -95,14 +98,225 @@ _08041374:\n\ .syntax divided\n"); } -s8 daycare_empty_slot(struct BoxPokemon * daycare_data){ +s8 daycare_empty_slot(struct BoxPokemon * daycare_data) +{ u8 i; for(i = 0;i <= 1;i++){ - if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0){ - return i; - } + if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0){ + return i; + } } return -1; } + +/*void sub_80413C8(struct Pokemon * mon, struct BoxPokemon * daycare_data){ // unfinished + s8 empty_slot; + + empty_slot = daycare_empty_slot(daycare_data); + if(sub_80A2B94(mon) != 0){ // if the mon holds a mail? + u8 empty_slot_times_56 = empty_slot * 56; + u8 * something2 = ((u8 *) (daycare_data + 2)) + empty_slot_times_56 + 36; + StringCopy(something2, gSaveBlock2); + PadNameString(something2, 0xFC); + something2 += 8; + pokemon_get_nick(mon, something2); + u8 pokerus = GetMonData(mon, MON_DATA_64); + something1 += (u8 * daycare_data) +}*/ + +__attribute__((naked)) +void sub_80413C8() +{ + // strange stack usage - happens because THUMB ARM only allows R0-R7 to be pushed/popped: + // all registers in reglist must be Lo registers, except that PUSH can include the LR, and POP can include the PC + // the ldm/stm section probably copies some struct, but I'm not sure how the code would look + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + adds r7, r0, 0\n\ + mov r8, r1\n\ + mov r0, r8\n\ + bl daycare_empty_slot\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + mov r9, r4\n\ + adds r0, r7, 0\n\ + bl sub_80A2B94\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _0804144A\n\ + lsls r0, r4, 24\n\ + asrs r0, 24\n\ + lsls r4, r0, 3\n\ + subs r4, r0\n\ + lsls r4, 3\n\ + adds r5, r4, 0\n\ + adds r5, 0xA0\n\ + add r5, r8\n\ + adds r6, r5, 0\n\ + adds r6, 0x24\n\ + ldr r1, _08041490 @ =gSaveBlock2\n\ + adds r0, r6, 0\n\ + bl StringCopy\n\ + adds r0, r6, 0\n\ + movs r1, 0xFC\n\ + bl PadNameString\n\ + adds r6, 0x8\n\ + adds r0, r7, 0\n\ + adds r1, r6, 0\n\ + bl pokemon_get_nick\n\ + adds r0, r7, 0\n\ + movs r1, 0x40\n\ + bl GetMonData\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + add r4, r8\n\ + ldr r2, _08041494 @ =gSaveBlock1\n\ + lsls r1, r0, 3\n\ + adds r1, r0\n\ + lsls r1, 2\n\ + adds r1, r2\n\ + adds r4, 0xA0\n\ + ldr r0, _08041498 @ =0x00002b4c\n\ + adds r1, r0\n\ + ldm r1!, {r0,r2,r3}\n\ + stm r4!, {r0,r2,r3}\n\ + ldm r1!, {r0,r2,r3}\n\ + stm r4!, {r0,r2,r3}\n\ + ldm r1!, {r0,r2,r3}\n\ + stm r4!, {r0,r2,r3}\n\ + adds r0, r7, 0\n\ + bl sub_80A2DF8\n\ +_0804144A:\n\ + mov r2, r9\n\ + lsls r4, r2, 24\n\ + asrs r4, 24\n\ + lsls r5, r4, 2\n\ + adds r4, r5, r4\n\ + lsls r4, 4\n\ + add r4, r8\n\ + adds r0, r4, 0\n\ + adds r1, r7, 0\n\ + movs r2, 0x50\n\ + bl memcpy\n\ + adds r0, r4, 0\n\ + bl pokemon_restore_pp\n\ + movs r0, 0x88\n\ + lsls r0, 1\n\ + add r0, r8\n\ + adds r0, r5\n\ + movs r1, 0\n\ + str r1, [r0]\n\ + adds r0, r7, 0\n\ + bl ZeroMonData\n\ + bl party_compaction\n\ + bl CalculatePlayerPartyCount\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_08041490: .4byte gSaveBlock2\n\ +_08041494: .4byte gSaveBlock1\n\ +_08041498: .4byte 0x00002b4c\n\ + .syntax divided\n"); +} + +void daycare_send() +{ + sub_80413C8(gPlayerParty + gUnknown_03005CE0, gSaveBlock1.filler_2F9C); +} + +void sub_80417F4(u8 *); + +void sub_80414C0(struct BoxPokemon * daycare_data) +{ + u32 second_species; + if((GetBoxMonData(daycare_data + 1, MON_DATA_SPECIES) != 0) && ((second_species = GetBoxMonData(daycare_data, MON_DATA_SPECIES)) == 0)){ + memcpy(daycare_data, daycare_data + 1, 80); + ZeroBoxMonData(daycare_data + 1); + memcpy(daycare_data + 2, (u8 *) (daycare_data + 1) + 0x88, 0x38); + *((u32 *)(daycare_data) + 68) = *((u32 *)(daycare_data) + 69); + *((u32 *)(daycare_data) + 69) = second_species; + sub_80417F4((u8 *) (daycare_data + 1) + 0x88); + } +} + +u8 TryIncrementMonLevel(struct Pokemon *); +extern u16 word_2024E82; + +void sub_804151C(struct Pokemon * mon) +{ + u32 i; + u8 r6; + u16 temp; + u16 minus1; + i = 0; + minus1 = 0xffff; + + while(i <= 100){ + if(TryIncrementMonLevel(mon) == 0) goto end; + r6 = 1; + i++; + while((temp = sub_803B7C8(mon, r6)) != 0){ + r6 = 0; + if(temp == minus1){ + DeleteFirstMoveAndGiveMoveToMon(mon, word_2024E82); + } + } + } + end: + + CalculateMonStats(mon); +} + +#ifdef NEVERDEFINED +sub_804151C: @ 804151C + push {r4-r7,lr} + adds r4, r0, 0 + movs r5, 0 + ldr r7, _08041538 @ =0x0000ffff +_08041524: <-----------------------------------+ + adds r0, r4, 0 | + bl TryIncrementMonLevel | + lsls r0, 24 | + cmp r0, 0 | + beq _08041560 break ----------------+ | + movs r6, 0x1 | | + adds r5, 0x1 | | + b _0804154C --------+ | | + .align 2, 0 | | | +_08041538: .4byte 0x0000ffff | | | +_0804153C: <-----------------------+---+---+ | + movs r6, 0 | | | | + cmp r0, r7 | | | | + bne _0804154C --------------------------->| | | | + ldr r0, _0804156C @ =word_2024E82 | | | | + ldrh r1, [r0] | | | | + adds r0, r4, 0 | | | | + bl DeleteFirstMoveAndGiveMoveToMon | | | | +_0804154C: <-------+ | | | + adds r0, r4, 0 | | | + adds r1, r6, 0 | | | + bl sub_803B7C8 | | | + lsls r0, 16 | | | + lsrs r0, 16 | | | + cmp r0, 0 | | | + bne _0804153C --------------------------------+---+ | + cmp r5, 0x63 | | + ble _08041524 --------------------------------+-------+ +_08041560: <-----------+ + adds r0, r4, 0 + bl CalculateMonStats + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_0804156C: .4byte word_2024E82 +#endif -- cgit v1.2.3 From 8e8e4334ce637e98bcc8348be3d73c19a747ec70 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sat, 11 Feb 2017 08:26:13 +0100 Subject: Matching sub_804151C --- src/daycare.c | 73 +++++++++++------------------------------------------------ 1 file changed, 13 insertions(+), 60 deletions(-) (limited to 'src') diff --git a/src/daycare.c b/src/daycare.c index 9bc51a025..e1ce7fb77 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -27,9 +27,9 @@ u8 daycare_count_pokemon(struct BoxPokemon *daycare_data) count = 0; for(i = 0;i <= 1;i++) { - if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) { - count++; - } + if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) { + count++; + } } return count; @@ -103,9 +103,9 @@ s8 daycare_empty_slot(struct BoxPokemon * daycare_data) u8 i; for(i = 0;i <= 1;i++){ - if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0){ - return i; - } + if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0){ + return i; + } } return -1; @@ -131,7 +131,7 @@ void sub_80413C8() { // strange stack usage - happens because THUMB ARM only allows R0-R7 to be pushed/popped: // all registers in reglist must be Lo registers, except that PUSH can include the LR, and POP can include the PC - // the ldm/stm section probably copies some struct, but I'm not sure how the code would look + // the ldm/stm section probably copies some struct, but I'm not sure how the code would look asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r9\n\ @@ -253,70 +253,23 @@ extern u16 word_2024E82; void sub_804151C(struct Pokemon * mon) { - u32 i; + s32 i; u8 r6; u16 temp; - u16 minus1; - i = 0; - minus1 = 0xffff; - while(i <= 100){ - if(TryIncrementMonLevel(mon) == 0) goto end; + for(i = 0; i < 100; i++){ + if(TryIncrementMonLevel(mon) == FALSE) goto end; + r6 = 1; - i++; while((temp = sub_803B7C8(mon, r6)) != 0){ r6 = 0; - if(temp == minus1){ + if(temp == 0xffff){ DeleteFirstMoveAndGiveMoveToMon(mon, word_2024E82); } } } + end: CalculateMonStats(mon); } - -#ifdef NEVERDEFINED -sub_804151C: @ 804151C - push {r4-r7,lr} - adds r4, r0, 0 - movs r5, 0 - ldr r7, _08041538 @ =0x0000ffff -_08041524: <-----------------------------------+ - adds r0, r4, 0 | - bl TryIncrementMonLevel | - lsls r0, 24 | - cmp r0, 0 | - beq _08041560 break ----------------+ | - movs r6, 0x1 | | - adds r5, 0x1 | | - b _0804154C --------+ | | - .align 2, 0 | | | -_08041538: .4byte 0x0000ffff | | | -_0804153C: <-----------------------+---+---+ | - movs r6, 0 | | | | - cmp r0, r7 | | | | - bne _0804154C --------------------------->| | | | - ldr r0, _0804156C @ =word_2024E82 | | | | - ldrh r1, [r0] | | | | - adds r0, r4, 0 | | | | - bl DeleteFirstMoveAndGiveMoveToMon | | | | -_0804154C: <-------+ | | | - adds r0, r4, 0 | | | - adds r1, r6, 0 | | | - bl sub_803B7C8 | | | - lsls r0, 16 | | | - lsrs r0, 16 | | | - cmp r0, 0 | | | - bne _0804153C --------------------------------+---+ | - cmp r5, 0x63 | | - ble _08041524 --------------------------------+-------+ -_08041560: <-----------+ - adds r0, r4, 0 - bl CalculateMonStats - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0804156C: .4byte word_2024E82 -#endif -- cgit v1.2.3 From b60ad4ccba10b7c570b633edcdb74c64055a0aa4 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sun, 14 May 2017 17:50:01 +0200 Subject: Make it build with all the label changes --- src/daycare.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/daycare.c b/src/daycare.c index e1ce7fb77..ca480329b 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -3,7 +3,7 @@ #include "string_util.h" #include "asm.h" -extern u8 gUnknown_03005CE0; +extern u8 gLastFieldPokeMenuOpened; u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest) { @@ -115,7 +115,7 @@ s8 daycare_empty_slot(struct BoxPokemon * daycare_data) s8 empty_slot; empty_slot = daycare_empty_slot(daycare_data); - if(sub_80A2B94(mon) != 0){ // if the mon holds a mail? + if(MonHasMail(mon) != 0){ // if the mon holds a mail? u8 empty_slot_times_56 = empty_slot * 56; u8 * something2 = ((u8 *) (daycare_data + 2)) + empty_slot_times_56 + 36; StringCopy(something2, gSaveBlock2); @@ -145,7 +145,7 @@ void sub_80413C8() lsrs r4, r0, 24\n\ mov r9, r4\n\ adds r0, r7, 0\n\ - bl sub_80A2B94\n\ + bl MonHasMail\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _0804144A\n\ @@ -190,7 +190,7 @@ void sub_80413C8() ldm r1!, {r0,r2,r3}\n\ stm r4!, {r0,r2,r3}\n\ adds r0, r7, 0\n\ - bl sub_80A2DF8\n\ + bl TakeMailFromMon\n\ _0804144A:\n\ mov r2, r9\n\ lsls r4, r2, 24\n\ @@ -204,7 +204,7 @@ _0804144A:\n\ movs r2, 0x50\n\ bl memcpy\n\ adds r0, r4, 0\n\ - bl pokemon_restore_pp\n\ + bl BoxMonRestorePP\n\ movs r0, 0x88\n\ lsls r0, 1\n\ add r0, r8\n\ @@ -230,7 +230,7 @@ _08041498: .4byte 0x00002b4c\n\ void daycare_send() { - sub_80413C8(gPlayerParty + gUnknown_03005CE0, gSaveBlock1.filler_2F9C); + sub_80413C8(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.filler_2F9C); } void sub_80417F4(u8 *); -- cgit v1.2.3 From 6563ec9bada46058c095be12ff1719a525a6f799 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sun, 14 May 2017 18:35:47 +0200 Subject: Name gSaveBlock1.daycareData, decompile sub_8041648 --- src/daycare.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++--- src/mori_debug_menu.c | 4 +- src/record_mixing.c | 2 +- 3 files changed, 116 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/daycare.c b/src/daycare.c index ca480329b..3d8de4ef6 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -118,7 +118,7 @@ s8 daycare_empty_slot(struct BoxPokemon * daycare_data) if(MonHasMail(mon) != 0){ // if the mon holds a mail? u8 empty_slot_times_56 = empty_slot * 56; u8 * something2 = ((u8 *) (daycare_data + 2)) + empty_slot_times_56 + 36; - StringCopy(something2, gSaveBlock2); + StringCopy(something2, gSaveBlock2.playerName); PadNameString(something2, 0xFC); something2 += 8; pokemon_get_nick(mon, something2); @@ -230,7 +230,7 @@ _08041498: .4byte 0x00002b4c\n\ void daycare_send() { - sub_80413C8(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.filler_2F9C); + sub_80413C8(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.daycareData); } void sub_80417F4(u8 *); @@ -238,9 +238,9 @@ void sub_80417F4(u8 *); void sub_80414C0(struct BoxPokemon * daycare_data) { u32 second_species; - if((GetBoxMonData(daycare_data + 1, MON_DATA_SPECIES) != 0) && ((second_species = GetBoxMonData(daycare_data, MON_DATA_SPECIES)) == 0)){ - memcpy(daycare_data, daycare_data + 1, 80); - ZeroBoxMonData(daycare_data + 1); + if((GetBoxMonData(&daycare_data[1], MON_DATA_SPECIES) != 0) && ((second_species = GetBoxMonData(&daycare_data[0], MON_DATA_SPECIES)) == 0)){ + daycare_data[0] = daycare_data[1]; + ZeroBoxMonData(&daycare_data[1]); memcpy(daycare_data + 2, (u8 *) (daycare_data + 1) + 0x88, 0x38); *((u32 *)(daycare_data) + 68) = *((u32 *)(daycare_data) + 69); *((u32 *)(daycare_data) + 69) = second_species; @@ -273,3 +273,111 @@ void sub_804151C(struct Pokemon * mon) CalculateMonStats(mon); } + +__attribute__((naked)) +u16 sub_8041570(struct BoxPokemon * daycare_data, u8 a2){ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + sub sp, 0x68\n\ + adds r5, r0, 0\n\ + lsls r1, 24\n\ + lsrs r4, r1, 24\n\ + lsls r7, r4, 2\n\ + adds r0, r7, r4\n\ + lsls r0, 4\n\ + adds r6, r5, r0\n\ + ldr r1, _08041640 @ =gStringVar1\n\ + adds r0, r6, 0\n\ + bl pokemon_get_nick_\n\ + adds r0, r6, 0\n\ + movs r1, 0xB\n\ + bl GetBoxMonData\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r9, r0\n\ + adds r0, r6, 0\n\ + mov r1, sp\n\ + bl sub_803B4B4\n\ + mov r0, sp\n\ + movs r1, 0x38\n\ + bl GetMonData\n\ + cmp r0, 0x64\n\ + beq _080415D8\n\ + mov r0, sp\n\ + movs r1, 0x19\n\ + bl GetMonData\n\ + movs r2, 0x88\n\ + lsls r2, 1\n\ + adds r1, r5, r2\n\ + adds r1, r7\n\ + ldr r1, [r1]\n\ + adds r0, r1\n\ + str r0, [sp, 0x64]\n\ + add r2, sp, 0x64\n\ + mov r0, sp\n\ + movs r1, 0x19\n\ + bl SetMonData\n\ + mov r0, sp\n\ + bl sub_804151C\n\ +_080415D8:\n\ + ldr r0, _08041644 @ =gPlayerParty\n\ + movs r1, 0xFA\n\ + lsls r1, 1\n\ + adds r1, r0\n\ + mov r8, r1\n\ + mov r0, r8\n\ + mov r1, sp\n\ + movs r2, 0x64\n\ + bl memcpy\n\ + lsls r0, r4, 3\n\ + subs r0, r4\n\ + lsls r1, r0, 3\n\ + adds r0, r5, r1\n\ + adds r0, 0xC0\n\ + ldrh r0, [r0]\n\ + cmp r0, 0\n\ + beq _08041610\n\ + adds r4, r1, 0\n\ + adds r4, 0xA0\n\ + adds r4, r5, r4\n\ + mov r0, r8\n\ + adds r1, r4, 0\n\ + bl GiveMailToMon2\n\ + adds r0, r4, 0\n\ + bl sub_80417F4\n\ +_08041610:\n\ + bl party_compaction\n\ + adds r0, r6, 0\n\ + bl ZeroBoxMonData\n\ + movs r2, 0x88\n\ + lsls r2, 1\n\ + adds r0, r5, r2\n\ + adds r0, r7\n\ + movs r1, 0\n\ + str r1, [r0]\n\ + adds r0, r5, 0\n\ + bl sub_80414C0\n\ + bl CalculatePlayerPartyCount\n\ + mov r0, r9\n\ + add sp, 0x68\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ + .align 2, 0\n\ +_08041640: .4byte gStringVar1\n\ +_08041644: .4byte gPlayerParty\n\ + .syntax divided"); +} + +extern u8 gSpecialVar_0x8004; + +u16 sub_8041648() +{ + return sub_8041570(gSaveBlock1.daycareData, gSpecialVar_0x8004); +} diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c index 9f586dcb9..ab0e00c8a 100644 --- a/src/mori_debug_menu.c +++ b/src/mori_debug_menu.c @@ -65,7 +65,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr) s8 MoriDebugMenu_Egg(void) { - if ( daycare_count_pokemon(gSaveBlock1.filler_2F9C) == 2 && daycare_relationship_score_from_savegame() ) + if ( daycare_count_pokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() ) sub_8041940(); CloseMenu(); @@ -74,7 +74,7 @@ s8 MoriDebugMenu_Egg(void) s8 MoriDebugMenu_MaleEgg(void) { - if ( daycare_count_pokemon(gSaveBlock1.filler_2F9C) == 2 && daycare_relationship_score_from_savegame() ) + if ( daycare_count_pokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() ) sub_8041950(); CloseMenu(); diff --git a/src/record_mixing.c b/src/record_mixing.c index ddf9a5376..5f2077432 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -66,7 +66,7 @@ void sub_80B92AC(void) memcpy(unk_2018000.easyChatPairs, recordMixingEasyChatPairs, 0x28); memcpy(gUnknown_02038738, gSaveBlock1.filler_303C, 0x38); memcpy(gUnknown_02038738 + 0x38, gSaveBlock1.filler_3074, 0x38); - sub_8041324(gSaveBlock1.filler_2F9C, gUnknown_02038738); + sub_8041324(gSaveBlock1.daycareData, gUnknown_02038738); memcpy(unk_2018000.filler10AC, gUnknown_083D0280, 0x78); memcpy(unk_2018000.filler1124, gUnknown_083D0284, 0xA4); -- cgit v1.2.3 From da925adb54af5423be679c15168147fad5d385ec Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sun, 14 May 2017 18:45:44 +0200 Subject: sub_8041664 --- src/daycare.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/daycare.c b/src/daycare.c index 3d8de4ef6..0d80bc54a 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -381,3 +381,10 @@ u16 sub_8041648() { return sub_8041570(gSaveBlock1.daycareData, gSpecialVar_0x8004); } + +u8 sub_8041664(struct BoxPokemon * mon, u32 steps){ + struct BoxPokemon temp = *mon; + u32 new_exp = GetBoxMonData(mon, MON_DATA_EXP) + steps; + SetBoxMonData(&temp, MON_DATA_EXP, (u8 *) &new_exp); + return GetLevelFromBoxMonExp(&temp); +} -- cgit v1.2.3 From 2774cb1bae07fe079c7faf53f697ea78ac8e76d4 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Mon, 15 May 2017 14:53:28 +0200 Subject: Name some functions --- src/daycare.c | 40 ++++++++++++++++++---------------------- src/mori_debug_menu.c | 4 ++-- 2 files changed, 20 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/daycare.c b/src/daycare.c index 0d80bc54a..cf7a5cd5f 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -5,7 +5,7 @@ extern u8 gLastFieldPokeMenuOpened; -u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest) +u8 *GetMonNick(struct Pokemon *mon, u8 *dest) { s8 nickname[POKEMON_NAME_LENGTH * 2]; @@ -13,7 +13,7 @@ u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest) return StringCopy10(dest, nickname); } -u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest) +u8 *GetBoxMonNick(struct BoxPokemon *mon, u8 *dest) { s8 nickname[POKEMON_NAME_LENGTH * 2]; @@ -21,16 +21,14 @@ u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest) return StringCopy10(dest, nickname); } -u8 daycare_count_pokemon(struct BoxPokemon *daycare_data) +u8 Daycare_CountPokemon(struct BoxPokemon *daycare_data) { u8 i, count; count = 0; - for(i = 0;i <= 1;i++) { - if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) { + for(i = 0;i <= 1;i++) + if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) count++; - } - } return count; } @@ -98,36 +96,34 @@ _08041374:\n\ .syntax divided\n"); } -s8 daycare_empty_slot(struct BoxPokemon * daycare_data) +s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data) { u8 i; - for(i = 0;i <= 1;i++){ - if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0){ + for(i = 0;i <= 1;i++) + if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0) return i; - } - } return -1; } -/*void sub_80413C8(struct Pokemon * mon, struct BoxPokemon * daycare_data){ // unfinished +/*void Daycare_SendPokemon(struct Pokemon * mon, struct BoxPokemon * daycare_data){ // unfinished s8 empty_slot; - empty_slot = daycare_empty_slot(daycare_data); + empty_slot = Daycare_FindEmptySpot(daycare_data); if(MonHasMail(mon) != 0){ // if the mon holds a mail? u8 empty_slot_times_56 = empty_slot * 56; u8 * something2 = ((u8 *) (daycare_data + 2)) + empty_slot_times_56 + 36; StringCopy(something2, gSaveBlock2.playerName); PadNameString(something2, 0xFC); something2 += 8; - pokemon_get_nick(mon, something2); + GetMonNick(mon, something2); u8 pokerus = GetMonData(mon, MON_DATA_64); something1 += (u8 * daycare_data) }*/ __attribute__((naked)) -void sub_80413C8() +void Daycare_SendPokemon() { // strange stack usage - happens because THUMB ARM only allows R0-R7 to be pushed/popped: // all registers in reglist must be Lo registers, except that PUSH can include the LR, and POP can include the PC @@ -140,7 +136,7 @@ void sub_80413C8() adds r7, r0, 0\n\ mov r8, r1\n\ mov r0, r8\n\ - bl daycare_empty_slot\n\ + bl Daycare_FindEmptySpot\n\ lsls r0, 24\n\ lsrs r4, r0, 24\n\ mov r9, r4\n\ @@ -168,7 +164,7 @@ void sub_80413C8() adds r6, 0x8\n\ adds r0, r7, 0\n\ adds r1, r6, 0\n\ - bl pokemon_get_nick\n\ + bl GetMonNick\n\ adds r0, r7, 0\n\ movs r1, 0x40\n\ bl GetMonData\n\ @@ -228,9 +224,9 @@ _08041498: .4byte 0x00002b4c\n\ .syntax divided\n"); } -void daycare_send() +void Daycare_SendPokemon_Special() { - sub_80413C8(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.daycareData); + Daycare_SendPokemon(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.daycareData); } void sub_80417F4(u8 *); @@ -291,7 +287,7 @@ u16 sub_8041570(struct BoxPokemon * daycare_data, u8 a2){ adds r6, r5, r0\n\ ldr r1, _08041640 @ =gStringVar1\n\ adds r0, r6, 0\n\ - bl pokemon_get_nick_\n\ + bl GetBoxMonNick\n\ adds r0, r6, 0\n\ movs r1, 0xB\n\ bl GetBoxMonData\n\ @@ -382,7 +378,7 @@ u16 sub_8041648() return sub_8041570(gSaveBlock1.daycareData, gSpecialVar_0x8004); } -u8 sub_8041664(struct BoxPokemon * mon, u32 steps){ +u8 Daycare_GetLevelAfterSteps(struct BoxPokemon * mon, u32 steps){ struct BoxPokemon temp = *mon; u32 new_exp = GetBoxMonData(mon, MON_DATA_EXP) + steps; SetBoxMonData(&temp, MON_DATA_EXP, (u8 *) &new_exp); diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c index ab0e00c8a..fd0ad773b 100644 --- a/src/mori_debug_menu.c +++ b/src/mori_debug_menu.c @@ -65,7 +65,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr) s8 MoriDebugMenu_Egg(void) { - if ( daycare_count_pokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() ) + if ( Daycare_CountPokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() ) sub_8041940(); CloseMenu(); @@ -74,7 +74,7 @@ s8 MoriDebugMenu_Egg(void) s8 MoriDebugMenu_MaleEgg(void) { - if ( daycare_count_pokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() ) + if ( Daycare_CountPokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() ) sub_8041950(); CloseMenu(); -- cgit v1.2.3 From d0549706007b1a24ffd75ba40594e70dda3ee123 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Mon, 15 May 2017 16:19:18 +0200 Subject: Rename PlaySE to PlaySoundEffect - wide code is good code, daycare.c renames, match sub_80B92AC in record_mixing --- src/battle_anim.c | 14 ++--- src/battle_interface.c | 8 +-- src/battle_party_menu.c | 16 ++--- src/berry_tag_screen.c | 4 +- src/bike.c | 2 +- src/braille_puzzles.c | 8 +-- src/cable_club.c | 4 +- src/clear_save_data_menu.c | 4 +- src/daycare.c | 2 + src/field_control_avatar.c | 8 +-- src/field_player_avatar.c | 20 +++--- src/field_special_scene.c | 8 +-- src/fldeff_cut.c | 4 +- src/fldeff_softboiled.c | 2 +- src/fldeff_sweetscent.c | 2 +- src/intro.c | 2 +- src/item_use.c | 8 +-- src/link.c | 4 +- src/main_menu.c | 18 +++--- src/menu.c | 24 ++++---- src/mystery_event_menu.c | 18 +++--- src/naming_screen.c | 10 +-- src/party_menu.c | 4 +- src/player_pc.c | 36 +++++------ src/pokedex.c | 78 ++++++++++++------------ src/record_mixing.c | 124 +++----------------------------------- src/rom4.c | 8 +-- src/rom6.c | 2 +- src/scrcmd.c | 4 +- src/script_menu.c | 6 +- src/script_pokemon_util_80F99CC.c | 8 +-- src/shop.c | 8 +-- src/sound.c | 8 +-- src/start_menu.c | 12 ++-- src/starter_choose.c | 2 +- src/text.c | 12 ++-- src/trainer_card.c | 2 +- src/wallclock.c | 4 +- 38 files changed, 203 insertions(+), 305 deletions(-) (limited to 'src') diff --git a/src/battle_anim.c b/src/battle_anim.c index bdb34365f..8ca66f745 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -673,7 +673,7 @@ static void ScriptCmd_end(void) static void ScriptCmd_playse(void) { gBattleAnimScriptPtr++; - PlaySE(SCRIPT_READ_16(gBattleAnimScriptPtr)); + PlaySoundEffect(SCRIPT_READ_16(gBattleAnimScriptPtr)); gBattleAnimScriptPtr += 2; } @@ -1715,7 +1715,7 @@ static void ScriptCmd_panse_19(void) gBattleAnimScriptPtr++; r4 = SCRIPT_READ_16(gBattleAnimScriptPtr); r0 = SCRIPT_READ_8(gBattleAnimScriptPtr + 2); - PlaySE12WithPanning(r4, sub_8076F98(r0)); + PlaySoundEffect12WithPanning(r4, sub_8076F98(r0)); gBattleAnimScriptPtr += 3; } @@ -1755,7 +1755,7 @@ static void ScriptCmd_panse_1B(void) gTasks[taskId].data[2] = r4; gTasks[taskId].data[3] = r7; gTasks[taskId].data[4] = panning; - PlaySE12WithPanning(songNum, panning); + PlaySoundEffect12WithPanning(songNum, panning); gAnimSoundTaskCount++; gBattleAnimScriptPtr += 6; } @@ -1917,7 +1917,7 @@ static void ScriptCmd_panse_26(void) gTasks[taskId].data[2] = r6; gTasks[taskId].data[3] = r10; gTasks[taskId].data[4] = r4; - PlaySE12WithPanning(r8, r4); + PlaySoundEffect12WithPanning(r8, r4); gAnimSoundTaskCount++; gBattleAnimScriptPtr += 6; } @@ -1949,7 +1949,7 @@ static void ScriptCmd_panse_27(void) gTasks[taskId].data[2] = r4_2; gTasks[taskId].data[3] = r7; gTasks[taskId].data[4] = r6; - PlaySE12WithPanning(r9, r6); + PlaySoundEffect12WithPanning(r9, r6); gAnimSoundTaskCount++; gBattleAnimScriptPtr += 6; } @@ -1996,7 +1996,7 @@ static void sub_80774FC(u8 taskId) r1 = gTasks[taskId].data[1]; gTasks[taskId].data[3]--; r4 = gTasks[taskId].data[3]; - PlaySE12WithPanning(r0, r1); + PlaySoundEffect12WithPanning(r0, r1); if (r4 == 0) { DestroyTask(taskId); @@ -2034,7 +2034,7 @@ static void sub_80775CC(u8 taskId) gTasks[taskId].data[2]--; if (r0 <= 0) { - PlaySE12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]); + PlaySoundEffect12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]); DestroyTask(taskId); gAnimSoundTaskCount--; } diff --git a/src/battle_interface.c b/src/battle_interface.c index 9938c4b54..827ed4ffc 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1589,7 +1589,7 @@ u8 sub_8044804(u8 a, const struct UnknownStruct8 *b, u8 c, u8 d) for (i = 0; i < 6; i++) gTasks[taskId].data[3 + i] = sp[i]; gTasks[taskId].data[10] = d; - PlaySE12WithPanning(SE_TB_START, 0); + PlaySoundEffect12WithPanning(SE_TB_START, 0); return taskId; } #else @@ -2169,7 +2169,7 @@ _08044C62:\n\ strh r6, [r0, 0x1C]\n\ movs r0, 0x72\n\ movs r1, 0\n\ - bl PlaySE12WithPanning\n\ + bl PlaySoundEffect12WithPanning\n\ adds r0, r4, 0\n\ add sp, 0x28\n\ pop {r3-r5}\n\ @@ -2356,9 +2356,9 @@ void sub_804507C(struct Sprite *sprite) if (r3 != 0) pan = -64; if (sprite->data7 != 0) - PlaySE2WithPanning(SE_TB_KARA, pan); + PlaySoundEffect2WithPanning(SE_TB_KARA, pan); else - PlaySE1WithPanning(SE_TB_KON, pan); + PlaySoundEffect1WithPanning(SE_TB_KON, pan); sprite->callback = SpriteCallbackDummy; } } diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index 820d16465..4ee55f0e2 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -230,7 +230,7 @@ void SetUpBattlePokemonMenu(u8 a) if (gUnknown_02038473 == 3) { if (GetMonData(&gPlayerParty[sub_806CA38(a)], MON_DATA_IS_EGG)) - PlaySE(SE_HAZURE); + PlaySoundEffect(SE_HAZURE); else { sub_806D5A4(); @@ -239,7 +239,7 @@ void SetUpBattlePokemonMenu(u8 a) } else { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); GetMonNickname(&gPlayerParty[sub_806CA38(a)], gStringVar1); sub_8095050(a, sub_806CA38(a)); SetTaskFuncWithFollowupFunc(a, Task_HandlePopupMenuInput, SetUpBattlePokemonMenu); @@ -247,10 +247,10 @@ void SetUpBattlePokemonMenu(u8 a) break; case 2: if (gUnknown_02038473 == 1) - PlaySE(SE_HAZURE); + PlaySoundEffect(SE_HAZURE); else { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); if (gUnknown_02038473 == 3) { gUnknown_0202E8F4 = 0; @@ -336,19 +336,19 @@ static void Task_HandlePopupMenuInput(u8 taskId) { if (gMain.newAndRepeatedKeys & DPAD_UP) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MoveMenuCursor(-1); return; } if (gMain.newAndRepeatedKeys & DPAD_DOWN) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MoveMenuCursor(1); return; } if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); func = PartyMenuGetPopupMenuFunc(gTasks[taskId].data[4], sBattlePartyPopupMenus, sBattlePartyMenuActions, @@ -358,7 +358,7 @@ static void Task_HandlePopupMenuInput(u8 taskId) } if (gMain.newKeys & B_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); Task_BattlePartyMenuCancel(taskId); return; } diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 511b88c5a..94f9c5941 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -245,7 +245,7 @@ static void sub_814640C(u8 taskId) static void sub_8146440(u8 taskId) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = sub_814640C; } @@ -379,7 +379,7 @@ _08146718:\n\ bgt _0814678C\n\ _08146728:\n\ movs r0, 0x5\n\ - bl PlaySE\n\ + bl PlaySoundEffect\n\ mov r2, r8\n\ ldrb r3, [r2, 0x1]\n\ ldrb r4, [r4, 0xC]\n\ diff --git a/src/bike.c b/src/bike.c index d7175b5e0..0c154de9c 100644 --- a/src/bike.c +++ b/src/bike.c @@ -617,7 +617,7 @@ static void AcroBikeTransition_80E5920(u8 direction) } } playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - PlaySE(SE_JITE_PYOKO); + PlaySoundEffect(SE_JITE_PYOKO); playerMapObj->mapobj_bit_9 = 1; PlayerSetAnimId(sub_80608A4(direction), 2); } diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 220e8420c..7c6a22547 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -46,7 +46,7 @@ void DoBrailleDigEffect(void) MapGridSetMetatileIdAt(17, 9, 563); MapGridSetMetatileIdAt(18, 9, 3636); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySoundEffect(SE_BAN); FlagSet(SYS_BRAILLE_DIG); ScriptContext2_Disable(); } @@ -88,7 +88,7 @@ void DoBrailleStrengthEffect(void) MapGridSetMetatileIdAt(15, 27, 563); MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySoundEffect(SE_BAN); FlagSet(SYS_BRAILLE_STRENGTH); ScriptContext2_Disable(); } @@ -134,7 +134,7 @@ void UseFlyAncientTomb_Finish(void) MapGridSetMetatileIdAt(15, 27, 563); MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySoundEffect(SE_BAN); FlagSet(SYS_BRAILLE_FLY); ScriptContext2_Disable(); } @@ -159,7 +159,7 @@ void Task_BrailleWait(u8 taskId) if (BrailleWait_CheckButtonPress() != FALSE) { MenuZeroFillScreen(); - PlaySE(5); + PlaySoundEffect(5); data[0] = 2; } else diff --git a/src/cable_club.c b/src/cable_club.c index 45fb347f3..1f2c6376a 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -89,7 +89,7 @@ static void sub_80830E4(u8 taskId) { if (gMain.heldKeys & A_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); sub_8007F4C(); gTasks[(u32) taskId].func = sub_8083188; } @@ -153,7 +153,7 @@ _08083158:\n\ cmp r0, 0\n\ beq _08083178\n\ movs r0, 0x5\n\ - bl PlaySE\n\ + bl PlaySoundEffect\n\ bl sub_8007F4C\n\ ldr r0, _08083180 @ =gTasks\n\ lsls r1, r6, 2\n\ diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c index 21cd643ef..301e169ce 100644 --- a/src/clear_save_data_menu.c +++ b/src/clear_save_data_menu.c @@ -59,13 +59,13 @@ static void Task_ProcessMenuInput(u8 taskId) switch (ProcessMenuInputNoWrap_()) { case 0: - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); sub_8071F40(gSystemText_ClearingData); gTasks[taskId].func = Task_ClearSaveData; break; case -1: case 1: - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); DestroyTask(taskId); SetMainCallback2(CB2_SoftReset); break; diff --git a/src/daycare.c b/src/daycare.c index cf7a5cd5f..b1bafa6f4 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -33,6 +33,7 @@ u8 Daycare_CountPokemon(struct BoxPokemon *daycare_data) return count; } +#ifndef ASDF __attribute__((naked)) void sub_8041324(struct BoxPokemon * box_pokemon, void * void_pointer) { @@ -95,6 +96,7 @@ _08041374:\n\ bx r0\n\ .syntax divided\n"); } +#endif s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data) { diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index c5f2c08e7..e51ae24b6 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -214,7 +214,7 @@ int sub_8068024(struct FieldInput *input) return TRUE; if (input->pressedStartButton) { - PlaySE(SE_WIN_OPEN); + PlaySoundEffect(SE_WIN_OPEN); sub_8071310(); return TRUE; } @@ -261,7 +261,7 @@ static bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c) && script != gUnknown_0815F36C && script != gUnknown_0815F43A && script != gUnknown_081A0009) - PlaySE(5); + PlaySoundEffect(5); ScriptContext1_SetupScript(script); return TRUE; @@ -828,7 +828,7 @@ int dive_warp(struct MapPosition *position, u16 b) { walkrun_find_lowest_active_bit_in_bitfield(); sp13E_warp_to_last_warp(); - PlaySE(SE_W291); + PlaySoundEffect(SE_W291); return TRUE; } } @@ -838,7 +838,7 @@ int dive_warp(struct MapPosition *position, u16 b) { walkrun_find_lowest_active_bit_in_bitfield(); sp13E_warp_to_last_warp(); - PlaySE(SE_W291); + PlaySoundEffect(SE_W291); return TRUE; } } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 6a0fe1dce..c0a71fcf4 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -871,7 +871,7 @@ void PlayerTurnInPlace(u8 direction) void PlayerJumpLedge(u8 direction) { - PlaySE(SE_DANSA); + PlaySoundEffect(SE_DANSA); PlayerSetAnimId(GetJumpLedgeAnimId(direction), 8); } @@ -902,31 +902,31 @@ void sub_8059534(u8 a) void sub_805954C(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySoundEffect(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060A5C(a), 1); } void sub_8059570(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySoundEffect(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060A88(a), 2); } void sub_8059594(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySoundEffect(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060AB4(a), 8); } void sub_80595B8(u8 direction) { - PlaySE(SE_JITE_PYOKO); + PlaySoundEffect(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060878(direction), 1); } void sub_80595DC(u8 direction) { - PlaySE(SE_WALL_HIT); + PlaySoundEffect(SE_WALL_HIT); PlayerSetAnimId(sub_8060AE0(direction), 2); } @@ -959,7 +959,7 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a) if (MetatileBehavior_IsWarpDoor(MapGridGetMetatileBehaviorAt(x, y))) return; } - PlaySE(SE_WALL_HIT); + PlaySoundEffect(SE_WALL_HIT); } } @@ -1292,7 +1292,7 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c) gUnknown_0202FF84[2] = c->elevation; gUnknown_0202FF84[3] = gSprites[c->spriteId].oam.priority; FieldEffectStart(10); - PlaySE(SE_W070); + PlaySoundEffect(SE_W070); task->data[0]++; } return 0; @@ -1334,7 +1334,7 @@ u8 sub_805A000(struct Task *task, struct MapObject *mapObject) gPlayerAvatar.unk6 = 1; if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) { - PlaySE(SE_DANSA); + PlaySoundEffect(SE_DANSA); FieldObjectSetSpecialAnim(mapObject, sub_806084C(mapObject->mapobj_unk_18)); task->data[1]++; if (task->data[1] > 1) @@ -1370,7 +1370,7 @@ u8 sub_805A0D8(struct Task *task, struct MapObject *mapObject) task->data[1] = mapObject->placeholder18; gPlayerAvatar.unk6 = 1; ScriptContext2_Enable(); - PlaySE(SE_TK_WARPIN); + PlaySoundEffect(SE_TK_WARPIN); return 1; } diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 59280b743..6282ea813 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -157,7 +157,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1] = 0; // reset the timer. data[2] = CreateTask(Task_Truck1, 0xA); data[0] = 1; // run the next case. - PlaySE(SE_TRACK_MOVE); + PlaySoundEffect(SE_TRACK_MOVE); } break; case 1: @@ -177,7 +177,7 @@ void Task_HandleTruckSequence(u8 taskId) DestroyTask(data[2]); data[3] = CreateTask(Task_Truck2, 0xA); data[0] = 3; - PlaySE(SE_TRACK_STOP); + PlaySoundEffect(SE_TRACK_STOP); } break; case 3: @@ -192,7 +192,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1]++; if (data[1] == 90) { - PlaySE(SE_TRACK_HAIK); + PlaySoundEffect(SE_TRACK_HAIK); data[1] = 0; data[0] = 5; } @@ -205,7 +205,7 @@ void Task_HandleTruckSequence(u8 taskId) MapGridSetMetatileIdAt(11, 9, 528); MapGridSetMetatileIdAt(11, 10, 536); DrawWholeMapView(); - PlaySE(SE_TRACK_DOOR); + PlaySoundEffect(SE_TRACK_DOOR); DestroyTask(taskId); ScriptContext2_Disable(); } diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 77c8752d1..39e438620 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -122,7 +122,7 @@ bool8 FldEff_CutGrass(void) u8 tileBehavior; u8 i, j; // not in for loop? - for(i = 0, PlaySE(SE_W015), PlayerGetDestCoords(&gUnknown_0203923C.x, &gUnknown_0203923C.y); i < 3; i++) + for(i = 0, PlaySoundEffect(SE_W015), PlayerGetDestCoords(&gUnknown_0203923C.x, &gUnknown_0203923C.y); i < 3; i++) { y = i - 1 + gUnknown_0203923C.y; for(j = 0; j < 3; j++) @@ -294,7 +294,7 @@ void sub_80A2AB8(void) void sub_80A2B00(void) { - PlaySE(0x80); + PlaySoundEffect(0x80); FieldEffectActiveListRemove(2); EnableBothScriptContexts(); } diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index d0ee712af..f5372b53b 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -122,7 +122,7 @@ static void sub_8133D50(u8 taskId) { return; } - PlaySE(SE_KAIFUKU); + PlaySoundEffect(SE_KAIFUKU); EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data0; diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 4e8214b07..8d23a41cb 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -49,7 +49,7 @@ static void sub_812C01C(void) { u8 taskId; - PlaySE(0xEC); + PlaySoundEffect(0xEC); BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, 0x1F); taskId = CreateTask(sub_812C084, 0); gTasks[taskId].data[0] = 0; diff --git a/src/intro.c b/src/intro.c index ea6edba3d..00c9894cf 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1419,7 +1419,7 @@ static void Task_IntroPokemonBattle(u8 taskId) gSprites[spriteId].invisible = 1; } if (gIntroFrameCounter == 800) - PlaySE(SE_OP_BASYU); + PlaySoundEffect(SE_OP_BASYU); if (gIntroFrameCounter == 850) BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0xFFFF); if (gIntroFrameCounter == 946) diff --git a/src/item_use.c b/src/item_use.c index 4047ade5c..5d0282844 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -362,7 +362,7 @@ void RunItemfinderResults(u8 taskId) } return; } - PlaySE(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder. + PlaySoundEffect(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder. data[4]++; } data[3] = (data[3] + 1) & 0x1F; @@ -943,7 +943,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId) void sub_80C9EE4(u8 taskId) { - PlaySE(2); + PlaySoundEffect(2); gTasks[taskId].func = sub_80C9F10; } @@ -1002,7 +1002,7 @@ void sub_80CA098(u8 taskId) { if(++gTasks[taskId].data[15] > 7) { - PlaySE(0x75); + PlaySoundEffect(0x75); DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1); } } @@ -1095,7 +1095,7 @@ void sub_80CA2BC(u8 taskId) { if(++gTasks[taskId].data[15] > 7) { - PlaySE(1); + PlaySoundEffect(1); RemoveBagItem(gScriptItemId, 1); DisplayItemMessageOnField(taskId, sub_803F378(gScriptItemId), sub_80CA294, 1); } diff --git a/src/link.c b/src/link.c index 224c0ae1c..d06e71c03 100644 --- a/src/link.c +++ b/src/link.c @@ -1262,10 +1262,10 @@ static void CB2_PrintErrorMessage(void) break; case 30: case 60: - PlaySE(SE_BOO); + PlaySoundEffect(SE_BOO); break; case 90: - PlaySE(SE_BOO); + PlaySoundEffect(SE_BOO); break; } diff --git a/src/main_menu.c b/src/main_menu.c index 50fefc471..c1e43e1a8 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -446,13 +446,13 @@ bool8 MainMenuProcessKeyInput(u8 taskId) { if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0x0000); gTasks[taskId].func = Task_MainMenuPressedA; } else if (gMain.newKeys & B_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); REG_WIN0H = WIN_RANGE(0, 240); REG_WIN0V = WIN_RANGE(0, 160); @@ -966,14 +966,14 @@ static void Task_NewGameSpeech16(u8 taskId) { case MALE: sub_8072DEC(); - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); gSaveBlock2.playerGender = MALE; MenuZeroFillWindowRect(2, 4, 8, 9); gTasks[taskId].func = Task_NewGameSpeech19; break; case FEMALE: sub_8072DEC(); - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); gSaveBlock2.playerGender = FEMALE; MenuZeroFillWindowRect(2, 4, 8, 9); gTasks[taskId].func = Task_NewGameSpeech19; @@ -1069,19 +1069,19 @@ static void Task_NewGameSpeech21(u8 taskId) case 3: case 4: sub_8072DEC(); - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MenuZeroFillWindowRect(2, 1, 22, 12); SetPresetPlayerName(selection); gTasks[taskId].func = Task_NewGameSpeech23; break; case 0: //NEW NAME - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); BeginNormalPaletteFade(-1, 0, 0, 16, 0); gTasks[taskId].func = Task_NewGameSpeech22; break; case -1: //B button sub_8072DEC(); - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MenuZeroFillWindowRect(2, 1, 22, 12); gTasks[taskId].func = Task_NewGameSpeech14; //Go back to gender menu break; @@ -1122,7 +1122,7 @@ static void Task_NewGameSpeech25(u8 taskId) switch (ProcessMenuInputNoWrap_()) { case 0: //YES - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MenuZeroFillWindowRect(2, 1, 8, 7); gSprites[gTasks[taskId].data[TD_TRAINER_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND; StartSpriteFadeOut(taskId, 2); @@ -1131,7 +1131,7 @@ static void Task_NewGameSpeech25(u8 taskId) break; case -1: //B button case 1: //NO - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MenuZeroFillWindowRect(2, 1, 8, 7); gTasks[taskId].func = Task_NewGameSpeech14; //Go back to gender menu break; diff --git a/src/menu.c b/src/menu.c index ba98ff057..84093b9b7 100644 --- a/src/menu.c +++ b/src/menu.c @@ -52,7 +52,7 @@ const struct MenuAction gMenuYesNoItems[] = void CloseMenu(void) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MenuZeroFillScreen(); sub_8064E2C(); ScriptContext2_Disable(); @@ -270,7 +270,7 @@ s8 ProcessMenuInput(void) { if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); if (gMenu.menu_field_7) sub_8072DEC(); return gMenu.cursorPos; @@ -285,13 +285,13 @@ s8 ProcessMenuInput(void) if (gMain.newKeys & DPAD_UP) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MoveMenuCursor(-1); return -2; } else if (gMain.newKeys & DPAD_DOWN) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MoveMenuCursor(1); return -2; } @@ -305,7 +305,7 @@ s8 ProcessMenuInputNoWrap(void) if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); if (gMenu.menu_field_7) sub_8072DEC(); return gMenu.cursorPos; @@ -321,13 +321,13 @@ s8 ProcessMenuInputNoWrap(void) if (gMain.newKeys & DPAD_UP) { if (cursorPos != MoveMenuCursorNoWrap(-1)) - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); return -2; } else if (gMain.newKeys & DPAD_DOWN) { if (cursorPos != MoveMenuCursorNoWrap(1)) - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); return -2; } @@ -520,7 +520,7 @@ s8 sub_80727CC(void) { if (gMenu.menu_field_7) sub_8072DEC(); - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); return GetMenuCursorPos(); } @@ -533,25 +533,25 @@ s8 sub_80727CC(void) if (gMain.newKeys & DPAD_UP) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MoveMenuCursor4(-gMenu.width); return -2; } else if (gMain.newKeys & DPAD_DOWN) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MoveMenuCursor4(gMenu.width); return -2; } else if (gMain.newKeys & DPAD_LEFT) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MoveMenuCursor4(-1); return -2; } else if (gMain.newKeys & DPAD_RIGHT) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MoveMenuCursor4(1); return -2; } diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 97deb348c..c257e7573 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -113,13 +113,13 @@ static void CB2_MysteryEventMenu(void) case 3: if ((gLinkStatus & 0x20) && (gLinkStatus & 0x1C) > 4) { - PlaySE(SE_PIN); + PlaySoundEffect(SE_PIN); sub_8072044(gSystemText_LoadEventPressA); gMain.state++; } if (gMain.newKeys & B_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); CloseLink(); gMain.state = 15; } @@ -139,7 +139,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); sub_8007F4C(); MenuDrawTextWindow(6, 5, 23, 8); MenuPrint(gSystemText_LoadingEvent, 7, 6); @@ -147,7 +147,7 @@ static void CB2_MysteryEventMenu(void) } else if (gMain.newKeys & B_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); CloseLink(); gMain.state = 15; } @@ -185,7 +185,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & B_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); CloseLink(); gMain.state = 15; break; @@ -199,7 +199,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); sub_8007F4C(); MenuDrawTextWindow(6, 5, 23, 8); MenuPrint(gSystemText_LoadingEvent, 7, 6); @@ -207,7 +207,7 @@ static void CB2_MysteryEventMenu(void) } else if (gMain.newKeys & B_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); CloseLink(); gMain.state = 15; } @@ -264,7 +264,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & B_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); CloseLink(); gMain.state = 15; break; @@ -313,7 +313,7 @@ static void CB2_MysteryEventMenu(void) case 14: if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); gMain.state++; } break; diff --git a/src/naming_screen.c b/src/naming_screen.c index b14c690e2..531d12bdd 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -453,7 +453,7 @@ static bool8 MainState_StartPageSwap(struct Task *task) StartPageSwapAnim(); sub_80B6888(1); sub_80B6460(0, 0, 1); - PlaySE(SE_WIN_OPEN); + PlaySoundEffect(SE_WIN_OPEN); namingScreenData.state = MAIN_STATE_WAIT_PAGE_SWAP; return FALSE; } @@ -607,7 +607,7 @@ static bool8 KeyboardKeyHandler_OK(u8 event) sub_80B6460(2, 1, 0); if (event == KBEVENT_PRESSED_A) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); namingScreenData.state = MAIN_STATE_6; return TRUE; } @@ -1370,7 +1370,7 @@ static void DeleteTextCharacter(void) var2 = GetKeyRoleAtCursorPos(); if (var2 == 0 || var2 == 2) sub_80B6460(1, 0, 1); - PlaySE(SE_BOWA); + PlaySoundEffect(SE_BOWA); } static bool8 sub_80B7004(void) @@ -1391,7 +1391,7 @@ static bool8 sub_80B7004(void) else AddTextCharacter(ch); sub_80B7960(); - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); if (r4) { if (GetPreviousTextCaretPosition() == namingScreenData.template->maxChars - 1) @@ -1422,7 +1422,7 @@ static void sub_80B7090(void) // DoInput? sub_80B72A4(r4, r5); } sub_80B7960(); - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); } static bool8 sub_80B7104(void) diff --git a/src/party_menu.c b/src/party_menu.c index d473eae6d..aebfd3307 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -109,7 +109,7 @@ void sub_8070088(u8 taskId) gUnknown_0202E8F4 = 1; MenuZeroFillWindowRect(3, 14, 26, 19); - PlaySE(SE_KAIFUKU); + PlaySoundEffect(SE_KAIFUKU); PartyMenuUpdateLevelOrStatus(unk_201C000.pokemon, unk_201C000.var05); task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle()][unk_201C000.var05], 9); @@ -214,7 +214,7 @@ _08070134:\n\ movs r3, 0x13\n\ bl MenuZeroFillWindowRect\n\ movs r0, 0x1\n\ - bl PlaySE\n\ + bl PlaySoundEffect\n\ ldr r0, [r4]\n\ ldrb r1, [r4, 0x5]\n\ bl PartyMenuUpdateLevelOrStatus\n\ diff --git a/src/player_pc.c b/src/player_pc.c index f0f0709b1..a31ce0803 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -129,24 +129,24 @@ void PlayerPCProcessMenuInput(u8 taskId) { if (gMain.newAndRepeatedKeys & 0x40) { - PlaySE(5); + PlaySoundEffect(5); MoveMenuCursor(-1); } else if (gMain.newAndRepeatedKeys & 0x80) { - PlaySE(5); + PlaySoundEffect(5); MoveMenuCursor(1); } else if (gMain.newKeys & 0x1) { sub_8072DEC(); - PlaySE(5); + PlaySoundEffect(5); gUnknown_08406298[gUnknown_02039314[GetMenuCursorPos()]].func(taskId); } else if (gMain.newKeys & 0x2) { sub_8072DEC(); - PlaySE(5); + PlaySoundEffect(5); gUnknown_08406298[gUnknown_030007B4[gUnknown_02039314 - 1]].func(taskId); } } @@ -222,25 +222,25 @@ void ItemStorageMenuProcessInput(u8 var) { if (gMain.newAndRepeatedKeys & 0x40) { - PlaySE(5); + PlaySoundEffect(5); MoveMenuCursor(-1); ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]); } else if (gMain.newAndRepeatedKeys & 0x80) { - PlaySE(5); + PlaySoundEffect(5); MoveMenuCursor(1); ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]); } else if (gMain.newKeys & 0x1) { - PlaySE(5); + PlaySoundEffect(5); gUnknown_084062C0[GetMenuCursorPos()].func(var); } else if (gMain.newKeys & 0x2) { sub_8072DEC(); - PlaySE(5); + PlaySoundEffect(5); gUnknown_084062C0[3].func(var); } } @@ -353,7 +353,7 @@ void sub_813A280(u8 taskId) { if(data[0]) { - PlaySE(5); + PlaySoundEffect(5); data[0] = MoveMenuCursor(-1); var = data[1] + data[0]; if (!data[9]) @@ -372,7 +372,7 @@ void sub_813A280(u8 taskId) { if (!data[1]) return; - PlaySE(5); + PlaySoundEffect(5); data[1]--; sub_813AE0C(taskId); // probably further down @@ -384,7 +384,7 @@ void sub_813A280(u8 taskId) { if(data[0] != data[4] - 1) { - PlaySE(5); + PlaySoundEffect(5); data[0] = MoveMenuCursor(1); var = data[1] + data[0]; @@ -398,7 +398,7 @@ void sub_813A280(u8 taskId) } else if(data[1] + data[0] != data[2]) { - PlaySE(5); + PlaySoundEffect(5); data[1]++; sub_813AE0C(taskId); @@ -412,7 +412,7 @@ void sub_813A280(u8 taskId) { if (data[0] + data[1] != data[2]) { - PlaySE(5); + PlaySoundEffect(5); data[9] = 1; data[8] = data[1] + data[0]; sub_813AD58(0xFFF7); @@ -422,14 +422,14 @@ void sub_813A280(u8 taskId) } else // _0813A3E8 { - PlaySE(5); // merging? + PlaySoundEffect(5); // merging? sub_813AA30(taskId, 0); sub_813AE0C(taskId); } } else if(gMain.newKeys & A_BUTTON) { - PlaySE(5); + PlaySoundEffect(5); if(!data[9]) { if(data[1] + data[0] != data[2]) @@ -449,7 +449,7 @@ void sub_813A280(u8 taskId) } else if(gMain.newKeys & B_BUTTON) { - PlaySE(5); + PlaySoundEffect(5); if(!data[9]) { sub_8072DEC(); @@ -554,7 +554,7 @@ void HandleQuantityRolling(u8 taskId) } else if(gMain.newKeys & A_BUTTON) // confirm quantity. { - PlaySE(5); + PlaySoundEffect(5); MenuZeroFillWindowRect(6, 6, 0xD, 0xB); if(!data[6]) @@ -564,7 +564,7 @@ void HandleQuantityRolling(u8 taskId) } else if(gMain.newKeys & B_BUTTON) // cancel quantity. { - PlaySE(5); + PlaySoundEffect(5); MenuZeroFillWindowRect(6, 6, 0xD, 0xB); sub_80F98DC(0); sub_80F98DC(1); diff --git a/src/pokedex.c b/src/pokedex.c index 5ea1f9938..688cae9e9 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -361,7 +361,7 @@ void Task_PokedexMainScreen(u8 taskId) 0, 0, 0x10, 0); gSprites[gPokedexView->unk626].callback = sub_808EDB8; gTasks[taskId].func = sub_808CA64; - PlaySE(SE_PIN); + PlaySoundEffect(SE_PIN); } else if (gMain.newKeys & START_BUTTON) { @@ -370,11 +370,11 @@ void Task_PokedexMainScreen(u8 taskId) gPokedexView->menuIsOpen = 1; gPokedexView->menuCursorPos = 0; gTasks[taskId].func = Task_PokedexMainScreenMenu; - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); } else if (gMain.newKeys & SELECT_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; @@ -383,13 +383,13 @@ void Task_PokedexMainScreen(u8 taskId) gPokedexView->unk614 = gPokedexView->dexMode; gPokedexView->unk618 = gPokedexView->dexOrder; gTasks[taskId].func = sub_808CB8C; - PlaySE(SE_PC_LOGON); + PlaySoundEffect(SE_PC_LOGON); } else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ClosePokedex; - PlaySE(SE_PC_OFF); + PlaySoundEffect(SE_PC_OFF); } else { @@ -444,7 +444,7 @@ void Task_PokedexMainScreenMenu(u8 taskId) case 3: //CLOSE POKEDEX BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ClosePokedex; - PlaySE(SE_PC_OFF); + PlaySoundEffect(SE_PC_OFF); break; } } @@ -454,17 +454,17 @@ void Task_PokedexMainScreenMenu(u8 taskId) { gPokedexView->menuIsOpen = 0; gTasks[taskId].func = Task_PokedexMainScreen; - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos != 0) { gPokedexView->menuCursorPos--; - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 2) { gPokedexView->menuCursorPos++; - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); } } } @@ -562,7 +562,7 @@ void Task_PokedexResultsScreen(u8 taskId) gSprites[gPokedexView->unk626].callback = sub_808EDB8; BeginNormalPaletteFade(~a, 0, 0, 0x10, 0); gTasks[taskId].func = sub_808D118; - PlaySE(SE_PIN); + PlaySoundEffect(SE_PIN); } else if (gMain.newKeys & START_BUTTON) { @@ -570,7 +570,7 @@ void Task_PokedexResultsScreen(u8 taskId) gPokedexView->menuIsOpen = 1; gPokedexView->menuCursorPos = 0; gTasks[taskId].func = Task_PokedexResultsScreenMenu; - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); } else if (gMain.newKeys & SELECT_BUTTON) { @@ -578,13 +578,13 @@ void Task_PokedexResultsScreen(u8 taskId) gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; gTasks[taskId].func = sub_808CB8C; - PlaySE(SE_PC_LOGON); + PlaySoundEffect(SE_PC_LOGON); } else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; - PlaySE(SE_PC_OFF); + PlaySoundEffect(SE_PC_OFF); } else { @@ -635,12 +635,12 @@ void Task_PokedexResultsScreenMenu(u8 taskId) case 3: //BACK TO POKEDEX BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; - PlaySE(SE_TRACK_DOOR); + PlaySoundEffect(SE_TRACK_DOOR); break; case 4: //CLOSE POKEDEX BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_PokedexResultsScreenExitPokedex; - PlaySE(SE_PC_OFF); + PlaySoundEffect(SE_PC_OFF); break; } } @@ -650,17 +650,17 @@ void Task_PokedexResultsScreenMenu(u8 taskId) { gPokedexView->menuIsOpen = 0; gTasks[taskId].func = Task_PokedexResultsScreen; - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos) { gPokedexView->menuCursorPos--; - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 3) { gPokedexView->menuCursorPos++; - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); } } } @@ -1371,7 +1371,7 @@ u16 sub_808E48C(u16 a, u16 b) gPokedexView->unk62C += (a - r6) * 16; sub_808E82C(); sub_808E0CC(a, 0xE); - PlaySE(SE_Z_PAGE); + PlaySoundEffect(SE_Z_PAGE); goto _0808E5A2; } //_0808E53C @@ -1387,7 +1387,7 @@ u16 sub_808E48C(u16 a, u16 b) gPokedexView->unk62C += (a - r6) * 16; sub_808E82C(); sub_808E0CC(a, 0xE); - PlaySE(SE_Z_PAGE); + PlaySoundEffect(SE_Z_PAGE); goto _0808E5A2; _0808E5A2: @@ -1402,7 +1402,7 @@ u16 sub_808E48C(u16 a, u16 b) sub_808E398(2, a); //goto _0808E60E sub_808DBE8(2, a, b); - PlaySE(SE_Z_SCROLL); + PlaySoundEffect(SE_Z_SCROLL); } //_0808E5E4 else @@ -1412,7 +1412,7 @@ u16 sub_808E48C(u16 a, u16 b) sub_808E398(1, a); //_0808E60E sub_808DBE8(1, a, b); - PlaySE(SE_Z_SCROLL); + PlaySoundEffect(SE_Z_SCROLL); } //_0808E60E goto _0808E5A2; @@ -1511,7 +1511,7 @@ _0808E4E0:\n\ movs r1, 0xE\n\ bl sub_808E0CC\n\ movs r0, 0x6D\n\ - bl PlaySE\n\ + bl PlaySoundEffect\n\ b _0808E5A2\n\ .align 2, 0\n\ _0808E52C: .4byte gMain\n\ @@ -1566,7 +1566,7 @@ _0808E55A:\n\ movs r1, 0xE\n\ bl sub_808E0CC\n\ movs r0, 0x6D\n\ - bl PlaySE\n\ + bl PlaySoundEffect\n\ _0808E5A2:\n\ mov r0, r10\n\ cmp r0, 0\n\ @@ -1623,7 +1623,7 @@ _0808E60E:\n\ adds r2, r4, 0\n\ bl sub_808DBE8\n\ movs r0, 0x6C\n\ - bl PlaySE\n\ + bl PlaySoundEffect\n\ b _0808E5A2\n\ .align 2, 0\n\ _0808E620: .4byte gPokedexView\n\ @@ -2335,13 +2335,13 @@ void Task_PageScreenProcessInput(u8 taskId) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = sub_808F888; - PlaySE(SE_Z_SCROLL); + PlaySoundEffect(SE_Z_SCROLL); } else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ClosePageScreen; - PlaySE(SE_PC_OFF); + PlaySoundEffect(SE_PC_OFF); } else if (gMain.newKeys & A_BUTTON) { @@ -2353,21 +2353,21 @@ void Task_PageScreenProcessInput(u8 taskId) case AREA_SCREEN: BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gTasks[taskId].func = Task_InitAreaScreenMultistep; - PlaySE(SE_PIN); + PlaySoundEffect(SE_PIN); break; case CRY_SCREEN: BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gTasks[taskId].func = Task_InitCryScreenMultistep; - PlaySE(SE_PIN); + PlaySoundEffect(SE_PIN); break; case SIZE_SCREEN: if (!gUnknown_0202FFBC->owned) - PlaySE(SE_HAZURE); + PlaySoundEffect(SE_HAZURE); else { BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gTasks[taskId].func = Task_InitSizeScreenMultistep; - PlaySE(SE_PIN); + PlaySoundEffect(SE_PIN); } break; } @@ -2378,7 +2378,7 @@ void Task_PageScreenProcessInput(u8 taskId) { gPokedexView->selectedScreen--; sub_8090584(gPokedexView->selectedScreen, 0xD); - PlaySE(SE_Z_PAGE); + PlaySoundEffect(SE_Z_PAGE); } else if (((gMain.newKeys & DPAD_RIGHT) || ((gMain.newKeys & R_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) @@ -2386,7 +2386,7 @@ void Task_PageScreenProcessInput(u8 taskId) { gPokedexView->selectedScreen++; sub_8090584(gPokedexView->selectedScreen, 0xD); - PlaySE(SE_Z_PAGE); + PlaySoundEffect(SE_Z_PAGE); } } @@ -2581,7 +2581,7 @@ void Task_CryScreenProcessInput(u8 taskId) m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 1; gTasks[taskId].func = sub_808FFBC; - PlaySE(SE_PC_OFF); + PlaySoundEffect(SE_PC_OFF); } else if ((gMain.newKeys & DPAD_LEFT) || ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) @@ -2590,20 +2590,20 @@ void Task_CryScreenProcessInput(u8 taskId) m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_808FFBC; - PlaySE(SE_Z_PAGE); + PlaySoundEffect(SE_Z_PAGE); } else if ((gMain.newKeys & DPAD_RIGHT) || ((gMain.newKeys & R_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { if (!gUnknown_0202FFBC->owned) - PlaySE(SE_HAZURE); + PlaySoundEffect(SE_HAZURE); else { BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 3; gTasks[taskId].func = sub_808FFBC; - PlaySE(SE_Z_PAGE); + PlaySoundEffect(SE_Z_PAGE); } } } @@ -2737,7 +2737,7 @@ void Task_SizeScreenProcessInput(u8 taskId) BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gPokedexView->unk64F = 1; gTasks[taskId].func = sub_8090498; - PlaySE(SE_PC_OFF); + PlaySoundEffect(SE_PC_OFF); } //_08090430 else if ((gMain.newKeys & DPAD_LEFT) @@ -2746,7 +2746,7 @@ void Task_SizeScreenProcessInput(u8 taskId) BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_8090498; - PlaySE(SE_Z_PAGE); + PlaySoundEffect(SE_Z_PAGE); } } diff --git a/src/record_mixing.c b/src/record_mixing.c index 5f2077432..d1a386dc7 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -23,7 +23,7 @@ extern u8 gUnknown_083D0288[2]; extern u8 gUnknown_083D028A[2][3]; extern u8 gUnknown_083D0290[9][4]; -extern u8 gUnknown_02038738[]; //Don't know what type this points to +extern struct RecordMixing_UnknownStruct gUnknown_02038738[2]; //Don't know what type this points to extern u16 gSpecialVar_0x8005; extern u32 gUnknown_03005D2C; extern u8 gUnknown_03000718; @@ -53,7 +53,9 @@ struct PlayerRecords { extern struct PlayerRecords unk_2008000; extern struct PlayerRecords unk_2018000; -#ifdef NONMATCHING +extern void sub_80BC300(); +extern void sub_80C045C(); + void sub_80B92AC(void) { sub_80BC300(); @@ -64,8 +66,8 @@ void sub_80B92AC(void) memcpy(unk_2018000.filler1004, gUnknown_083D0274, 0x40); memcpy(unk_2018000.filler1044, gUnknown_083D0278, 0x40); memcpy(unk_2018000.easyChatPairs, recordMixingEasyChatPairs, 0x28); - memcpy(gUnknown_02038738, gSaveBlock1.filler_303C, 0x38); - memcpy(gUnknown_02038738 + 0x38, gSaveBlock1.filler_3074, 0x38); + gUnknown_02038738[0] = gSaveBlock1.filler_303C[0]; + gUnknown_02038738[1] = gSaveBlock1.filler_303C[1]; sub_8041324(gSaveBlock1.daycareData, gUnknown_02038738); memcpy(unk_2018000.filler10AC, gUnknown_083D0280, 0x78); memcpy(unk_2018000.filler1124, gUnknown_083D0284, 0xA4); @@ -73,112 +75,6 @@ void sub_80B92AC(void) if (GetMultiplayerId() == 0) unk_2018000.filler11C8[0] = sub_8126338(); } -#else -__attribute__((naked)) -void sub_80B92AC(void) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - bl sub_80BC300\n\ - bl sub_80C045C\n\ - ldr r6, _080B9364 @ =0x02018000\n\ - ldr r0, _080B9368 @ =recordMixingSecretBases\n\ - ldr r1, [r0]\n\ - movs r2, 0xC8\n\ - lsls r2, 4\n\ - adds r0, r6, 0\n\ - bl memcpy\n\ - movs r1, 0xC8\n\ - lsls r1, 4\n\ - adds r0, r6, r1\n\ - ldr r1, _080B936C @ =recordMixingTvShows\n\ - ldr r1, [r1]\n\ - movs r2, 0xE1\n\ - lsls r2, 2\n\ - bl memcpy\n\ - ldr r2, _080B9370 @ =0x00001004\n\ - adds r0, r6, r2\n\ - ldr r1, _080B9374 @ =gUnknown_083D0274\n\ - ldr r1, [r1]\n\ - movs r2, 0x40\n\ - bl memcpy\n\ - ldr r1, _080B9378 @ =0x00001044\n\ - adds r0, r6, r1\n\ - ldr r1, _080B937C @ =gUnknown_083D0278\n\ - ldr r1, [r1]\n\ - movs r2, 0x40\n\ - bl memcpy\n\ - ldr r2, _080B9380 @ =0x00001084\n\ - adds r0, r6, r2\n\ - ldr r1, _080B9384 @ =recordMixingEasyChatPairs\n\ - ldr r1, [r1]\n\ - movs r2, 0x28\n\ - bl memcpy\n\ - ldr r5, _080B9388 @ =gUnknown_02038738\n\ - ldr r4, _080B938C @ =gSaveBlock1\n\ - ldr r0, _080B9390 @ =0x0000303c\n\ - adds r1, r4, r0\n\ - adds r0, r5, 0\n\ - movs r2, 0x38\n\ - bl memcpy\n\ - ldr r2, _080B9394 @ =0x00003074\n\ - adds r1, r4, r2\n\ - adds r0, r5, 0\n\ - adds r0, 0x38\n\ - movs r2, 0x38\n\ - bl memcpy\n\ - ldr r0, _080B9398 @ =0x00002f9c\n\ - adds r4, r0\n\ - adds r0, r4, 0\n\ - adds r1, r5, 0\n\ - bl sub_8041324\n\ - ldr r1, _080B939C @ =0x000010ac\n\ - adds r0, r6, r1\n\ - ldr r1, _080B93A0 @ =gUnknown_083D0280\n\ - ldr r1, [r1]\n\ - movs r2, 0x78\n\ - bl memcpy\n\ - ldr r2, _080B93A4 @ =0x00001124\n\ - adds r0, r6, r2\n\ - ldr r1, _080B93A8 @ =gUnknown_083D0284\n\ - ldr r1, [r1]\n\ - movs r2, 0xA4\n\ - bl memcpy\n\ - bl GetMultiplayerId\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080B935C\n\ - bl sub_8126338\n\ - ldr r2, _080B93AC @ =0x000011c8\n\ - adds r1, r6, r2\n\ - strh r0, [r1]\n\ -_080B935C:\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080B9364: .4byte 0x02018000\n\ -_080B9368: .4byte recordMixingSecretBases\n\ -_080B936C: .4byte recordMixingTvShows\n\ -_080B9370: .4byte 0x00001004\n\ -_080B9374: .4byte gUnknown_083D0274\n\ -_080B9378: .4byte 0x00001044\n\ -_080B937C: .4byte gUnknown_083D0278\n\ -_080B9380: .4byte 0x00001084\n\ -_080B9384: .4byte recordMixingEasyChatPairs\n\ -_080B9388: .4byte gUnknown_02038738\n\ -_080B938C: .4byte gSaveBlock1\n\ -_080B9390: .4byte 0x0000303c\n\ -_080B9394: .4byte 0x00003074\n\ -_080B9398: .4byte 0x00002f9c\n\ -_080B939C: .4byte 0x000010ac\n\ -_080B93A0: .4byte gUnknown_083D0280\n\ -_080B93A4: .4byte 0x00001124\n\ -_080B93A8: .4byte gUnknown_083D0284\n\ -_080B93AC: .4byte 0x000011c8\n\ - .syntax divided\n"); -} -#endif #undef NONMATCHING @@ -200,7 +96,7 @@ void sub_80B9450(u8 taskId) gTasks[taskId].data[0]++; if (gTasks[taskId].data[0] == 50) { - PlaySE(SE_W213); + PlaySoundEffect(SE_W213); gTasks[taskId].data[0] = 0; } } @@ -235,7 +131,7 @@ void sub_80B9484(u8 taskId) case 2: taskData[10] = CreateTask(sub_80BA00C, 10); taskData[TD_STATE] = 3; - PlaySE(SE_W226); + PlaySoundEffect(SE_W226); break; case 3: if (!gTasks[taskData[10]].isActive) @@ -294,14 +190,14 @@ void sub_80B95F0(u8 taskId) { if (players == sub_800820C()) { - PlaySE(0x15); + PlaySoundEffect(0x15); task->data[TD_STATE] = 201; task->data[12] = 0; } } else { - PlaySE(0x16); + PlaySoundEffect(0x16); task->data[TD_STATE] = 301; } break; diff --git a/src/rom4.c b/src/rom4.c index 79ac6d769..9ed08aa7f 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -2203,28 +2203,28 @@ void sub_80557E8(void) void sub_80557F4(void) { - PlaySE(SE_WIN_OPEN); + PlaySoundEffect(SE_WIN_OPEN); sub_8071310(); ScriptContext2_Enable(); } void sub_8055808(u8 *script) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); ScriptContext1_SetupScript(script); ScriptContext2_Enable(); } void sub_8055824(void) { - PlaySE(SE_WIN_OPEN); + PlaySoundEffect(SE_WIN_OPEN); ScriptContext1_SetupScript(TradeRoom_PromptToCancelLink); ScriptContext2_Enable(); } void sub_8055840(u8 *script) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); ScriptContext1_SetupScript(script); ScriptContext2_Enable(); } diff --git a/src/rom6.c b/src/rom6.c index a2b52c9aa..a8c489e70 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -150,7 +150,7 @@ int FldEff_RockSmash(void) static void sub_810B58C(void) { - PlaySE(SE_W088); + PlaySoundEffect(SE_W088); FieldEffectActiveListRemove(0x25); EnableBothScriptContexts(); } diff --git a/src/scrcmd.c b/src/scrcmd.c index 136181bd3..fa3467d22 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -807,7 +807,7 @@ bool8 ScrCmd_countpokemon(struct ScriptContext *ctx) bool8 ScrCmd_playsfx(struct ScriptContext *ctx) { - PlaySE(ScriptReadHalfword(ctx)); + PlaySoundEffect(ScriptReadHalfword(ctx)); return FALSE; } @@ -1787,7 +1787,7 @@ bool8 ScrCmd_setdooropened(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); x += 7; y += 7; - PlaySE(sub_8058790(x, y)); + PlaySoundEffect(sub_8058790(x, y)); FieldAnimateDoorOpen(x, y); return FALSE; } diff --git a/src/script_menu.c b/src/script_menu.c index eba438397..38f7f0af5 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -672,7 +672,7 @@ void sub_80B52B4(u8 taskId) { if (!gTasks[taskId].data[4]) { - PlaySE(5); + PlaySoundEffect(5); gScriptResult = 127; } else @@ -770,7 +770,7 @@ void task_yes_no_maybe(u8 taskId) return; case -1: case 1: - PlaySE(5); + PlaySoundEffect(5); gScriptResult = 0; break; case 0: @@ -835,7 +835,7 @@ void sub_80B5684(u8 taskId) { if (!gTasks[taskId].data[4]) { - PlaySE(5); + PlaySoundEffect(5); gScriptResult = 127; } else diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index ce62f2abb..2efc0e2c6 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -169,13 +169,13 @@ void sub_80F9C6C(u8 var) switch(sub_806BD80(var)) { case 1: - PlaySE(5); + PlaySoundEffect(5); gUnknown_02038694 = sub_806CA38(var); gSpecialVar_0x8004 = gUnknown_02038694; sub_8123138(var); break; case 2: - PlaySE(5); + PlaySoundEffect(5); gUnknown_02038694 = 0xFF; gSpecialVar_0x8004 = 0xFF; sub_8123138(var); @@ -268,13 +268,13 @@ void sub_80F9E64(u8 var) switch(sub_806BD80(var)) { case 1: - PlaySE(5); + PlaySoundEffect(5); gSpecialVar_0x8004 = sub_806CA38(var); gSpecialVar_0x8005 = sub_8040574(&gPlayerParty[gSpecialVar_0x8004]); sub_8123138(var); break; case 2: - PlaySE(5); + PlaySoundEffect(5); gSpecialVar_0x8004 = 0xFF; sub_8123138(var); } diff --git a/src/shop.c b/src/shop.c index 780dff02a..27aa5b335 100644 --- a/src/shop.c +++ b/src/shop.c @@ -106,7 +106,7 @@ void sub_80B2E38(u8 var) { if(gUnknown_03000708.unk9) { - PlaySE(0x5); + PlaySoundEffect(0x5); gUnknown_03000708.unk9 = MoveMenuCursor(-1); } } @@ -114,13 +114,13 @@ void sub_80B2E38(u8 var) { if(gUnknown_03000708.unk9 != gUnknown_03000708.unkA) { - PlaySE(0x5); + PlaySoundEffect(0x5); gUnknown_03000708.unk9 = MoveMenuCursor(1); } } else if (gMain.newKeys & 1) { - PlaySE(0x5); + PlaySoundEffect(0x5); if(!gUnknown_03000708.unkC) { gUnknown_083CC6D0[gUnknown_083CC6E8[gUnknown_03000708.unk9]].func(local); @@ -132,7 +132,7 @@ void sub_80B2E38(u8 var) } else if(gMain.newKeys & 2) { - PlaySE(0x5); + PlaySoundEffect(0x5); HandleShopMenuQuit(local); } } diff --git a/src/sound.c b/src/sound.c index ed69ca01d..897b13ddf 100644 --- a/src/sound.c +++ b/src/sound.c @@ -521,12 +521,12 @@ void PlayBGM(u16 songNum) m4aSongNumStart(songNum); } -void PlaySE(u16 songNum) +void PlaySoundEffect(u16 songNum) { m4aSongNumStart(songNum); } -void PlaySE12WithPanning(u16 songNum, s8 pan) +void PlaySoundEffect12WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE1); @@ -535,14 +535,14 @@ void PlaySE12WithPanning(u16 songNum, s8 pan) m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); } -void PlaySE1WithPanning(u16 songNum, s8 pan) +void PlaySoundEffect1WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE1); m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); } -void PlaySE2WithPanning(u16 songNum, s8 pan) +void PlaySoundEffect2WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE2); diff --git a/src/start_menu.c b/src/start_menu.c index 37d361c0b..4c3a0b6e1 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -315,17 +315,17 @@ static u8 StartMenu_InputProcessCallback(void) { if (gMain.newKeys & DPAD_UP) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(-1); } if (gMain.newKeys & DPAD_DOWN) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(1); } if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func == StartMenu_PokedexCallback) { if (GetNationalPokedexCount(0) == 0) @@ -566,7 +566,7 @@ static bool8 SaveDialogCheckForTimeoutOrKeypress(void) saveDialogTimer--; if (gMain.heldKeys & A_BUTTON) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); return TRUE; } else if (saveDialogTimer == 0) @@ -702,7 +702,7 @@ static u8 SaveDialogCB_SaveSuccess(void) { if (MenuUpdateWindowText()) { - PlaySE(SE_SAVE); + PlaySoundEffect(SE_SAVE); saveDialogCallback = SaveDialogCB_ReturnSuccess; } return SAVE_IN_PROGRESS; @@ -723,7 +723,7 @@ static u8 SaveDialogCB_SaveError(void) { if (MenuUpdateWindowText()) { - PlaySE(SE_BOO); + PlaySoundEffect(SE_BOO); saveDialogCallback = SaveDialogCB_ReturnError; } return SAVE_IN_PROGRESS; diff --git a/src/starter_choose.c b/src/starter_choose.c index 6ef410d21..e133c6212 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -455,7 +455,7 @@ static void Task_StarterChoose5(u8 taskId) break; case 1: // NO case -1: // B button - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MenuZeroFillWindowRect(21, 7, 27, 12); spriteId = gTasks[taskId].tPkmnSpriteId; diff --git a/src/text.c b/src/text.c index 7be72833a..ee5089c4d 100644 --- a/src/text.c +++ b/src/text.c @@ -136,7 +136,7 @@ static u8 ExtCtrlCode_Escape(struct Window *); static u8 ExtCtrlCode_Nop2(struct Window *); static u8 ExtCtrlCode_SetCursorY(struct Window *); static u8 ExtCtrlCode_ClearWindowTextLines(struct Window *); -static u8 ExtCtrlCode_PlaySE(struct Window *); +static u8 ExtCtrlCode_PlaySoundEffect(struct Window *); static u8 ExtCtrlCode_Skip(struct Window *); static u8 ExtCtrlCode_SetCursorX(struct Window *); static u8 ExtCtrlCode_SkipTo(struct Window *); @@ -380,7 +380,7 @@ static const ExtCtrlCodeFunc sExtCtrlCodeFuncs[] = ExtCtrlCode_Nop2, ExtCtrlCode_SetCursorY, ExtCtrlCode_ClearWindowTextLines, - ExtCtrlCode_PlaySE, + ExtCtrlCode_PlaySoundEffect, ExtCtrlCode_Skip, ExtCtrlCode_SetCursorX, ExtCtrlCode_SkipTo, @@ -2197,11 +2197,11 @@ static u8 ExtCtrlCode_ClearWindowTextLines(struct Window *win) return 2; } -static u8 ExtCtrlCode_PlaySE(struct Window *win) +static u8 ExtCtrlCode_PlaySoundEffect(struct Window *win) { u16 loByte = win->text[win->textIndex++]; u16 hiByte = win->text[win->textIndex++] << 8; - PlaySE(loByte | hiByte); + PlaySoundEffect(loByte | hiByte); return 2; } @@ -2377,7 +2377,7 @@ static u8 UpdateWindowText(struct Window *win) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); } else { @@ -3187,7 +3187,7 @@ static u8 WaitWithDownArrow(struct Window *win) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); TryEraseDownArrow(win); } else diff --git a/src/trainer_card.c b/src/trainer_card.c index e6ed79c15..945d469e3 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -662,7 +662,7 @@ bool8 sub_80938CC(struct Task *task) bool8 sub_8093918(struct Task *task) { sub_8093A28(); - PlaySE(SE_CARD); + PlaySoundEffect(SE_CARD); ewram0.var_0 += 1; diff --git a/src/wallclock.c b/src/wallclock.c index 0f3665c65..f8c3fdeea 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -429,13 +429,13 @@ static void Task_SetClock4(u8 taskId) switch (ProcessMenuInputNoWrap_()) { case 0: //YES - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); gTasks[taskId].func = Task_SetClock5; //Move on return; case -1: //B button case 1: //NO sub_8072DEC(); - PlaySE(SE_SELECT); + PlaySoundEffect(SE_SELECT); MenuZeroFillWindowRect(23, 8, 29, 13); MenuZeroFillWindowRect(2, 16, 27, 19); gTasks[taskId].func = Task_SetClock2; //Go back and let player adjust clock -- cgit v1.2.3 From a240212df98595f9ce95dabd833846e58468a8ea Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Mon, 15 May 2017 16:57:54 +0200 Subject: More record_mixing maintenance --- src/record_mixing.c | 74 ++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 40 deletions(-) (limited to 'src') diff --git a/src/record_mixing.c b/src/record_mixing.c index d1a386dc7..f8c684161 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -36,7 +36,7 @@ extern bool8 gReceivedRemoteLinkPlayers; void sub_80B929C(void) { - sub_8083A84(sub_80B9484); + sub_8083A84(Task_RecordMixing_Main); } struct PlayerRecords { @@ -53,10 +53,10 @@ struct PlayerRecords { extern struct PlayerRecords unk_2008000; extern struct PlayerRecords unk_2018000; -extern void sub_80BC300(); -extern void sub_80C045C(); +void sub_80BC300(); +void sub_80C045C(); -void sub_80B92AC(void) +void RecordMixing_PrepareExchangePacket(void) { sub_80BC300(); sub_80C045C(); @@ -76,9 +76,7 @@ void sub_80B92AC(void) unk_2018000.filler11C8[0] = sub_8126338(); } -#undef NONMATCHING - -void sub_80B93B0(u32 a) +void RecordMixing_ReceiveExchangePacket(u32 a) { sub_80BD674(unk_2008000.secretBases, sizeof(struct PlayerRecords), a); sub_80BFD44((u8 *)unk_2008000.tvShows, sizeof(struct PlayerRecords), a); @@ -91,7 +89,7 @@ void sub_80B93B0(u32 a) sub_80B9F3C(unk_2008000.filler11C8, a); } -void sub_80B9450(u8 taskId) +void Task_RecordMixing_SoundEffect(u8 taskId) { gTasks[taskId].data[0]++; if (gTasks[taskId].data[0] == 50) @@ -102,24 +100,23 @@ void sub_80B9450(u8 taskId) } #define TD_STATE 0 - -void sub_80B9484(u8 taskId) +void Task_RecordMixing_Main(u8 taskId) { s16 *taskData = gTasks[taskId].data; switch (taskData[TD_STATE]) { - case 0: + case 0: // init sub_8007270(gSpecialVar_0x8005); VarSet(0x4000, 1); gUnknown_03000718 = 0; - sub_80B92AC(); + RecordMixing_PrepareExchangePacket(); CreateRecordMixingSprite(); taskData[TD_STATE] = 1; taskData[10] = CreateTask(sub_80B95F0, 0x50); - taskData[15] = CreateTask(sub_80B9450, 0x51); + taskData[15] = CreateTask(Task_RecordMixing_SoundEffect, 0x51); break; - case 1: + case 1: // wait for sub_80B95F0 if (!gTasks[taskData[10]].isActive) { taskData[TD_STATE] = 2; @@ -133,7 +130,7 @@ void sub_80B9484(u8 taskId) taskData[TD_STATE] = 3; PlaySoundEffect(SE_W226); break; - case 3: + case 3: // wait for sub_80BA00C if (!gTasks[taskData[10]].isActive) { taskData[TD_STATE] = 4; @@ -143,7 +140,7 @@ void sub_80B9484(u8 taskId) taskData[8] = 0; } break; - case 4: + case 4: // wait 60 frames taskData[8]++; if (taskData[8] > 60) taskData[TD_STATE] = 5; @@ -171,10 +168,10 @@ void sub_80B95F0(u8 taskId) MenuDisplayMessageBox(); MenuPrint(gOtherText_MixingRecordsWithFriend, 2, 15); task->data[8] = 0x708; - task->data[TD_STATE] = 0x190; + task->data[TD_STATE] = 400; ClearLinkCallback_2(); break; - case 100: + case 100: // wait 20 frames task->data[12]++; if (task->data[12] > 20) { @@ -216,7 +213,7 @@ void sub_80B95F0(u8 taskId) if (sub_800820C() == GetLinkPlayerCount_2()) task->data[TD_STATE] = 1; break; - case 400: + case 400: // wait 20 frames task->data[12]++; if (task->data[12] > 20) { @@ -224,7 +221,7 @@ void sub_80B95F0(u8 taskId) task->data[12] = 0; } break; - case 1: + case 1: // wait for handshake if (gReceivedRemoteLinkPlayers) { ConvertIntToDecimalStringN(gStringVar1, GetMultiplayerId_(), 2, 2); @@ -238,16 +235,16 @@ void sub_80B95F0(u8 taskId) task->data[6] = GetLinkPlayerCount_2(); task->data[TD_STATE] = 0; task->data[5] = GetMultiplayerId_(); - task->func = sub_80B97DC; + task->func = Task_RecordMixing_SendPacket; StorePtrInTaskData(&unk_2018000, &task->data[2]); - subTaskId = CreateTask(Task_CopyRecvBuffer, 0x50); + subTaskId = CreateTask(Task_RecordMixing_CopyReceiveBuffer, 0x50); task->data[10] = subTaskId; gTasks[subTaskId].data[0] = taskId; //StorePtrInTaskData((void*)0x2008000, &gTasks[subTaskId].data[5]); StorePtrInTaskData((u8 *)&unk_2018000 - 0x10000, &gTasks[subTaskId].data[5]); break; } - case 5: + case 5: // wait 60 frames task->data[10]++; if (task->data[10] > 60) { @@ -258,9 +255,10 @@ void sub_80B95F0(u8 taskId) } } -void sub_80B97DC(u8 taskId) +void Task_RecordMixing_SendPacket(u8 taskId) { struct Task *task = &gTasks[taskId]; + // does this send the data 24 times? switch (task->data[TD_STATE]) { @@ -288,15 +286,15 @@ void sub_80B97DC(u8 taskId) break; case 4: if (!gTasks[task->data[10]].isActive) - task->func = sub_80B9A1C; + task->func = Task_RecordMixing_SendPacket_SwitchToReceive; } } -void Task_CopyRecvBuffer(u8 taskId) +void Task_RecordMixing_CopyReceiveBuffer(u8 taskId) { struct Task *task = &gTasks[taskId]; s32 recvStatus = GetBlockReceivedStatus(); - u32 sp8 = 0; + u8 handledPlayers = 0; if (recvStatus == sub_8008198()) { @@ -304,32 +302,27 @@ void Task_CopyRecvBuffer(u8 taskId) for (player = 0; player < GetLinkPlayerCount(); player++) { - //_080B98D4 - u8 *ptr; void *src; u8 *dst; if ((recvStatus >> player) & 1) { - ptr = LoadPtrFromTaskData(&task->data[5]); - dst = ptr + task->data[player + 1] * BUFFER_CHUNK_SIZE + player * sizeof(struct PlayerRecords); + dst = LoadPtrFromTaskData(&task->data[5]) + task->data[player + 1] * BUFFER_CHUNK_SIZE + player * sizeof(struct PlayerRecords); src = GetPlayerRecvBuffer(player); - if ((u32)(task->data[player + 1] + 1) * BUFFER_CHUNK_SIZE > sizeof(struct PlayerRecords)) + if ((task->data[player + 1] + 1) * BUFFER_CHUNK_SIZE > sizeof(struct PlayerRecords)) memcpy(dst, src, sizeof(struct PlayerRecords) - task->data[player + 1] * BUFFER_CHUNK_SIZE); else memcpy(dst, src, BUFFER_CHUNK_SIZE); - //_080B993C ResetBlockReceivedFlag(player); task->data[player + 1]++; if ((u16)task->data[player + 1] == 0x18) - sp8 = (u8)(sp8 + 1); + handledPlayers++; } } - //line 828 gTasks[task->data[0]].data[0]++; } //_080B998A - if (sp8 == GetLinkPlayerCount()) + if (handledPlayers == GetLinkPlayerCount()) DestroyTask(taskId); } @@ -341,18 +334,18 @@ void sub_80B99B4(u8 taskId) DestroyTask(taskId); } -void sub_80B99E8(u8 taskId) +void Task_RecordMixing_ReceivePacket(u8 taskId) { struct Task *task = &gTasks[taskId]; task->func = sub_80B99B4; if (gUnknown_03000718 == 1) - sub_80B93B0(task->data[5]); + RecordMixing_ReceiveExchangePacket(task->data[5]); } -void sub_80B9A1C(u8 taskId) +void Task_RecordMixing_SendPacket_SwitchToReceive(u8 taskId) { - gTasks[taskId].func = sub_80B99E8; + gTasks[taskId].func = Task_RecordMixing_ReceivePacket; gUnknown_03000718 = 1; } @@ -433,6 +426,7 @@ u8 sub_80B9BBC(u16 *a) return a[16]; } +#undef NONMATCHING #ifdef NONMATCHING void sub_80B9BC4(u32 a, u32 b, u32 c, u32 d) -- cgit v1.2.3 From 5847cceee4656ca5ffd08eb57d90e2cccdaaea60 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sun, 21 May 2017 14:28:59 +0200 Subject: Fix tabs - it's 4 spaces --- src/daycare.c | 598 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 299 insertions(+), 299 deletions(-) (limited to 'src') diff --git a/src/daycare.c b/src/daycare.c index b1bafa6f4..92be45cfa 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -7,243 +7,243 @@ extern u8 gLastFieldPokeMenuOpened; u8 *GetMonNick(struct Pokemon *mon, u8 *dest) { - s8 nickname[POKEMON_NAME_LENGTH * 2]; + s8 nickname[POKEMON_NAME_LENGTH * 2]; - GetMonData(mon, MON_DATA_NICKNAME, nickname); - return StringCopy10(dest, nickname); + GetMonData(mon, MON_DATA_NICKNAME, nickname); + return StringCopy10(dest, nickname); } u8 *GetBoxMonNick(struct BoxPokemon *mon, u8 *dest) { - s8 nickname[POKEMON_NAME_LENGTH * 2]; + s8 nickname[POKEMON_NAME_LENGTH * 2]; - GetBoxMonData(mon, MON_DATA_NICKNAME, nickname); - return StringCopy10(dest, nickname); + GetBoxMonData(mon, MON_DATA_NICKNAME, nickname); + return StringCopy10(dest, nickname); } u8 Daycare_CountPokemon(struct BoxPokemon *daycare_data) { - u8 i, count; - count = 0; + u8 i, count; + count = 0; - for(i = 0;i <= 1;i++) - if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) - count++; + for(i = 0;i <= 1;i++) + if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) + count++; - return count; + return count; } #ifndef ASDF __attribute__((naked)) void sub_8041324(struct BoxPokemon * box_pokemon, void * void_pointer) { - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - mov r9, r0\n\ - mov r10, r1\n\ - movs r7, 0\n\ - movs r5, 0\n\ - mov r6, r10\n\ - adds r6, 0x74\n\ - movs r0, 0x1\n\ - mov r8, r0\n\ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + mov r9, r0\n\ + mov r10, r1\n\ + movs r7, 0\n\ + movs r5, 0\n\ + mov r6, r10\n\ + adds r6, 0x74\n\ + movs r0, 0x1\n\ + mov r8, r0\n\ _0804133E:\n\ - lsls r0, r5, 2\n\ - adds r0, r5\n\ - lsls r0, 4\n\ - mov r1, r9\n\ - adds r4, r1, r0\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - bl GetBoxMonData\n\ - cmp r0, 0\n\ - beq _0804136E\n\ - adds r0, r7, 0x1\n\ - lsls r0, 24\n\ - lsrs r7, r0, 24\n\ - adds r0, r4, 0\n\ - movs r1, 0xC\n\ - bl GetBoxMonData\n\ - adds r1, r0, 0\n\ - cmp r1, 0\n\ - bne _0804136E\n\ - lsls r0, r5, 1\n\ - adds r0, r6, r0\n\ - b _08041374\n\ + lsls r0, r5, 2\n\ + adds r0, r5\n\ + lsls r0, 4\n\ + mov r1, r9\n\ + adds r4, r1, r0\n\ + adds r0, r4, 0\n\ + movs r1, 0xB\n\ + bl GetBoxMonData\n\ + cmp r0, 0\n\ + beq _0804136E\n\ + adds r0, r7, 0x1\n\ + lsls r0, 24\n\ + lsrs r7, r0, 24\n\ + adds r0, r4, 0\n\ + movs r1, 0xC\n\ + bl GetBoxMonData\n\ + adds r1, r0, 0\n\ + cmp r1, 0\n\ + bne _0804136E\n\ + lsls r0, r5, 1\n\ + adds r0, r6, r0\n\ + b _08041374\n\ _0804136E:\n\ - lsls r0, r5, 1\n\ - adds r0, r6, r0\n\ - mov r1, r8\n\ + lsls r0, r5, 1\n\ + adds r0, r6, r0\n\ + mov r1, r8\n\ _08041374:\n\ - strh r1, [r0]\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - cmp r5, 0x1\n\ - bls _0804133E\n\ - mov r0, r10\n\ - str r7, [r0, 0x70]\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); + strh r1, [r0]\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + cmp r5, 0x1\n\ + bls _0804133E\n\ + mov r0, r10\n\ + str r7, [r0, 0x70]\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); } #endif s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data) { - u8 i; + u8 i; - for(i = 0;i <= 1;i++) - if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0) - return i; + for(i = 0;i <= 1;i++) + if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0) + return i; - return -1; + return -1; } /*void Daycare_SendPokemon(struct Pokemon * mon, struct BoxPokemon * daycare_data){ // unfinished - s8 empty_slot; + s8 empty_slot; - empty_slot = Daycare_FindEmptySpot(daycare_data); - if(MonHasMail(mon) != 0){ // if the mon holds a mail? - u8 empty_slot_times_56 = empty_slot * 56; - u8 * something2 = ((u8 *) (daycare_data + 2)) + empty_slot_times_56 + 36; - StringCopy(something2, gSaveBlock2.playerName); - PadNameString(something2, 0xFC); - something2 += 8; - GetMonNick(mon, something2); - u8 pokerus = GetMonData(mon, MON_DATA_64); - something1 += (u8 * daycare_data) + empty_slot = Daycare_FindEmptySpot(daycare_data); + if(MonHasMail(mon) != 0){ // if the mon holds a mail? + u8 empty_slot_times_56 = empty_slot * 56; + u8 * something2 = ((u8 *) (daycare_data + 2)) + empty_slot_times_56 + 36; + StringCopy(something2, gSaveBlock2.playerName); + PadNameString(something2, 0xFC); + something2 += 8; + GetMonNick(mon, something2); + u8 pokerus = GetMonData(mon, MON_DATA_64); + something1 += (u8 * daycare_data) }*/ __attribute__((naked)) void Daycare_SendPokemon() { - // strange stack usage - happens because THUMB ARM only allows R0-R7 to be pushed/popped: - // all registers in reglist must be Lo registers, except that PUSH can include the LR, and POP can include the PC - // the ldm/stm section probably copies some struct, but I'm not sure how the code would look - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r9\n\ - mov r6, r8\n\ - push {r6,r7}\n\ - adds r7, r0, 0\n\ - mov r8, r1\n\ - mov r0, r8\n\ - bl Daycare_FindEmptySpot\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - mov r9, r4\n\ - adds r0, r7, 0\n\ - bl MonHasMail\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _0804144A\n\ - lsls r0, r4, 24\n\ - asrs r0, 24\n\ - lsls r4, r0, 3\n\ - subs r4, r0\n\ - lsls r4, 3\n\ - adds r5, r4, 0\n\ - adds r5, 0xA0\n\ - add r5, r8\n\ - adds r6, r5, 0\n\ - adds r6, 0x24\n\ - ldr r1, _08041490 @ =gSaveBlock2\n\ - adds r0, r6, 0\n\ - bl StringCopy\n\ - adds r0, r6, 0\n\ - movs r1, 0xFC\n\ - bl PadNameString\n\ - adds r6, 0x8\n\ - adds r0, r7, 0\n\ - adds r1, r6, 0\n\ - bl GetMonNick\n\ - adds r0, r7, 0\n\ - movs r1, 0x40\n\ - bl GetMonData\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - add r4, r8\n\ - ldr r2, _08041494 @ =gSaveBlock1\n\ - lsls r1, r0, 3\n\ - adds r1, r0\n\ - lsls r1, 2\n\ - adds r1, r2\n\ - adds r4, 0xA0\n\ - ldr r0, _08041498 @ =0x00002b4c\n\ - adds r1, r0\n\ - ldm r1!, {r0,r2,r3}\n\ - stm r4!, {r0,r2,r3}\n\ - ldm r1!, {r0,r2,r3}\n\ - stm r4!, {r0,r2,r3}\n\ - ldm r1!, {r0,r2,r3}\n\ - stm r4!, {r0,r2,r3}\n\ - adds r0, r7, 0\n\ - bl TakeMailFromMon\n\ + // strange stack usage - happens because THUMB ARM only allows R0-R7 to be pushed/popped: + // all registers in reglist must be Lo registers, except that PUSH can include the LR, and POP can include the PC + // the ldm/stm section probably copies some struct, but I'm not sure how the code would look + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + adds r7, r0, 0\n\ + mov r8, r1\n\ + mov r0, r8\n\ + bl Daycare_FindEmptySpot\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + mov r9, r4\n\ + adds r0, r7, 0\n\ + bl MonHasMail\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _0804144A\n\ + lsls r0, r4, 24\n\ + asrs r0, 24\n\ + lsls r4, r0, 3\n\ + subs r4, r0\n\ + lsls r4, 3\n\ + adds r5, r4, 0\n\ + adds r5, 0xA0\n\ + add r5, r8\n\ + adds r6, r5, 0\n\ + adds r6, 0x24\n\ + ldr r1, _08041490 @ =gSaveBlock2\n\ + adds r0, r6, 0\n\ + bl StringCopy\n\ + adds r0, r6, 0\n\ + movs r1, 0xFC\n\ + bl PadNameString\n\ + adds r6, 0x8\n\ + adds r0, r7, 0\n\ + adds r1, r6, 0\n\ + bl GetMonNick\n\ + adds r0, r7, 0\n\ + movs r1, 0x40\n\ + bl GetMonData\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + add r4, r8\n\ + ldr r2, _08041494 @ =gSaveBlock1\n\ + lsls r1, r0, 3\n\ + adds r1, r0\n\ + lsls r1, 2\n\ + adds r1, r2\n\ + adds r4, 0xA0\n\ + ldr r0, _08041498 @ =0x00002b4c\n\ + adds r1, r0\n\ + ldm r1!, {r0,r2,r3}\n\ + stm r4!, {r0,r2,r3}\n\ + ldm r1!, {r0,r2,r3}\n\ + stm r4!, {r0,r2,r3}\n\ + ldm r1!, {r0,r2,r3}\n\ + stm r4!, {r0,r2,r3}\n\ + adds r0, r7, 0\n\ + bl TakeMailFromMon\n\ _0804144A:\n\ - mov r2, r9\n\ - lsls r4, r2, 24\n\ - asrs r4, 24\n\ - lsls r5, r4, 2\n\ - adds r4, r5, r4\n\ - lsls r4, 4\n\ - add r4, r8\n\ - adds r0, r4, 0\n\ - adds r1, r7, 0\n\ - movs r2, 0x50\n\ - bl memcpy\n\ - adds r0, r4, 0\n\ - bl BoxMonRestorePP\n\ - movs r0, 0x88\n\ - lsls r0, 1\n\ - add r0, r8\n\ - adds r0, r5\n\ - movs r1, 0\n\ - str r1, [r0]\n\ - adds r0, r7, 0\n\ - bl ZeroMonData\n\ - bl party_compaction\n\ - bl CalculatePlayerPartyCount\n\ - pop {r3,r4}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ + mov r2, r9\n\ + lsls r4, r2, 24\n\ + asrs r4, 24\n\ + lsls r5, r4, 2\n\ + adds r4, r5, r4\n\ + lsls r4, 4\n\ + add r4, r8\n\ + adds r0, r4, 0\n\ + adds r1, r7, 0\n\ + movs r2, 0x50\n\ + bl memcpy\n\ + adds r0, r4, 0\n\ + bl BoxMonRestorePP\n\ + movs r0, 0x88\n\ + lsls r0, 1\n\ + add r0, r8\n\ + adds r0, r5\n\ + movs r1, 0\n\ + str r1, [r0]\n\ + adds r0, r7, 0\n\ + bl ZeroMonData\n\ + bl party_compaction\n\ + bl CalculatePlayerPartyCount\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ _08041490: .4byte gSaveBlock2\n\ _08041494: .4byte gSaveBlock1\n\ _08041498: .4byte 0x00002b4c\n\ - .syntax divided\n"); + .syntax divided\n"); } void Daycare_SendPokemon_Special() { - Daycare_SendPokemon(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.daycareData); + Daycare_SendPokemon(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.daycareData); } void sub_80417F4(u8 *); void sub_80414C0(struct BoxPokemon * daycare_data) { - u32 second_species; - if((GetBoxMonData(&daycare_data[1], MON_DATA_SPECIES) != 0) && ((second_species = GetBoxMonData(&daycare_data[0], MON_DATA_SPECIES)) == 0)){ - daycare_data[0] = daycare_data[1]; - ZeroBoxMonData(&daycare_data[1]); - memcpy(daycare_data + 2, (u8 *) (daycare_data + 1) + 0x88, 0x38); - *((u32 *)(daycare_data) + 68) = *((u32 *)(daycare_data) + 69); - *((u32 *)(daycare_data) + 69) = second_species; - sub_80417F4((u8 *) (daycare_data + 1) + 0x88); - } + u32 second_species; + if((GetBoxMonData(&daycare_data[1], MON_DATA_SPECIES) != 0) && ((second_species = GetBoxMonData(&daycare_data[0], MON_DATA_SPECIES)) == 0)){ + daycare_data[0] = daycare_data[1]; + ZeroBoxMonData(&daycare_data[1]); + memcpy(daycare_data + 2, (u8 *) (daycare_data + 1) + 0x88, 0x38); + *((u32 *)(daycare_data) + 68) = *((u32 *)(daycare_data) + 69); + *((u32 *)(daycare_data) + 69) = second_species; + sub_80417F4((u8 *) (daycare_data + 1) + 0x88); + } } u8 TryIncrementMonLevel(struct Pokemon *); @@ -251,138 +251,138 @@ extern u16 word_2024E82; void sub_804151C(struct Pokemon * mon) { - s32 i; - u8 r6; - u16 temp; + s32 i; + u8 r6; + u16 temp; - for(i = 0; i < 100; i++){ - if(TryIncrementMonLevel(mon) == FALSE) goto end; + for(i = 0; i < 100; i++){ + if(TryIncrementMonLevel(mon) == FALSE) goto end; - r6 = 1; - while((temp = sub_803B7C8(mon, r6)) != 0){ - r6 = 0; - if(temp == 0xffff){ - DeleteFirstMoveAndGiveMoveToMon(mon, word_2024E82); - } - } - } + r6 = 1; + while((temp = sub_803B7C8(mon, r6)) != 0){ + r6 = 0; + if(temp == 0xffff){ + DeleteFirstMoveAndGiveMoveToMon(mon, word_2024E82); + } + } + } - end: + end: - CalculateMonStats(mon); + CalculateMonStats(mon); } __attribute__((naked)) u16 sub_8041570(struct BoxPokemon * daycare_data, u8 a2){ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r9\n\ - mov r6, r8\n\ - push {r6,r7}\n\ - sub sp, 0x68\n\ - adds r5, r0, 0\n\ - lsls r1, 24\n\ - lsrs r4, r1, 24\n\ - lsls r7, r4, 2\n\ - adds r0, r7, r4\n\ - lsls r0, 4\n\ - adds r6, r5, r0\n\ - ldr r1, _08041640 @ =gStringVar1\n\ - adds r0, r6, 0\n\ - bl GetBoxMonNick\n\ - adds r0, r6, 0\n\ - movs r1, 0xB\n\ - bl GetBoxMonData\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - mov r9, r0\n\ - adds r0, r6, 0\n\ - mov r1, sp\n\ - bl sub_803B4B4\n\ - mov r0, sp\n\ - movs r1, 0x38\n\ - bl GetMonData\n\ - cmp r0, 0x64\n\ - beq _080415D8\n\ - mov r0, sp\n\ - movs r1, 0x19\n\ - bl GetMonData\n\ - movs r2, 0x88\n\ - lsls r2, 1\n\ - adds r1, r5, r2\n\ - adds r1, r7\n\ - ldr r1, [r1]\n\ - adds r0, r1\n\ - str r0, [sp, 0x64]\n\ - add r2, sp, 0x64\n\ - mov r0, sp\n\ - movs r1, 0x19\n\ - bl SetMonData\n\ - mov r0, sp\n\ - bl sub_804151C\n\ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + sub sp, 0x68\n\ + adds r5, r0, 0\n\ + lsls r1, 24\n\ + lsrs r4, r1, 24\n\ + lsls r7, r4, 2\n\ + adds r0, r7, r4\n\ + lsls r0, 4\n\ + adds r6, r5, r0\n\ + ldr r1, _08041640 @ =gStringVar1\n\ + adds r0, r6, 0\n\ + bl GetBoxMonNick\n\ + adds r0, r6, 0\n\ + movs r1, 0xB\n\ + bl GetBoxMonData\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r9, r0\n\ + adds r0, r6, 0\n\ + mov r1, sp\n\ + bl sub_803B4B4\n\ + mov r0, sp\n\ + movs r1, 0x38\n\ + bl GetMonData\n\ + cmp r0, 0x64\n\ + beq _080415D8\n\ + mov r0, sp\n\ + movs r1, 0x19\n\ + bl GetMonData\n\ + movs r2, 0x88\n\ + lsls r2, 1\n\ + adds r1, r5, r2\n\ + adds r1, r7\n\ + ldr r1, [r1]\n\ + adds r0, r1\n\ + str r0, [sp, 0x64]\n\ + add r2, sp, 0x64\n\ + mov r0, sp\n\ + movs r1, 0x19\n\ + bl SetMonData\n\ + mov r0, sp\n\ + bl sub_804151C\n\ _080415D8:\n\ - ldr r0, _08041644 @ =gPlayerParty\n\ - movs r1, 0xFA\n\ - lsls r1, 1\n\ - adds r1, r0\n\ - mov r8, r1\n\ - mov r0, r8\n\ - mov r1, sp\n\ - movs r2, 0x64\n\ - bl memcpy\n\ - lsls r0, r4, 3\n\ - subs r0, r4\n\ - lsls r1, r0, 3\n\ - adds r0, r5, r1\n\ - adds r0, 0xC0\n\ - ldrh r0, [r0]\n\ - cmp r0, 0\n\ - beq _08041610\n\ - adds r4, r1, 0\n\ - adds r4, 0xA0\n\ - adds r4, r5, r4\n\ - mov r0, r8\n\ - adds r1, r4, 0\n\ - bl GiveMailToMon2\n\ - adds r0, r4, 0\n\ - bl sub_80417F4\n\ + ldr r0, _08041644 @ =gPlayerParty\n\ + movs r1, 0xFA\n\ + lsls r1, 1\n\ + adds r1, r0\n\ + mov r8, r1\n\ + mov r0, r8\n\ + mov r1, sp\n\ + movs r2, 0x64\n\ + bl memcpy\n\ + lsls r0, r4, 3\n\ + subs r0, r4\n\ + lsls r1, r0, 3\n\ + adds r0, r5, r1\n\ + adds r0, 0xC0\n\ + ldrh r0, [r0]\n\ + cmp r0, 0\n\ + beq _08041610\n\ + adds r4, r1, 0\n\ + adds r4, 0xA0\n\ + adds r4, r5, r4\n\ + mov r0, r8\n\ + adds r1, r4, 0\n\ + bl GiveMailToMon2\n\ + adds r0, r4, 0\n\ + bl sub_80417F4\n\ _08041610:\n\ - bl party_compaction\n\ - adds r0, r6, 0\n\ - bl ZeroBoxMonData\n\ - movs r2, 0x88\n\ - lsls r2, 1\n\ - adds r0, r5, r2\n\ - adds r0, r7\n\ - movs r1, 0\n\ - str r1, [r0]\n\ - adds r0, r5, 0\n\ - bl sub_80414C0\n\ - bl CalculatePlayerPartyCount\n\ - mov r0, r9\n\ - add sp, 0x68\n\ - pop {r3,r4}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .align 2, 0\n\ + bl party_compaction\n\ + adds r0, r6, 0\n\ + bl ZeroBoxMonData\n\ + movs r2, 0x88\n\ + lsls r2, 1\n\ + adds r0, r5, r2\n\ + adds r0, r7\n\ + movs r1, 0\n\ + str r1, [r0]\n\ + adds r0, r5, 0\n\ + bl sub_80414C0\n\ + bl CalculatePlayerPartyCount\n\ + mov r0, r9\n\ + add sp, 0x68\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ + .align 2, 0\n\ _08041640: .4byte gStringVar1\n\ _08041644: .4byte gPlayerParty\n\ - .syntax divided"); + .syntax divided"); } extern u8 gSpecialVar_0x8004; u16 sub_8041648() { - return sub_8041570(gSaveBlock1.daycareData, gSpecialVar_0x8004); + return sub_8041570(gSaveBlock1.daycareData, gSpecialVar_0x8004); } u8 Daycare_GetLevelAfterSteps(struct BoxPokemon * mon, u32 steps){ - struct BoxPokemon temp = *mon; - u32 new_exp = GetBoxMonData(mon, MON_DATA_EXP) + steps; - SetBoxMonData(&temp, MON_DATA_EXP, (u8 *) &new_exp); - return GetLevelFromBoxMonExp(&temp); + struct BoxPokemon temp = *mon; + u32 new_exp = GetBoxMonData(mon, MON_DATA_EXP) + steps; + SetBoxMonData(&temp, MON_DATA_EXP, (u8 *) &new_exp); + return GetLevelFromBoxMonExp(&temp); } -- cgit v1.2.3 From 619da0f339c4d529de919d0b73b747fa16127d37 Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sun, 21 May 2017 19:46:04 +0200 Subject: PlaySE renaming after rebase --- src/battle_anim.c | 14 +++---- src/battle_interface.c | 8 ++-- src/battle_party_menu.c | 16 ++++---- src/berry_tag_screen.c | 4 +- src/bike.c | 2 +- src/braille_puzzles.c | 8 ++-- src/cable_club.c | 4 +- src/clear_save_data_menu.c | 4 +- src/field_control_avatar.c | 8 ++-- src/field_player_avatar.c | 20 +++++----- src/field_special_scene.c | 8 ++-- src/fldeff_cut.c | 4 +- src/fldeff_softboiled.c | 2 +- src/fldeff_sweetscent.c | 2 +- src/intro.c | 2 +- src/item_use.c | 8 ++-- src/link.c | 4 +- src/main_menu.c | 18 ++++----- src/menu.c | 24 ++++++------ src/mystery_event_menu.c | 18 ++++----- src/naming_screen.c | 10 ++--- src/party_menu.c | 4 +- src/player_pc.c | 36 +++++++++--------- src/pokedex.c | 78 +++++++++++++++++++-------------------- src/record_mixing.c | 8 ++-- src/rom4.c | 8 ++-- src/rom6.c | 2 +- src/scrcmd.c | 4 +- src/script_menu.c | 6 +-- src/script_pokemon_util_80F99CC.c | 8 ++-- src/shop.c | 8 ++-- src/sound.c | 8 ++-- src/start_menu.c | 12 +++--- src/starter_choose.c | 2 +- src/text.c | 12 +++--- src/trainer_card.c | 2 +- src/wallclock.c | 4 +- 37 files changed, 195 insertions(+), 195 deletions(-) (limited to 'src') diff --git a/src/battle_anim.c b/src/battle_anim.c index 8ca66f745..bdb34365f 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -673,7 +673,7 @@ static void ScriptCmd_end(void) static void ScriptCmd_playse(void) { gBattleAnimScriptPtr++; - PlaySoundEffect(SCRIPT_READ_16(gBattleAnimScriptPtr)); + PlaySE(SCRIPT_READ_16(gBattleAnimScriptPtr)); gBattleAnimScriptPtr += 2; } @@ -1715,7 +1715,7 @@ static void ScriptCmd_panse_19(void) gBattleAnimScriptPtr++; r4 = SCRIPT_READ_16(gBattleAnimScriptPtr); r0 = SCRIPT_READ_8(gBattleAnimScriptPtr + 2); - PlaySoundEffect12WithPanning(r4, sub_8076F98(r0)); + PlaySE12WithPanning(r4, sub_8076F98(r0)); gBattleAnimScriptPtr += 3; } @@ -1755,7 +1755,7 @@ static void ScriptCmd_panse_1B(void) gTasks[taskId].data[2] = r4; gTasks[taskId].data[3] = r7; gTasks[taskId].data[4] = panning; - PlaySoundEffect12WithPanning(songNum, panning); + PlaySE12WithPanning(songNum, panning); gAnimSoundTaskCount++; gBattleAnimScriptPtr += 6; } @@ -1917,7 +1917,7 @@ static void ScriptCmd_panse_26(void) gTasks[taskId].data[2] = r6; gTasks[taskId].data[3] = r10; gTasks[taskId].data[4] = r4; - PlaySoundEffect12WithPanning(r8, r4); + PlaySE12WithPanning(r8, r4); gAnimSoundTaskCount++; gBattleAnimScriptPtr += 6; } @@ -1949,7 +1949,7 @@ static void ScriptCmd_panse_27(void) gTasks[taskId].data[2] = r4_2; gTasks[taskId].data[3] = r7; gTasks[taskId].data[4] = r6; - PlaySoundEffect12WithPanning(r9, r6); + PlaySE12WithPanning(r9, r6); gAnimSoundTaskCount++; gBattleAnimScriptPtr += 6; } @@ -1996,7 +1996,7 @@ static void sub_80774FC(u8 taskId) r1 = gTasks[taskId].data[1]; gTasks[taskId].data[3]--; r4 = gTasks[taskId].data[3]; - PlaySoundEffect12WithPanning(r0, r1); + PlaySE12WithPanning(r0, r1); if (r4 == 0) { DestroyTask(taskId); @@ -2034,7 +2034,7 @@ static void sub_80775CC(u8 taskId) gTasks[taskId].data[2]--; if (r0 <= 0) { - PlaySoundEffect12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]); + PlaySE12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]); DestroyTask(taskId); gAnimSoundTaskCount--; } diff --git a/src/battle_interface.c b/src/battle_interface.c index 827ed4ffc..9938c4b54 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1589,7 +1589,7 @@ u8 sub_8044804(u8 a, const struct UnknownStruct8 *b, u8 c, u8 d) for (i = 0; i < 6; i++) gTasks[taskId].data[3 + i] = sp[i]; gTasks[taskId].data[10] = d; - PlaySoundEffect12WithPanning(SE_TB_START, 0); + PlaySE12WithPanning(SE_TB_START, 0); return taskId; } #else @@ -2169,7 +2169,7 @@ _08044C62:\n\ strh r6, [r0, 0x1C]\n\ movs r0, 0x72\n\ movs r1, 0\n\ - bl PlaySoundEffect12WithPanning\n\ + bl PlaySE12WithPanning\n\ adds r0, r4, 0\n\ add sp, 0x28\n\ pop {r3-r5}\n\ @@ -2356,9 +2356,9 @@ void sub_804507C(struct Sprite *sprite) if (r3 != 0) pan = -64; if (sprite->data7 != 0) - PlaySoundEffect2WithPanning(SE_TB_KARA, pan); + PlaySE2WithPanning(SE_TB_KARA, pan); else - PlaySoundEffect1WithPanning(SE_TB_KON, pan); + PlaySE1WithPanning(SE_TB_KON, pan); sprite->callback = SpriteCallbackDummy; } } diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index 4ee55f0e2..820d16465 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -230,7 +230,7 @@ void SetUpBattlePokemonMenu(u8 a) if (gUnknown_02038473 == 3) { if (GetMonData(&gPlayerParty[sub_806CA38(a)], MON_DATA_IS_EGG)) - PlaySoundEffect(SE_HAZURE); + PlaySE(SE_HAZURE); else { sub_806D5A4(); @@ -239,7 +239,7 @@ void SetUpBattlePokemonMenu(u8 a) } else { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); GetMonNickname(&gPlayerParty[sub_806CA38(a)], gStringVar1); sub_8095050(a, sub_806CA38(a)); SetTaskFuncWithFollowupFunc(a, Task_HandlePopupMenuInput, SetUpBattlePokemonMenu); @@ -247,10 +247,10 @@ void SetUpBattlePokemonMenu(u8 a) break; case 2: if (gUnknown_02038473 == 1) - PlaySoundEffect(SE_HAZURE); + PlaySE(SE_HAZURE); else { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); if (gUnknown_02038473 == 3) { gUnknown_0202E8F4 = 0; @@ -336,19 +336,19 @@ static void Task_HandlePopupMenuInput(u8 taskId) { if (gMain.newAndRepeatedKeys & DPAD_UP) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor(-1); return; } if (gMain.newAndRepeatedKeys & DPAD_DOWN) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor(1); return; } if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); func = PartyMenuGetPopupMenuFunc(gTasks[taskId].data[4], sBattlePartyPopupMenus, sBattlePartyMenuActions, @@ -358,7 +358,7 @@ static void Task_HandlePopupMenuInput(u8 taskId) } if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); Task_BattlePartyMenuCancel(taskId); return; } diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 94f9c5941..511b88c5a 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -245,7 +245,7 @@ static void sub_814640C(u8 taskId) static void sub_8146440(u8 taskId) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = sub_814640C; } @@ -379,7 +379,7 @@ _08146718:\n\ bgt _0814678C\n\ _08146728:\n\ movs r0, 0x5\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ mov r2, r8\n\ ldrb r3, [r2, 0x1]\n\ ldrb r4, [r4, 0xC]\n\ diff --git a/src/bike.c b/src/bike.c index 0c154de9c..d7175b5e0 100644 --- a/src/bike.c +++ b/src/bike.c @@ -617,7 +617,7 @@ static void AcroBikeTransition_80E5920(u8 direction) } } playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - PlaySoundEffect(SE_JITE_PYOKO); + PlaySE(SE_JITE_PYOKO); playerMapObj->mapobj_bit_9 = 1; PlayerSetAnimId(sub_80608A4(direction), 2); } diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 7c6a22547..220e8420c 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -46,7 +46,7 @@ void DoBrailleDigEffect(void) MapGridSetMetatileIdAt(17, 9, 563); MapGridSetMetatileIdAt(18, 9, 3636); DrawWholeMapView(); - PlaySoundEffect(SE_BAN); + PlaySE(SE_BAN); FlagSet(SYS_BRAILLE_DIG); ScriptContext2_Disable(); } @@ -88,7 +88,7 @@ void DoBrailleStrengthEffect(void) MapGridSetMetatileIdAt(15, 27, 563); MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); - PlaySoundEffect(SE_BAN); + PlaySE(SE_BAN); FlagSet(SYS_BRAILLE_STRENGTH); ScriptContext2_Disable(); } @@ -134,7 +134,7 @@ void UseFlyAncientTomb_Finish(void) MapGridSetMetatileIdAt(15, 27, 563); MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); - PlaySoundEffect(SE_BAN); + PlaySE(SE_BAN); FlagSet(SYS_BRAILLE_FLY); ScriptContext2_Disable(); } @@ -159,7 +159,7 @@ void Task_BrailleWait(u8 taskId) if (BrailleWait_CheckButtonPress() != FALSE) { MenuZeroFillScreen(); - PlaySoundEffect(5); + PlaySE(5); data[0] = 2; } else diff --git a/src/cable_club.c b/src/cable_club.c index 1f2c6376a..45fb347f3 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -89,7 +89,7 @@ static void sub_80830E4(u8 taskId) { if (gMain.heldKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sub_8007F4C(); gTasks[(u32) taskId].func = sub_8083188; } @@ -153,7 +153,7 @@ _08083158:\n\ cmp r0, 0\n\ beq _08083178\n\ movs r0, 0x5\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ bl sub_8007F4C\n\ ldr r0, _08083180 @ =gTasks\n\ lsls r1, r6, 2\n\ diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c index 301e169ce..21cd643ef 100644 --- a/src/clear_save_data_menu.c +++ b/src/clear_save_data_menu.c @@ -59,13 +59,13 @@ static void Task_ProcessMenuInput(u8 taskId) switch (ProcessMenuInputNoWrap_()) { case 0: - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sub_8071F40(gSystemText_ClearingData); gTasks[taskId].func = Task_ClearSaveData; break; case -1: case 1: - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); DestroyTask(taskId); SetMainCallback2(CB2_SoftReset); break; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index e51ae24b6..c5f2c08e7 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -214,7 +214,7 @@ int sub_8068024(struct FieldInput *input) return TRUE; if (input->pressedStartButton) { - PlaySoundEffect(SE_WIN_OPEN); + PlaySE(SE_WIN_OPEN); sub_8071310(); return TRUE; } @@ -261,7 +261,7 @@ static bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c) && script != gUnknown_0815F36C && script != gUnknown_0815F43A && script != gUnknown_081A0009) - PlaySoundEffect(5); + PlaySE(5); ScriptContext1_SetupScript(script); return TRUE; @@ -828,7 +828,7 @@ int dive_warp(struct MapPosition *position, u16 b) { walkrun_find_lowest_active_bit_in_bitfield(); sp13E_warp_to_last_warp(); - PlaySoundEffect(SE_W291); + PlaySE(SE_W291); return TRUE; } } @@ -838,7 +838,7 @@ int dive_warp(struct MapPosition *position, u16 b) { walkrun_find_lowest_active_bit_in_bitfield(); sp13E_warp_to_last_warp(); - PlaySoundEffect(SE_W291); + PlaySE(SE_W291); return TRUE; } } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index c0a71fcf4..6a0fe1dce 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -871,7 +871,7 @@ void PlayerTurnInPlace(u8 direction) void PlayerJumpLedge(u8 direction) { - PlaySoundEffect(SE_DANSA); + PlaySE(SE_DANSA); PlayerSetAnimId(GetJumpLedgeAnimId(direction), 8); } @@ -902,31 +902,31 @@ void sub_8059534(u8 a) void sub_805954C(u8 a) { - PlaySoundEffect(SE_JITE_PYOKO); + PlaySE(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060A5C(a), 1); } void sub_8059570(u8 a) { - PlaySoundEffect(SE_JITE_PYOKO); + PlaySE(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060A88(a), 2); } void sub_8059594(u8 a) { - PlaySoundEffect(SE_JITE_PYOKO); + PlaySE(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060AB4(a), 8); } void sub_80595B8(u8 direction) { - PlaySoundEffect(SE_JITE_PYOKO); + PlaySE(SE_JITE_PYOKO); PlayerSetAnimId(sub_8060878(direction), 1); } void sub_80595DC(u8 direction) { - PlaySoundEffect(SE_WALL_HIT); + PlaySE(SE_WALL_HIT); PlayerSetAnimId(sub_8060AE0(direction), 2); } @@ -959,7 +959,7 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a) if (MetatileBehavior_IsWarpDoor(MapGridGetMetatileBehaviorAt(x, y))) return; } - PlaySoundEffect(SE_WALL_HIT); + PlaySE(SE_WALL_HIT); } } @@ -1292,7 +1292,7 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c) gUnknown_0202FF84[2] = c->elevation; gUnknown_0202FF84[3] = gSprites[c->spriteId].oam.priority; FieldEffectStart(10); - PlaySoundEffect(SE_W070); + PlaySE(SE_W070); task->data[0]++; } return 0; @@ -1334,7 +1334,7 @@ u8 sub_805A000(struct Task *task, struct MapObject *mapObject) gPlayerAvatar.unk6 = 1; if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) { - PlaySoundEffect(SE_DANSA); + PlaySE(SE_DANSA); FieldObjectSetSpecialAnim(mapObject, sub_806084C(mapObject->mapobj_unk_18)); task->data[1]++; if (task->data[1] > 1) @@ -1370,7 +1370,7 @@ u8 sub_805A0D8(struct Task *task, struct MapObject *mapObject) task->data[1] = mapObject->placeholder18; gPlayerAvatar.unk6 = 1; ScriptContext2_Enable(); - PlaySoundEffect(SE_TK_WARPIN); + PlaySE(SE_TK_WARPIN); return 1; } diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 6282ea813..59280b743 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -157,7 +157,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1] = 0; // reset the timer. data[2] = CreateTask(Task_Truck1, 0xA); data[0] = 1; // run the next case. - PlaySoundEffect(SE_TRACK_MOVE); + PlaySE(SE_TRACK_MOVE); } break; case 1: @@ -177,7 +177,7 @@ void Task_HandleTruckSequence(u8 taskId) DestroyTask(data[2]); data[3] = CreateTask(Task_Truck2, 0xA); data[0] = 3; - PlaySoundEffect(SE_TRACK_STOP); + PlaySE(SE_TRACK_STOP); } break; case 3: @@ -192,7 +192,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1]++; if (data[1] == 90) { - PlaySoundEffect(SE_TRACK_HAIK); + PlaySE(SE_TRACK_HAIK); data[1] = 0; data[0] = 5; } @@ -205,7 +205,7 @@ void Task_HandleTruckSequence(u8 taskId) MapGridSetMetatileIdAt(11, 9, 528); MapGridSetMetatileIdAt(11, 10, 536); DrawWholeMapView(); - PlaySoundEffect(SE_TRACK_DOOR); + PlaySE(SE_TRACK_DOOR); DestroyTask(taskId); ScriptContext2_Disable(); } diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 39e438620..77c8752d1 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -122,7 +122,7 @@ bool8 FldEff_CutGrass(void) u8 tileBehavior; u8 i, j; // not in for loop? - for(i = 0, PlaySoundEffect(SE_W015), PlayerGetDestCoords(&gUnknown_0203923C.x, &gUnknown_0203923C.y); i < 3; i++) + for(i = 0, PlaySE(SE_W015), PlayerGetDestCoords(&gUnknown_0203923C.x, &gUnknown_0203923C.y); i < 3; i++) { y = i - 1 + gUnknown_0203923C.y; for(j = 0; j < 3; j++) @@ -294,7 +294,7 @@ void sub_80A2AB8(void) void sub_80A2B00(void) { - PlaySoundEffect(0x80); + PlaySE(0x80); FieldEffectActiveListRemove(2); EnableBothScriptContexts(); } diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index f5372b53b..d0ee712af 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -122,7 +122,7 @@ static void sub_8133D50(u8 taskId) { return; } - PlaySoundEffect(SE_KAIFUKU); + PlaySE(SE_KAIFUKU); EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data0; diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 8d23a41cb..4e8214b07 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -49,7 +49,7 @@ static void sub_812C01C(void) { u8 taskId; - PlaySoundEffect(0xEC); + PlaySE(0xEC); BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, 0x1F); taskId = CreateTask(sub_812C084, 0); gTasks[taskId].data[0] = 0; diff --git a/src/intro.c b/src/intro.c index 00c9894cf..ea6edba3d 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1419,7 +1419,7 @@ static void Task_IntroPokemonBattle(u8 taskId) gSprites[spriteId].invisible = 1; } if (gIntroFrameCounter == 800) - PlaySoundEffect(SE_OP_BASYU); + PlaySE(SE_OP_BASYU); if (gIntroFrameCounter == 850) BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0xFFFF); if (gIntroFrameCounter == 946) diff --git a/src/item_use.c b/src/item_use.c index 5d0282844..4047ade5c 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -362,7 +362,7 @@ void RunItemfinderResults(u8 taskId) } return; } - PlaySoundEffect(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder. + PlaySE(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder. data[4]++; } data[3] = (data[3] + 1) & 0x1F; @@ -943,7 +943,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId) void sub_80C9EE4(u8 taskId) { - PlaySoundEffect(2); + PlaySE(2); gTasks[taskId].func = sub_80C9F10; } @@ -1002,7 +1002,7 @@ void sub_80CA098(u8 taskId) { if(++gTasks[taskId].data[15] > 7) { - PlaySoundEffect(0x75); + PlaySE(0x75); DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1); } } @@ -1095,7 +1095,7 @@ void sub_80CA2BC(u8 taskId) { if(++gTasks[taskId].data[15] > 7) { - PlaySoundEffect(1); + PlaySE(1); RemoveBagItem(gScriptItemId, 1); DisplayItemMessageOnField(taskId, sub_803F378(gScriptItemId), sub_80CA294, 1); } diff --git a/src/link.c b/src/link.c index d06e71c03..224c0ae1c 100644 --- a/src/link.c +++ b/src/link.c @@ -1262,10 +1262,10 @@ static void CB2_PrintErrorMessage(void) break; case 30: case 60: - PlaySoundEffect(SE_BOO); + PlaySE(SE_BOO); break; case 90: - PlaySoundEffect(SE_BOO); + PlaySE(SE_BOO); break; } diff --git a/src/main_menu.c b/src/main_menu.c index c1e43e1a8..50fefc471 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -446,13 +446,13 @@ bool8 MainMenuProcessKeyInput(u8 taskId) { if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0x0000); gTasks[taskId].func = Task_MainMenuPressedA; } else if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); REG_WIN0H = WIN_RANGE(0, 240); REG_WIN0V = WIN_RANGE(0, 160); @@ -966,14 +966,14 @@ static void Task_NewGameSpeech16(u8 taskId) { case MALE: sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); gSaveBlock2.playerGender = MALE; MenuZeroFillWindowRect(2, 4, 8, 9); gTasks[taskId].func = Task_NewGameSpeech19; break; case FEMALE: sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); gSaveBlock2.playerGender = FEMALE; MenuZeroFillWindowRect(2, 4, 8, 9); gTasks[taskId].func = Task_NewGameSpeech19; @@ -1069,19 +1069,19 @@ static void Task_NewGameSpeech21(u8 taskId) case 3: case 4: sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(2, 1, 22, 12); SetPresetPlayerName(selection); gTasks[taskId].func = Task_NewGameSpeech23; break; case 0: //NEW NAME - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); BeginNormalPaletteFade(-1, 0, 0, 16, 0); gTasks[taskId].func = Task_NewGameSpeech22; break; case -1: //B button sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(2, 1, 22, 12); gTasks[taskId].func = Task_NewGameSpeech14; //Go back to gender menu break; @@ -1122,7 +1122,7 @@ static void Task_NewGameSpeech25(u8 taskId) switch (ProcessMenuInputNoWrap_()) { case 0: //YES - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(2, 1, 8, 7); gSprites[gTasks[taskId].data[TD_TRAINER_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND; StartSpriteFadeOut(taskId, 2); @@ -1131,7 +1131,7 @@ static void Task_NewGameSpeech25(u8 taskId) break; case -1: //B button case 1: //NO - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(2, 1, 8, 7); gTasks[taskId].func = Task_NewGameSpeech14; //Go back to gender menu break; diff --git a/src/menu.c b/src/menu.c index 84093b9b7..ba98ff057 100644 --- a/src/menu.c +++ b/src/menu.c @@ -52,7 +52,7 @@ const struct MenuAction gMenuYesNoItems[] = void CloseMenu(void) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillScreen(); sub_8064E2C(); ScriptContext2_Disable(); @@ -270,7 +270,7 @@ s8 ProcessMenuInput(void) { if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); if (gMenu.menu_field_7) sub_8072DEC(); return gMenu.cursorPos; @@ -285,13 +285,13 @@ s8 ProcessMenuInput(void) if (gMain.newKeys & DPAD_UP) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor(-1); return -2; } else if (gMain.newKeys & DPAD_DOWN) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor(1); return -2; } @@ -305,7 +305,7 @@ s8 ProcessMenuInputNoWrap(void) if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); if (gMenu.menu_field_7) sub_8072DEC(); return gMenu.cursorPos; @@ -321,13 +321,13 @@ s8 ProcessMenuInputNoWrap(void) if (gMain.newKeys & DPAD_UP) { if (cursorPos != MoveMenuCursorNoWrap(-1)) - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); return -2; } else if (gMain.newKeys & DPAD_DOWN) { if (cursorPos != MoveMenuCursorNoWrap(1)) - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); return -2; } @@ -520,7 +520,7 @@ s8 sub_80727CC(void) { if (gMenu.menu_field_7) sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); return GetMenuCursorPos(); } @@ -533,25 +533,25 @@ s8 sub_80727CC(void) if (gMain.newKeys & DPAD_UP) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(-gMenu.width); return -2; } else if (gMain.newKeys & DPAD_DOWN) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(gMenu.width); return -2; } else if (gMain.newKeys & DPAD_LEFT) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(-1); return -2; } else if (gMain.newKeys & DPAD_RIGHT) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(1); return -2; } diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index c257e7573..97deb348c 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -113,13 +113,13 @@ static void CB2_MysteryEventMenu(void) case 3: if ((gLinkStatus & 0x20) && (gLinkStatus & 0x1C) > 4) { - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); sub_8072044(gSystemText_LoadEventPressA); gMain.state++; } if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); CloseLink(); gMain.state = 15; } @@ -139,7 +139,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sub_8007F4C(); MenuDrawTextWindow(6, 5, 23, 8); MenuPrint(gSystemText_LoadingEvent, 7, 6); @@ -147,7 +147,7 @@ static void CB2_MysteryEventMenu(void) } else if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); CloseLink(); gMain.state = 15; } @@ -185,7 +185,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); CloseLink(); gMain.state = 15; break; @@ -199,7 +199,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sub_8007F4C(); MenuDrawTextWindow(6, 5, 23, 8); MenuPrint(gSystemText_LoadingEvent, 7, 6); @@ -207,7 +207,7 @@ static void CB2_MysteryEventMenu(void) } else if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); CloseLink(); gMain.state = 15; } @@ -264,7 +264,7 @@ static void CB2_MysteryEventMenu(void) } if (gMain.newKeys & B_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); CloseLink(); gMain.state = 15; break; @@ -313,7 +313,7 @@ static void CB2_MysteryEventMenu(void) case 14: if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); gMain.state++; } break; diff --git a/src/naming_screen.c b/src/naming_screen.c index 531d12bdd..b14c690e2 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -453,7 +453,7 @@ static bool8 MainState_StartPageSwap(struct Task *task) StartPageSwapAnim(); sub_80B6888(1); sub_80B6460(0, 0, 1); - PlaySoundEffect(SE_WIN_OPEN); + PlaySE(SE_WIN_OPEN); namingScreenData.state = MAIN_STATE_WAIT_PAGE_SWAP; return FALSE; } @@ -607,7 +607,7 @@ static bool8 KeyboardKeyHandler_OK(u8 event) sub_80B6460(2, 1, 0); if (event == KBEVENT_PRESSED_A) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); namingScreenData.state = MAIN_STATE_6; return TRUE; } @@ -1370,7 +1370,7 @@ static void DeleteTextCharacter(void) var2 = GetKeyRoleAtCursorPos(); if (var2 == 0 || var2 == 2) sub_80B6460(1, 0, 1); - PlaySoundEffect(SE_BOWA); + PlaySE(SE_BOWA); } static bool8 sub_80B7004(void) @@ -1391,7 +1391,7 @@ static bool8 sub_80B7004(void) else AddTextCharacter(ch); sub_80B7960(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); if (r4) { if (GetPreviousTextCaretPosition() == namingScreenData.template->maxChars - 1) @@ -1422,7 +1422,7 @@ static void sub_80B7090(void) // DoInput? sub_80B72A4(r4, r5); } sub_80B7960(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } static bool8 sub_80B7104(void) diff --git a/src/party_menu.c b/src/party_menu.c index aebfd3307..d473eae6d 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -109,7 +109,7 @@ void sub_8070088(u8 taskId) gUnknown_0202E8F4 = 1; MenuZeroFillWindowRect(3, 14, 26, 19); - PlaySoundEffect(SE_KAIFUKU); + PlaySE(SE_KAIFUKU); PartyMenuUpdateLevelOrStatus(unk_201C000.pokemon, unk_201C000.var05); task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle()][unk_201C000.var05], 9); @@ -214,7 +214,7 @@ _08070134:\n\ movs r3, 0x13\n\ bl MenuZeroFillWindowRect\n\ movs r0, 0x1\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ ldr r0, [r4]\n\ ldrb r1, [r4, 0x5]\n\ bl PartyMenuUpdateLevelOrStatus\n\ diff --git a/src/player_pc.c b/src/player_pc.c index a31ce0803..f0f0709b1 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -129,24 +129,24 @@ void PlayerPCProcessMenuInput(u8 taskId) { if (gMain.newAndRepeatedKeys & 0x40) { - PlaySoundEffect(5); + PlaySE(5); MoveMenuCursor(-1); } else if (gMain.newAndRepeatedKeys & 0x80) { - PlaySoundEffect(5); + PlaySE(5); MoveMenuCursor(1); } else if (gMain.newKeys & 0x1) { sub_8072DEC(); - PlaySoundEffect(5); + PlaySE(5); gUnknown_08406298[gUnknown_02039314[GetMenuCursorPos()]].func(taskId); } else if (gMain.newKeys & 0x2) { sub_8072DEC(); - PlaySoundEffect(5); + PlaySE(5); gUnknown_08406298[gUnknown_030007B4[gUnknown_02039314 - 1]].func(taskId); } } @@ -222,25 +222,25 @@ void ItemStorageMenuProcessInput(u8 var) { if (gMain.newAndRepeatedKeys & 0x40) { - PlaySoundEffect(5); + PlaySE(5); MoveMenuCursor(-1); ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]); } else if (gMain.newAndRepeatedKeys & 0x80) { - PlaySoundEffect(5); + PlaySE(5); MoveMenuCursor(1); ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]); } else if (gMain.newKeys & 0x1) { - PlaySoundEffect(5); + PlaySE(5); gUnknown_084062C0[GetMenuCursorPos()].func(var); } else if (gMain.newKeys & 0x2) { sub_8072DEC(); - PlaySoundEffect(5); + PlaySE(5); gUnknown_084062C0[3].func(var); } } @@ -353,7 +353,7 @@ void sub_813A280(u8 taskId) { if(data[0]) { - PlaySoundEffect(5); + PlaySE(5); data[0] = MoveMenuCursor(-1); var = data[1] + data[0]; if (!data[9]) @@ -372,7 +372,7 @@ void sub_813A280(u8 taskId) { if (!data[1]) return; - PlaySoundEffect(5); + PlaySE(5); data[1]--; sub_813AE0C(taskId); // probably further down @@ -384,7 +384,7 @@ void sub_813A280(u8 taskId) { if(data[0] != data[4] - 1) { - PlaySoundEffect(5); + PlaySE(5); data[0] = MoveMenuCursor(1); var = data[1] + data[0]; @@ -398,7 +398,7 @@ void sub_813A280(u8 taskId) } else if(data[1] + data[0] != data[2]) { - PlaySoundEffect(5); + PlaySE(5); data[1]++; sub_813AE0C(taskId); @@ -412,7 +412,7 @@ void sub_813A280(u8 taskId) { if (data[0] + data[1] != data[2]) { - PlaySoundEffect(5); + PlaySE(5); data[9] = 1; data[8] = data[1] + data[0]; sub_813AD58(0xFFF7); @@ -422,14 +422,14 @@ void sub_813A280(u8 taskId) } else // _0813A3E8 { - PlaySoundEffect(5); // merging? + PlaySE(5); // merging? sub_813AA30(taskId, 0); sub_813AE0C(taskId); } } else if(gMain.newKeys & A_BUTTON) { - PlaySoundEffect(5); + PlaySE(5); if(!data[9]) { if(data[1] + data[0] != data[2]) @@ -449,7 +449,7 @@ void sub_813A280(u8 taskId) } else if(gMain.newKeys & B_BUTTON) { - PlaySoundEffect(5); + PlaySE(5); if(!data[9]) { sub_8072DEC(); @@ -554,7 +554,7 @@ void HandleQuantityRolling(u8 taskId) } else if(gMain.newKeys & A_BUTTON) // confirm quantity. { - PlaySoundEffect(5); + PlaySE(5); MenuZeroFillWindowRect(6, 6, 0xD, 0xB); if(!data[6]) @@ -564,7 +564,7 @@ void HandleQuantityRolling(u8 taskId) } else if(gMain.newKeys & B_BUTTON) // cancel quantity. { - PlaySoundEffect(5); + PlaySE(5); MenuZeroFillWindowRect(6, 6, 0xD, 0xB); sub_80F98DC(0); sub_80F98DC(1); diff --git a/src/pokedex.c b/src/pokedex.c index 688cae9e9..5ea1f9938 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -361,7 +361,7 @@ void Task_PokedexMainScreen(u8 taskId) 0, 0, 0x10, 0); gSprites[gPokedexView->unk626].callback = sub_808EDB8; gTasks[taskId].func = sub_808CA64; - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); } else if (gMain.newKeys & START_BUTTON) { @@ -370,11 +370,11 @@ void Task_PokedexMainScreen(u8 taskId) gPokedexView->menuIsOpen = 1; gPokedexView->menuCursorPos = 0; gTasks[taskId].func = Task_PokedexMainScreenMenu; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if (gMain.newKeys & SELECT_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; @@ -383,13 +383,13 @@ void Task_PokedexMainScreen(u8 taskId) gPokedexView->unk614 = gPokedexView->dexMode; gPokedexView->unk618 = gPokedexView->dexOrder; gTasks[taskId].func = sub_808CB8C; - PlaySoundEffect(SE_PC_LOGON); + PlaySE(SE_PC_LOGON); } else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ClosePokedex; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); } else { @@ -444,7 +444,7 @@ void Task_PokedexMainScreenMenu(u8 taskId) case 3: //CLOSE POKEDEX BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ClosePokedex; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); break; } } @@ -454,17 +454,17 @@ void Task_PokedexMainScreenMenu(u8 taskId) { gPokedexView->menuIsOpen = 0; gTasks[taskId].func = Task_PokedexMainScreen; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos != 0) { gPokedexView->menuCursorPos--; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 2) { gPokedexView->menuCursorPos++; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } } } @@ -562,7 +562,7 @@ void Task_PokedexResultsScreen(u8 taskId) gSprites[gPokedexView->unk626].callback = sub_808EDB8; BeginNormalPaletteFade(~a, 0, 0, 0x10, 0); gTasks[taskId].func = sub_808D118; - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); } else if (gMain.newKeys & START_BUTTON) { @@ -570,7 +570,7 @@ void Task_PokedexResultsScreen(u8 taskId) gPokedexView->menuIsOpen = 1; gPokedexView->menuCursorPos = 0; gTasks[taskId].func = Task_PokedexResultsScreenMenu; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if (gMain.newKeys & SELECT_BUTTON) { @@ -578,13 +578,13 @@ void Task_PokedexResultsScreen(u8 taskId) gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; gTasks[taskId].func = sub_808CB8C; - PlaySoundEffect(SE_PC_LOGON); + PlaySE(SE_PC_LOGON); } else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); } else { @@ -635,12 +635,12 @@ void Task_PokedexResultsScreenMenu(u8 taskId) case 3: //BACK TO POKEDEX BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; - PlaySoundEffect(SE_TRACK_DOOR); + PlaySE(SE_TRACK_DOOR); break; case 4: //CLOSE POKEDEX BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_PokedexResultsScreenExitPokedex; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); break; } } @@ -650,17 +650,17 @@ void Task_PokedexResultsScreenMenu(u8 taskId) { gPokedexView->menuIsOpen = 0; gTasks[taskId].func = Task_PokedexResultsScreen; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos) { gPokedexView->menuCursorPos--; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 3) { gPokedexView->menuCursorPos++; - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } } } @@ -1371,7 +1371,7 @@ u16 sub_808E48C(u16 a, u16 b) gPokedexView->unk62C += (a - r6) * 16; sub_808E82C(); sub_808E0CC(a, 0xE); - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); goto _0808E5A2; } //_0808E53C @@ -1387,7 +1387,7 @@ u16 sub_808E48C(u16 a, u16 b) gPokedexView->unk62C += (a - r6) * 16; sub_808E82C(); sub_808E0CC(a, 0xE); - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); goto _0808E5A2; _0808E5A2: @@ -1402,7 +1402,7 @@ u16 sub_808E48C(u16 a, u16 b) sub_808E398(2, a); //goto _0808E60E sub_808DBE8(2, a, b); - PlaySoundEffect(SE_Z_SCROLL); + PlaySE(SE_Z_SCROLL); } //_0808E5E4 else @@ -1412,7 +1412,7 @@ u16 sub_808E48C(u16 a, u16 b) sub_808E398(1, a); //_0808E60E sub_808DBE8(1, a, b); - PlaySoundEffect(SE_Z_SCROLL); + PlaySE(SE_Z_SCROLL); } //_0808E60E goto _0808E5A2; @@ -1511,7 +1511,7 @@ _0808E4E0:\n\ movs r1, 0xE\n\ bl sub_808E0CC\n\ movs r0, 0x6D\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ b _0808E5A2\n\ .align 2, 0\n\ _0808E52C: .4byte gMain\n\ @@ -1566,7 +1566,7 @@ _0808E55A:\n\ movs r1, 0xE\n\ bl sub_808E0CC\n\ movs r0, 0x6D\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ _0808E5A2:\n\ mov r0, r10\n\ cmp r0, 0\n\ @@ -1623,7 +1623,7 @@ _0808E60E:\n\ adds r2, r4, 0\n\ bl sub_808DBE8\n\ movs r0, 0x6C\n\ - bl PlaySoundEffect\n\ + bl PlaySE\n\ b _0808E5A2\n\ .align 2, 0\n\ _0808E620: .4byte gPokedexView\n\ @@ -2335,13 +2335,13 @@ void Task_PageScreenProcessInput(u8 taskId) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = sub_808F888; - PlaySoundEffect(SE_Z_SCROLL); + PlaySE(SE_Z_SCROLL); } else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ClosePageScreen; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); } else if (gMain.newKeys & A_BUTTON) { @@ -2353,21 +2353,21 @@ void Task_PageScreenProcessInput(u8 taskId) case AREA_SCREEN: BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gTasks[taskId].func = Task_InitAreaScreenMultistep; - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); break; case CRY_SCREEN: BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gTasks[taskId].func = Task_InitCryScreenMultistep; - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); break; case SIZE_SCREEN: if (!gUnknown_0202FFBC->owned) - PlaySoundEffect(SE_HAZURE); + PlaySE(SE_HAZURE); else { BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gTasks[taskId].func = Task_InitSizeScreenMultistep; - PlaySoundEffect(SE_PIN); + PlaySE(SE_PIN); } break; } @@ -2378,7 +2378,7 @@ void Task_PageScreenProcessInput(u8 taskId) { gPokedexView->selectedScreen--; sub_8090584(gPokedexView->selectedScreen, 0xD); - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); } else if (((gMain.newKeys & DPAD_RIGHT) || ((gMain.newKeys & R_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) @@ -2386,7 +2386,7 @@ void Task_PageScreenProcessInput(u8 taskId) { gPokedexView->selectedScreen++; sub_8090584(gPokedexView->selectedScreen, 0xD); - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); } } @@ -2581,7 +2581,7 @@ void Task_CryScreenProcessInput(u8 taskId) m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 1; gTasks[taskId].func = sub_808FFBC; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); } else if ((gMain.newKeys & DPAD_LEFT) || ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) @@ -2590,20 +2590,20 @@ void Task_CryScreenProcessInput(u8 taskId) m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_808FFBC; - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); } else if ((gMain.newKeys & DPAD_RIGHT) || ((gMain.newKeys & R_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { if (!gUnknown_0202FFBC->owned) - PlaySoundEffect(SE_HAZURE); + PlaySE(SE_HAZURE); else { BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 3; gTasks[taskId].func = sub_808FFBC; - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); } } } @@ -2737,7 +2737,7 @@ void Task_SizeScreenProcessInput(u8 taskId) BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gPokedexView->unk64F = 1; gTasks[taskId].func = sub_8090498; - PlaySoundEffect(SE_PC_OFF); + PlaySE(SE_PC_OFF); } //_08090430 else if ((gMain.newKeys & DPAD_LEFT) @@ -2746,7 +2746,7 @@ void Task_SizeScreenProcessInput(u8 taskId) BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_8090498; - PlaySoundEffect(SE_Z_PAGE); + PlaySE(SE_Z_PAGE); } } diff --git a/src/record_mixing.c b/src/record_mixing.c index f8c684161..58722010f 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -94,7 +94,7 @@ void Task_RecordMixing_SoundEffect(u8 taskId) gTasks[taskId].data[0]++; if (gTasks[taskId].data[0] == 50) { - PlaySoundEffect(SE_W213); + PlaySE(SE_W213); gTasks[taskId].data[0] = 0; } } @@ -128,7 +128,7 @@ void Task_RecordMixing_Main(u8 taskId) case 2: taskData[10] = CreateTask(sub_80BA00C, 10); taskData[TD_STATE] = 3; - PlaySoundEffect(SE_W226); + PlaySE(SE_W226); break; case 3: // wait for sub_80BA00C if (!gTasks[taskData[10]].isActive) @@ -187,14 +187,14 @@ void sub_80B95F0(u8 taskId) { if (players == sub_800820C()) { - PlaySoundEffect(0x15); + PlaySE(0x15); task->data[TD_STATE] = 201; task->data[12] = 0; } } else { - PlaySoundEffect(0x16); + PlaySE(0x16); task->data[TD_STATE] = 301; } break; diff --git a/src/rom4.c b/src/rom4.c index 9ed08aa7f..79ac6d769 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -2203,28 +2203,28 @@ void sub_80557E8(void) void sub_80557F4(void) { - PlaySoundEffect(SE_WIN_OPEN); + PlaySE(SE_WIN_OPEN); sub_8071310(); ScriptContext2_Enable(); } void sub_8055808(u8 *script) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); ScriptContext1_SetupScript(script); ScriptContext2_Enable(); } void sub_8055824(void) { - PlaySoundEffect(SE_WIN_OPEN); + PlaySE(SE_WIN_OPEN); ScriptContext1_SetupScript(TradeRoom_PromptToCancelLink); ScriptContext2_Enable(); } void sub_8055840(u8 *script) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); ScriptContext1_SetupScript(script); ScriptContext2_Enable(); } diff --git a/src/rom6.c b/src/rom6.c index a8c489e70..a2b52c9aa 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -150,7 +150,7 @@ int FldEff_RockSmash(void) static void sub_810B58C(void) { - PlaySoundEffect(SE_W088); + PlaySE(SE_W088); FieldEffectActiveListRemove(0x25); EnableBothScriptContexts(); } diff --git a/src/scrcmd.c b/src/scrcmd.c index fa3467d22..136181bd3 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -807,7 +807,7 @@ bool8 ScrCmd_countpokemon(struct ScriptContext *ctx) bool8 ScrCmd_playsfx(struct ScriptContext *ctx) { - PlaySoundEffect(ScriptReadHalfword(ctx)); + PlaySE(ScriptReadHalfword(ctx)); return FALSE; } @@ -1787,7 +1787,7 @@ bool8 ScrCmd_setdooropened(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); x += 7; y += 7; - PlaySoundEffect(sub_8058790(x, y)); + PlaySE(sub_8058790(x, y)); FieldAnimateDoorOpen(x, y); return FALSE; } diff --git a/src/script_menu.c b/src/script_menu.c index 38f7f0af5..eba438397 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -672,7 +672,7 @@ void sub_80B52B4(u8 taskId) { if (!gTasks[taskId].data[4]) { - PlaySoundEffect(5); + PlaySE(5); gScriptResult = 127; } else @@ -770,7 +770,7 @@ void task_yes_no_maybe(u8 taskId) return; case -1: case 1: - PlaySoundEffect(5); + PlaySE(5); gScriptResult = 0; break; case 0: @@ -835,7 +835,7 @@ void sub_80B5684(u8 taskId) { if (!gTasks[taskId].data[4]) { - PlaySoundEffect(5); + PlaySE(5); gScriptResult = 127; } else diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index 2efc0e2c6..ce62f2abb 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -169,13 +169,13 @@ void sub_80F9C6C(u8 var) switch(sub_806BD80(var)) { case 1: - PlaySoundEffect(5); + PlaySE(5); gUnknown_02038694 = sub_806CA38(var); gSpecialVar_0x8004 = gUnknown_02038694; sub_8123138(var); break; case 2: - PlaySoundEffect(5); + PlaySE(5); gUnknown_02038694 = 0xFF; gSpecialVar_0x8004 = 0xFF; sub_8123138(var); @@ -268,13 +268,13 @@ void sub_80F9E64(u8 var) switch(sub_806BD80(var)) { case 1: - PlaySoundEffect(5); + PlaySE(5); gSpecialVar_0x8004 = sub_806CA38(var); gSpecialVar_0x8005 = sub_8040574(&gPlayerParty[gSpecialVar_0x8004]); sub_8123138(var); break; case 2: - PlaySoundEffect(5); + PlaySE(5); gSpecialVar_0x8004 = 0xFF; sub_8123138(var); } diff --git a/src/shop.c b/src/shop.c index 27aa5b335..780dff02a 100644 --- a/src/shop.c +++ b/src/shop.c @@ -106,7 +106,7 @@ void sub_80B2E38(u8 var) { if(gUnknown_03000708.unk9) { - PlaySoundEffect(0x5); + PlaySE(0x5); gUnknown_03000708.unk9 = MoveMenuCursor(-1); } } @@ -114,13 +114,13 @@ void sub_80B2E38(u8 var) { if(gUnknown_03000708.unk9 != gUnknown_03000708.unkA) { - PlaySoundEffect(0x5); + PlaySE(0x5); gUnknown_03000708.unk9 = MoveMenuCursor(1); } } else if (gMain.newKeys & 1) { - PlaySoundEffect(0x5); + PlaySE(0x5); if(!gUnknown_03000708.unkC) { gUnknown_083CC6D0[gUnknown_083CC6E8[gUnknown_03000708.unk9]].func(local); @@ -132,7 +132,7 @@ void sub_80B2E38(u8 var) } else if(gMain.newKeys & 2) { - PlaySoundEffect(0x5); + PlaySE(0x5); HandleShopMenuQuit(local); } } diff --git a/src/sound.c b/src/sound.c index 897b13ddf..ed69ca01d 100644 --- a/src/sound.c +++ b/src/sound.c @@ -521,12 +521,12 @@ void PlayBGM(u16 songNum) m4aSongNumStart(songNum); } -void PlaySoundEffect(u16 songNum) +void PlaySE(u16 songNum) { m4aSongNumStart(songNum); } -void PlaySoundEffect12WithPanning(u16 songNum, s8 pan) +void PlaySE12WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE1); @@ -535,14 +535,14 @@ void PlaySoundEffect12WithPanning(u16 songNum, s8 pan) m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); } -void PlaySoundEffect1WithPanning(u16 songNum, s8 pan) +void PlaySE1WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE1); m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); } -void PlaySoundEffect2WithPanning(u16 songNum, s8 pan) +void PlaySE2WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE2); diff --git a/src/start_menu.c b/src/start_menu.c index 4c3a0b6e1..37d361c0b 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -315,17 +315,17 @@ static u8 StartMenu_InputProcessCallback(void) { if (gMain.newKeys & DPAD_UP) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(-1); } if (gMain.newKeys & DPAD_DOWN) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(1); } if (gMain.newKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func == StartMenu_PokedexCallback) { if (GetNationalPokedexCount(0) == 0) @@ -566,7 +566,7 @@ static bool8 SaveDialogCheckForTimeoutOrKeypress(void) saveDialogTimer--; if (gMain.heldKeys & A_BUTTON) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); return TRUE; } else if (saveDialogTimer == 0) @@ -702,7 +702,7 @@ static u8 SaveDialogCB_SaveSuccess(void) { if (MenuUpdateWindowText()) { - PlaySoundEffect(SE_SAVE); + PlaySE(SE_SAVE); saveDialogCallback = SaveDialogCB_ReturnSuccess; } return SAVE_IN_PROGRESS; @@ -723,7 +723,7 @@ static u8 SaveDialogCB_SaveError(void) { if (MenuUpdateWindowText()) { - PlaySoundEffect(SE_BOO); + PlaySE(SE_BOO); saveDialogCallback = SaveDialogCB_ReturnError; } return SAVE_IN_PROGRESS; diff --git a/src/starter_choose.c b/src/starter_choose.c index e133c6212..6ef410d21 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -455,7 +455,7 @@ static void Task_StarterChoose5(u8 taskId) break; case 1: // NO case -1: // B button - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(21, 7, 27, 12); spriteId = gTasks[taskId].tPkmnSpriteId; diff --git a/src/text.c b/src/text.c index ee5089c4d..7be72833a 100644 --- a/src/text.c +++ b/src/text.c @@ -136,7 +136,7 @@ static u8 ExtCtrlCode_Escape(struct Window *); static u8 ExtCtrlCode_Nop2(struct Window *); static u8 ExtCtrlCode_SetCursorY(struct Window *); static u8 ExtCtrlCode_ClearWindowTextLines(struct Window *); -static u8 ExtCtrlCode_PlaySoundEffect(struct Window *); +static u8 ExtCtrlCode_PlaySE(struct Window *); static u8 ExtCtrlCode_Skip(struct Window *); static u8 ExtCtrlCode_SetCursorX(struct Window *); static u8 ExtCtrlCode_SkipTo(struct Window *); @@ -380,7 +380,7 @@ static const ExtCtrlCodeFunc sExtCtrlCodeFuncs[] = ExtCtrlCode_Nop2, ExtCtrlCode_SetCursorY, ExtCtrlCode_ClearWindowTextLines, - ExtCtrlCode_PlaySoundEffect, + ExtCtrlCode_PlaySE, ExtCtrlCode_Skip, ExtCtrlCode_SetCursorX, ExtCtrlCode_SkipTo, @@ -2197,11 +2197,11 @@ static u8 ExtCtrlCode_ClearWindowTextLines(struct Window *win) return 2; } -static u8 ExtCtrlCode_PlaySoundEffect(struct Window *win) +static u8 ExtCtrlCode_PlaySE(struct Window *win) { u16 loByte = win->text[win->textIndex++]; u16 hiByte = win->text[win->textIndex++] << 8; - PlaySoundEffect(loByte | hiByte); + PlaySE(loByte | hiByte); return 2; } @@ -2377,7 +2377,7 @@ static u8 UpdateWindowText(struct Window *win) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); } else { @@ -3187,7 +3187,7 @@ static u8 WaitWithDownArrow(struct Window *win) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); TryEraseDownArrow(win); } else diff --git a/src/trainer_card.c b/src/trainer_card.c index 945d469e3..e6ed79c15 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -662,7 +662,7 @@ bool8 sub_80938CC(struct Task *task) bool8 sub_8093918(struct Task *task) { sub_8093A28(); - PlaySoundEffect(SE_CARD); + PlaySE(SE_CARD); ewram0.var_0 += 1; diff --git a/src/wallclock.c b/src/wallclock.c index f8c3fdeea..0f3665c65 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -429,13 +429,13 @@ static void Task_SetClock4(u8 taskId) switch (ProcessMenuInputNoWrap_()) { case 0: //YES - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); gTasks[taskId].func = Task_SetClock5; //Move on return; case -1: //B button case 1: //NO sub_8072DEC(); - PlaySoundEffect(SE_SELECT); + PlaySE(SE_SELECT); MenuZeroFillWindowRect(23, 8, 29, 13); MenuZeroFillWindowRect(2, 16, 27, 19); gTasks[taskId].func = Task_SetClock2; //Go back and let player adjust clock -- cgit v1.2.3