diff options
Diffstat (limited to 'src')
138 files changed, 1774 insertions, 3359 deletions
diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c index 13a3d538e..d1cee94d9 100644 --- a/src/battle/anim/bottle.c +++ b/src/battle/anim/bottle.c @@ -126,7 +126,7 @@ static void sub_80CCF70(struct Sprite* sprite) } break; case 3: - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0]++; break; case 4: diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c index 9d078f440..b7b4239df 100644 --- a/src/battle/anim/copy_orb.c +++ b/src/battle/anim/copy_orb.c @@ -55,13 +55,13 @@ void sub_80CB4CC(struct Sprite* sprite) sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0]; sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1]; - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0]++; break; } case 1: { - sprite->invisible = 0; + sprite->invisible = FALSE; if (sprite->affineAnimEnded) { ChangeSpriteAffineAnim(sprite, 1); diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c index e807002b4..d45d6cd16 100644 --- a/src/battle/anim/cube.c +++ b/src/battle/anim/cube.c @@ -72,7 +72,7 @@ static void sub_80CE000(struct Sprite* sprite) { sprite->data[4]++; if (!(sprite->data[4] & 1)) - PlaySE12WithPanning(SE_W207B, sprite->data[5]); + PlaySE12WithPanning(SE_M_SWAGGER2, sprite->data[5]); } sprite->data[0] = 0; diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c index 165bded09..32d09ddf2 100644 --- a/src/battle/anim/current.c +++ b/src/battle/anim/current.c @@ -808,7 +808,7 @@ void sub_80D6E9C(u8 taskId) } break; case 3: - gSprites[task->data[15]].invisible = 0; + gSprites[task->data[15]].invisible = FALSE; DestroyAnimVisualTask(taskId); break; } @@ -1045,7 +1045,7 @@ static bool8 sub_80D7470(struct Task *task, u8 taskId) if (task->data[4] == 0 && task->data[5] > 0) { task->data[14] += task->data[15]; - PlaySE12WithPanning(SE_W085, task->data[14]); + PlaySE12WithPanning(SE_M_THUNDERBOLT, task->data[14]); } if ((task->data[5] < 0 && task->data[7] <= task->data[8]) diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index 08aafe195..bae52d83f 100644 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -233,7 +233,7 @@ static void sub_80DFC9C(u8 taskId) gTasks[taskId].data[2] = 0; if (r2 == 16) { - gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = 1; + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = TRUE; DestroyAnimVisualTask(taskId); } } @@ -797,12 +797,12 @@ void sub_80E0918(u8 taskId) { u8 toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker) ^ 1 ? 1 : 0; MoveBattlerSpriteToBG(gBattleAnimAttacker, toBG2); - gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = 0; + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = FALSE; if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) { MoveBattlerSpriteToBG(gBattleAnimAttacker ^ 2, toBG2 ^ 1); - gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].invisible = 0; + gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].invisible = FALSE; } DestroyAnimVisualTask(taskId); diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index 6ac0746a3..d49f83952 100644 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -214,7 +214,7 @@ void sub_80DF5A0(struct Sprite *sprite) sprite->data[1] = gBattleAnimArgs[3]; sprite->data[3] = gBattleAnimArgs[4]; sprite->data[5] = gBattleAnimArgs[5]; - sprite->invisible = 1; + sprite->invisible = TRUE; StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix); sprite->callback = sub_8078504; } diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index 34f661f6a..a42d8617f 100644 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -144,7 +144,7 @@ static void sub_80D0E8C(struct Sprite* sprite) } if (++sprite->data[1] > 16) { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->data[0]++; } break; @@ -184,7 +184,7 @@ static void sub_80D0E8C(struct Sprite* sprite) } if (++sprite->data[1] > 16) { - sprite->invisible = 0; + sprite->invisible = FALSE; DestroyAnimSprite(sprite); } break; diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c index cd3b70542..27dc47c21 100644 --- a/src/battle/anim/espeed.c +++ b/src/battle/anim/espeed.c @@ -73,7 +73,7 @@ void sub_80D15E0(u8 taskId) if (RunAffineAnimFromTaskData(task) == 0) { gSprites[task->data[0]].pos2.y = 0; - gSprites[task->data[0]].invisible = 1; + gSprites[task->data[0]].invisible = TRUE; DestroyAnimVisualTask(taskId); } } @@ -170,9 +170,9 @@ void sub_80D1808(u8 taskId) { task->data[1] = 0; if (++task->data[2] & 1) - gSprites[task->data[15]].invisible = 0; + gSprites[task->data[15]].invisible = FALSE; else - gSprites[task->data[15]].invisible = 1; + gSprites[task->data[15]].invisible = TRUE; if (++task->data[3] >= task->data[13]) { @@ -184,7 +184,7 @@ void sub_80D1808(u8 taskId) } else { - gSprites[task->data[15]].invisible = 0; + gSprites[task->data[15]].invisible = FALSE; DestroyAnimVisualTask(taskId); } } diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index 64991d161..588729ab5 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -16,36 +16,36 @@ extern u8 gBattlerPositions[]; extern const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538; void sub_80785E4(struct Sprite *sprite); -void sub_80DA034(struct Sprite *sprite); -void sub_80DA05C(struct Sprite *sprite); -void sub_80DA16C(struct Sprite *sprite); -void sub_80DA1EC(struct Sprite *sprite); -void sub_80DA208(struct Sprite *sprite); -void sub_80DA300(struct Sprite *sprite); -void sub_80DA348(struct Sprite *sprite); -void sub_80DA38C(struct Sprite *sprite); -void sub_80DA4D8(struct Sprite *sprite); -void sub_80DA410(struct Sprite *sprite); -void sub_80DA6F0(struct Sprite *sprite); -void sub_80DAD30(struct Sprite *sprite); -void sub_80DAD84(struct Sprite *sprite); -void sub_80DAF0C(struct Sprite *sprite); -void sub_80DB000(struct Sprite *sprite); -void sub_80DB0A0(struct Sprite *sprite); -void sub_80DB194(struct Sprite *sprite); -void sub_80DB1F4(struct Sprite *sprite); -void sub_80DB288(struct Sprite *sprite); -void sub_80DB2D0(struct Sprite *sprite); -void sub_80DB330(struct Sprite *sprite); -void sub_80DB374(struct Sprite *sprite); -void sub_80DB458(struct Sprite *sprite); -void sub_80DB508(struct Sprite *sprite); -void sub_80DB564(struct Sprite *sprite); -void sub_80DB578(struct Sprite *sprite); -void sub_80DB5E4(struct Sprite *sprite); -void sub_80DB6A0(struct Sprite *sprite); - -void sub_80DA0DC(u8 taskId); +static void sub_80DA034(struct Sprite *sprite); +static void sub_80DA05C(struct Sprite *sprite); +static void sub_80DA16C(struct Sprite *sprite); +static void sub_80DA1EC(struct Sprite *sprite); +static void sub_80DA208(struct Sprite *sprite); +static void sub_80DA300(struct Sprite *sprite); +static void sub_80DA348(struct Sprite *sprite); +static void sub_80DA38C(struct Sprite *sprite); +static void AnimFallingFeather(struct Sprite *sprite); +static void sub_80DA410(struct Sprite *sprite); +static void DestroyAnimSpriteAfterTimer(struct Sprite *sprite); +static void sub_80DAD30(struct Sprite *sprite); +static void sub_80DAD84(struct Sprite *sprite); +static void sub_80DAF0C(struct Sprite *sprite); +static void sub_80DB000(struct Sprite *sprite); +static void sub_80DB0A0(struct Sprite *sprite); +static void sub_80DB194(struct Sprite *sprite); +static void sub_80DB1F4(struct Sprite *sprite); +static void sub_80DB288(struct Sprite *sprite); +static void sub_80DB2D0(struct Sprite *sprite); +static void sub_80DB330(struct Sprite *sprite); +static void sub_80DB374(struct Sprite *sprite); +static void sub_80DB458(struct Sprite *sprite); +static void sub_80DB508(struct Sprite *sprite); +static void sub_80DB564(struct Sprite *sprite); +static void sub_80DB578(struct Sprite *sprite); +static void sub_80DB5E4(struct Sprite *sprite); +static void sub_80DB6A0(struct Sprite *sprite); + +static void sub_80DA0DC(u8 taskId); const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA380 = { @@ -186,7 +186,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA498 = .anims = gSpriteAnimTable_83DA490, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DA4D8, + .callback = AnimFallingFeather, }; const u16 gUnknownPalette_83DA4B0[] = INCBIN_U16("graphics/unknown/unknown_3DA4B0.gbapal"); @@ -369,7 +369,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA65C = .callback = sub_80DB5E4, }; -void sub_80DA034(struct Sprite *sprite) +static void sub_80DA034(struct Sprite *sprite) { sub_8078764(sprite, FALSE); sprite->pos1.y += 20; @@ -378,7 +378,7 @@ void sub_80DA034(struct Sprite *sprite) sub_80DA05C(sprite); } -void sub_80DA05C(struct Sprite *sprite) { +static void sub_80DA05C(struct Sprite *sprite) { sprite->pos2.x = Sin(sprite->data[1], 0x20); sprite->pos2.y = Cos(sprite->data[1], 0x8); sprite->data[1] = (sprite->data[1] + 5) & 0xFF; @@ -395,7 +395,7 @@ void sub_80DA09C(u8 taskId) gTasks[taskId].func = sub_80DA0DC; } -void sub_80DA0DC(u8 taskId) +static void sub_80DA0DC(u8 taskId) { u8 data2; u16 temp; @@ -427,7 +427,7 @@ void sub_80DA0DC(u8 taskId) } } -void sub_80DA16C(struct Sprite *sprite) +static void sub_80DA16C(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) @@ -444,7 +444,7 @@ void sub_80DA16C(struct Sprite *sprite) StoreSpriteCallbackInData(sprite, sub_80DA1EC); } -void sub_80DA1EC(struct Sprite *sprite) +static void sub_80DA1EC(struct Sprite *sprite) { if (TranslateAnimLinear(sprite) != 0) { @@ -452,7 +452,7 @@ void sub_80DA1EC(struct Sprite *sprite) } } -void sub_80DA208(struct Sprite *sprite) +static void sub_80DA208(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { @@ -492,16 +492,16 @@ void sub_80DA208(struct Sprite *sprite) SeekSpriteAnim(sprite, gBattleAnimArgs[5]); } -void sub_80DA300(struct Sprite *sprite) +static void sub_80DA300(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[3]; sprite->callback = sub_80DA348; - gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; + gSprites[GetAnimBattlerSpriteId(0)].invisible = TRUE; } -void sub_80DA348(struct Sprite *sprite) +static void sub_80DA348(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -519,7 +519,7 @@ void sub_80DA348(struct Sprite *sprite) } } -void sub_80DA38C(struct Sprite *sprite) +static void sub_80DA38C(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { @@ -543,7 +543,7 @@ void sub_80DA38C(struct Sprite *sprite) sprite->callback = sub_80DA410; } -void sub_80DA410(struct Sprite *sprite) +static void sub_80DA410(struct Sprite *sprite) { sprite->data[0] = 1; TranslateAnimLinear(sprite); @@ -555,1331 +555,283 @@ void sub_80DA410(struct Sprite *sprite) sprite->data[3] &= 0xFF; } + //The below if statement relies on overflow when cast to unsigned whenever pos1.x and pos2.x add up to less than 32. if ((u32) (sprite->pos1.x + sprite->pos2.x + 32) > 304 || sprite->pos1.y + sprite->pos2.y > 160) { - gSprites[GetAnimBattlerSpriteId(0)].invisible = 0; + gSprites[GetAnimBattlerSpriteId(0)].invisible = FALSE; DestroyAnimSprite(sprite); } } void sub_80DA48C(struct Sprite *sprite) { - if (sprite->data[0]-- <= 0) + if (sprite->data[0]-- > 0) + return; + if (sprite->oam.affineMode & 1) { - if (sprite->oam.affineMode & 1) - { - FreeOamMatrix(sprite->oam.matrixNum); - sprite->oam.affineMode = 0; - } - - DestroySprite(sprite); - gAnimVisualTaskCount--; + FreeOamMatrix(sprite->oam.matrixNum); + sprite->oam.affineMode = 0; } + + DestroySprite(sprite); + gAnimVisualTaskCount--; } -// FAKEMATCHING -void sub_80DA4D8(struct Sprite *sprite) +struct FeatherDanceData +{ + u16 unk0_0a : 1; + u16 unk0_0b : 1; + u16 unk0_0c : 1; + u16 unk0_0d : 1; + u16 unk0_1 : 4; + u16 unk1 : 8; + u16 unk2; + s16 unk4; + u16 unk6; + u16 unk8; + u16 unkA; + u8 unkC[2]; + + u16 unkE_0 : 1; + u16 unkE_1 : 15; +}; +#define ANIM_SWITCH(sprite) \ + { \ + (sprite)->hFlip ^= 1; \ + (sprite)->animNum = (sprite)->hFlip; \ + (sprite)->animBeginning = TRUE; \ + (sprite)->animEnded = FALSE; \ + } + +#define CHANGE_PRIORITY(sprite, data) \ + { \ + if ((data)->unk0_0c) \ + { \ + if (gMain.inBattle) \ + { \ + if ((data)->unkE_0 == 0) \ + { \ + (sprite)->oam.priority--; \ + (data)->unkE_0 ^= 1; \ + } \ + else \ + { \ + (sprite)->oam.priority++; \ + (data)->unkE_0 ^= 1; \ + } \ + } \ + else \ + { \ + if ((data)->unkE_0 == 0) \ + { \ + (sprite)->subpriority -= 12; \ + (data)->unkE_0 ^= 1; \ + } \ + else \ + { \ + (sprite)->subpriority += 12; \ + (data)->unkE_0 ^= 1; \ + } \ + } \ + } \ + } + +static void AnimFallingFeather(struct Sprite *sprite) { - s16 *data; - u8 slot; - s16 spriteCoord; - int t1, t2; - u32 arg2; + u8 battler, sinIndex; u32 matrixNum; - u8 sinIndex; - register s16 sinVal asm ("r4"); - register int sinVal2 asm ("r0"); + s16 sinVal; - data = sprite->data; + struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data; - if (gBattleAnimArgs[7] & 0x100) - { - slot = gBattleAnimAttacker; - } - else - { - slot = gBattleAnimTarget; - } + battler = (gBattleAnimArgs[7] & 0x100) ? gBattleAnimAttacker : gBattleAnimTarget; - if (GetBattlerSide(slot) == 0) - { + if (GetBattlerSide(battler) == B_SIDE_PLAYER) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; - } - sprite->pos1.x = GetBattlerSpriteCoord(slot, 0) + gBattleAnimArgs[0]; - spriteCoord = GetBattlerSpriteCoord(slot, 1); - sprite->pos1.y = spriteCoord + gBattleAnimArgs[1]; - data[4] = sprite->pos1.y << 8; + sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_HEIGHT) + gBattleAnimArgs[0]; + sinVal = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_WIDTH); + sprite->pos1.y = sinVal + gBattleAnimArgs[1]; - t1 = (spriteCoord + (u16) gBattleAnimArgs[6]) << 1; - data[7] = (data[7] & 1) | t1; - ((u8 *) data)[0] |= 4; + data->unk8 = (u16)sprite->pos1.y << 8; + data->unkE_1 = (u16)(sinVal + gBattleAnimArgs[6]); - arg2 = (u16) gBattleAnimArgs[2]; - data[1] = (u8) gBattleAnimArgs[2]; - arg2 <<= 16; - data[5] = arg2 >> 24; - data[2] = gBattleAnimArgs[3]; - data[3] = gBattleAnimArgs[4]; - data[6] = gBattleAnimArgs[5]; + data->unk0_0c = 1; + data->unk2 = (u16)(gBattleAnimArgs[2] & 0xFF); + data->unkA = (u16)gBattleAnimArgs[2] >> 8; + data->unk4 = gBattleAnimArgs[3]; + data->unk6 = (u16)gBattleAnimArgs[4]; + *((u16 *)data->unkC) = (u16)gBattleAnimArgs[5]; - if ((u16) (data[1] - 64) <= 0x7f) + if (data->unk2 >= 64 && data->unk2 < 192) { if (gMain.inBattle) { - sprite->oam.priority = GetBattlerSpriteBGPriority(slot) + 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1; } else { - sprite->oam.priority = GetBattlerSpriteBGPriority(slot); + sprite->oam.priority = GetBattlerSpriteBGPriority(battler); } - ((u8 *) data)[14] = data[7] & -2; + data->unkE_0 = 0; - if (!(data[2] & 0x8000)) + if (!(data->unk4 & 0x8000)) { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - - sprite->animBeginning = 1; - sprite->animEnded = 0; + ANIM_SWITCH(sprite); } } else { - sprite->oam.priority = GetBattlerSpriteBGPriority(slot); - ((u8 *) data)[14] |= 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(battler); + data->unkE_0 = 1; - if (data[2] & 0x8000) + if (data->unk4 & 0x8000) { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - - sprite->animBeginning = 1; - sprite->animEnded = 0; + ANIM_SWITCH(sprite); } } - t2 = (u16) data[1] >> 6 << 4; - ((u8 *) data)[0] = (15 & data[0]) | t2; - - sprite->pos2.x = (gSineTable[(u16) data[1]] * (u8) data[6]) >> 8; - + data->unk0_1 = data->unk2/64; + + sprite->pos2.x = (gSineTable[data->unk2] * (s32)data->unkC[0]) >> 8; matrixNum = sprite->oam.matrixNum; - sinIndex = (-sprite->pos2.x >> 1) + data[5]; + sinIndex = ((-sprite->pos2.x >> 1) + data->unkA) & 0xFF; sinVal = gSineTable[sinIndex]; gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; gOamMatrices[matrixNum].b = sinVal; - sinVal2 = -sinVal; - gOamMatrices[matrixNum].c = sinVal2; + gOamMatrices[matrixNum].c = -sinVal; - sprite->callback = sub_80DA6F0; + sprite->callback = DestroyAnimSpriteAfterTimer; } -#ifdef NONMATCHING -void sub_80DA6F0(struct Sprite * sprite) +static void DestroyAnimSpriteAfterTimer(struct Sprite *sprite) { // (Probably) Functionally equivalent - struct dataStruct { - u8 one:1; - u8 two:1; - u8 three:1; - u8 four:1; - u8 fiveeight:4; - }; - - u8 zero; - s16 * data; - u8 * dataByte; - - u16 r8; - u32 matrixNum; u8 sinIndex; - s16 sinVal; - - zero = 0; - data = sprite->data; - dataByte = (u8 *)data; + u32 matrixNum; + s16 sinVal = 0; + struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data; - if (dataByte[0] & 1) + if (data->unk0_0a) { - u32 t1; - - t1 = dataByte[1]; - dataByte[1] += 0xff; - - t1 <<= 24; - if (t1 == 0) - { - // 080da724 - ((struct dataStruct *)dataByte)[0].one = 0; - dataByte[1] = zero; - } - + if (data->unk1-- > 0) return; + data->unk0_0a = 0; + data->unk1 = 0; + return; } - else + switch (data->unk2 / 64) { - // 080da730 - u16 tData; - u16 t2; - - tData = data[1]; - t2 = tData >> 6; - r8 = tData; - - switch (t2) + case 0: + if ((u8)data->unk0_1 == 1) // this must be cast to u8 { - case (0): - // 080da756 - - if (dataByte[0] >> 4 == 1) - { - dataByte[0] |= 8; - dataByte[0] |= 1; - dataByte[1] = zero; - } - else if (dataByte[0] >> 4 == 3) - { - /*080da76c*/ - ((struct dataStruct *)dataByte)[0].two ^= 1; - ((struct dataStruct *)dataByte)[0].one = 1; - dataByte[1] = zero; - } - else - { - // 080da790 - if (dataByte[0] & 8) - { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - sprite->animBeginning = 1; - sprite->animEnded = 0; - - if ((dataByte)[0] & 4) - { - u8 b; - if (gMain.inBattle) - { - if (!(dataByte[14] & 1)) - { - sprite->oam.priority -= 1; - } - else - { - // 080da814 - sprite->oam.priority += 1; - } - } - else - { - // 080da82e - if (!(dataByte[14] & 1)) - { - sprite->subpriority -= 12; - } - else - { - // 080da85c - sprite->subpriority += 12; - } - } - b = (((u32)(dataByte[14] << 31) >> 31) ^ 1) & 1; - dataByte[14] = (dataByte[14] & -2) | b; - } - // 080da87a - ((struct dataStruct *)dataByte)[0].four = 0; - r8 = data[1]; - } - } - - // 080da88a - dataByte[0] &= 15; - // 080dac52 - break; - case (1): - // 080da896 - if (dataByte[0] >> 4 == 0) - { - dataByte[0] |= 8; - dataByte[0] |= 1; - dataByte[1] = zero; - } - else/*080da8ac*/if (dataByte[0] >> 4 == 2) - { - dataByte[0] |= 1; - dataByte[1] = zero; - } - else - { - // 080da8be - if (dataByte[0] & 8) - { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - sprite->animBeginning = 1; - sprite->animEnded = 0; - - if (dataByte[0] & 4) - { - u8 b; - if (gMain.inBattle) - { - if (!(dataByte[14] & 1)) - { - sprite->oam.priority -= 1; - } - else - { - // 080da948 - sprite->oam.priority += 1; - } - } - else - { - // 080da962 - if (!(dataByte[14] & 1)) - { - sprite->subpriority -=12; - } - else - { - // 080da98c - sprite->subpriority += 12; - } - } - // 080da978 + 080da996 - b = (((u32)(dataByte[14] << 31) >> 31) ^ 1) & 1; - dataByte[14] = (dataByte[14] & -2) | b; - } - // 080da9ac - ((struct dataStruct *)dataByte)[0].four = 0; - r8 = data[1]; - } - } - // 080da9bc - dataByte[0] &= 15; - dataByte[0] |= 16; - // 080dac52 - break; - case (2): - // 080da9c8 - if (dataByte[0] >> 4 == 3) - { - dataByte[0] |= 8; - dataByte[0] |= 1; - dataByte[1] = zero; - } - else/*080da9de*/if (dataByte[0] >> 4 == 1) - { - dataByte[0] |= 1; - dataByte[1] = zero; - } - else - { - // 080da9f0 - if (dataByte[0] & 8) - { - // 080da9fa - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - sprite->animBeginning = 1; - sprite->animEnded = 0; - - if (dataByte[0] & 4) - { - u8 b; - if (gMain.inBattle) - { - if (!(dataByte[14] & 1)) - { - sprite->oam.priority -= 1; - } - else - { - // 080daa74 - sprite->oam.priority += 1; - } - } - else - { - // 080daaa4 - if (!(dataByte[14] & 1)) - { - sprite->subpriority -= 12; - } - else - { - // 080daace - sprite->subpriority += 12; - } - } - b = (((u32)(dataByte[14] << 31) >> 31) ^ 1) & 1; - dataByte[14] = (dataByte[14] & -2) | b; - } - // 080daaec - ((struct dataStruct *)dataByte)[0].four = 0; - r8 = data[1]; - } - } - // 080daafe - dataByte[0] &= 15; - dataByte[0] |= 32; - // 080dac52 - break; - case (3): - // 080dab0e - if (dataByte[0] >> 4 == 2) - { - dataByte[0] |= 8; - // 080dac42 - } - else/*080dab20*/if (dataByte[0] >> 4 == 0) - { - ((struct dataStruct *)dataByte)[0].two ^= 1; - ((struct dataStruct *)dataByte)[0].one = 1; - dataByte[1] = zero; - // 080dac42 - } - else - { - // 080dab44 - if (dataByte[0] & 8) - { - sprite->hFlip ^= 1; - sprite->animNum = sprite->hFlip; - sprite->animBeginning = 1; - sprite->animEnded = 0; - - if (dataByte[0] & 4) - { - u8 b; - if (gMain.inBattle) - { - if (!(dataByte[14] & 1)) - { - sprite->oam.priority -= 1; - } - else - { - // 080dabcc - sprite->oam.priority += 1; - } - } - else - { - // 080dabe6 - if (!(dataByte[14] & 1)) - { - sprite->subpriority -= 12; - } - else - { - // 080dac14 - sprite->subpriority += 12; - } - } - // 080dac00 + 080dac1e - b = (((u32)(dataByte[14]) << 31 >> 31) ^ 1) & 1; - dataByte[14] = (-2 & dataByte[14]) | b; - } - // 080dac32 - ((struct dataStruct *)dataByte)[0].four = 0; - r8 = data[1]; - } - } - // 080dac42 - dataByte[0] &= 15; - dataByte[0] |= 48; - break; + data->unk0_0d = 1; + data->unk0_0a = 1; + data->unk1 = 0; } - - // 080dac52 - - sprite->pos2.x = (dataByte[12 + ((struct dataStruct *)dataByte)[0].two] * gSineTable[r8]) >> 8; - - matrixNum = sprite->oam.matrixNum; - - sinIndex = (-sprite->pos2.x >> 1) + dataByte[10]; - sinVal = gSineTable[sinIndex]; - - gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; - gOamMatrices[matrixNum].b = sinVal; - gOamMatrices[matrixNum].c = -sinVal; - - data[4] += data[3]; - - sprite->pos1.y = (u16)data[4] >> 8; - - if (data[2] & (0x80 << 8)) + else if ((u8)data->unk0_1 == 3) { - data[1] = (data[1] - (data[2] & ((0x80 << 8) - 1))) & 0xff; + data->unk0_0b ^= 1; + data->unk0_0a = 1; + data->unk1 = 0; } - else + else if (data->unk0_0d) + { + ANIM_SWITCH(sprite); + CHANGE_PRIORITY(sprite, data); + data->unk0_0d = 0; + } + data->unk0_1 = 0; + break; + case 1: + if ((u8)data->unk0_1 == 0) + { + data->unk0_0d = 1; + data->unk0_0a = 1; + data->unk1 = 0; + } + else if ((u8)data->unk0_1 == 2) + { + data->unk0_0a = 1; + data->unk1 = 0; + } + else if (data->unk0_0d) + { + ANIM_SWITCH(sprite); + CHANGE_PRIORITY(sprite, data); + data->unk0_0d = 0; + } + data->unk0_1 = 1; + break; + case 2: + if ((u8)data->unk0_1 == 3) + { + data->unk0_0d = 1; + data->unk0_0a = 1; + data->unk1 = 0; + } + else if ((u8)data->unk0_1 == 1) + { + data->unk0_0a = 1; + data->unk1 = 0; + } + else if (data->unk0_0d) + { + ANIM_SWITCH(sprite); + CHANGE_PRIORITY(sprite, data) + data->unk0_0d = 0; + } + data->unk0_1 = 2; + break; + case 3: + if ((u8)data->unk0_1 == 2) { - // 080dace8 - data[1] = ((data[2] & 0x7fff) + data[1]) & 0xff; + data->unk0_0d = 1; } - // 080dacfe - if (sprite->pos1.y + sprite->pos2.y >= (u16)data[7] / 2) + else if ((u8)data->unk0_1 == 0) { - sprite->data[0] = 0; - sprite->callback = sub_80DA48C; + data->unk0_0b ^= 1; + data->unk0_0a = 1; + data->unk1 = 0; } + else if (data->unk0_0d) + { + ANIM_SWITCH(sprite); + CHANGE_PRIORITY(sprite, data); + data->unk0_0d = 0; + } + data->unk0_1 = 3; + break; + } + + sprite->pos2.x = ((s32)(data->unkC[data->unk0_0b]) * gSineTable[data->unk2]) >> 8; + matrixNum = sprite->oam.matrixNum; + + sinIndex = ((-sprite->pos2.x >> 1) + data->unkA) & 0xFF; + sinVal = gSineTable[sinIndex]; + + gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; + gOamMatrices[matrixNum].b = sinVal; + gOamMatrices[matrixNum].c = -sinVal; + + data->unk8 += data->unk6; + sprite->pos1.y = (s16)(data->unk8 >> 8); + if (data->unk4 & 0x8000) + data->unk2 = (data->unk2 - (data->unk4 & 0x7FFF)) & 0xFF; + else + data->unk2 = (data->unk2 + (data->unk4 & 0x7FFF)) & 0xFF; + // 080dacfe + if (sprite->pos1.y + sprite->pos2.y >= data->unkE_1) + { + sprite->data[0] = 0; + sprite->callback = sub_80DA48C; } } -#else -NAKED -void sub_80DA6F0(struct Sprite *sprite) -{ - asm_unified("push {r4-r7,lr}\n\ - mov r7, r9\n\ - mov r6, r8\n\ - push {r6,r7}\n\ - adds r5, r0, 0\n\ - movs r6, 0\n\ - movs r0, 0x2E\n\ - adds r0, r5\n\ - mov r12, r0\n\ - ldrb r2, [r0]\n\ - movs r7, 0x1\n\ - movs r1, 0x1\n\ - mov r9, r1\n\ - mov r0, r9\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _080DA730\n\ - mov r3, r12\n\ - ldrb r0, [r3, 0x1]\n\ - adds r1, r0, 0\n\ - adds r1, 0xFF\n\ - strb r1, [r3, 0x1]\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080DA724\n\ - b _080DAD1A\n\ -_080DA724:\n\ - movs r0, 0x2\n\ - negs r0, r0\n\ - ands r0, r2\n\ - strb r0, [r3]\n\ - strb r6, [r3, 0x1]\n\ - b _080DAD1A\n\ -_080DA730:\n\ - mov r4, r12\n\ - ldrh r0, [r4, 0x2]\n\ - lsrs r4, r0, 6\n\ - mov r8, r0\n\ - cmp r4, 0x1\n\ - bne _080DA73E\n\ - b _080DA896\n\ -_080DA73E:\n\ - cmp r4, 0x1\n\ - bgt _080DA748\n\ - cmp r4, 0\n\ - beq _080DA756\n\ - b _080DAC52\n\ -_080DA748:\n\ - cmp r4, 0x2\n\ - bne _080DA74E\n\ - b _080DA9C8\n\ -_080DA74E:\n\ - cmp r4, 0x3\n\ - bne _080DA754\n\ - b _080DAB0E\n\ -_080DA754:\n\ - b _080DAC52\n\ -_080DA756:\n\ - lsls r1, r2, 24\n\ - lsrs r0, r1, 28\n\ - cmp r0, 0x1\n\ - bne _080DA76C\n\ - movs r0, 0x8\n\ - orrs r0, r2\n\ - orrs r0, r7\n\ - mov r1, r12\n\ - strb r0, [r1]\n\ - strb r6, [r1, 0x1]\n\ - b _080DA88A\n\ -_080DA76C:\n\ - lsrs r0, r1, 28\n\ - cmp r0, 0x3\n\ - bne _080DA790\n\ - lsls r0, r2, 30\n\ - lsrs r0, 31\n\ - movs r1, 0x1\n\ - eors r0, r1\n\ - ands r0, r7\n\ - lsls r0, 1\n\ - movs r1, 0x3\n\ - negs r1, r1\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - orrs r1, r7\n\ - mov r2, r12\n\ - strb r1, [r2]\n\ - strb r6, [r2, 0x1]\n\ - b _080DA88A\n\ -_080DA790:\n\ - movs r0, 0x8\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _080DA88A\n\ - adds r3, r5, 0\n\ - adds r3, 0x3F\n\ - ldrb r2, [r3]\n\ - lsls r1, r2, 31\n\ - lsrs r1, 31\n\ - movs r4, 0x1\n\ - eors r1, r4\n\ - ands r1, r7\n\ - movs r6, 0x2\n\ - negs r6, r6\n\ - adds r0, r6, 0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r3]\n\ - lsls r0, 31\n\ - lsrs r0, 31\n\ - adds r1, r5, 0\n\ - adds r1, 0x2A\n\ - strb r0, [r1]\n\ - ldrb r0, [r3]\n\ - movs r1, 0x4\n\ - orrs r0, r1\n\ - movs r1, 0x11\n\ - negs r1, r1\n\ - ands r0, r1\n\ - strb r0, [r3]\n\ - mov r3, r12\n\ - ldrb r1, [r3]\n\ - movs r0, 0x4\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DA87A\n\ - ldr r0, _080DA80C @ =gMain\n\ - ldr r1, _080DA810 @ =0x0000043d\n\ - adds r0, r1\n\ - ldrb r1, [r0]\n\ - movs r0, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DA82E\n\ - ldrb r1, [r3, 0xE]\n\ - mov r0, r9\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _080DA814\n\ - ldrb r2, [r5, 0x5]\n\ - lsls r1, r2, 28\n\ - lsrs r1, 30\n\ - subs r1, 0x1\n\ - movs r0, 0x3\n\ - ands r1, r0\n\ - lsls r1, 2\n\ - movs r0, 0xD\n\ - negs r0, r0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r5, 0x5]\n\ - b _080DA868\n\ - .align 2, 0\n\ -_080DA80C: .4byte gMain\n\ -_080DA810: .4byte 0x0000043d\n\ -_080DA814:\n\ - ldrb r2, [r5, 0x5]\n\ - lsls r1, r2, 28\n\ - lsrs r1, 30\n\ - adds r1, 0x1\n\ - movs r0, 0x3\n\ - ands r1, r0\n\ - lsls r1, 2\n\ - movs r0, 0xD\n\ - negs r0, r0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r5, 0x5]\n\ - b _080DA866\n\ -_080DA82E:\n\ - mov r0, r12\n\ - ldrb r1, [r0, 0xE]\n\ - mov r0, r9\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _080DA85C\n\ - adds r1, r5, 0\n\ - adds r1, 0x43\n\ - ldrb r0, [r1]\n\ - subs r0, 0xC\n\ - strb r0, [r1]\n\ - mov r1, r12\n\ - ldrb r2, [r1, 0xE]\n\ - lsls r0, r2, 31\n\ - lsrs r0, 31\n\ - eors r0, r4\n\ - ands r0, r7\n\ - adds r1, r6, 0\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - mov r2, r12\n\ - strb r1, [r2, 0xE]\n\ - b _080DA87A\n\ -_080DA85C:\n\ - adds r1, r5, 0\n\ - adds r1, 0x43\n\ - ldrb r0, [r1]\n\ - adds r0, 0xC\n\ - strb r0, [r1]\n\ -_080DA866:\n\ - mov r3, r12\n\ -_080DA868:\n\ - ldrb r2, [r3, 0xE]\n\ - lsls r0, r2, 31\n\ - lsrs r0, 31\n\ - eors r0, r4\n\ - ands r0, r7\n\ - adds r1, r6, 0\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - strb r1, [r3, 0xE]\n\ -_080DA87A:\n\ - mov r4, r12\n\ - ldrb r1, [r4]\n\ - movs r0, 0x9\n\ - negs r0, r0\n\ - ands r0, r1\n\ - strb r0, [r4]\n\ - ldrh r0, [r4, 0x2]\n\ - mov r8, r0\n\ -_080DA88A:\n\ - mov r2, r12\n\ - ldrb r1, [r2]\n\ - movs r0, 0xF\n\ - ands r0, r1\n\ - strb r0, [r2]\n\ - b _080DAC52\n\ -_080DA896:\n\ - lsls r1, r2, 24\n\ - lsrs r0, r1, 28\n\ - cmp r0, 0\n\ - bne _080DA8AC\n\ - movs r0, 0x8\n\ - orrs r0, r2\n\ - orrs r0, r7\n\ - mov r3, r12\n\ - strb r0, [r3]\n\ - strb r6, [r3, 0x1]\n\ - b _080DA9BC\n\ -_080DA8AC:\n\ - lsrs r0, r1, 28\n\ - cmp r0, 0x2\n\ - bne _080DA8BE\n\ - adds r0, r2, 0\n\ - orrs r0, r7\n\ - mov r4, r12\n\ - strb r0, [r4]\n\ - strb r6, [r4, 0x1]\n\ - b _080DA9BC\n\ -_080DA8BE:\n\ - movs r0, 0x8\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _080DA9BC\n\ - adds r3, r5, 0\n\ - adds r3, 0x3F\n\ - ldrb r2, [r3]\n\ - lsls r1, r2, 31\n\ - lsrs r1, 31\n\ - movs r4, 0x1\n\ - eors r1, r4\n\ - ands r1, r7\n\ - movs r6, 0x2\n\ - negs r6, r6\n\ - adds r0, r6, 0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r3]\n\ - lsls r0, 31\n\ - lsrs r0, 31\n\ - adds r1, r5, 0\n\ - adds r1, 0x2A\n\ - strb r0, [r1]\n\ - ldrb r0, [r3]\n\ - movs r1, 0x4\n\ - orrs r0, r1\n\ - movs r1, 0x11\n\ - negs r1, r1\n\ - ands r0, r1\n\ - strb r0, [r3]\n\ - mov r0, r12\n\ - ldrb r1, [r0]\n\ - movs r0, 0x4\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DA9AC\n\ - ldr r0, _080DA940 @ =gMain\n\ - ldr r1, _080DA944 @ =0x0000043d\n\ - adds r0, r1\n\ - ldrb r1, [r0]\n\ - movs r0, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DA962\n\ - mov r2, r12\n\ - ldrb r1, [r2, 0xE]\n\ - mov r0, r9\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _080DA948\n\ - ldrb r2, [r5, 0x5]\n\ - lsls r1, r2, 28\n\ - lsrs r1, 30\n\ - subs r1, 0x1\n\ - movs r0, 0x3\n\ - ands r1, r0\n\ - lsls r1, 2\n\ - movs r0, 0xD\n\ - negs r0, r0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r5, 0x5]\n\ - mov r3, r12\n\ - b _080DA978\n\ - .align 2, 0\n\ -_080DA940: .4byte gMain\n\ -_080DA944: .4byte 0x0000043d\n\ -_080DA948:\n\ - ldrb r2, [r5, 0x5]\n\ - lsls r1, r2, 28\n\ - lsrs r1, 30\n\ - adds r1, 0x1\n\ - movs r0, 0x3\n\ - ands r1, r0\n\ - lsls r1, 2\n\ - movs r0, 0xD\n\ - negs r0, r0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r5, 0x5]\n\ - b _080DA996\n\ -_080DA962:\n\ - mov r3, r12\n\ - ldrb r1, [r3, 0xE]\n\ - mov r0, r9\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _080DA98C\n\ - adds r1, r5, 0\n\ - adds r1, 0x43\n\ - ldrb r0, [r1]\n\ - subs r0, 0xC\n\ - strb r0, [r1]\n\ -_080DA978:\n\ - ldrb r2, [r3, 0xE]\n\ - lsls r0, r2, 31\n\ - lsrs r0, 31\n\ - eors r0, r4\n\ - ands r0, r7\n\ - adds r1, r6, 0\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - strb r1, [r3, 0xE]\n\ - b _080DA9AC\n\ -_080DA98C:\n\ - adds r1, r5, 0\n\ - adds r1, 0x43\n\ - ldrb r0, [r1]\n\ - adds r0, 0xC\n\ - strb r0, [r1]\n\ -_080DA996:\n\ - mov r0, r12\n\ - ldrb r2, [r0, 0xE]\n\ - lsls r0, r2, 31\n\ - lsrs r0, 31\n\ - eors r0, r4\n\ - ands r0, r7\n\ - adds r1, r6, 0\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - mov r2, r12\n\ - strb r1, [r2, 0xE]\n\ -_080DA9AC:\n\ - mov r3, r12\n\ - ldrb r1, [r3]\n\ - movs r0, 0x9\n\ - negs r0, r0\n\ - ands r0, r1\n\ - strb r0, [r3]\n\ - ldrh r4, [r3, 0x2]\n\ - mov r8, r4\n\ -_080DA9BC:\n\ - mov r1, r12\n\ - ldrb r0, [r1]\n\ - movs r1, 0xF\n\ - ands r1, r0\n\ - movs r0, 0x10\n\ - b _080DAC4C\n\ -_080DA9C8:\n\ - lsls r1, r2, 24\n\ - lsrs r0, r1, 28\n\ - cmp r0, 0x3\n\ - bne _080DA9DE\n\ - movs r0, 0x8\n\ - orrs r0, r2\n\ - orrs r0, r7\n\ - mov r3, r12\n\ - strb r0, [r3]\n\ - strb r6, [r3, 0x1]\n\ - b _080DAAFE\n\ -_080DA9DE:\n\ - lsrs r0, r1, 28\n\ - cmp r0, 0x1\n\ - bne _080DA9F0\n\ - adds r0, r2, 0\n\ - orrs r0, r7\n\ - mov r4, r12\n\ - strb r0, [r4]\n\ - strb r6, [r4, 0x1]\n\ - b _080DAAFE\n\ -_080DA9F0:\n\ - movs r0, 0x8\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _080DA9FA\n\ - b _080DAAFE\n\ -_080DA9FA:\n\ - adds r3, r5, 0\n\ - adds r3, 0x3F\n\ - ldrb r2, [r3]\n\ - lsls r1, r2, 31\n\ - lsrs r1, 31\n\ - movs r6, 0x1\n\ - eors r1, r6\n\ - ands r1, r7\n\ - movs r0, 0x2\n\ - negs r0, r0\n\ - mov r8, r0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r3]\n\ - lsls r0, 31\n\ - lsrs r0, 31\n\ - adds r1, r5, 0\n\ - adds r1, 0x2A\n\ - strb r0, [r1]\n\ - ldrb r0, [r3]\n\ - movs r1, 0x4\n\ - orrs r0, r1\n\ - movs r1, 0x11\n\ - negs r1, r1\n\ - ands r0, r1\n\ - strb r0, [r3]\n\ - mov r2, r12\n\ - ldrb r1, [r2]\n\ - movs r0, 0x4\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DAAEC\n\ - ldr r0, _080DAA6C @ =gMain\n\ - ldr r3, _080DAA70 @ =0x0000043d\n\ - adds r0, r3\n\ - ldrb r0, [r0]\n\ - ands r4, r0\n\ - cmp r4, 0\n\ - beq _080DAAA4\n\ - ldrb r1, [r2, 0xE]\n\ - mov r0, r9\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _080DAA74\n\ - ldrb r2, [r5, 0x5]\n\ - lsls r1, r2, 28\n\ - lsrs r1, 30\n\ - subs r1, 0x1\n\ - movs r0, 0x3\n\ - ands r1, r0\n\ - lsls r1, 2\n\ - movs r0, 0xD\n\ - negs r0, r0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r5, 0x5]\n\ - b _080DAAD8\n\ - .align 2, 0\n\ -_080DAA6C: .4byte gMain\n\ -_080DAA70: .4byte 0x0000043d\n\ -_080DAA74:\n\ - ldrb r2, [r5, 0x5]\n\ - lsls r1, r2, 28\n\ - lsrs r1, 30\n\ - adds r1, 0x1\n\ - movs r0, 0x3\n\ - ands r1, r0\n\ - lsls r1, 2\n\ - movs r0, 0xD\n\ - negs r0, r0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r5, 0x5]\n\ - mov r0, r12\n\ - ldrb r2, [r0, 0xE]\n\ - lsls r0, r2, 31\n\ - lsrs r0, 31\n\ - eors r0, r6\n\ - ands r0, r7\n\ - mov r1, r8\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - mov r2, r12\n\ - strb r1, [r2, 0xE]\n\ - b _080DAAEC\n\ -_080DAAA4:\n\ - mov r3, r12\n\ - ldrb r1, [r3, 0xE]\n\ - mov r0, r9\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _080DAACE\n\ - adds r1, r5, 0\n\ - adds r1, 0x43\n\ - ldrb r0, [r1]\n\ - subs r0, 0xC\n\ - strb r0, [r1]\n\ - ldrb r2, [r3, 0xE]\n\ - lsls r0, r2, 31\n\ - lsrs r0, 31\n\ - eors r0, r6\n\ - ands r0, r7\n\ - mov r1, r8\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - strb r1, [r3, 0xE]\n\ - b _080DAAEC\n\ -_080DAACE:\n\ - adds r1, r5, 0\n\ - adds r1, 0x43\n\ - ldrb r0, [r1]\n\ - adds r0, 0xC\n\ - strb r0, [r1]\n\ -_080DAAD8:\n\ - mov r4, r12\n\ - ldrb r2, [r4, 0xE]\n\ - lsls r0, r2, 31\n\ - lsrs r0, 31\n\ - eors r0, r6\n\ - ands r0, r7\n\ - mov r1, r8\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - strb r1, [r4, 0xE]\n\ -_080DAAEC:\n\ - mov r0, r12\n\ - ldrb r1, [r0]\n\ - movs r0, 0x9\n\ - negs r0, r0\n\ - ands r0, r1\n\ - mov r1, r12\n\ - strb r0, [r1]\n\ - ldrh r2, [r1, 0x2]\n\ - mov r8, r2\n\ -_080DAAFE:\n\ - mov r3, r12\n\ - ldrb r0, [r3]\n\ - movs r1, 0xF\n\ - ands r1, r0\n\ - movs r0, 0x20\n\ - orrs r1, r0\n\ - strb r1, [r3]\n\ - b _080DAC52\n\ -_080DAB0E:\n\ - lsls r1, r2, 24\n\ - lsrs r0, r1, 28\n\ - cmp r0, 0x2\n\ - bne _080DAB20\n\ - movs r0, 0x8\n\ - orrs r0, r2\n\ - mov r4, r12\n\ - strb r0, [r4]\n\ - b _080DAC42\n\ -_080DAB20:\n\ - lsrs r0, r1, 28\n\ - cmp r0, 0\n\ - bne _080DAB44\n\ - lsls r0, r2, 30\n\ - lsrs r0, 31\n\ - movs r1, 0x1\n\ - eors r0, r1\n\ - ands r0, r7\n\ - lsls r0, 1\n\ - movs r1, 0x3\n\ - negs r1, r1\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - orrs r1, r7\n\ - mov r0, r12\n\ - strb r1, [r0]\n\ - strb r6, [r0, 0x1]\n\ - b _080DAC42\n\ -_080DAB44:\n\ - movs r0, 0x8\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _080DAC42\n\ - adds r3, r5, 0\n\ - adds r3, 0x3F\n\ - ldrb r2, [r3]\n\ - lsls r1, r2, 31\n\ - lsrs r1, 31\n\ - movs r4, 0x1\n\ - eors r1, r4\n\ - ands r1, r7\n\ - movs r6, 0x2\n\ - negs r6, r6\n\ - adds r0, r6, 0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r3]\n\ - lsls r0, 31\n\ - lsrs r0, 31\n\ - adds r1, r5, 0\n\ - adds r1, 0x2A\n\ - strb r0, [r1]\n\ - ldrb r0, [r3]\n\ - movs r1, 0x4\n\ - orrs r0, r1\n\ - movs r1, 0x11\n\ - negs r1, r1\n\ - ands r0, r1\n\ - strb r0, [r3]\n\ - mov r2, r12\n\ - ldrb r1, [r2]\n\ - movs r0, 0x4\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DAC32\n\ - ldr r0, _080DABC4 @ =gMain\n\ - ldr r3, _080DABC8 @ =0x0000043d\n\ - adds r0, r3\n\ - ldrb r1, [r0]\n\ - movs r0, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DABE6\n\ - ldrb r1, [r2, 0xE]\n\ - mov r0, r9\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _080DABCC\n\ - ldrb r2, [r5, 0x5]\n\ - lsls r1, r2, 28\n\ - lsrs r1, 30\n\ - subs r1, 0x1\n\ - movs r0, 0x3\n\ - ands r1, r0\n\ - lsls r1, 2\n\ - movs r0, 0xD\n\ - negs r0, r0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r5, 0x5]\n\ - mov r0, r12\n\ - ldrb r2, [r0, 0xE]\n\ - b _080DAC00\n\ - .align 2, 0\n\ -_080DABC4: .4byte gMain\n\ -_080DABC8: .4byte 0x0000043d\n\ -_080DABCC:\n\ - ldrb r2, [r5, 0x5]\n\ - lsls r1, r2, 28\n\ - lsrs r1, 30\n\ - adds r1, 0x1\n\ - movs r0, 0x3\n\ - ands r1, r0\n\ - lsls r1, 2\n\ - movs r0, 0xD\n\ - negs r0, r0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r5, 0x5]\n\ - b _080DAC1E\n\ -_080DABE6:\n\ - mov r0, r12\n\ - ldrb r1, [r0, 0xE]\n\ - mov r0, r9\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _080DAC14\n\ - adds r1, r5, 0\n\ - adds r1, 0x43\n\ - ldrb r0, [r1]\n\ - subs r0, 0xC\n\ - strb r0, [r1]\n\ - mov r1, r12\n\ - ldrb r2, [r1, 0xE]\n\ -_080DAC00:\n\ - lsls r0, r2, 31\n\ - lsrs r0, 31\n\ - eors r0, r4\n\ - ands r0, r7\n\ - adds r1, r6, 0\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - mov r2, r12\n\ - strb r1, [r2, 0xE]\n\ - b _080DAC32\n\ -_080DAC14:\n\ - adds r1, r5, 0\n\ - adds r1, 0x43\n\ - ldrb r0, [r1]\n\ - adds r0, 0xC\n\ - strb r0, [r1]\n\ -_080DAC1E:\n\ - mov r3, r12\n\ - ldrb r2, [r3, 0xE]\n\ - lsls r0, r2, 31\n\ - lsrs r0, 31\n\ - eors r0, r4\n\ - ands r0, r7\n\ - adds r1, r6, 0\n\ - ands r1, r2\n\ - orrs r1, r0\n\ - strb r1, [r3, 0xE]\n\ -_080DAC32:\n\ - mov r4, r12\n\ - ldrb r1, [r4]\n\ - movs r0, 0x9\n\ - negs r0, r0\n\ - ands r0, r1\n\ - strb r0, [r4]\n\ - ldrh r0, [r4, 0x2]\n\ - mov r8, r0\n\ -_080DAC42:\n\ - mov r1, r12\n\ - ldrb r0, [r1]\n\ - movs r1, 0xF\n\ - ands r1, r0\n\ - movs r0, 0x30\n\ -_080DAC4C:\n\ - orrs r1, r0\n\ - mov r2, r12\n\ - strb r1, [r2]\n\ -_080DAC52:\n\ - mov r3, r12\n\ - ldrb r1, [r3]\n\ - lsls r1, 30\n\ - lsrs r1, 31\n\ - mov r0, r12\n\ - adds r0, 0xC\n\ - adds r0, r1\n\ - ldrb r1, [r0]\n\ - ldr r3, _080DACE0 @ =gSineTable\n\ - mov r4, r8\n\ - lsls r0, r4, 1\n\ - adds r0, r3\n\ - movs r2, 0\n\ - ldrsh r0, [r0, r2]\n\ - muls r0, r1\n\ - asrs r0, 8\n\ - strh r0, [r5, 0x24]\n\ - ldrb r2, [r5, 0x3]\n\ - lsls r2, 26\n\ - lsrs r2, 27\n\ - movs r4, 0x24\n\ - ldrsh r0, [r5, r4]\n\ - negs r0, r0\n\ - asrs r0, 1\n\ - mov r1, r12\n\ - ldrb r1, [r1, 0xA]\n\ - adds r0, r1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - lsls r1, r0, 1\n\ - adds r1, r3\n\ - ldrh r6, [r1]\n\ - ldr r1, _080DACE4 @ =gOamMatrices\n\ - lsls r2, 3\n\ - adds r2, r1\n\ - adds r0, 0x40\n\ - lsls r0, 1\n\ - adds r0, r3\n\ - ldrh r0, [r0]\n\ - strh r0, [r2, 0x6]\n\ - strh r0, [r2]\n\ - strh r6, [r2, 0x2]\n\ - lsls r0, r6, 16\n\ - asrs r0, 16\n\ - negs r0, r0\n\ - strh r0, [r2, 0x4]\n\ - mov r2, r12\n\ - ldrh r0, [r2, 0x6]\n\ - ldrh r3, [r2, 0x8]\n\ - adds r0, r3\n\ - strh r0, [r2, 0x8]\n\ - lsls r0, 16\n\ - lsrs r0, 24\n\ - strh r0, [r5, 0x22]\n\ - movs r4, 0x4\n\ - ldrsh r0, [r2, r4]\n\ - movs r1, 0x80\n\ - lsls r1, 8\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080DACE8\n\ - ldrh r0, [r2, 0x4]\n\ - subs r1, 0x1\n\ - ands r1, r0\n\ - ldrh r0, [r2, 0x2]\n\ - subs r0, r1\n\ - movs r1, 0xFF\n\ - ands r0, r1\n\ - strh r0, [r2, 0x2]\n\ - b _080DACFE\n\ - .align 2, 0\n\ -_080DACE0: .4byte gSineTable\n\ -_080DACE4: .4byte gOamMatrices\n\ -_080DACE8:\n\ - mov r1, r12\n\ - ldrh r0, [r1, 0x4]\n\ - ldr r1, _080DAD28 @ =0x00007fff\n\ - ands r1, r0\n\ - mov r2, r12\n\ - ldrh r2, [r2, 0x2]\n\ - adds r1, r2\n\ - movs r0, 0xFF\n\ - ands r1, r0\n\ - mov r3, r12\n\ - strh r1, [r3, 0x2]\n\ -_080DACFE:\n\ - movs r4, 0x22\n\ - ldrsh r1, [r5, r4]\n\ - movs r2, 0x26\n\ - ldrsh r0, [r5, r2]\n\ - adds r1, r0\n\ - mov r3, r12\n\ - ldrh r0, [r3, 0xE]\n\ - lsrs r0, 1\n\ - cmp r1, r0\n\ - blt _080DAD1A\n\ - movs r0, 0\n\ - strh r0, [r5, 0x2E]\n\ - ldr r0, _080DAD2C @ =sub_80DA48C\n\ - str r0, [r5, 0x1C]\n\ -_080DAD1A:\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\ -_080DAD28: .4byte 0x00007fff\n\ -_080DAD2C: .4byte sub_80DA48C\n"); -}; -#endif -void sub_80DAD30(struct Sprite *sprite) +static void sub_80DAD30(struct Sprite *sprite) { sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget); sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); @@ -1887,9 +839,9 @@ void sub_80DAD30(struct Sprite *sprite) sprite->callback = TranslateAnimSpriteToTargetMonLocation; } -void sub_80DAD84(struct Sprite * sprite) +static void sub_80DAD84(struct Sprite * sprite) { - s16 matrixNum; + u32 matrixNum; s16 rand; s16 sinVal; @@ -1930,7 +882,7 @@ void sub_80DAD84(struct Sprite * sprite) sprite->pos2.x = sprite->pos2.y = 0; matrixNum = sprite->oam.matrixNum; - sprite->data[1] = (u8) (sprite->data[1] >> 8); + sprite->data[1] = ((u16)sprite->data[1] >> 8); rand = Random(); if (rand & 0x8000) @@ -1957,217 +909,66 @@ void sub_80DAD84(struct Sprite * sprite) } -#ifdef NONMATCHING -void sub_80DAF0C(struct Sprite *sprite) +static void sub_80DAF0C(struct Sprite *sprite) { - - /* NONMATCHING - Functionally equivalent - * - * differences: - * - * asm contains useless: - * movs r1, 0 - * mov r8, r1 - * where r8 is never used can't be matched - * - * 0x8001 and 0x8002 loaded then added with 0 to r0 instead of loaded straight there */ - - u16 *data; u16 dataCpy[8]; - int higher; - - data = sprite->data; + struct FeatherDanceData *data = (struct FeatherDanceData *)sprite->data; - if (++sprite->data[0] > 4) - { - sprite->pos2.x = (sprite->data[4] * sprite->data[6]) >> 8; - sprite->pos2.y = (sprite->data[5] * sprite->data[6]) >> 8; - - sprite->data[6] += sprite->data[3] & 0xff; - - if (sprite->data[6] >= (sprite->data[2] & 0xff)) - { - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; + if (++sprite->data[0] < 5) + return; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->pos2.x = (sprite->data[4] * sprite->data[6]) >> 8; + sprite->pos2.y = (sprite->data[5] * sprite->data[6]) >> 8; - memcpy(dataCpy, data, 16); - memset(data, 0, 16); + sprite->data[6] += sprite->data[3] & 0xff; - data[4] = sprite->pos1.y << 8; - data[3] = dataCpy[3] >> 8; - data[1] = 0; - data[5] = dataCpy[1]; + if (sprite->data[6] < (sprite->data[2] & 0xff)) + return; + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; - if (sprite->animNum != 0) - { - if (data[3] & 8) - { - data[2] = 0x8001; - } - else - { - data[2] = 0x8002; - } - } - else - { - if (data[3] & 8) - { - data[2] = 1; - } - else - { - data[2] = 2; - } - } + sprite->pos2.x = 0; + sprite->pos2.y = 0; - ((u8 *) data)[12] = dataCpy[2] >> 8; - ((u8 *) data)[13] = (u8) data[6] - 2; + memcpy(dataCpy, sprite->data, 16); + memset(sprite->data, 0, 16); - higher = dataCpy[7] << 1; - data[7] = (data[7] & 1) | higher; + data->unk8 = (u16)sprite->pos1.y << 8; + data->unk6 = dataCpy[3] >> 8; + data->unk2 = 0; + data->unkA = dataCpy[1]; - sprite->callback = sub_80DA6F0; + if (sprite->animNum != 0) + { + if (data->unk6 & 8) + { + data->unk4 = 0x8001; + } + else + { + data->unk4 = 0x8002; } } -} -#else -NAKED -void sub_80DAF0C(struct Sprite *sprite) -{ - asm_unified("push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - sub sp, 0x10\n\ - adds r4, r0, 0\n\ - adds r5, r4, 0\n\ - adds r5, 0x2E\n\ - ldrh r0, [r4, 0x2E]\n\ - adds r0, 0x1\n\ - movs r1, 0\n\ - mov r8, r1\n\ - movs r7, 0\n\ - strh r0, [r4, 0x2E]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - cmp r0, 0x4\n\ - ble _080DAFF0\n\ - movs r2, 0x36\n\ - ldrsh r1, [r4, r2]\n\ - movs r2, 0x3A\n\ - ldrsh r0, [r4, r2]\n\ - muls r0, r1\n\ - asrs r6, r0, 8\n\ - strh r6, [r4, 0x24]\n\ - movs r0, 0x38\n\ - ldrsh r1, [r4, r0]\n\ - movs r2, 0x3A\n\ - ldrsh r0, [r4, r2]\n\ - muls r0, r1\n\ - asrs r3, r0, 8\n\ - strh r3, [r4, 0x26]\n\ - ldrh r2, [r4, 0x34]\n\ - movs r1, 0xFF\n\ - adds r0, r1, 0\n\ - ands r0, r2\n\ - ldrh r2, [r4, 0x3A]\n\ - adds r0, r2\n\ - strh r0, [r4, 0x3A]\n\ - ldrh r2, [r4, 0x32]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - ands r1, r2\n\ - cmp r0, r1\n\ - blt _080DAFF0\n\ - ldrh r0, [r4, 0x20]\n\ - adds r0, r6\n\ - strh r0, [r4, 0x20]\n\ - ldrh r0, [r4, 0x22]\n\ - adds r0, r3\n\ - strh r0, [r4, 0x22]\n\ - strh r7, [r4, 0x24]\n\ - strh r7, [r4, 0x26]\n\ - mov r0, sp\n\ - adds r1, r5, 0\n\ - movs r2, 0x10\n\ - bl memcpy\n\ - adds r0, r5, 0\n\ - movs r1, 0\n\ - movs r2, 0x10\n\ - bl memset\n\ - ldrh r0, [r4, 0x22]\n\ - lsls r0, 8\n\ - strh r0, [r5, 0x8]\n\ - mov r0, sp\n\ - ldrh r0, [r0, 0x6]\n\ - lsrs r1, r0, 8\n\ - strh r1, [r5, 0x6]\n\ - strh r7, [r5, 0x2]\n\ - mov r0, sp\n\ - ldrh r0, [r0, 0x2]\n\ - strh r0, [r5, 0xA]\n\ - adds r0, r4, 0\n\ - adds r0, 0x2A\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _080DAFC0\n\ - movs r0, 0x8\n\ - ands r1, r0\n\ - cmp r1, 0\n\ - beq _080DAFB8\n\ - ldr r0, _080DAFB4 @ =0x00008001\n\ - b _080DAFCE\n\ - .align 2, 0\n\ - _080DAFB4: .4byte 0x00008001\n\ - _080DAFB8:\n\ - ldr r0, _080DAFBC @ =0x00008002\n\ - b _080DAFCE\n\ - .align 2, 0\n\ - _080DAFBC: .4byte 0x00008002\n\ - _080DAFC0:\n\ - movs r0, 0x8\n\ - ands r1, r0\n\ - cmp r1, 0\n\ - beq _080DAFCC\n\ - movs r0, 0x1\n\ - b _080DAFCE\n\ - _080DAFCC:\n\ - movs r0, 0x2\n\ - _080DAFCE:\n\ - strh r0, [r5, 0x4]\n\ - mov r0, sp\n\ - ldrh r0, [r0, 0x4]\n\ - lsrs r0, 8\n\ - strb r0, [r5, 0xC]\n\ - subs r0, 0x2\n\ - strb r0, [r5, 0xD]\n\ - mov r0, sp\n\ - ldrh r1, [r0, 0xE]\n\ - lsls r1, 1\n\ - ldrh r2, [r5, 0xE]\n\ - movs r0, 0x1\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strh r0, [r5, 0xE]\n\ - ldr r0, _080DAFFC @ =sub_80DA6F0\n\ - str r0, [r4, 0x1C]\n\ - _080DAFF0:\n\ - add sp, 0x10\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ - _080DAFFC: .4byte sub_80DA6F0\n"); + else + { + if (data->unk6 & 8) + { + data->unk4 = 1; + } + else + { + data->unk4 = 2; + } + } + + data->unkC[0] = (u8)(dataCpy[2] >> 8); + data->unkC[1] = data->unkC[0] - 2; + data->unkE_1 = dataCpy[7]; + sprite->callback = DestroyAnimSpriteAfterTimer; } -#endif -void sub_80DB000(struct Sprite *sprite) +static void sub_80DB000(struct Sprite *sprite) { u16 arg; u8 mult; @@ -2199,7 +1000,7 @@ void sub_80DB000(struct Sprite *sprite) sprite->callback = sub_80DB0A0; } -void sub_80DB0A0(struct Sprite *sprite) +static void sub_80DB0A0(struct Sprite *sprite) { sprite->pos2.x += sprite->data[1] >> 8; @@ -2210,7 +1011,7 @@ void sub_80DB0A0(struct Sprite *sprite) StartSpriteAnim(sprite, 0); } - if (--sprite->data[7] == -1) + if (sprite->data[7]-- == 0) { DestroyAnimSprite(sprite); } @@ -2242,13 +1043,13 @@ void sub_80DB0E8(u8 task) } } -void sub_80DB194(struct Sprite *sprite) +static void sub_80DB194(struct Sprite *sprite) { switch (sprite->data[0]) { case 0: InitAnimSpritePos(sprite, 1); - gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; + gSprites[GetAnimBattlerSpriteId(0)].invisible = TRUE; ++sprite->data[0]; break; case 1: @@ -2259,7 +1060,7 @@ void sub_80DB194(struct Sprite *sprite) } } -void sub_80DB1F4(struct Sprite *sprite) +static void sub_80DB1F4(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -2279,22 +1080,22 @@ void sub_80DB1F4(struct Sprite *sprite) sprite->pos2.y -= 10; if (sprite->pos1.y + sprite->pos2.y < -32) { - gSprites[GetAnimBattlerSpriteId(0)].invisible = 0; + gSprites[GetAnimBattlerSpriteId(0)].invisible = FALSE; DestroyAnimSprite(sprite); } } } -void sub_80DB288(struct Sprite *sprite) +static void sub_80DB288(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[3]; sprite->callback = sub_80DB2D0; - gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; + gSprites[GetAnimBattlerSpriteId(0)].invisible = TRUE; } -void sub_80DB2D0(struct Sprite *sprite) +static void sub_80DB2D0(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -2307,7 +1108,7 @@ void sub_80DB2D0(struct Sprite *sprite) } else { - sprite->invisible = 1; + sprite->invisible = TRUE; if (sprite->data[3]++ > 20) { sprite->callback = sub_80DB330; @@ -2315,13 +1116,13 @@ void sub_80DB2D0(struct Sprite *sprite) } } -void sub_80DB330(struct Sprite *sprite) +static void sub_80DB330(struct Sprite *sprite) { sprite->pos2.y += sprite->data[2] >> 8; if (sprite->pos1.y + sprite->pos2.y > -32) { - sprite->invisible = 0; + sprite->invisible = FALSE; } if (sprite->pos2.y > 0) @@ -2330,7 +1131,7 @@ void sub_80DB330(struct Sprite *sprite) } } -void sub_80DB374(struct Sprite *sprite) +static void sub_80DB374(struct Sprite *sprite) { u32 matrixNum; int t1, t2; @@ -2384,7 +1185,7 @@ void sub_80DB374(struct Sprite *sprite) } } -void sub_80DB458(struct Sprite *sprite) +static void sub_80DB458(struct Sprite *sprite) { int v1, v2; @@ -2430,7 +1231,7 @@ void sub_80DB458(struct Sprite *sprite) sprite->callback = sub_80DB508; } -void sub_80DB508(struct Sprite *sprite) +static void sub_80DB508(struct Sprite *sprite) { if (sprite->data[2] == 0) { @@ -2457,14 +1258,14 @@ void sub_80DB508(struct Sprite *sprite) } } -void sub_80DB564(struct Sprite *sprite) +static void sub_80DB564(struct Sprite *sprite) { sprite->data[6] = 0; sprite->data[7] = 0x40; sprite->callback = sub_80DB578; } -void sub_80DB578(struct Sprite *sprite) +static void sub_80DB578(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -2484,7 +1285,7 @@ void sub_80DB578(struct Sprite *sprite) } } -void sub_80DB5E4(struct Sprite *sprite) +static void sub_80DB5E4(struct Sprite *sprite) { s16 posx, posy; u16 rotation; @@ -2509,7 +1310,7 @@ void sub_80DB5E4(struct Sprite *sprite) sprite->callback = sub_80DB6A0; } -void sub_80DB6A0(struct Sprite *sprite) +static void sub_80DB6A0(struct Sprite *sprite) { sprite->data[4] += sprite->data[6]; sprite->data[5] += sprite->data[7]; @@ -2528,12 +1329,12 @@ void unref_sub_80DB6E4(u8 taskId) if (gBattleAnimArgs[0] == 0) { u8 spriteId = GetAnimBattlerSpriteId(0); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; } else { u8 spriteId = GetAnimBattlerSpriteId(0); - gSprites[spriteId].invisible = 0; + gSprites[spriteId].invisible = FALSE; } DestroyAnimVisualTask(taskId); diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index 4dea1ed1d..ed5445c10 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -257,7 +257,7 @@ static void sub_80DDBD8(struct Sprite *sprite) return; if (r0 <= 0) return; - PlaySE12WithPanning(SE_W109, gUnknown_0202F7D2); + PlaySE12WithPanning(SE_M_CONFUSE_RAY, gUnknown_0202F7D2); } static void sub_80DDC4C(struct Sprite *sprite) @@ -276,7 +276,7 @@ static void sub_80DDC4C(struct Sprite *sprite) if (r2 == 0 || r2 > 196) { if (r0 > 0) - PlaySE(SE_W109); + PlaySE(SE_M_CONFUSE_RAY); } if (sprite->data[6] == 0) @@ -723,7 +723,7 @@ static void sub_80DE6B0(u8 taskId) BlendPalette(task->data[4], 16, 0, RGB(13, 0, 15)); break; case 2: - gSprites[task->data[14]].invisible = 1; + gSprites[task->data[14]].invisible = TRUE; obj_delete_but_dont_free_vram(&gSprites[task->data[0]]); FreeSpritePaletteByTag(0x2771); REG_BLDCNT = 0; @@ -774,7 +774,7 @@ static void sub_80DE7B8(struct Sprite *sprite) sprite->pos1.x = battler1X; sprite->pos1.y = battler1Y; sprite->callback = sub_80DE8D8; - sprite->invisible = 1; + sprite->invisible = TRUE; } static void sub_80DE8D8(struct Sprite *sprite) @@ -1102,7 +1102,7 @@ static void sub_80DF018(struct Sprite *sprite) REG_BLDALPHA = (16 - sprite->data[2]) | (sprite->data[2] << 8); if (sprite->data[2] == 16) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_80DF090; } } @@ -1153,7 +1153,7 @@ static void sub_80DF0B8(struct Sprite *sprite) sprite->data[6] = (coeffB << 8) | coeffA; if (coeffB == 16 && coeffA == 0) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_80DF18C; } } @@ -1301,7 +1301,7 @@ static void sub_80DF3D8(struct Sprite *sprite) static void sub_80DF49C(struct Sprite *sprite) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[5] = gBattlerSpriteIds[gBattleAnimAttacker]; sprite->data[0] = 128; sprite->data[1] = 10; diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c index 8d342a2f6..eebba4810 100644 --- a/src/battle/anim/ground.c +++ b/src/battle/anim/ground.c @@ -337,7 +337,7 @@ static void sub_80E1284(u8 taskId) if (task->data[14] < 0) task->data[14] = 0; - gSprites[task->data[10]].invisible = 1; + gSprites[task->data[10]].invisible = TRUE; task->data[0]++; break; case 1: @@ -376,7 +376,7 @@ static void sub_80E1284(u8 taskId) break; case 4: DestroyAnimVisualTask(taskId); - gSprites[task->data[10]].invisible = 1; + gSprites[task->data[10]].invisible = TRUE; break; } } @@ -384,7 +384,7 @@ static void sub_80E1284(u8 taskId) static void sub_80E143C(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(0); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gSprites[spriteId].pos2.x = 0; gSprites[spriteId].pos2.y = 0; @@ -416,7 +416,7 @@ static void sub_80E14DC(u8 taskId) { case 0: task->data[10] = GetAnimBattlerSpriteId(0); - gSprites[task->data[10]].invisible = 0; + gSprites[task->data[10]].invisible = FALSE; gSprites[task->data[10]].pos2.x = 0; gSprites[task->data[10]].pos2.y = 160 - gSprites[task->data[10]].pos1.y; task->data[0]++; diff --git a/src/battle/anim/lunge.c b/src/battle/anim/lunge.c index f23b34efc..da3eda56a 100644 --- a/src/battle/anim/lunge.c +++ b/src/battle/anim/lunge.c @@ -49,7 +49,7 @@ const struct SpriteTemplate gSpriteTemplate_83D6DFC = void sub_80CD774(struct Sprite* sprite) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0] = 0; switch (gBattleAnimArgs[0]) { diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index ef7f50f00..c3100a15d 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -355,7 +355,7 @@ static void AnimSimplePaletteBlend(struct Sprite *sprite) { u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]); BeginNormalPaletteFade(selectedPalettes, gBattleAnimArgs[1], gBattleAnimArgs[2], gBattleAnimArgs[3], gBattleAnimArgs[4]); - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = AnimSimplePaletteBlendStep; } @@ -401,7 +401,7 @@ static void sub_80E1E2C(struct Sprite *sprite) selectedPalettes = UnpackSelectedBattleAnimPalettes(sprite->data[7]); BlendPalettes(selectedPalettes, gBattleAnimArgs[4], gBattleAnimArgs[3]); - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_80E1E80; } @@ -724,7 +724,7 @@ static void sub_80E24B8(struct Sprite *sprite) { u16 var0; - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0] = -gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[1]; @@ -1426,9 +1426,9 @@ static void sub_80E3338(u8 taskId) gTasks[taskId].func = sub_80E3704; if (taskData[0] == 0) - PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_STAT_INCREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG)); else - PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_STAT_DECREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG)); } static void sub_80E3704(u8 taskId) @@ -1921,7 +1921,7 @@ void sub_80E4300(u8 taskId) else { gTasks[taskId].data[0] = ewram17800[gBattleAnimAttacker].invisible; - ewram17800[gBattleAnimAttacker].invisible = 1; + ewram17800[gBattleAnimAttacker].invisible = TRUE; gTasks[taskId].func = sub_80E4368; gAnimVisualTaskCount--; } diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c index 165820cc1..c2b4e169c 100644 --- a/src/battle/anim/note_spin.c +++ b/src/battle/anim/note_spin.c @@ -69,7 +69,7 @@ void sub_80D2E68(struct Sprite *sprite) if (sprite->data[0] == 0) { sprite->data[1] = 120 - gBattleAnimArgs[0]; - sprite->invisible = 1; + sprite->invisible = TRUE; } if (++sprite->data[0] == sprite->data[1]) diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index c76e522f4..8bff55f47 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -524,14 +524,14 @@ static void sub_80DB92C(struct Sprite *sprite) u8 bank = bankCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); if (IsAnimBankSpriteVisible(bank)) - gSprites[gBattlerSpriteIds[bank]].invisible = 0; + gSprites[gBattlerSpriteIds[bank]].invisible = FALSE; bank = bankCopy ^ 2; if (IsAnimBankSpriteVisible(bank)) - gSprites[gBattlerSpriteIds[bank]].invisible = 0; + gSprites[gBattlerSpriteIds[bank]].invisible = FALSE; } - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_80DB9E4; } } @@ -721,7 +721,7 @@ static void sub_80DBD58(u8 taskId) } else { - gSprites[task->data[0]].invisible = 1; + gSprites[task->data[0]].invisible = TRUE; gSprites[task->data[0]].pos1.x = 272; sub_8078F40(task->data[0]); DestroyAnimVisualTask(taskId); @@ -1129,7 +1129,7 @@ void sub_80DC700(struct Sprite *sprite) case 1: if (sprite->affineAnimEnded) { - PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_TELEPORT, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); ChangeSpriteAffineAnim(sprite, 1); sprite->data[0]++; } @@ -1144,7 +1144,7 @@ void sub_80DC700(struct Sprite *sprite) if (sprite->data[1] == 0) { sprite->data[0]++; - sprite->invisible = 1; + sprite->invisible = TRUE; } } diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c index 69e903921..999d10a59 100644 --- a/src/battle/anim/ring.c +++ b/src/battle/anim/ring.c @@ -432,7 +432,7 @@ static void sub_80D154C(struct Sprite* sprite) { if ((u16)gBattleAnimArgs[7] == 0xFFFF) { - sprite->invisible = 1; + sprite->invisible = TRUE; if (sprite->data[7] == 0) sprite->callback = sub_80D158C; else diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index d97076e89..a16be68e5 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -653,7 +653,7 @@ static void sub_80DD604(u8 taskId) task->data[0]++; } - PlaySE12WithPanning(SE_W029, task->data[13]); + PlaySE12WithPanning(SE_M_HEADBUTT, task->data[13]); break; case 1: if (--task->data[11] == 0) @@ -683,7 +683,7 @@ static void sub_80DD604(u8 taskId) task->data[9] = 0; sub_80DD774(task); task->data[13] += task->data[14]; - PlaySE12WithPanning(SE_W091, task->data[13]); + PlaySE12WithPanning(SE_M_DIG, task->data[13]); } if (--task->data[8] == 0) @@ -782,12 +782,12 @@ void sub_80DD8E8(struct Sprite *sprite) sprite->data[0] = 3; sprite->data[1] = gBattleAnimArgs[3]; sprite->callback = sub_80DD928; - sprite->invisible = 1; + sprite->invisible = TRUE; } static void sub_80DD928(struct Sprite *sprite) { - sprite->invisible = 0; + sprite->invisible = FALSE; if (sprite->data[3] != 0) { sprite->pos2.y = sprite->data[2] + sprite->data[3]; diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c index 9b0d87eca..2f679a454 100644 --- a/src/battle/anim/seed.c +++ b/src/battle/anim/seed.c @@ -69,7 +69,7 @@ static void AnimLeechSeedStep(struct Sprite* sprite) { if (TranslateAnimArc(sprite)) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0] = 10; sprite->callback = WaitAnimForDuration; StoreSpriteCallbackInData(sprite, AnimLeechSeedSprouts); @@ -78,7 +78,7 @@ static void AnimLeechSeedStep(struct Sprite* sprite) static void AnimLeechSeedSprouts(struct Sprite* sprite) { - sprite->invisible = 0; + sprite->invisible = FALSE; StartSpriteAnim(sprite, 1); sprite->data[0] = 60; sprite->callback = WaitAnimForDuration; diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c index 6e601efa3..4babfee65 100644 --- a/src/battle/anim/shield.c +++ b/src/battle/anim/shield.c @@ -86,7 +86,7 @@ static void sub_80CCE0C(struct Sprite* sprite) REG_BLDALPHA = (sprite->data[7] << 8) | (16 - sprite->data[7]); if (sprite->data[7] == 16) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_807861C; } } diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c index 0209823b8..a1c1a0785 100644 --- a/src/battle/anim/unused_2.c +++ b/src/battle/anim/unused_2.c @@ -105,15 +105,15 @@ void unref_sub_80CCB6C(struct Sprite* sprite) { if (sprite->data[3] & 1) { - sprite->invisible = 0; - gSprites[sprite->data[0]].invisible = 0; - gSprites[sprite->data[1]].invisible = 0; + sprite->invisible = FALSE; + gSprites[sprite->data[0]].invisible = FALSE; + gSprites[sprite->data[1]].invisible = FALSE; } else { - sprite->invisible = 1; - gSprites[sprite->data[0]].invisible = 1; - gSprites[sprite->data[1]].invisible = 1; + sprite->invisible = TRUE; + gSprites[sprite->data[0]].invisible = TRUE; + gSprites[sprite->data[1]].invisible = TRUE; } sprite->data[2] = 0; diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c index 1ab6663f1..5b4781842 100644 --- a/src/battle/anim/unused_7.c +++ b/src/battle/anim/unused_7.c @@ -60,5 +60,5 @@ void sub_80CF3C4(struct Sprite* sprite) sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = a; sprite->callback = sub_80CF374; - sprite->invisible = 1; + sprite->invisible = TRUE; } diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c index d1f25c09d..1c430d923 100644 --- a/src/battle/anim/wisp_orb.c +++ b/src/battle/anim/wisp_orb.c @@ -142,7 +142,7 @@ static void sub_80D5C5C(struct Sprite *sprite) if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0) { - PlaySE12WithPanning(SE_W172, gUnknown_0202F7D2); + PlaySE12WithPanning(SE_M_FLAME_WHEEL, gUnknown_0202F7D2); } } else diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 56e348f20..881f13c97 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -1235,7 +1235,7 @@ static void sub_812C268(struct Sprite *sprite) REG_BLDALPHA = ((16 - sprite->data[1]) << 8) | sprite->data[1]; if (--sprite->data[1] < 0) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_812C2A4; } } @@ -1295,7 +1295,7 @@ static void sub_812C380(struct Sprite *sprite) REG_BLDALPHA = 0; StartSpriteAffineAnim(sprite, 1); sprite->data[2] = 0; - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->affineAnimPaused = 1; sprite->callback = sub_812C40C; } @@ -1305,7 +1305,7 @@ static void sub_812C40C(struct Sprite *sprite) { if (sprite->data[2]++ > 9) { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->affineAnimPaused = 0; if (sprite->affineAnimEnded) sprite->callback = sub_812C450; @@ -1362,7 +1362,7 @@ static void sub_812C4FC(struct Sprite *sprite) } if (sprite->data[0] == 0) - sprite->invisible = 1; + sprite->invisible = TRUE; if (sprite->data[0] < 0) { @@ -1560,7 +1560,7 @@ static void sub_812C990(struct Sprite *sprite) sub_8078764(sprite, FALSE); sprite->oam.objMode = ST_OAM_OBJ_WINDOW; - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_812CA04; } @@ -1569,7 +1569,7 @@ static void sub_812CA04(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->invisible = 0; + sprite->invisible = FALSE; if (sprite->affineAnimEnded) sprite->data[0]++; break; @@ -1599,7 +1599,7 @@ static void sub_812CA04(struct Sprite *sprite) case 5: if (sprite->affineAnimEnded) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_812CAD0; } break; @@ -2028,13 +2028,13 @@ static void sub_812D294(struct Sprite *sprite) { u16 var = sprite->data[0]; if ((var & 1) == 0) - sprite->invisible = 1; + sprite->invisible = TRUE; else - sprite->invisible = 0; + sprite->invisible = FALSE; } if (sprite->data[0] > 30) - sprite->invisible = 0; + sprite->invisible = FALSE; if (sprite->data[0] == 61) { @@ -2095,7 +2095,7 @@ static void sub_812D3AC(struct Sprite *sprite) if (++sprite->data[3] == 9) { sprite->data[3] = 0; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; sub_8078F40(spriteId); sprite->data[0]++; } @@ -2178,11 +2178,11 @@ static void sub_812D5E8(struct Sprite *sprite) else { if (sprite->data[1] == 2) - sprite->invisible = 0; + sprite->invisible = FALSE; if (sprite->data[1] == 3) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[1] = -1; } @@ -2421,7 +2421,7 @@ void sub_812DB84(u8 taskId) gTasks[taskId].data[11] = gBattle_BG1_Y; gTasks[taskId].data[0]++; - PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); break; case 1: if (gTasks[taskId].data[4]++ > 0) @@ -2456,7 +2456,7 @@ void sub_812DB84(u8 taskId) { gTasks[taskId].data[3] = 0; gTasks[taskId].data[0] = 1; - PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); } break; case 4: @@ -2504,8 +2504,8 @@ static void sub_812DEAC(struct Sprite *sprite) gSprites[spriteId2].data[2] = gBattleAnimArgs[1]; gSprites[spriteId1].data[7] = -1; gSprites[spriteId2].data[7] = -1; - gSprites[spriteId1].invisible = 1; - gSprites[spriteId2].invisible = 1; + gSprites[spriteId1].invisible = TRUE; + gSprites[spriteId2].invisible = TRUE; gSprites[spriteId1].callback = sub_812E0F8; gSprites[spriteId2].callback = sub_812E0F8; @@ -2525,19 +2525,19 @@ static void sub_812DFEC(struct Sprite *sprite) sprite->data[3] = var0 & 0xFF; if (sprite->data[4] == 0 && sprite->pos2.y < -8) { - gSprites[sprite->data[6]].invisible = 0; + gSprites[sprite->data[6]].invisible = FALSE; sprite->data[4]++; } if (sprite->data[4] == 1 && sprite->pos2.y < -16) { - gSprites[sprite->data[7]].invisible = 0; + gSprites[sprite->data[7]].invisible = FALSE; sprite->data[4]++; } if (--sprite->data[1] == -1) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_812E09C; } } @@ -2555,24 +2555,16 @@ static void sub_812E09C(struct Sprite *sprite) static void sub_812E0F8(struct Sprite *sprite) { - u16 d2; - register u16 d3 asm("r1"); - int var0; - s8 var1; - - if (!sprite->invisible) - { - d2 = sprite->data[2]; - d3 = sprite->data[3]; - var0 = d2 + d3; - var1 = var0 >> 8; - sprite->pos2.y -= var1; - sprite->data[3] = var0 & 0xFF; - if (--sprite->data[1] == -1) - { - sprite->invisible = 1; - sprite->callback = SpriteCallbackDummy; - } + if (sprite->invisible) + return; + + sprite->data[3] += sprite->data[2]; + sprite->pos2.y -= sprite->data[3] >> 8; + sprite->data[3] &= 0xFF; + if (sprite->data[1]-- == 0) + { + sprite->invisible = TRUE; + sprite->callback = SpriteCallbackDummy; } } @@ -3102,7 +3094,7 @@ static void sub_812ED84(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[2]; sub_8078764(sprite, FALSE); sprite->oam.objMode = ST_OAM_OBJ_WINDOW; - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_812EE00; } @@ -3111,7 +3103,7 @@ static void sub_812EE00(struct Sprite *sprite) switch (sprite->data[1]) { case 0: - sprite->invisible = 0; + sprite->invisible = FALSE; if (sprite->affineAnimEnded) sprite->data[1]++; break; @@ -3125,7 +3117,7 @@ static void sub_812EE00(struct Sprite *sprite) case 2: if (sprite->affineAnimEnded) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[1]++; } break; @@ -4593,7 +4585,7 @@ static void sub_8130FE0(struct Sprite *sprite) REG_BLDALPHA = (sprite->data[2] << 8) | sprite->data[1]; if (++sprite->data[0] == 32) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[5]++; } break; @@ -4666,7 +4658,7 @@ void sub_81312E4(u8 taskId) { gTasks[taskId].data[3] = 0; sub_8078F40(spriteId); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gTasks[taskId].data[0]++; } } @@ -4695,7 +4687,7 @@ static void sub_8131408(u8 taskId) case 0: gSprites[spriteId].pos2.y = -200; gSprites[spriteId].pos2.x = 200; - gSprites[spriteId].invisible = 0; + gSprites[spriteId].invisible = FALSE; gTasks[taskId].data[10] = 0; gTasks[taskId].data[0]++; break; @@ -4710,7 +4702,7 @@ static void sub_8131408(u8 taskId) if (gSprites[spriteId].pos2.y == 0) { - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); gTasks[taskId].data[10] -= 0x800; gTasks[taskId].data[0]++; } @@ -4732,7 +4724,7 @@ static void sub_8131408(u8 taskId) if (gSprites[spriteId].pos2.y == 0) { - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); DestroyAnimVisualTask(taskId); } break; @@ -4767,7 +4759,7 @@ static void sub_81315C8(struct Sprite *sprite) sprite->pos2.y += 10; if (sprite->pos2.y >= 0) { - PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->pos2.y = 0; sprite->data[0]++; } @@ -4777,7 +4769,7 @@ static void sub_81315C8(struct Sprite *sprite) sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3); if (sprite->data[1] > 127) { - PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->data[1] = 0; sprite->pos2.y = 0; sprite->data[0]++; @@ -4796,7 +4788,7 @@ static void sub_81315C8(struct Sprite *sprite) case 3: if (++sprite->data[1] > 8) { - PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->data[1] = 0; sprite->data[0]++; } @@ -4858,8 +4850,8 @@ void sub_81316F8(u8 taskId) gSprites[spriteId2].data[7] = 0; gSprites[spriteId1].data[7] = 0; gTasks[taskId].data[0] = 2; - gSprites[spriteId2].invisible = 0; - gSprites[spriteId1].invisible = 1; + gSprites[spriteId2].invisible = FALSE; + gSprites[spriteId1].invisible = TRUE; gSprites[spriteId2].oam.objMode = ST_OAM_OBJ_NORMAL; gSprites[spriteId1].oam.objMode = ST_OAM_OBJ_NORMAL; gSprites[spriteId2].callback = sub_8131838; @@ -5744,17 +5736,17 @@ void sub_8131EB8(struct Sprite *sprite) case 0: if (gBattleAnimArgs[7] == -1) { - PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_M_VITAL_THROW, BattleAnimAdjustPanning(63)); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16; sprite->data[0] = -32; sprite->data[7]++; - sprite->invisible = 0; + sprite->invisible = FALSE; if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT && !IsContest()) sprite->subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_BATTLER_TARGET)].subpriority - 1; } else { - sprite->invisible = 1; + sprite->invisible = TRUE; } break; case 1: diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index bae635e9f..e86b9359c 100755 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -19,9 +19,9 @@ #include "constants/items.h" #include "constants/songs.h" -extern int gUnknown_03005F0C; -extern u16 gUnknown_03005F10; -extern u16 gUnknown_03005F14; +int gUnknown_03005F0C; +u16 gUnknown_03005F10; +u16 gUnknown_03005F14; extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; @@ -582,7 +582,7 @@ void sub_813F798(u8 taskId) break; case 2: sub_8078F40(spriteId); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; DestroyAnimVisualTask(taskId); break; } @@ -736,7 +736,7 @@ static void sub_813FCBC(u8 taskId) { if (gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animCmdIndex == 1) { - PlaySE12WithPanning(SE_NAGERU, 0); + PlaySE12WithPanning(SE_BALL_THROW, 0); gSprites[gTasks[taskId].data[0]].callback = sub_813FD90; CreateTask(sub_813FD34, 10); gTasks[taskId].func = sub_813FB7C; @@ -824,7 +824,7 @@ static void sub_813FEC8(struct Sprite *sprite) taskId = sprite->data[5]; if (++gTasks[taskId].data[1] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); switch (gTasks[taskId].data[0]) { @@ -847,7 +847,7 @@ static void sub_813FEC8(struct Sprite *sprite) break; case 2: sub_8078F40(spriteId); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gTasks[taskId].data[0]++; break; default: @@ -903,16 +903,16 @@ static void sub_8140058(struct Sprite *sprite) switch (bounceCount) { case 1: - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); break; case 2: - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); break; case 3: - PlaySE(SE_KON3); + PlaySE(SE_BALL_BOUNCE_3); break; default: - PlaySE(SE_KON4); + PlaySE(SE_BALL_BOUNCE_4); break; } } @@ -956,7 +956,7 @@ static void sub_8140158(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 1); ewram17840.unkC = 0; sprite->callback = sub_81401A0; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } @@ -1098,7 +1098,7 @@ static void sub_81401A0(struct Sprite *sprite) else StartSpriteAffineAnim(sprite, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } break; } @@ -1135,7 +1135,7 @@ static void sub_8140454(struct Sprite *sprite) gDoingBattleAnim = 0; UpdateOamPriorityInAllHealthboxes(1); m4aMPlayAllStop(); - PlaySE(MUS_FANFA5); + PlaySE(MUS_EVOLVED); } else if (sprite->data[4] == 315) { @@ -1173,7 +1173,7 @@ static void sub_81404E4(struct Sprite *sprite) } break; case 2: - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0]++; break; default: @@ -1223,7 +1223,7 @@ static void sub_81405F4(struct Sprite *sprite) sub_8141314(1, gBattleAnimTarget, 14, ballIndex); LABEL: - gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = 0; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = FALSE; StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 1); AnimateSprite(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]]); gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] = 0x1000; @@ -1234,7 +1234,7 @@ static void sub_81406BC(struct Sprite *sprite) int next = FALSE; if (sprite->animEnded) - sprite->invisible = 1; + sprite->invisible = TRUE; if (gSprites[gBattlerSpriteIds[gBattleAnimTarget]].affineAnimEnded) { @@ -1307,7 +1307,7 @@ u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballInde gTasks[taskId].data[3] = priority; gTasks[taskId].data[4] = subpriority; gTasks[taskId].data[15] = ballIndex; - PlaySE(SE_BOWA2); + PlaySE(SE_BALL_OPEN); if (gMain.inBattle) ewram17840.unkA++; @@ -1942,7 +1942,7 @@ static void sub_814191C(u8 taskId) gSprites[spriteId].callback = sub_8141B74; gSprites[spriteId].pos2.x = -32; gSprites[spriteId].pos2.y = 32; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; if (gTasks[taskId].data[11] == 0) { if (GetBattlerSide(battler) == B_SIDE_PLAYER) @@ -1950,7 +1950,7 @@ static void sub_814191C(u8 taskId) else pan = 63; - PlaySE12WithPanning(SE_REAPOKE, pan); + PlaySE12WithPanning(SE_SHINY, pan); } } @@ -1998,7 +1998,7 @@ static void sub_8141B74(struct Sprite *sprite) } else { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->pos2.x += 5; sprite->pos2.y -= 5; if (sprite->pos2.x > 32) @@ -2050,7 +2050,7 @@ static void sub_8141CF4(struct Sprite *sprite) if (TranslateAnimArc(sprite)) { sprite->data[0] = 0; - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_8141D20; } } diff --git a/src/battle_bg.c b/src/battle_bg.c index 29369958c..6aa22edf6 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -618,7 +618,7 @@ void sub_800DE30(u8 taskId) if (gTasks[taskId].data[5]) { PrintLinkBattleWinLossTie(); } - PlaySE(SE_W231); + PlaySE(SE_M_HARDEN); DestroyTask(taskId); gSprites[gBattleStruct->unk1608A].invisible = FALSE; gSprites[gBattleStruct->unk1608B].invisible = FALSE; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 445c6eac5..d781599e9 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -506,7 +506,7 @@ void sub_8037EF0(void) { if (gReceivedRemoteLinkPlayers == 0) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(c2_8011A1C); @@ -524,7 +524,7 @@ void sub_8037F34(void) } else { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); @@ -1290,7 +1290,7 @@ void LinkOpponentHandlecmd10(void) else if (!ewram17810[gActiveBattler].unk0_6) { ewram17810[gActiveBattler].unk4 = 0; - PlaySE12WithPanning(SE_POKE_DEAD, 63); + PlaySE12WithPanning(SE_FAINT, 63); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8010384; gBattlerControllerFuncs[gActiveBattler] = sub_8037B78; } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index acc35e2d2..67c46c59d 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1227,7 +1227,7 @@ void LinkPartnerHandlecmd10(void) { ewram17810[gActiveBattler].unk4 = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, -64); + PlaySE12WithPanning(SE_FAINT, -64); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80105EC; diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 9fe69811e..b3685806d 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1294,7 +1294,7 @@ void OpponentHandlecmd10(void) else if (!ewram17810[gActiveBattler].unk0_6) { ewram17810[gActiveBattler].unk4 = 0; - PlaySE12WithPanning(SE_POKE_DEAD, 63); + PlaySE12WithPanning(SE_FAINT, 63); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8010384; gBattlerControllerFuncs[gActiveBattler] = sub_803311C; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index cf816f392..772728295 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -962,7 +962,7 @@ void sub_802D148(void) { if (gReceivedRemoteLinkPlayers == 0) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(c2_8011A1C); @@ -980,7 +980,7 @@ void sub_802D18C(void) } else { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); @@ -2470,7 +2470,7 @@ void PlayerHandlecmd10(void) { ewram17810[gActiveBattler].unk4 = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, -64); + PlaySE12WithPanning(SE_FAINT, -64); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80105EC; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index a2a48dd38..104a0eecf 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -795,7 +795,7 @@ void HandleLowHpMusicChange(struct Pokemon *pkmn, u8 b) if (!ewram17800[b].unk0_1) { if (!ewram17800[b ^ 2].unk0_1) - PlaySE(SE_HINSI); + PlaySE(SE_LOW_HEALTH); ewram17800[b].unk0_1 = 1; } } @@ -804,12 +804,12 @@ void HandleLowHpMusicChange(struct Pokemon *pkmn, u8 b) ewram17800[b].unk0_1 = 0; if (!IsDoubleBattle()) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); return; } if (IsDoubleBattle() && !ewram17800[b ^ 2].unk0_1) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); return; } } @@ -822,7 +822,7 @@ void BattleStopLowHpSound(void) ewram17800[r4].unk0_1 = 0; if (IsDoubleBattle()) ewram17800[r4 ^ 2].unk0_1 = 0; - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); } u8 unref_sub_8032604(struct Pokemon *pkmn) diff --git a/src/battle_interface.c b/src/battle_interface.c index 149e409cb..c36556f11 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -23,7 +23,7 @@ struct UnknownStruct5 u32 unk4; u32 unk8; u32 unkC; - u32 unk10; + int unk10; }; struct UnknownStruct7 @@ -680,7 +680,7 @@ void sub_8043D84(u8 a, u8 b, u32 c, u32 d, u32 e) ewram17850[a].unk4 = c; ewram17850[a].unk8 = d; ewram17850[a].unkC = e; - ewram17850[a].unk10 = 0xFFFF8000; + ewram17850[a].unk10 = -0x8000; } void sub_8043DB0(u8 a) @@ -1688,7 +1688,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *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); + PlaySE12WithPanning(SE_BALL_TRAY_ENTER, 0); return taskId; } #else @@ -2455,9 +2455,9 @@ static void sub_804507C(struct Sprite *sprite) if (r3 != 0) pan = -64; if (sprite->data[7] != 0) - PlaySE2WithPanning(SE_TB_KARA, pan); + PlaySE2WithPanning(SE_BALL_TRAY_EXIT, pan); else - PlaySE1WithPanning(SE_TB_KON, pan); + PlaySE1WithPanning(SE_BALL_TRAY_BALL, pan); sprite->callback = SpriteCallbackDummy; } } diff --git a/src/battle_main.c b/src/battle_main.c index b34beeb98..040d42ef9 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -113,11 +113,14 @@ extern u16 gUnknown_02024DE8; extern u8 gActionSelectionCursor[]; extern u8 gMoveSelectionCursor[]; extern u8 gUnknown_02038470[]; -extern MainCallback gPreBattleCallback1; +MainCallback gPreBattleCallback1; +u8 gUnknown_03004344; +u8 gUnknown_03004348; extern void (*gBattleMainFunc)(void); -extern u8 gLeveledUpInBattle; -extern void (*gBattlerControllerFuncs[])(void); -extern u8 gHealthboxSpriteIds[]; +u8 gLeveledUpInBattle; +void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void); +u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT]; +u8 gUnknown_0300434C[MAX_BATTLERS_COUNT]; extern u16 gBattleTypeFlags; extern u8 gReservedSpritePaletteCount; extern u16 gTrainerBattleOpponent; @@ -163,6 +166,7 @@ extern u8 gNumSafariBalls; extern u8 gUnknown_081FA70C[][3]; extern u8 gUnknown_081FA71B[]; extern u8 gUnknown_081FA71F[]; +struct BattleResults gBattleResults; void BattleMainCB1(void); static void BattlePrepIntroSlide(void); @@ -241,9 +245,8 @@ void CB2_InitBattleInternal(void) gScanlineEffectRegBuffers[0][i] = 0xF0; gScanlineEffectRegBuffers[1][i] = 0xF0; } - for (i = 80; i < 160; i++) + for (; i < 160; i++) { - asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter gScanlineEffectRegBuffers[0][i] = 0xFF10; gScanlineEffectRegBuffers[1][i] = 0xFF10; } @@ -1185,7 +1188,7 @@ void sub_800FE20(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_800FDB0; - PlaySE(SE_BT_START); + PlaySE(SE_MUGSHOT); } void sub_800FE40(u8 taskId) @@ -1289,9 +1292,8 @@ void c2_8011A1C(void) gScanlineEffectRegBuffers[0][i] = 0xF0; gScanlineEffectRegBuffers[1][i] = 0xF0; } - for (i = 80; i < 160; i++) + for (; i < 160; i++) { - asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter gScanlineEffectRegBuffers[0][i] = 0xFF10; gScanlineEffectRegBuffers[1][i] = 0xFF10; } @@ -4944,7 +4946,7 @@ void HandleEndTurn_BattleWon(void) { case TRAINER_CLASS_ELITE_FOUR: case TRAINER_CLASS_CHAMPION: - PlayBGM(MUS_KACHI5); + PlayBGM(MUS_VICTORY_LEAGUE); break; case TRAINER_CLASS_TEAM_AQUA: case TRAINER_CLASS_TEAM_MAGMA: @@ -4952,13 +4954,13 @@ void HandleEndTurn_BattleWon(void) case TRAINER_CLASS_AQUA_LEADER: case TRAINER_CLASS_MAGMA_ADMIN: case TRAINER_CLASS_MAGMA_LEADER: - PlayBGM(MUS_KACHI4); + PlayBGM(MUS_VICTORY_AQUA_MAGMA); break; case TRAINER_CLASS_LEADER: - PlayBGM(MUS_KACHI3); + PlayBGM(MUS_VICTORY_GYM_LEADER); break; default: - PlayBGM(MUS_KACHI1); + PlayBGM(MUS_VICTORY_TRAINER); break; } } @@ -5621,7 +5623,7 @@ void HandleAction_GoNear(void) void HandleAction_SafriZoneRun(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; - PlaySE(SE_NIGERU); + PlaySE(SE_FLEE); gCurrentTurnActionNumber = gBattlersCount; gBattleOutcome = B_OUTCOME_RAN; } diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index e758b7957..e0e455811 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -476,7 +476,7 @@ void HandleBattlePartyMenu(u8 taskId) if (gUnknown_02038473 == 3) { if (GetMonData(&gPlayerParty[sub_806CA38(taskId)], MON_DATA_IS_EGG)) - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); else { sub_806D5A4(); @@ -493,7 +493,7 @@ void HandleBattlePartyMenu(u8 taskId) break; case B_BUTTON: if (gUnknown_02038473 == 1) - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); else { PlaySE(SE_SELECT); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index db2e1af12..0cdcfe8f9 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2091,11 +2091,11 @@ static void atk0E_effectivenesssound(void) switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED))) { case MOVE_RESULT_SUPER_EFFECTIVE: - BtlController_EmitPlaySE(0, SE_KOUKA_H); + BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); break; case MOVE_RESULT_NOT_VERY_EFFECTIVE: - BtlController_EmitPlaySE(0, SE_KOUKA_L); + BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); break; case MOVE_RESULT_DOESNT_AFFECT_FOE: @@ -2108,17 +2108,17 @@ static void atk0E_effectivenesssound(void) default: if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) { - BtlController_EmitPlaySE(0, SE_KOUKA_H); + BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE) { - BtlController_EmitPlaySE(0, SE_KOUKA_L); + BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED))) { - BtlController_EmitPlaySE(0, SE_KOUKA_M); + BtlController_EmitPlaySE(0, SE_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } break; @@ -5413,7 +5413,7 @@ static void atk23_getexp(void) if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp && !gBattleStruct->wildVictorySong) { BattleStopLowHpSound(); - PlayBGM(MUS_KACHI2); + PlayBGM(MUS_VICTORY_WILD); gBattleStruct->wildVictorySong++; } diff --git a/src/battle_setup.c b/src/battle_setup.c index a7da9905a..d8319e620 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -27,6 +27,7 @@ #include "task.h" #include "text.h" #include "trainer.h" +#include "constants/battle_setup.h" #include "constants/map_types.h" #include "constants/maps.h" #include "constants/opponents.h" @@ -54,13 +55,13 @@ extern u8 gBattleOutcome; extern struct ObjectEvent gObjectEvents[]; -extern u8 gUnknown_0819F818[]; -extern u8 gUnknown_0819F840[]; -extern u8 gUnknown_0819F878[]; -extern u8 gUnknown_0819F887[]; -extern u8 gUnknown_0819F8AE[]; +extern u8 EventScript_TryDoNormalTrainerBattle[]; +extern u8 EventScript_TryDoDoubleTrainerBattle[]; +extern u8 EventScript_DoNoIntroTrainerBattle[]; +extern u8 EventScript_TryDoRematchBattle[]; +extern u8 EventScript_TryDoDoubleRematchBattle[]; -extern u8 gUnknown_0819F80B[]; +extern u8 EventScript_StartTrainerBattle[]; extern u8 gUnknown_081C6C02[]; // The first transition is used if the enemy pokemon are lower level than our pokemon. @@ -589,7 +590,7 @@ void ScrSpecial_StartRayquazaBattle(void) ScriptContext2_Enable(); gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY; - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE34); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_KYOGRE_GROUDON); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -600,9 +601,9 @@ void ScrSpecial_StartGroudonKyogreBattle(void) gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON; if (gGameVersion == VERSION_RUBY) - CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_BATTLE34); // GROUDON + CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_VS_KYOGRE_GROUDON); // GROUDON else - CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_BATTLE34); // KYOGRE + CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_VS_KYOGRE_GROUDON); // KYOGRE IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -612,7 +613,7 @@ void ScrSpecial_StartRegiBattle(void) ScriptContext2_Enable(); gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI; - CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_BATTLE36); + CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_VS_REGI); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -1005,37 +1006,37 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) switch (sTrainerBattleMode) { - case 3: + case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT: TrainerBattleLoadArgs(gTrainerBattleSpecs_3, data); - return gUnknown_0819F878; - case 4: + return EventScript_DoNoIntroTrainerBattle; + case TRAINER_BATTLE_DOUBLE: TrainerBattleLoadArgs(gTrainerBattleSpecs_2, data); SetMapVarsToTrainer(); - return gUnknown_0819F840; - case 1: - case 2: + return EventScript_TryDoDoubleTrainerBattle; + case TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC: + case TRAINER_BATTLE_CONTINUE_SCRIPT: TrainerBattleLoadArgs(gTrainerBattleSpecs_1, data); SetMapVarsToTrainer(); - return gUnknown_0819F818; - case 6: - case 8: + return EventScript_TryDoNormalTrainerBattle; + case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE: + case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC: TrainerBattleLoadArgs(gTrainerBattleSpecs_4, data); SetMapVarsToTrainer(); - return gUnknown_0819F840; - case 7: + return EventScript_TryDoDoubleTrainerBattle; + case TRAINER_BATTLE_REMATCH_DOUBLE: TrainerBattleLoadArgs(gTrainerBattleSpecs_2, data); SetMapVarsToTrainer(); gTrainerBattleOpponent = GetRematchTrainerId(gTrainerBattleOpponent); - return gUnknown_0819F8AE; - case 5: + return EventScript_TryDoDoubleRematchBattle; + case TRAINER_BATTLE_REMATCH: TrainerBattleLoadArgs(gTrainerBattleSpecs_0, data); SetMapVarsToTrainer(); gTrainerBattleOpponent = GetRematchTrainerId(gTrainerBattleOpponent); - return gUnknown_0819F887; - default: + return EventScript_TryDoRematchBattle; + default: // TRAINER_BATTLE_SINGLE TrainerBattleLoadArgs(gTrainerBattleSpecs_0, data); SetMapVarsToTrainer(); - return gUnknown_0819F818; + return EventScript_TryDoNormalTrainerBattle; } } @@ -1044,7 +1045,7 @@ void TrainerWantsBattle(u8 trainerObjEventId, const u8 *trainerScript) gSelectedObjectEvent = trainerObjEventId; gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); - ScriptContext1_SetupScript(gUnknown_0819F80B); + ScriptContext1_SetupScript(EventScript_StartTrainerBattle); ScriptContext2_Enable(); } @@ -1054,7 +1055,7 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) return FlagGet(TRAINER_FLAG_START + flag); } -void sub_8082524(void) +void SetUpTrainerMovement(void) { struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent]; @@ -1066,7 +1067,7 @@ u8 ScrSpecial_GetTrainerBattleMode(void) return sTrainerBattleMode; } -u8 ScrSpecial_HasTrainerBeenFought(void) +u8 GetTrainerFlag(void) { return FlagGet(CurrentOpponentTrainerFlag()); } @@ -1139,7 +1140,7 @@ void CB2_EndTrainerEyeRematchBattle(void) } } -void ScrSpecial_StartTrainerEyeRematch(void) +void BattleSetup_StartRematchBattle(void) { gBattleTypeFlags = BATTLE_TYPE_TRAINER; gMain.savedCallback = CB2_EndTrainerEyeRematchBattle; @@ -1150,7 +1151,7 @@ void ScrSpecial_StartTrainerEyeRematch(void) static const u8 *GetTrainerIntroSpeech(void); static const u8 *GetTrainerNonBattlingSpeech(void); -void ScrSpecial_ShowTrainerIntroSpeech(void) +void ShowTrainerIntroSpeech(void) { ShowFieldMessage(GetTrainerIntroSpeech()); } @@ -1185,46 +1186,46 @@ void PlayTrainerEncounterMusic(void) switch (sub_803FC58(gTrainerBattleOpponent)) { case TRAINER_ENCOUNTER_MUSIC_MALE: - music = MUS_BOYEYE; + music = MUS_ENCOUNTER_MALE; break; case TRAINER_ENCOUNTER_MUSIC_FEMALE: - music = MUS_GIRLEYE; + music = MUS_ENCOUNTER_FEMALE; break; case TRAINER_ENCOUNTER_MUSIC_GIRL: - music = MUS_SYOUJOEYE; + music = MUS_ENCOUNTER_GIRL; break; case TRAINER_ENCOUNTER_MUSIC_INTENSE: - music = MUS_HAGESHII; + music = MUS_ENCOUNTER_INTENSE; break; case TRAINER_ENCOUNTER_MUSIC_COOL: - music = MUS_KAKKOII; + music = MUS_ENCOUNTER_COOL; break; case TRAINER_ENCOUNTER_MUSIC_AQUA: - music = MUS_AQA_0; + music = MUS_ENCOUNTER_AQUA; break; case TRAINER_ENCOUNTER_MUSIC_MAGMA: - music = MUS_MGM0; + music = MUS_ENCOUNTER_MAGMA; break; case TRAINER_ENCOUNTER_MUSIC_SWIMMER: - music = MUS_SWIMEYE; + music = MUS_ENCOUNTER_SWIMMER; break; case TRAINER_ENCOUNTER_MUSIC_TWINS: - music = MUS_HUTAGO; + music = MUS_ENCOUNTER_TWINS; break; case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR: - music = MUS_SITENNOU; + music = MUS_ENCOUNTER_ELITE_FOUR; break; case TRAINER_ENCOUNTER_MUSIC_HIKER: - music = MUS_YAMA_EYE; + music = MUS_ENCOUNTER_HIKER; break; case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER: - music = MUS_INTER_V; + music = MUS_ENCOUNTER_INTERVIEWER; break; case TRAINER_ENCOUNTER_MUSIC_RICH: - music = MUS_TEST; + music = MUS_ENCOUNTER_RICH; break; default: - music = MUS_AYASII; + music = MUS_ENCOUNTER_SUSPICIOUS; } PlayNewMapMusic(music); } @@ -1471,7 +1472,7 @@ bool8 ShouldTryRematchBattle(void) return WasSecondRematchWon(gTrainerEyeTrainers, gTrainerBattleOpponent); } -u8 ScrSpecial_GetTrainerEyeRematchFlag(void) +u8 IsTrainerReadyForRematch(void) { return GetTrainerEyeRematchFlag(gTrainerEyeTrainers, gTrainerBattleOpponent); } diff --git a/src/battle_transition.c b/src/battle_transition.c index a0c94f713..b7aac2c65 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1580,7 +1580,7 @@ static bool8 Phase2_Mugshot_Func4(struct Task* task) sub_811CA10(task->tMugshotPlayerID, 1); sub_811CA28(task->tMugshotOpponentID); - PlaySE(SE_BT_START); + PlaySE(SE_MUGSHOT); TRANSITION_STRUCT.VBlank_DMA++; return FALSE; diff --git a/src/berry.c b/src/berry.c index f1bdb5235..590b03469 100644 --- a/src/berry.c +++ b/src/berry.c @@ -11,6 +11,7 @@ #include "random.h" #include "task.h" #include "text.h" +#include "constants/berry.h" #include "constants/event_object_movement.h" #include "constants/items.h" @@ -1127,7 +1128,7 @@ const struct Berry *GetBerryInfo(u8 berry) // when getting the pointer to the berry info, enigma berries are handled differently. if your // berry is an Enigma Berry and its checksum is valid, fetch the pointer to its information in // the save block. - if (berry == GETBERRYID(ITEM_ENIGMA_BERRY) && IsEnigmaBerryValid()) + if (berry == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) && IsEnigmaBerryValid()) return &gSaveBlock1.enigmaBerry.berry; else { @@ -1135,8 +1136,8 @@ const struct Berry *GetBerryInfo(u8 berry) // an enigma berry whos checksum failed, the game will use the Enigma Berry information // for this: meaning if you see the Enigma Berry information, its actually because the // checksum failed. - if (berry == BERRY_NONE || berry > GETBERRYID(LAST_BERRY)) - berry = GETBERRYID(FIRST_BERRY); + if (berry == BERRY_NONE || berry > ITEM_TO_BERRY(LAST_BERRY_INDEX)) + berry = ITEM_TO_BERRY(FIRST_BERRY_INDEX); return &gBerries[berry - 1]; } } @@ -1321,22 +1322,22 @@ u8 GetStageByBerryTreeId(u8 id) u8 ItemIdToBerryType(u16 item) { - u16 berry = item - FIRST_BERRY; + u16 berry = item - FIRST_BERRY_INDEX; - if (berry > LAST_BERRY - FIRST_BERRY) - return GETBERRYID(FIRST_BERRY); + if (berry > LAST_BERRY_INDEX - FIRST_BERRY_INDEX) + return ITEM_TO_BERRY(FIRST_BERRY_INDEX); else - return GETBERRYID(item); + return ITEM_TO_BERRY(item); } static u16 BerryTypeToItemId(u16 berry) { u16 item = berry - 1; - if (item > LAST_BERRY - FIRST_BERRY) - return FIRST_BERRY; + if (item > LAST_BERRY_INDEX - FIRST_BERRY_INDEX) + return FIRST_BERRY_INDEX; else - return GETITEMID(berry); + return berry + FIRST_BERRY_INDEX - 1; } void GetBerryNameByBerryType(u8 berry, u8 *string) diff --git a/src/berry_blender.c b/src/berry_blender.c index a0d69f3e4..7955c1458 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -970,7 +970,7 @@ void sub_804E738(struct Sprite* sprite) if (++sprite->data[5] > 3) DestroySprite(sprite); else - PlaySE(SE_TB_KARA); + PlaySE(SE_BALL_TRAY_EXIT); } sprite->pos1.x = sprite->data[1]; sprite->pos1.y = sprite->data[2]; @@ -1451,7 +1451,7 @@ static void sub_804F378(void) case 13: gBerryBlenderData->field_0++; sub_804F238(); - PlaySE(SE_RU_HYUU); + PlaySE(SE_FALL); sub_8051414(&gBerryBlenderData->field_168); break; case 14: @@ -1465,7 +1465,7 @@ static void sub_804F378(void) gBerryBlenderData->arrowPos = gUnknown_082162F8[gUnknown_08216300[gBerryBlenderData->playersNo - 2]]; REG_BG2CNT = 0x4882; gBerryBlenderData->framesToWait = 0; - PlaySE(SE_TRACK_DOOR);; + PlaySE(SE_TRUCK_DOOR);; sub_804F2A8(); } sub_8051414(&gBerryBlenderData->field_168); @@ -1508,7 +1508,7 @@ static void sub_804F378(void) gBerryBlenderData->field_178 = GetCurrentMapMusic(); } PlayBGM(MUS_CYCLING); - PlaySE(SE_MOTER); + PlaySE(SE_BERRY_BLENDER); Blender_ControlHitPitch(); break; } @@ -1699,17 +1699,17 @@ static void sub_804FC48(u16 a0, u8 a1) { StartSpriteAnim(&gSprites[spriteID], 2); gSprites[spriteID].callback = sub_8051684; - PlaySE(SE_RU_GASHIN); + PlaySE(SE_ICE_STAIRS); } else if (a0 == 0x5432) { StartSpriteAnim(&gSprites[spriteID], 0); - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); } else if (a0 == 0x2345) { StartSpriteAnim(&gSprites[spriteID], 1); - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } sub_805156C(); } @@ -1888,7 +1888,12 @@ u32 Blender_GetPokeblockColor(struct BlenderBerry* berries, s16* a1, u8 playersN s32 r6; u8 r2; - for (i = 0; i <= 5; i++) // bug, writing one index too far + // bug, writing one index too far +#ifdef UBFIX + for (i = 0; i < 5; i++) +#else + for (i = 0; i <= 5; i++) +#endif //UBFIX vars[i] = a1[i]; r6 = 0; for (i = 0; i < 5; i++) @@ -2765,7 +2770,7 @@ static void sub_805181C(struct Sprite* sprite) { sprite->data[1] = 88; sprite->data[0]++; - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); } break; case 1: @@ -3532,7 +3537,7 @@ static void sub_8052BD0(u8 taskID) { if (gTasks[taskID].data[0] == 0) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); gTasks[taskID].data[0]++; } if (IsFanfareTaskInactive()) diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index a8f797e28..2a2ff6ae2 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -20,7 +20,6 @@ #include "text.h" #define OFFSET_7B (123) -#define FIRST_BERRY ITEM_CHERI_BERRY struct Struct2000000 { @@ -277,7 +276,7 @@ static void sub_81464E4(void) berryInfo = GetBerryInfo(gSpecialVar_ItemId + OFFSET_7B + 1); - ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_ItemId - FIRST_BERRY + 1, STR_CONV_MODE_LEADING_ZEROS, 2); + ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_ItemId - FIRST_BERRY_INDEX + 1, STR_CONV_MODE_LEADING_ZEROS, 2); Menu_PrintText(gStringVar1, 12, 4); #if ENGLISH diff --git a/src/bike.c b/src/bike.c index c03926168..75a5d2d41 100644 --- a/src/bike.c +++ b/src/bike.c @@ -678,7 +678,7 @@ static void AcroBikeTransition_SideJump(u8 direction) } } playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); playerObjEvent->facingDirectionLocked = 1; PlayerSetAnimId(GetJumpMovementAction(direction), 2); } diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 428d114c7..d00a86cd5 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -50,7 +50,7 @@ void DoBrailleDigEffect(void) MapGridSetMetatileIdAt(17, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomMid)); MapGridSetMetatileIdAt(18, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT)); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_BRAILLE_DIG); ScriptContext2_Disable(); } @@ -93,7 +93,7 @@ void DoBrailleStrengthEffect(void) MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid)); MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT)); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_BRAILLE_STRENGTH); ScriptContext2_Disable(); } @@ -139,7 +139,7 @@ void UseFlyAncientTomb_Finish(void) MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid)); MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT)); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_SYS_BRAILLE_FLY); ScriptContext2_Disable(); } diff --git a/src/cable_car.c b/src/cable_car.c index 45e0a9cbc..3a661be34 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -386,7 +386,7 @@ static void CableCarMainCallback_Setup(void) break; case 7: BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0)); - FadeInNewBGM(MUS_ROPEWAY, 1); + FadeInNewBGM(MUS_CABLE_CAR, 1); sub_8123FBC(1); gMain.state++; break; diff --git a/src/cable_club.c b/src/cable_club.c index 28bf3b759..115f02d81 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -732,7 +732,7 @@ static void sub_80837EC(u8 taskId) void sub_8083820(void) { - ScrSpecial_DoSaveDialog(); + SaveGame(); } static void sub_808382C(u8 taskId) @@ -766,9 +766,9 @@ static void sub_808382C(u8 taskId) break; case 5: if (gLinkPlayers[0].trainerId & 1) - current_map_music_set__default_for_battle(MUS_BATTLE32); + current_map_music_set__default_for_battle(MUS_VS_GYM_LEADER); else - current_map_music_set__default_for_battle(MUS_BATTLE20); + current_map_music_set__default_for_battle(MUS_VS_TRAINER); switch (gSpecialVar_0x8004) { diff --git a/src/choose_party.c b/src/choose_party.c index 305f9cd63..f1252f965 100644 --- a/src/choose_party.c +++ b/src/choose_party.c @@ -390,7 +390,7 @@ static void sub_81224A8(u8 taskId) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintPartyMenuPromptText(14, 0); gTasks[taskId].func = sub_8122480; } @@ -460,7 +460,7 @@ static void BattleTowerEntryMenuCallback_Enter(u8 taskId) return; } } - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); Menu_EraseWindowRect(20, 10, 29, 19); Menu_DestroyCursor(); sub_806D5A4(); @@ -658,7 +658,7 @@ static void sub_8122AB8(u8 taskId) { gTasks[taskId].func = sub_8122B10; ewram1B000.unk261 = 2; - PlaySE(SE_W231); + PlaySE(SE_M_HARDEN); } } diff --git a/src/coins.c b/src/coins.c index 2c217e635..273322161 100644 --- a/src/coins.c +++ b/src/coins.c @@ -54,7 +54,7 @@ u16 GetCoins(void) return gSaveBlock1.coins; } -bool8 GiveCoins(u16 coins) +bool8 AddCoins(u16 coins) { u32 newCoins; @@ -72,7 +72,7 @@ bool8 GiveCoins(u16 coins) return TRUE; } -bool8 TakeCoins(u16 coins) +bool8 RemoveCoins(u16 coins) { if (GetCoins() >= coins) { diff --git a/src/contest.c b/src/contest.c index 40afb9741..50824c867 100644 --- a/src/contest.c +++ b/src/contest.c @@ -49,7 +49,7 @@ extern u8 gBattlerTarget; extern u8 gBattlerPositions[]; extern u8 gBattlerSpriteIds[]; extern struct Window gUnknown_03004210; -extern u32 gContestRngValue; +u32 gContestRngValue; extern struct SpriteTemplate gUnknown_02024E8C; extern const struct ContestPokemon gContestOpponents[60]; @@ -293,12 +293,12 @@ void ResetContestGpuRegs(void) { u16 savedIme; - REG_DISPCNT = 0x40; + REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP; savedIme = REG_IME; REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; REG_IME = savedIme; - REG_DISPSTAT = 8; + REG_DISPSTAT = DISPSTAT_VBLANK_INTR; REG_BG0CNT = 0x9800; REG_BG1CNT = 0x9E09; REG_BG2CNT = 0x9C00; @@ -323,7 +323,6 @@ void ResetContestGpuRegs(void) gBattle_WIN1H = 0; gBattle_WIN1V = 0; } - void LoadContestBgAfterMoveAnim(void) { s32 i; @@ -474,14 +473,12 @@ void sub_80AB694(u8 taskId) void sub_80AB6B4(u8 taskId) { - gTasks[taskId].data[0]--; - if (gTasks[taskId].data[0] <= 0) - { - GetMultiplayerId(); // unused return value - DestroyTask(taskId); - gTasks[sContest.mainTaskId].func = sub_80AB960; - gRngValue = gContestRngValue; - } + if (--gTasks[taskId].data[0] > 0) + return; + GetMultiplayerId(); // unused return value + DestroyTask(taskId); + gTasks[sContest.mainTaskId].func = sub_80AB960; + gRngValue = gContestRngValue; } u8 sub_80AB70C(u8 *a) @@ -566,7 +563,7 @@ void sub_80AB9A0(u8 taskId) if (gTasks[taskId].data[1]++ <= 60) break; gTasks[taskId].data[1] = 0; - PlaySE12WithPanning(SE_C_MAKU_U, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_RISE, 0); gTasks[taskId].data[0]++; break; case 1: @@ -1301,7 +1298,7 @@ void sub_80AC2CC(u8 taskId) return; case 50: if (sub_80AF038(r7)) - PlaySE(SE_C_PASI); + PlaySE(SE_CONTEST_ICON_CHANGE); gTasks[taskId].data[0] = 25; return; case 25: @@ -1387,9 +1384,9 @@ void sub_80AC2CC(u8 taskId) break; } if (sub_80AF038(i)) - PlaySE(SE_C_PASI); + PlaySE(SE_CONTEST_ICON_CHANGE); else - PlaySE(SE_C_SYU); + PlaySE(SE_CONTEST_ICON_CLEAR); if (sContestantStatus[i].judgesAttentionWasRemoved) { sub_80B03A8(i); @@ -1570,7 +1567,7 @@ void sub_80AC2CC(u8 taskId) { case 0: sub_80B1EA8(-1, 1); - PlayFanfare(MUS_ME_ZANNEN); + PlayFanfare(MUS_TOO_BAD); gTasks[taskId].data[10]++; break; case 1: @@ -1615,7 +1612,7 @@ void sub_80AC2CC(u8 taskId) if (!sContest.unk1920B_0) { sub_80B1DDC(); - PlaySE(SE_W227B); + PlaySE(SE_M_ENCORE2); sub_80B1CBC(1); gTasks[taskId].data[10]++; } @@ -1999,7 +1996,7 @@ void sub_80ADE54(u8 taskId) sub_80B2184(); gBattle_BG1_X = 0; gBattle_BG1_Y = 160; - PlaySE12WithPanning(SE_C_MAKU_D, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].func = sub_80ADEAC; } @@ -2673,7 +2670,7 @@ bool8 sub_80AEE54(u8 a, u8 b) } if (b != 0) { - PlaySE(SE_EXPMAX); + PlaySE(SE_EXP_MAX); sContestantStatus[a].conditionMod = 0; } } @@ -2688,7 +2685,7 @@ bool8 sub_80AEE54(u8 a, u8 b) } if (b != 0) { - PlaySE(SE_FU_ZAKU2); + PlaySE(SE_CONTEST_CONDITION_LOSE); sContestantStatus[a].conditionMod = 0; } } @@ -3365,7 +3362,7 @@ void sub_80AFC74(u8 taskId) CpuFill16(r6, (void *)(VRAM + 0xC000 + (0x56 + r5 + gUnknown_02038696[r7] * 160) * 2), 2); if (r1 > 0) { - PlaySE(SE_C_GAJI); + PlaySE(SE_CONTEST_HEART); m4aMPlayImmInit(&gMPlayInfo_SE1); m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256); } @@ -3578,7 +3575,7 @@ void sub_80B02A8(struct Sprite *sprite) StartSpriteAnim(sprite, sContestantStatus[sprite->data[0]].unkB_0); StartSpriteAffineAnim(sprite, 2); sprite->callback = sub_80B02F4; - PlaySE(SE_JYUNI); + PlaySE(SE_CONTEST_PLACE); } void sub_80B02F4(struct Sprite *sprite) @@ -3679,28 +3676,22 @@ void sub_80B0588(void) sub_80B05A4(i); } -// TODO: Try to write this better void sub_80B05A4(u8 a) { - u32 var; - u32 r0; - sub_80B0548(a); // 2-byte DMA copy? Why? - r0 = a + 5; DmaCopy16Defvars( 3, - gPlttBufferUnfaded + r0 * 16 + 10, - gPlttBufferFaded + r0 * 16 + 10, + &gPlttBufferUnfaded[16 * (5 + a) + 10], + &gPlttBufferFaded[16 * (5 + a) + 10], 2); - var = (a + 5) * 16 + 12 + a; DmaCopy16Defvars( 3, - gPlttBufferUnfaded + var, - gPlttBufferFaded + var, + &gPlttBufferUnfaded[16 * (5 + a) + 12 + a], + &gPlttBufferFaded[16 * (5 + a) + 12 + a], 2); } @@ -4265,9 +4256,9 @@ void sub_80B0BC4(u8 a, bool8 b) gSprites[a].callback = sub_80B0C5C; gSprites[r5].callback = SpriteCallbackDummy; if (b == FALSE) - PlaySE(SE_C_PIKON); + PlaySE(SE_CONTEST_MONS_TURN); else - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); } void sub_80B0C5C(struct Sprite *sprite) @@ -4732,36 +4723,36 @@ void sub_80B1710(u8 a) case 0: case 1: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0]; - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); break; case 2: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 4; - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); break; case 3: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 8; - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); break; case 4: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; case 5: // exactly the same as case 4 gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; case 6: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 16; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; case 8: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 24; - PlaySE(SE_W215); + PlaySE(SE_M_HEAL_BELL); break; case 7: default: gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 20; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); break; } gSprites[spriteId].data[1] = 0; @@ -5089,7 +5080,7 @@ void sub_80B20C4(void) *(u16 *)(VRAM + 0xC000 + r4 * 64 + 0x2A) = r0 + 1; *(u16 *)(VRAM + 0xC000 + (r4 + 1) * 64 + 0x28) = r0 + 16; *(u16 *)(VRAM + 0xC000 + (r4 + 1) * 64 + 0x2A) = r0 + 17; - PlaySE(SE_C_PASI); + PlaySE(SE_CONTEST_ICON_CHANGE); } } } @@ -5157,7 +5148,7 @@ void sub_80B237C(u8 taskId) { gBattle_BG1_X = 0; gBattle_BG1_Y = DISPLAY_HEIGHT; - PlaySE12WithPanning(SE_C_MAKU_D, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0); gTasks[taskId].func = sub_80B23BC; } @@ -5269,7 +5260,7 @@ void sub_80B25A4(u8 taskId) else { gTasks[taskId].data[2] = 0; - PlaySE12WithPanning(SE_C_MAKU_U, 0); + PlaySE12WithPanning(SE_CONTEST_CURTAIN_RISE, 0); gTasks[taskId].func = sub_80B2508; } } diff --git a/src/contest_link_80C2020.c b/src/contest_link_80C2020.c index f4203dd42..e14880ee0 100644 --- a/src/contest_link_80C2020.c +++ b/src/contest_link_80C2020.c @@ -329,7 +329,7 @@ void sub_80C2358(void) gBattle_WIN1V = 0x80a0; CreateTask(sub_80C2F28, 20); sub_80C3F00(); - PlayBGM(MUS_CON_K); + PlayBGM(MUS_CONTEST_RESULTS); SetVBlankCallback(sub_80C2448); } @@ -1378,12 +1378,12 @@ void sub_80C3698(const u8 *text) sprite = &gSprites[eContestLink80C2020Struct2018000.unk_01]; sprite->pos1.x = x + 32; sprite->pos1.y = 80; - sprite->invisible = 0; + sprite->invisible = FALSE; for (i = 0; i < 3; i++) { gSprites[sprite->data[i]].pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64; gSprites[sprite->data[i]].pos1.y = sprite->pos1.y; - gSprites[sprite->data[i]].invisible = 0; + gSprites[sprite->data[i]].invisible = FALSE; } gBattle_WIN0H = 0x00F0; @@ -1397,9 +1397,9 @@ void sub_80C3764(void) struct Sprite *sprite; sprite = &gSprites[eContestLink80C2020Struct2018000.unk_01]; - sprite->invisible = 1; + sprite->invisible = TRUE; for (i = 0; i < 3; i++) - gSprites[sprite->data[i]].invisible = 1; + gSprites[sprite->data[i]].invisible = TRUE; gBattle_WIN0H = 0; gBattle_WIN0V = 0; @@ -1854,7 +1854,7 @@ void sub_80C3A5C(u8 taskId) *(vu16 *)((VRAM + 0xE184) + gTasks[taskId].data[1] * 192) = firstTileNum + 0x11; eContestLink80C2020Struct2018000.unk_05++; DestroyTask(taskId); - PlaySE(SE_JYUNI); + PlaySE(SE_CONTEST_PLACE); } } } @@ -2025,7 +2025,7 @@ void sub_80C3CB8(struct Sprite *sprite) if (sprite->pos1.x < -32) { sprite->callback = SpriteCallbackDummy; - sprite->invisible = 1; + sprite->invisible = TRUE; eContestLink80C2020Struct2018000.unk_06 = 2; } } @@ -2062,7 +2062,7 @@ void sub_80C3DF0(struct Sprite *sprite) sprite->data[4] = var0; sprite->pos1.y++; if (eContestLink80C2020Struct2018000.unk_09) - sprite->invisible = 1; + sprite->invisible = TRUE; if (sprite->pos1.x > 248 || sprite->pos1.y > 116) { diff --git a/src/contest_painting.c b/src/contest_painting.c index af5eddf76..ae683d267 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -341,13 +341,9 @@ static void sub_8106AC4(u16 species, u8 arg1) } } - static void sub_8106B90(u8 *a, u16 *b, u16 *c) { - u16 i; - u16 j; - u16 k; - u16 l; + u16 i, j, k, l; /* Raw arithmetics are required to match this function. @@ -365,12 +361,7 @@ static void sub_8106B90(u8 *a, u16 *b, u16 *c) { for (l = 0; l < 8; l++) { - /* - Parenthesis/group hack absolutely required to match regalloc. Remove any - unneeded parentheses and the function gets thrown off. See the comments - in CopyWallpaperTilemap for documentation on a similar behavior. - */ - u8 temp = ((u8*)a + ((((i << 3) + j) << 5) + (k << 2) + (l >> 1)))[0]; + u8 temp = a[(((i * 8) + j) * 32) + (k << 2) + (l >> 1)]; /* The shifts have to be there to match r0 and r2's order in one instruction: add r5, r2, r0 @@ -389,9 +380,9 @@ static void sub_8106B90(u8 *a, u16 *b, u16 *c) // Same order as above needs to be written here, or else this happens: // add r0, r7, r1 <- regswap if (temp == 0) - ((u16*)c + (((i << 3) + k) << 6) + ((j << 3)+l))[0] = 0x8000; + *(u16 *)(c + (((i * 8) + k) << 6) + ((j * 8) + l)) = 0x8000; else - ((u16*)c + (((i << 3) + k) << 6) + ((j << 3)+l))[0] = b[temp]; + *(u16 *)(c + (((i * 8) + k) << 6) + ((j * 8) + l)) = b[temp]; } } } diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c index 57706aea7..ade91a0ec 100644 --- a/src/contest_painting_effects.c +++ b/src/contest_painting_effects.c @@ -2,17 +2,18 @@ #include "contest_painting_effects.h" #include "contest_painting.h" -extern u16 (*gUnknown_03005DEC)[][32]; -extern u8 gUnknown_083E7A50[][3]; -extern u8 gUnknown_03005DE8; -extern u8 gUnknown_03005DF0; -extern u8 gUnknown_03005DFC; -extern u8 gUnknown_03005DF8; -extern u8 gUnknown_03005DF4; -extern u8 gUnknown_03005E00; -extern u8 gUnknown_03005E04; -extern u16 * gUnknown_03005E08; -extern u16 gUnknown_03005E0C; +extern const u8 gUnknown_083E7A50[][3]; + +u16 (*gUnknown_03005DEC)[][32]; +u8 gUnknown_03005DE8; +u8 gUnknown_03005DF0; +u8 gUnknown_03005DFC; +u8 gUnknown_03005DF8; +u8 gUnknown_03005DF4; +u8 gUnknown_03005E00; +u8 gUnknown_03005E04; +u16 * gUnknown_03005E08; +u16 gUnknown_03005E0C; // this file's functions void sub_80FCAA4(void); diff --git a/src/credits.c b/src/credits.c index daf6d2b5c..28a4994be 100644 --- a/src/credits.c +++ b/src/credits.c @@ -497,7 +497,7 @@ void sub_81439D0(void) SetVBlankCallback(vblank_8143948); - m4aSongNumStart(MUS_THANKFOR); + m4aSongNumStart(MUS_CREDITS); SetMainCallback2(sub_814395C); gUnknown_02039325 = 0; @@ -1126,8 +1126,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) switch (data) { case 0: - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; @@ -1137,8 +1137,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gTasks[taskIdA].data[TDA_0] = sub_8148EC0(0, 0x2000, 0x20, 8); break; case 1: - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; @@ -1148,8 +1148,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gTasks[taskIdA].data[TDA_0] = sub_8148EC0(0, 0x2000, 0x20, 8); break; case 2: - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; @@ -1159,8 +1159,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gTasks[taskIdA].data[TDA_0] = sub_8148EC0(1, 0x2000, 0x200, 8); break; case 3: - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = -32; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; @@ -1170,8 +1170,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gTasks[taskIdA].data[TDA_0] = sub_8148EC0(1, 0x2000, 0x200, 8); break; case 4: - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 88; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 152; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; diff --git a/src/crt0.s b/src/crt0.s index 15698972d..e876c4c10 100644 --- a/src/crt0.s +++ b/src/crt0.s @@ -1,3 +1,4 @@ + .include "constants/global.h" .include "constants/gba_constants.inc" .include "constants/misc_constants.inc" .include "constants/version.inc" diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h index 951807252..4534516c1 100644 --- a/src/data/battle_strings_en.h +++ b/src/data/battle_strings_en.h @@ -613,23 +613,23 @@ const u8 BattleText_StatNoHigher[] = _("{ATTACKING_MON}'s stats won't\ngo any hi const u8 BattleText_StatNoLower[] = _("{DEFENDING_MON}'s stats won't\ngo any lower!"); const u8 BattleText_Critical[] = _("A critical hit!"); const u8 BattleText_GrandSlam[] = _("It's a one-hit KO!"); -const u8 BattleText_MoveForget123[] = _("{PAUSE 32}1, {PAUSE 15}2 and...{PAUSE 15} ...{PAUSE 15} ...{PAUSE 15}\n{PAUSE 15}{PLAY_SE SE_KON}Poof!\p"); +const u8 BattleText_MoveForget123[] = _("{PAUSE 32}1, {PAUSE 15}2 and...{PAUSE 15} ...{PAUSE 15} ...{PAUSE 15}\n{PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p"); const u8 BattleText_MoveForgetAnd[] = _("And...\p"); const u8 BattleText_CantForgetHM[] = _("HM moves can't be\nforgotten now.\p"); const u8 BattleText_NotEffective[] = _("It's not very effective..."); const u8 BattleText_SuperEffective[] = _("It's super effective!"); -const u8 BattleText_GotAwaySafely[] = _("{PLAY_SE SE_NIGERU}Got away safely!\p"); -const u8 BattleText_FledUsingItem[] = _("{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing its {STRING 19}!\p"); -const u8 BattleText_FledUsingOther[] = _("{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing {STRING 21}!\p"); -const u8 BattleText_FledWild[] = _("{PLAY_SE SE_NIGERU}Wild {STRING 0} fled!"); +const u8 BattleText_GotAwaySafely[] = _("{PLAY_SE SE_FLEE}Got away safely!\p"); +const u8 BattleText_FledUsingItem[] = _("{PLAY_SE SE_FLEE}{ATTACKING_MON} fled\nusing its {STRING 19}!\p"); +const u8 BattleText_FledUsingOther[] = _("{PLAY_SE SE_FLEE}{ATTACKING_MON} fled\nusing {STRING 21}!\p"); +const u8 BattleText_FledWild[] = _("{PLAY_SE SE_FLEE}Wild {STRING 0} fled!"); const u8 BattleText_PlayerDefeatedTrainer[] = _("Player defeated\n{STRING 29}!"); const u8 BattleText_PlayerDefeatedTrainers[] = _("Player beat {STRING 30}\nand {STRING 29}!"); const u8 BattleText_PlayerLostTrainer[] = _("Player lost against\n{STRING 29}!"); const u8 BattleText_PlayerLostTrainers[] = _("Player lost to {STRING 30}\nand {STRING 29}!"); const u8 BattleText_PlayerTiedTrainer[] = _("Player tied against\n{STRING 29}!"); const u8 BattleText_PlayerTiedTrainers[] = _("Player tied against {STRING 30}\nand {STRING 29}!"); -const u8 BattleText_FledSingle[] = _("{PLAY_SE SE_NIGERU}{STRING 29} fled!"); -const u8 BattleText_FledDouble[] = _("{PLAY_SE SE_NIGERU}{STRING 29} and\n{STRING 30} fled!"); +const u8 BattleText_FledSingle[] = _("{PLAY_SE SE_FLEE}{STRING 29} fled!"); +const u8 BattleText_FledDouble[] = _("{PLAY_SE SE_FLEE}{STRING 29} and\n{STRING 30} fled!"); const u8 BattleText_NoRunning[] = _("No! There's no running\nfrom a TRAINER battle!\p"); const u8 BattleText_CantEscape2[] = _("Can't escape!\p"); const u8 BattleText_BirchDontLeaveMe[] = _("PROF. BIRCH: D-don't leave\nme here like this!\p"); @@ -679,7 +679,7 @@ const u8 BattleText_CuriousAbout[] = _("{STRING 3} is curious about\nthe {STRING const u8 BattleText_EnthralledBy[] = _("{STRING 3} is enthralled by\nthe {STRING 0}!"); const u8 BattleText_IgnoredThing[] = _("{STRING 3} completely ignored\nthe {STRING 0}!"); const u8 BattleText_ThrewBlock[] = _("{STRING 32} threw a {POKEBLOCK}\nat the {STRING 3}!"); -const u8 BattleText_SafariOver[] = _("{PLAY_SE SE_PINPON}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); +const u8 BattleText_SafariOver[] = _("{PLAY_SE SE_DING_DONG}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); const u8 BattleText_WildAppeared1[] = _("Wild {STRING 3} appeared!\p"); const u8 BattleText_WildAppeared2[] = _("Wild {STRING 3} appeared!\p"); const u8 BattleText_WildAppeared3[] = _("Wild {STRING 3} appeared!{PAUSE 127}"); @@ -747,8 +747,8 @@ const u8 BattleText_BallBrokeOhNo[] = _("Oh, no!\nThe POKéMON broke free!"); const u8 BattleText_BallBrokeAppeared[] = _("Aww!\nIt appeared to be caught!"); const u8 BattleText_BallBrokeAlmost[] = _("Aargh!\nAlmost had it!"); const u8 BattleText_BallBrokeSoClose[] = _("Shoot!\nIt was so close, too!"); -const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}\p"); -const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}"); +const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_CAUGHT}\p"); +const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_CAUGHT}{PAUSE 127}"); const u8 BattleText_GiveNickname[] = _("Give a nickname to the\ncaptured {STRING 3}?"); const u8 BattleText_SentToPC[] = _("{STRING 3} was sent to\n{STRING 35} PC."); const u8 BattleText_Someone[] = _("someone's"); diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index e89cb144e..80527ad42 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -940,7 +940,7 @@ bool8 debug_sub_80901A4(void) bool8 debug_sub_80901E4(void) { ResetFanClub(); - sub_810FAA0(); + UpdateTrainerFanClubGameClear(); CloseMenu(); return TRUE; } diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index dec9b4371..5b7a26f97 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -814,373 +814,373 @@ void sub_80BB1D4(void) #define SOUND_LIST_BGM \ X(MUS_STOP, "STOP") \ - X(MUS_TETSUJI, "TETSUJI") \ - X(MUS_FIELD13, "FIELD13") \ - X(MUS_KACHI22, "KACHI22") \ - X(MUS_KACHI2, "KACHI2") \ - X(MUS_KACHI3, "KACHI3") \ - X(MUS_KACHI5, "KACHI5") \ - X(MUS_PCC, "PCC") \ - X(MUS_NIBI, "NIBI") \ - X(MUS_SUIKUN, "SUIKUN") \ - X(MUS_DOORO1, "DOORO1") \ - X(MUS_DOORO_X1, "DOORO-X1") \ - X(MUS_DOORO_X3, "DOORO-X3") \ - X(MUS_MACHI_S2, "MACHI-S2") \ - X(MUS_MACHI_S4, "MACHI-S4") \ - X(MUS_GIM, "GIM") \ - X(MUS_NAMINORI, "NAMINORI") \ - X(MUS_DAN01, "DAN01") \ - X(MUS_FANFA1, "FANFA1") \ - X(MUS_ME_ASA, "ME-ASA") \ - X(MUS_ME_BACHI, "ME-BACHI") \ - X(MUS_FANFA4, "FANFA4") \ - X(MUS_FANFA5, "FANFA5") \ - X(MUS_ME_WAZA, "ME-WAZA") \ - X(MUS_BIJYUTU, "BIJYUTU") \ - X(MUS_DOORO_X4, "DOORO-X4") \ - X(MUS_FUNE_KAN, "FUNE-KAN") \ - X(MUS_ME_SHINKA, "ME-SHINKA") \ - X(MUS_SHINKA, "SHINKA") \ - X(MUS_ME_WASURE, "ME-WASURE") \ - X(MUS_SYOUJOEYE, "SYOUJOEYE") \ - X(MUS_BOYEYE, "BOYEYE") \ - X(MUS_DAN02, "DAN02") \ - X(MUS_MACHI_S3, "MACHI-S3") \ - X(MUS_ODAMAKI, "ODAMAKI") \ + X(MUS_LITTLEROOT_TEST, "TETSUJI") \ + X(MUS_GSC_ROUTE38, "FIELD13") \ + X(MUS_CAUGHT, "KACHI22") \ + X(MUS_VICTORY_WILD, "KACHI2") \ + X(MUS_VICTORY_GYM_LEADER, "KACHI3") \ + X(MUS_VICTORY_LEAGUE, "KACHI5") \ + X(MUS_C_COMM_CENTER, "PCC") \ + X(MUS_GSC_PEWTER, "NIBI") \ + X(MUS_C_VS_LEGEND_BEAST, "SUIKUN") \ + X(MUS_ROUTE101, "DOORO1") \ + X(MUS_ROUTE110, "DOORO-X1") \ + X(MUS_ROUTE120, "DOORO-X3") \ + X(MUS_PETALBURG, "MACHI-S2") \ + X(MUS_OLDALE, "MACHI-S4") \ + X(MUS_GYM, "GIM") \ + X(MUS_SURF, "NAMINORI") \ + X(MUS_PETALBURG_WOODS, "DAN01") \ + X(MUS_LEVEL_UP, "FANFA1") \ + X(MUS_HEAL, "ME-ASA") \ + X(MUS_OBTAIN_BADGE, "ME-BACHI") \ + X(MUS_OBTAIN_ITEM, "FANFA4") \ + X(MUS_EVOLVED, "FANFA5") \ + X(MUS_OBTAIN_TMHM, "ME-WAZA") \ + X(MUS_LILYCOVE_MUSEUM, "BIJYUTU") \ + X(MUS_ROUTE122, "DOORO-X4") \ + X(MUS_OCEANIC_MUSEUM, "FUNE-KAN") \ + X(MUS_EVOLUTION_INTRO, "ME-SHINKA") \ + X(MUS_EVOLUTION, "SHINKA") \ + X(MUS_MOVE_DELETED, "ME-WASURE") \ + X(MUS_ENCOUNTER_GIRL, "SYOUJOEYE") \ + X(MUS_ENCOUNTER_MALE, "BOYEYE") \ + X(MUS_ABANDONED_SHIP, "DAN02") \ + X(MUS_FORTREE, "MACHI-S3") \ + X(MUS_BIRCH_LAB, "ODAMAKI") \ X(MUS_B_TOWER, "B-TOWER") \ - X(MUS_SWIMEYE, "SWIMEYE") \ - X(MUS_DAN03, "DAN03") \ - X(MUS_ME_KINOMI, "ME-KINOMI") \ - X(MUS_ME_TAMA, "ME-TAMA") \ - X(MUS_ME_B_BIG, "ME-B-BIG") \ - X(MUS_ME_B_SMALL, "ME-B-SMALL") \ - X(MUS_ME_ZANNEN, "ME-ZANNEN") \ - X(MUS_BD_TIME, "BD-TIME") \ - X(MUS_TEST1, "TEST1") \ - X(MUS_TEST2, "TEST2") \ - X(MUS_TEST3, "TEST3") \ - X(MUS_TEST4, "TEST4") \ - X(MUS_TEST, "TEST") \ - X(MUS_GOMACHI0, "GOMACHI0") \ - X(MUS_GOTOWN, "GOTOWN") \ - X(MUS_POKECEN, "POKECEN") \ - X(MUS_NEXTROAD, "NEXTROAD") \ - X(MUS_GRANROAD, "GRANROAD") \ + X(MUS_ENCOUNTER_SWIMMER, "SWIMEYE") \ + X(MUS_CAVE_OF_ORIGIN, "DAN03") \ + X(MUS_OBTAIN_BERRY, "ME-KINOMI") \ + X(MUS_AWAKEN_LEGEND, "ME-TAMA") \ + X(MUS_SLOTS_JACKPOT, "ME-B-BIG") \ + X(MUS_SLOTS_WIN, "ME-B-SMALL") \ + X(MUS_TOO_BAD, "ME-ZANNEN") \ + X(MUS_ROULETTE, "BD-TIME") \ + X(MUS_LINK_CONTEST_P1, "TEST1") \ + X(MUS_LINK_CONTEST_P2, "TEST2") \ + X(MUS_LINK_CONTEST_P3, "TEST3") \ + X(MUS_LINK_CONTEST_P4, "TEST4") \ + X(MUS_ENCOUNTER_RICH, "TEST") \ + X(MUS_VERDANTURF, "GOMACHI0") \ + X(MUS_RUSTBORO, "GOTOWN") \ + X(MUS_POKE_CENTER, "POKECEN") \ + X(MUS_ROUTE104, "NEXTROAD") \ + X(MUS_ROUTE119, "GRANROAD") \ X(MUS_CYCLING, "CYCLING") \ - X(MUS_FRIENDLY, "FRIENDLY") \ - X(MUS_MISHIRO, "MISHIRO") \ - X(MUS_TOZAN, "TOZAN") \ - X(MUS_GIRLEYE, "GIRLEYE") \ - X(MUS_MINAMO, "MINAMO") \ - X(MUS_ASHROAD, "ASHROAD") \ - X(MUS_EVENT0, "EVENT0") \ - X(MUS_DEEPDEEP, "DEEPDEEP") \ - X(MUS_KACHI1, "KACHI1") \ - X(MUS_TITLE3, "TITLE3") \ - X(MUS_DEMO1, "DEMO1") \ - X(MUS_GIRL_SUP, "GIRL-SUP") \ - X(MUS_HAGESHII, "HAGESHII") \ - X(MUS_KAKKOII, "KAKKOII") \ - X(MUS_KAZANBAI, "KAZANBAI") \ - X(MUS_AQA_0, "AQA-0") \ - X(MUS_TSURETEK, "TSURETEK") \ - X(MUS_BOY_SUP, "BOY-SUP") \ - X(MUS_RAINBOW, "RAINBOW") \ - X(MUS_AYASII, "AYASII") \ - X(MUS_KACHI4, "KACHI4") \ - X(MUS_ROPEWAY, "ROPEWAY") \ - X(MUS_CASINO, "CASINO") \ - X(MUS_HIGHTOWN, "HIGHTOWN") \ - X(MUS_SAFARI, "SAFARI") \ - X(MUS_C_ROAD, "C-ROAD") \ - X(MUS_AJITO, "AJITO") \ - X(MUS_M_BOAT, "M-BOAT") \ - X(MUS_M_DUNGON, "M-DUNGON") \ - X(MUS_FINECITY, "FINECITY") \ - X(MUS_MACHUPI, "MACHUPI") \ - X(MUS_P_SCHOOL, "P-SCHOOL") \ - X(MUS_DENDOU, "DENDOU") \ - X(MUS_TONEKUSA, "TONEKUSA") \ - X(MUS_MABOROSI, "MABOROSI") \ - X(MUS_CON_FAN, "CON-FAN") \ - X(MUS_CONTEST0, "CONTEST0") \ - X(MUS_MGM0, "MGM0") \ - X(MUS_T_BATTLE, "T-BATTLE") \ - X(MUS_OOAME, "OOAME") \ - X(MUS_HIDERI, "HIDERI") \ - X(MUS_RUNECITY, "RUNECITY") \ - X(MUS_CON_K, "CON-K") \ - X(MUS_EIKOU_R, "EIKOU-R") \ - X(MUS_KARAKURI, "KARAKURI") \ - X(MUS_HUTAGO, "HUTAGO") \ - X(MUS_SITENNOU, "SITENNOU") \ - X(MUS_YAMA_EYE, "YAMA-EYE") \ - X(MUS_CONLOBBY, "CONLOBBY") \ - X(MUS_INTER_V, "INTER-V") \ - X(MUS_DAIGO, "DAIGO") \ - X(MUS_THANKFOR, "THANKFOR") \ + X(MUS_POKE_MART, "FRIENDLY") \ + X(MUS_LITTLEROOT, "MISHIRO") \ + X(MUS_MT_CHIMNEY, "TOZAN") \ + X(MUS_ENCOUNTER_FEMALE, "GIRLEYE") \ + X(MUS_LILYCOVE, "MINAMO") \ + X(MUS_ROUTE111, "ASHROAD") \ + X(MUS_HELP, "EVENT0") \ + X(MUS_UNDERWATER, "DEEPDEEP") \ + X(MUS_VICTORY_TRAINER, "KACHI1") \ + X(MUS_TITLE, "TITLE3") \ + X(MUS_INTRO, "DEMO1") \ + X(MUS_ENCOUNTER_MAY, "GIRL-SUP") \ + X(MUS_ENCOUNTER_INTENSE, "HAGESHII") \ + X(MUS_ENCOUNTER_COOL, "KAKKOII") \ + X(MUS_ROUTE113, "KAZANBAI") \ + X(MUS_ENCOUNTER_AQUA, "AQA-0") \ + X(MUS_FOLLOW_ME, "TSURETEK") \ + X(MUS_ENCOUNTER_BRENDAN, "BOY-SUP") \ + X(MUS_EVER_GRANDE, "RAINBOW") \ + X(MUS_ENCOUNTER_SUSPICIOUS, "AYASII") \ + X(MUS_VICTORY_AQUA_MAGMA, "KACHI4") \ + X(MUS_CABLE_CAR, "ROPEWAY") \ + X(MUS_GAME_CORNER, "CASINO") \ + X(MUS_DEWFORD, "HIGHTOWN") \ + X(MUS_SAFARI_ZONE, "SAFARI") \ + X(MUS_VICTORY_ROAD, "C-ROAD") \ + X(MUS_AQUA_MAGMA_HIDEOUT, "AJITO") \ + X(MUS_SAILING, "M-BOAT") \ + X(MUS_MT_PYRE, "M-DUNGON") \ + X(MUS_SLATEPORT, "FINECITY") \ + X(MUS_MT_PYRE_EXTERIOR, "MACHUPI") \ + X(MUS_SCHOOL, "P-SCHOOL") \ + X(MUS_HALL_OF_FAME, "DENDOU") \ + X(MUS_FALLARBOR, "TONEKUSA") \ + X(MUS_SEALED_CHAMBER, "MABOROSI") \ + X(MUS_CONTEST_WINNER, "CON-FAN") \ + X(MUS_CONTEST, "CONTEST0") \ + X(MUS_ENCOUNTER_MAGMA, "MGM0") \ + X(MUS_INTRO_BATTLE, "T-BATTLE") \ + X(MUS_WEATHER_KYOGRE, "OOAME") \ + X(MUS_WEATHER_GROUDON, "HIDERI") \ + X(MUS_SOOTOPOLIS, "RUNECITY") \ + X(MUS_CONTEST_RESULTS, "CON-K") \ + X(MUS_HALL_OF_FAME_ROOM, "EIKOU-R") \ + X(MUS_TRICK_HOUSE, "KARAKURI") \ + X(MUS_ENCOUNTER_TWINS, "HUTAGO") \ + X(MUS_ENCOUNTER_ELITE_FOUR, "SITENNOU") \ + X(MUS_ENCOUNTER_HIKER, "YAMA-EYE") \ + X(MUS_CONTEST_LOBBY, "CONLOBBY") \ + X(MUS_ENCOUNTER_INTERVIEWER, "INTER-V") \ + X(MUS_ENCOUNTER_CHAMPION, "DAIGO") \ + X(MUS_CREDITS, "THANKFOR") \ X(MUS_END, "END") \ - X(MUS_BATTLE27, "BATTLE27") \ - X(MUS_BATTLE31, "BATTLE31") \ - X(MUS_BATTLE20, "BATTLE20") \ - X(MUS_BATTLE32, "BATTLE32") \ - X(MUS_BATTLE33, "BATTLE33") \ - X(MUS_BATTLE36, "BATTLE36") \ - X(MUS_BATTLE34, "BATTLE34") \ - X(MUS_BATTLE35, "BATTLE35") \ - X(MUS_BATTLE38, "BATTLE38") \ - X(MUS_BATTLE30, "BATTLE30") + X(MUS_VS_WILD, "BATTLE27") \ + X(MUS_VS_AQUA_MAGMA, "BATTLE31") \ + X(MUS_VS_TRAINER, "BATTLE20") \ + X(MUS_VS_GYM_LEADER, "BATTLE32") \ + X(MUS_VS_CHAMPION, "BATTLE33") \ + X(MUS_VS_REGI, "BATTLE36") \ + X(MUS_VS_KYOGRE_GROUDON, "BATTLE34") \ + X(MUS_VS_RIVAL, "BATTLE35") \ + X(MUS_VS_ELITE_FOUR, "BATTLE38") \ + X(MUS_VS_AQUA_MAGMA_LEADER, "BATTLE30") #define SOUND_LIST_SE \ - X(SE_STOP, "STOP") \ - X(SE_KAIFUKU, "KAIFUKU") \ - X(SE_PC_LOGON, "PC-LOGON") \ + X(MUS_DUMMY, "STOP") \ + X(SE_USE_ITEM, "KAIFUKU") \ + X(SE_PC_LOGIN, "PC-LOGON") \ X(SE_PC_OFF, "PC-OFF") \ X(SE_PC_ON, "PC-ON") \ X(SE_SELECT, "SELECT") \ X(SE_WIN_OPEN, "WIN-OPEN") \ X(SE_WALL_HIT, "WALL-HIT") \ X(SE_DOOR, "DOOR") \ - X(SE_KAIDAN, "KAIDAN") \ - X(SE_DANSA, "DANSA") \ - X(SE_JITENSYA, "JITENSYA") \ - X(SE_KOUKA_L, "KOUKA-L") \ - X(SE_KOUKA_M, "KOUKA-M") \ - X(SE_KOUKA_H, "KOUKA-H") \ - X(SE_BOWA2, "BOWA2") \ - X(SE_POKE_DEAD, "POKE-DEAD") \ - X(SE_NIGERU, "NIGERU") \ - X(SE_JIDO_DOA, "JIDO-DOA") \ - X(SE_NAMINORI, "NAMINORI") \ - X(SE_BAN, "BAN") \ + X(SE_EXIT, "KAIDAN") \ + X(SE_LEDGE, "DANSA") \ + X(SE_BIKE_BELL, "JITENSYA") \ + X(SE_NOT_EFFECTIVE, "KOUKA-L") \ + X(SE_EFFECTIVE, "KOUKA-M") \ + X(SE_SUPER_EFFECTIVE, "KOUKA-H") \ + X(SE_BALL_OPEN, "BOWA2") \ + X(SE_FAINT, "POKE-DEAD") \ + X(SE_FLEE, "NIGERU") \ + X(SE_SLIDING_DOOR, "JIDO-DOA") \ + X(SE_SHIP, "NAMINORI") \ + X(SE_BANG, "BAN") \ X(SE_PIN, "PIN") \ X(SE_BOO, "BOO") \ - X(SE_BOWA, "BOWA") \ - X(SE_JYUNI, "JYUNI") \ + X(SE_BALL, "BOWA") \ + X(SE_CONTEST_PLACE, "JYUNI") \ X(SE_A, "A") \ X(SE_I, "I") \ X(SE_U, "U") \ X(SE_E, "E") \ X(SE_O, "O") \ X(SE_N, "N") \ - X(SE_SEIKAI, "SEIKAI") \ - X(SE_HAZURE, "HAZURE") \ + X(SE_SUCCESS, "SEIKAI") \ + X(SE_FAILURE, "HAZURE") \ X(SE_EXP, "EXP") \ - X(SE_JITE_PYOKO, "JITE-PYOKO") \ - X(SE_MU_PACHI, "MU-PACHI") \ - X(SE_TK_KASYA, "TK-KASYA") \ + X(SE_BIKE_HOP, "JITE-PYOKO") \ + X(SE_SWITCH, "MU-PACHI") \ + X(SE_CLICK, "TK-KASYA") \ X(SE_FU_ZAKU, "FU-ZAKU") \ - X(SE_FU_ZAKU2, "FU-ZAKU2") \ - X(SE_FU_ZUZUZU, "FU-ZUZUZU") \ - X(SE_RU_GASHIN, "RU-GASHIN") \ - X(SE_RU_GASYAN, "RU-GASYAN") \ - X(SE_RU_BARI, "RU-BARI") \ - X(SE_RU_HYUU, "RU-HYUU") \ - X(SE_KI_GASYAN, "KI-GASYAN") \ - X(SE_TK_WARPIN, "TK-WARPIN") \ - X(SE_TK_WARPOUT, "TK-WARPOUT") \ - X(SE_TU_SAA, "TU-SAA") \ - X(SE_HI_TURUN, "HI-TURUN") \ - X(SE_TRACK_MOVE, "TRACK-MOVE") \ - X(SE_TRACK_STOP, "TRACK-STOP") \ - X(SE_TRACK_HAIK, "TRACK-HAIK") \ - X(SE_TRACK_DOOR, "TRACK-DOOR") \ - X(SE_MOTER, "MOTER") \ + X(SE_CONTEST_CONDITION_LOSE, "FU-ZAKU2") \ + X(SE_LAVARIDGE_FALL_WARP, "FU-ZUZUZU") \ + X(SE_ICE_STAIRS, "RU-GASHIN") \ + X(SE_ICE_BREAK, "RU-GASYAN") \ + X(SE_ICE_CRACK, "RU-BARI") \ + X(SE_FALL, "RU-HYUU") \ + X(SE_UNLOCK, "KI-GASYAN") \ + X(SE_WARP_IN, "TK-WARPIN") \ + X(SE_WARP_OUT, "TK-WARPOUT") \ + X(SE_REPEL, "TU-SAA") \ + X(SE_ROTATING_GATE, "HI-TURUN") \ + X(SE_TRUCK_MOVE, "TRACK-MOVE") \ + X(SE_TRUCK_STOP, "TRACK-STOP") \ + X(SE_TRUCK_UNLOAD, "TRACK-HAIK") \ + X(SE_TRUCK_DOOR, "TRACK-DOOR") \ + X(SE_BERRY_BLENDER, "MOTER") \ X(SE_CARD, "CARD") \ X(SE_SAVE, "SAVE") \ - X(SE_KON, "KON") \ - X(SE_KON2, "KON2") \ - X(SE_KON3, "KON3") \ - X(SE_KON4, "KON4") \ - X(SE_SUIKOMU, "SUIKOMU") \ - X(SE_NAGERU, "NAGERU") \ - X(SE_TOY_C, "TOY-C") \ - X(SE_TOY_D, "TOY-D") \ - X(SE_TOY_E, "TOY-E") \ - X(SE_TOY_F, "TOY-F") \ - X(SE_TOY_G, "TOY-G") \ - X(SE_TOY_A, "TOY-A") \ - X(SE_TOY_B, "TOY-B") \ - X(SE_TOY_C1, "TOY-C1") \ - X(SE_MIZU, "MIZU") \ - X(SE_HASHI, "HASHI") \ - X(SE_DAUGI, "DAUGI") \ - X(SE_PINPON, "PINPON") \ - X(SE_FUUSEN1, "FUUSEN1") \ - X(SE_FUUSEN2, "FUUSEN2") \ - X(SE_FUUSEN3, "FUUSEN3") \ - X(SE_TOY_KABE, "TOY-KABE") \ - X(SE_TOY_DANGO, "TOY-DANGO") \ - X(SE_DOKU, "DOKU") \ - X(SE_ESUKA, "ESUKA") \ - X(SE_T_AME, "T-AME") \ - X(SE_T_AME_E, "T-AME-E") \ - X(SE_T_OOAME, "T-OOAME") \ - X(SE_T_OOAME_E, "T-OOAME-E") \ - X(SE_T_KOAME, "T-KOAME") \ - X(SE_T_KOAME_E, "T-KOAME-E") \ - X(SE_T_KAMI, "T-KAMI") \ - X(SE_T_KAMI2, "T-KAMI2") \ - X(SE_ELEBETA, "ELEBETA") \ - X(SE_HINSI, "HINSI") \ - X(SE_EXPMAX, "EXPMAX") \ - X(SE_TAMAKORO, "TAMAKORO") \ - X(SE_TAMAKORO_E, "TAMAKORO-E") \ - X(SE_BASABASA, "BASABASA") \ - X(SE_REGI, "REGI") \ - X(SE_C_GAJI, "C-GAJI") \ - X(SE_C_MAKU_U, "C-MAKU-U") \ - X(SE_C_MAKU_D, "C-MAKU-D") \ - X(SE_C_PASI, "C-PASI") \ - X(SE_C_SYU, "C-SYU") \ - X(SE_C_PIKON, "C-PIKON") \ - X(SE_REAPOKE, "REAPOKE") \ - X(SE_OP_BASYU, "OP-BASYU") \ - X(SE_BT_START, "BT-START") \ - X(SE_DENDOU, "DENDOU") \ - X(SE_JIHANKI, "JIHANKI") \ - X(SE_TAMA, "TAMA") \ - X(SE_Z_SCROLL, "Z-SCROLL") \ - X(SE_Z_PAGE, "Z-PAGE") \ - X(SE_PN_ON, "PN-ON") \ - X(SE_PN_OFF, "PN-OFF") \ - X(SE_Z_SEARCH, "Z-SEARCH") \ - X(SE_TAMAGO, "TAMAGO") \ - X(SE_TB_START, "TB-START") \ - X(SE_TB_KON, "TB-KON") \ - X(SE_TB_KARA, "TB-KARA") \ - X(SE_BIDORO, "BIDORO") \ - X(SE_W085, "W085") \ - X(SE_W085B, "W085B") \ - X(SE_W231, "W231") \ - X(SE_W171, "W171") \ - X(SE_W233, "W233") \ - X(SE_W233B, "W233B") \ - X(SE_W145, "W145") \ - X(SE_W145B, "W145B") \ - X(SE_W145C, "W145C") \ - X(SE_W240, "W240") \ - X(SE_W015, "W015") \ - X(SE_W081, "W081") \ - X(SE_W081B, "W081B") \ - X(SE_W088, "W088") \ - X(SE_W016, "W016") \ - X(SE_W016B, "W016B") \ - X(SE_W003, "W003") \ - X(SE_W104, "W104") \ - X(SE_W013, "W013") \ - X(SE_W196, "W196") \ - X(SE_W086, "W086") \ - X(SE_W004, "W004") \ - X(SE_W025, "W025") \ - X(SE_W025B, "W025B") \ - X(SE_W152, "W152") \ - X(SE_W026, "W026") \ - X(SE_W172, "W172") \ - X(SE_W172B, "W172B") \ - X(SE_W053, "W053") \ - X(SE_W007, "W007") \ - X(SE_W092, "W092") \ - X(SE_W221, "W221") \ - X(SE_W221B, "W221B") \ - X(SE_W052, "W052") \ - X(SE_W036, "W036") \ - X(SE_W059, "W059") \ - X(SE_W059B, "W059B") \ - X(SE_W010, "W010") \ - X(SE_W011, "W011") \ - X(SE_W017, "W017") \ - X(SE_W019, "W019") \ - X(SE_W028, "W028") \ - X(SE_W013B, "W013B") \ - X(SE_W044, "W044") \ - X(SE_W029, "W029") \ - X(SE_W057, "W057") \ - X(SE_W056, "W056") \ - X(SE_W250, "W250") \ - X(SE_W030, "W030") \ - X(SE_W039, "W039") \ - X(SE_W054, "W054") \ - X(SE_W077, "W077") \ - X(SE_W020, "W020") \ - X(SE_W082, "W082") \ - X(SE_W047, "W047") \ - X(SE_W195, "W195") \ - X(SE_W006, "W006") \ - X(SE_W091, "W091") \ - X(SE_W146, "W146") \ - X(SE_W120, "W120") \ - X(SE_W153, "W153") \ - X(SE_W071B, "W071B") \ - X(SE_W071, "W071") \ - X(SE_W103, "W103") \ - X(SE_W062, "W062") \ - X(SE_W062B, "W062B") \ - X(SE_W048, "W048") \ - X(SE_W187, "W187") \ - X(SE_W118, "W118") \ - X(SE_W155, "W155") \ - X(SE_W122, "W122") \ - X(SE_W060, "W060") \ - X(SE_W185, "W185") \ - X(SE_W014, "W014") \ - X(SE_W043, "W043") \ - X(SE_W207, "W207") \ - X(SE_W207B, "W207B") \ - X(SE_W215, "W215") \ - X(SE_W109, "W109") \ - X(SE_W173, "W173") \ - X(SE_W280, "W280") \ - X(SE_W202, "W202") \ - X(SE_W060B, "W060B") \ - X(SE_W076, "W076") \ - X(SE_W080, "W080") \ - X(SE_W100, "W100") \ - X(SE_W107, "W107") \ - X(SE_W166, "W166") \ - X(SE_W129, "W129") \ - X(SE_W115, "W115") \ - X(SE_W112, "W112") \ - X(SE_W197, "W197") \ - X(SE_W199, "W199") \ - X(SE_W236, "W236") \ - X(SE_W204, "W204") \ - X(SE_W268, "W268") \ - X(SE_W070, "W070") \ - X(SE_W063, "W063") \ - X(SE_W127, "W127") \ - X(SE_W179, "W179") \ - X(SE_W151, "W151") \ - X(SE_W201, "W201") \ - X(SE_W161, "W161") \ - X(SE_W161B, "W161B") \ - X(SE_W227, "W227") \ - X(SE_W227B, "W227B") \ - X(SE_W226, "W226") \ - X(SE_W208, "W208") \ - X(SE_W213, "W213") \ - X(SE_W213B, "W213B") \ - X(SE_W234, "W234") \ - X(SE_W260, "W260") \ - X(SE_W328, "W328") \ - X(SE_W320, "W320") \ - X(SE_W255, "W255") \ - X(SE_W291, "W291") \ - X(SE_W089, "W089") \ - X(SE_W239, "W239") \ - X(SE_W230, "W230") \ - X(SE_W281, "W281") \ - X(SE_W327, "W327") \ - X(SE_W287, "W287") \ - X(SE_W257, "W257") \ - X(SE_W253, "W253") \ - X(SE_W258, "W258") \ - X(SE_W322, "W322") \ - X(SE_W298, "W298") \ - X(SE_W287B, "W287B") \ - X(SE_W114, "W114") \ - X(SE_W063B, "W063B") + X(SE_BALL_BOUNCE_1, "KON") \ + X(SE_BALL_BOUNCE_2, "KON2") \ + X(SE_BALL_BOUNCE_3, "KON3") \ + X(SE_BALL_BOUNCE_4, "KON4") \ + X(SE_BALL_TRADE, "SUIKOMU") \ + X(SE_BALL_THROW, "NAGERU") \ + X(SE_NOTE_C, "TOY-C") \ + X(SE_NOTE_D, "TOY-D") \ + X(SE_NOTE_E, "TOY-E") \ + X(SE_NOTE_F, "TOY-F") \ + X(SE_NOTE_G, "TOY-G") \ + X(SE_NOTE_A, "TOY-A") \ + X(SE_NOTE_B, "TOY-B") \ + X(SE_NOTE_C_HIGH, "TOY-C1") \ + X(SE_PUDDLE, "MIZU") \ + X(SE_BRIDGE_WALK, "HASHI") \ + X(SE_ITEMFINDER, "DAUGI") \ + X(SE_DING_DONG, "PINPON") \ + X(SE_BALLOON_RED, "FUUSEN1") \ + X(SE_BALLOON_BLUE, "FUUSEN2") \ + X(SE_BALLOON_YELLOW, "FUUSEN3") \ + X(SE_BREAKABLE_DOOR, "TOY-KABE") \ + X(SE_MUD_BALL, "TOY-DANGO") \ + X(SE_FIELD_POISON, "DOKU") \ + X(SE_ESCALATOR, "ESUKA") \ + X(SE_THUNDERSTORM, "T-AME") \ + X(SE_THUNDERSTORM_STOP, "T-AME-E") \ + X(SE_DOWNPOUR, "T-OOAME") \ + X(SE_DOWNPOUR_STOP, "T-OOAME-E") \ + X(SE_RAIN, "T-KOAME") \ + X(SE_RAIN_STOP, "T-KOAME-E") \ + X(SE_THUNDER, "T-KAMI") \ + X(SE_THUNDER2, "T-KAMI2") \ + X(SE_ELEVATOR, "ELEBETA") \ + X(SE_LOW_HEALTH, "HINSI") \ + X(SE_EXP_MAX, "EXPMAX") \ + X(SE_ROULETTE_BALL, "TAMAKORO") \ + X(SE_ROULETTE_BALL2, "TAMAKORO-E") \ + X(SE_TAILLOW_WING_FLAP, "BASABASA") \ + X(SE_SHOP, "REGI") \ + X(SE_CONTEST_HEART, "C-GAJI") \ + X(SE_CONTEST_CURTAIN_RISE, "C-MAKU-U") \ + X(SE_CONTEST_CURTAIN_FALL, "C-MAKU-D") \ + X(SE_CONTEST_ICON_CHANGE, "C-PASI") \ + X(SE_CONTEST_ICON_CLEAR, "C-SYU") \ + X(SE_CONTEST_MONS_TURN, "C-PIKON") \ + X(SE_SHINY, "REAPOKE") \ + X(SE_INTRO_BLAST, "OP-BASYU") \ + X(SE_MUGSHOT, "BT-START") \ + X(SE_APPLAUSE, "DENDOU") \ + X(SE_VEND, "JIHANKI") \ + X(SE_ORB, "TAMA") \ + X(SE_DEX_SCROLL, "Z-SCROLL") \ + X(SE_DEX_PAGE, "Z-PAGE") \ + X(SE_POKENAV_ON, "PN-ON") \ + X(SE_POKENAV_OFF, "PN-OFF") \ + X(SE_DEX_SEARCH, "Z-SEARCH") \ + X(SE_EGG_HATCH, "TAMAGO") \ + X(SE_BALL_TRAY_ENTER, "TB-START") \ + X(SE_BALL_TRAY_BALL, "TB-KON") \ + X(SE_BALL_TRAY_EXIT, "TB-KARA") \ + X(SE_GLASS_FLUTE, "BIDORO") \ + X(SE_M_THUNDERBOLT, "W085") \ + X(SE_M_THUNDERBOLT2, "W085B") \ + X(SE_M_HARDEN, "W231") \ + X(SE_M_NIGHTMARE, "W171") \ + X(SE_M_VITAL_THROW, "W233") \ + X(SE_M_VITAL_THROW2, "W233B") \ + X(SE_M_BUBBLE, "W145") \ + X(SE_M_BUBBLE2, "W145B") \ + X(SE_M_BUBBLE3, "W145C") \ + X(SE_M_RAIN_DANCE, "W240") \ + X(SE_M_CUT, "W015") \ + X(SE_M_STRING_SHOT, "W081") \ + X(SE_M_STRING_SHOT2, "W081B") \ + X(SE_M_ROCK_THROW, "W088") \ + X(SE_M_GUST, "W016") \ + X(SE_M_GUST2, "W016B") \ + X(SE_M_DOUBLE_SLAP, "W003") \ + X(SE_M_DOUBLE_TEAM, "W104") \ + X(SE_M_RAZOR_WIND, "W013") \ + X(SE_M_ICY_WIND, "W196") \ + X(SE_M_THUNDER_WAVE, "W086") \ + X(SE_M_COMET_PUNCH, "W004") \ + X(SE_M_MEGA_KICK, "W025") \ + X(SE_M_MEGA_KICK2, "W025B") \ + X(SE_M_CRABHAMMER, "W152") \ + X(SE_M_JUMP_KICK, "W026") \ + X(SE_M_FLAME_WHEEL, "W172") \ + X(SE_M_FLAME_WHEEL2, "W172B") \ + X(SE_M_FLAMETHROWER, "W053") \ + X(SE_M_FIRE_PUNCH, "W007") \ + X(SE_M_TOXIC, "W092") \ + X(SE_M_SACRED_FIRE, "W221") \ + X(SE_M_SACRED_FIRE2, "W221B") \ + X(SE_M_EMBER, "W052") \ + X(SE_M_TAKE_DOWN, "W036") \ + X(SE_M_BLIZZARD, "W059") \ + X(SE_M_BLIZZARD2, "W059B") \ + X(SE_M_SCRATCH, "W010") \ + X(SE_M_VICEGRIP, "W011") \ + X(SE_M_WING_ATTACK, "W017") \ + X(SE_M_FLY, "W019") \ + X(SE_M_SAND_ATTACK, "W028") \ + X(SE_M_RAZOR_WIND2, "W013B") \ + X(SE_M_BITE, "W044") \ + X(SE_M_HEADBUTT, "W029") \ + X(SE_M_SURF, "W057") \ + X(SE_M_HYDRO_PUMP, "W056") \ + X(SE_M_WHIRLPOOL, "W250") \ + X(SE_M_HORN_ATTACK, "W030") \ + X(SE_M_TAIL_WHIP, "W039") \ + X(SE_M_MIST, "W054") \ + X(SE_M_POISON_POWDER, "W077") \ + X(SE_M_BIND, "W020") \ + X(SE_M_DRAGON_RAGE, "W082") \ + X(SE_M_SING, "W047") \ + X(SE_M_PERISH_SONG, "W195") \ + X(SE_M_PAY_DAY, "W006") \ + X(SE_M_DIG, "W091") \ + X(SE_M_DIZZY_PUNCH, "W146") \ + X(SE_M_SELF_DESTRUCT, "W120") \ + X(SE_M_EXPLOSION, "W153") \ + X(SE_M_ABSORB_2, "W071B") \ + X(SE_M_ABSORB, "W071") \ + X(SE_M_SCREECH, "W103") \ + X(SE_M_BUBBLE_BEAM, "W062") \ + X(SE_M_BUBBLE_BEAM2, "W062B") \ + X(SE_M_SUPERSONIC, "W048") \ + X(SE_M_BELLY_DRUM, "W187") \ + X(SE_M_METRONOME, "W118") \ + X(SE_M_BONEMERANG, "W155") \ + X(SE_M_LICK, "W122") \ + X(SE_M_PSYBEAM, "W060") \ + X(SE_M_FAINT_ATTACK, "W185") \ + X(SE_M_SWORDS_DANCE, "W014") \ + X(SE_M_LEER, "W043") \ + X(SE_M_SWAGGER, "W207") \ + X(SE_M_SWAGGER2, "W207B") \ + X(SE_M_HEAL_BELL, "W215") \ + X(SE_M_CONFUSE_RAY, "W109") \ + X(SE_M_SNORE, "W173") \ + X(SE_M_BRICK_BREAK, "W280") \ + X(SE_M_GIGA_DRAIN, "W202") \ + X(SE_M_PSYBEAM2, "W060B") \ + X(SE_M_SOLAR_BEAM, "W076") \ + X(SE_M_PETAL_DANCE, "W080") \ + X(SE_M_TELEPORT, "W100") \ + X(SE_M_MINIMIZE, "W107") \ + X(SE_M_SKETCH, "W166") \ + X(SE_M_SWIFT, "W129") \ + X(SE_M_REFLECT, "W115") \ + X(SE_M_BARRIER, "W112") \ + X(SE_M_DETECT, "W197") \ + X(SE_M_LOCK_ON, "W199") \ + X(SE_M_MOONLIGHT, "W236") \ + X(SE_M_CHARM, "W204") \ + X(SE_M_CHARGE, "W268") \ + X(SE_M_STRENGTH, "W070") \ + X(SE_M_HYPER_BEAM, "W063") \ + X(SE_M_WATERFALL, "W127") \ + X(SE_M_REVERSAL, "W179") \ + X(SE_M_ACID_ARMOR, "W151") \ + X(SE_M_SANDSTORM, "W201") \ + X(SE_M_TRI_ATTACK, "W161") \ + X(SE_M_TRI_ATTACK2, "W161B") \ + X(SE_M_ENCORE, "W227") \ + X(SE_M_ENCORE2, "W227B") \ + X(SE_M_BATON_PASS, "W226") \ + X(SE_M_MILK_DRINK, "W208") \ + X(SE_M_ATTRACT, "W213") \ + X(SE_M_ATTRACT2, "W213B") \ + X(SE_M_MORNING_SUN, "W234") \ + X(SE_M_FLATTER, "W260") \ + X(SE_M_SAND_TOMB, "W328") \ + X(SE_M_GRASSWHISTLE, "W320") \ + X(SE_M_SPIT_UP, "W255") \ + X(SE_M_DIVE, "W291") \ + X(SE_M_EARTHQUAKE, "W089") \ + X(SE_M_TWISTER, "W239") \ + X(SE_M_SWEET_SCENT, "W230") \ + X(SE_M_YAWN, "W281") \ + X(SE_M_SKY_UPPERCUT, "W327") \ + X(SE_M_STAT_INCREASE, "W287") \ + X(SE_M_HEAT_WAVE, "W257") \ + X(SE_M_UPROAR, "W253") \ + X(SE_M_HAIL, "W258") \ + X(SE_M_COSMIC_POWER, "W322") \ + X(SE_M_TEETER_DANCE, "W298") \ + X(SE_M_STAT_DECREASE, "W287B") \ + X(SE_M_HAZE, "W114") \ + X(SE_M_HYPER_BEAM2, "W063B") // Create BGM list #define X(songId, name) static const u8 sBGMName_##songId[] = _(name); diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index ef83fc3f0..2f100069d 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -610,7 +610,7 @@ void DebugMenu_8076E30(u8 taskId) Menu_DisplayDialogueFrame(); sub_813B79C(); Menu_PrintText(Str_839BD7D, 2, 15); - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); data[0]++; } else if (gMain.newKeys & B_BUTTON) @@ -1836,7 +1836,7 @@ void DebugMenu_8078310(u8 taskId) case 1: if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); *GetVarPointer(VAR_MIRAGE_RND_H) = data[1]; Menu_EraseScreen(); DestroyTask(taskId); @@ -2324,7 +2324,7 @@ void DebugMenu_8078AA4(u8 taskId) else if (gMain.newKeys & A_BUTTON) { gSaveBlock2.battleTower.curStreakChallengesNum[data[0]] = data[1]; - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); gTasks[taskId].func = DebugMenu_8078B38; } else if (gMain.newKeys & B_BUTTON) @@ -2424,7 +2424,7 @@ void DebugMenu_8078BD4(u8 taskId) case 1: if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); Menu_EraseScreen(); DestroyTask(taskId); ScriptContext2_Disable(); @@ -2631,7 +2631,7 @@ void DebugMenu_8078F68(u8 taskId) gSaveBlock2.playTimeHours = data[1]; gSaveBlock2.playTimeMinutes = data[2]; gSaveBlock2.playTimeSeconds = data[3]; - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); gTasks[taskId].func = DebugMenu_8079020; } else if (gMain.newKeys & B_BUTTON) diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index 8196a3ca6..b76e5f794 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -262,7 +262,7 @@ bool8 debug_sub_8090880(void) { if (!UpdatePaletteFade()) { - sub_80E60D8(); + ShowEasyChatScreen(); return TRUE; } diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index d9f5a3f5b..64da15dc7 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -773,7 +773,7 @@ static const struct MenuAction gUnknown_Debug_083C1A9C[] = { static const u8 gUnknown_Debug_083C1AAC[] = {2}; static const u16 gUnknown_Debug_083C1AAE[][9] = { - {FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1} + {FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08} }; static const u8 gUnknown_Debug_083C1AC0[] = DTR("ジムリーダー", "GYM LEADER"); @@ -1597,7 +1597,7 @@ static const u16 sControlWorks_SaveWork_ItemArrays[][9] = { {VAR_TRICK_HOUSE_ENTRANCE_STATE_2, VAR_TRICK_HOUSE_PRIZE_PICKUP, VAR_TRICK_HOUSE_STATE, VAR_TRICK_HOUSE_ENTRANCE_STATE_3, VAR_TRICK_HOUSE_ENTRANCE_STATE}, {VAR_TRICK_HOUSE_PUZZLE_1_STATE, VAR_TRICK_HOUSE_PUZZLE_2_STATE, VAR_TRICK_HOUSE_PUZZLE_3_STATE, VAR_TRICK_HOUSE_PUZZLE_4_STATE, VAR_TRICK_HOUSE_PUZZLE_5_STATE, VAR_TRICK_HOUSE_PUZZLE_6_STATE, VAR_TRICK_HOUSE_PUZZLE_7_STATE, VAR_TRICK_HOUSE_PUZZLE_8_STATE, VAR_TRICK_HOUSE_PUZZLE_7_STATE_2}, {VAR_BRINEY_HOUSE_STATE, VAR_GLASS_WORKSHOP_STATE}, - {VAR_0x4089, VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, VAR_BRINEY_LOCATION, VAR_0x4097, VAR_LILYCOVE_CONTEST_LOBBY_STATE, VAR_ELITE_4_STATE, VAR_CABLE_CAR_STATION_STATE, VAR_SAFARI_ZONE_STATE, VAR_CYCLING_CHALLENGE_STATE}, + {VAR_SECRET_BASE_INITIALIZED, VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, VAR_BRINEY_LOCATION, VAR_INIT_SECRET_BASE, VAR_LILYCOVE_CONTEST_LOBBY_STATE, VAR_ELITE_4_STATE, VAR_CABLE_CAR_STATION_STATE, VAR_SAFARI_ZONE_STATE, VAR_CYCLING_CHALLENGE_STATE}, {VAR_WEATHER_INSTITUTE_STATE, VAR_SLATEPORT_FAN_CLUB_STATE, 0x40BB, VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, VAR_GAME_CORNER_STATE, VAR_WHICH_FOSSIL_REVIVED} }; diff --git a/src/decoration.c b/src/decoration.c index f2a1cf4b9..35b9ff47f 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1430,7 +1430,7 @@ const struct YesNoFuncTable gUnknown_083EC634[] = { // text -extern u8 gUnknown_0815F399[]; +extern u8 SecretBase_EventScript_PCCancel[]; void sub_80FE1DC(void) { @@ -1524,7 +1524,7 @@ void gpu_pal_decompress_alloc_tag_and_upload(u8 taskId) FreeSpritePaletteByTag(6); if (ewram_1f000.isPlayerRoom == 0) { - ScriptContext1_SetupScript(gUnknown_0815F399); + ScriptContext1_SetupScript(SecretBase_EventScript_PCCancel); DestroyTask(taskId); } else { @@ -2542,7 +2542,7 @@ void sub_8100038(u8 taskId) DisplayItemMessageOnField(taskId, gSecretBaseText_PlaceItHere, sub_81000A0, 0); } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); DisplayItemMessageOnField(taskId, gSecretBaseText_CantBePlacedHere, sub_81006A8, 0); } } @@ -3039,15 +3039,15 @@ void sub_81009C0(struct Sprite *sprite) { if (sprite->data[6] < 15) { - sprite->invisible = 0; + sprite->invisible = FALSE; } else { - sprite->invisible = 1; + sprite->invisible = TRUE; } sprite->data[6] = (sprite->data[6] + 1) & 0x1f; } else { - sprite->invisible = 0; + sprite->invisible = FALSE; } } @@ -3239,7 +3239,7 @@ void sub_8100EEC(u8 taskId) { Menu_EraseWindowRect(0, 0, 29, 19); gSprites[gUnknown_020391A8].data[7] = 0; - gSprites[gUnknown_020391A8].invisible = 0; + gSprites[gUnknown_020391A8].invisible = FALSE; gSprites[gUnknown_020391A8].callback = sub_8101698; gSprites[gUnknown_020391A9].pos1.x = 0x88; gSprites[gUnknown_020391A9].pos1.y = 0x48; @@ -3258,7 +3258,7 @@ void sub_8100FB4(u8 taskId) { gTasks[taskId].data[10] = 0; sub_810045C(); - gSprites[gUnknown_020391A8].invisible = 0; + gSprites[gUnknown_020391A8].invisible = FALSE; gSprites[gUnknown_020391A8].callback = SpriteCallbackDummy; DisplayItemMessageOnField(taskId, gSecretBaseText_StopPuttingAwayDecor, sub_810156C, 0); } @@ -3278,7 +3278,7 @@ void sub_8101024(u8 taskId) if (MetatileBehavior_IsSecretBasePC(metatileBehavior) == TRUE || MetatileBehavior_IsPlayerRoomPCOn(metatileBehavior) == TRUE) { - gSprites[gUnknown_020391A8].invisible = 0; + gSprites[gUnknown_020391A8].invisible = FALSE; gSprites[gUnknown_020391A8].callback = SpriteCallbackDummy; DisplayItemMessageOnField(taskId, gSecretBaseText_StopPuttingAwayDecor, sub_810156C, 0); } else @@ -3343,7 +3343,7 @@ void sub_8101118(u8 decorIdx, struct UnkStruct_020391B4 *unk_020391B4) void sub_8101198(u8 x, u8 y) { - gSprites[gUnknown_020391A8].invisible = 1; + gSprites[gUnknown_020391A8].invisible = TRUE; gSprites[gUnknown_020391A8].callback = SpriteCallbackDummy; gSprites[gUnknown_020391A9].pos1.x = 0x88 + x * 16; gSprites[gUnknown_020391A9].pos1.y = 0x48 + y * 16; diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c index feec11670..d9aa5d0fc 100644 --- a/src/decoration_inventory.c +++ b/src/decoration_inventory.c @@ -61,7 +61,7 @@ bool8 InventoryContainsDecoration(u8 decorationId) return FALSE; } -bool8 GiveDecoration(u8 decorationId) +bool8 AddDecoration(u8 decorationId) { u8 category; s8 slot; @@ -159,6 +159,6 @@ void Debug_GiveAllDecorations(void) u8 decor; for (decor = 0; decor < DECOR_COUNT; decor++) - GiveDecoration(decor); + AddDecoration(decor); } #endif diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index 4f5c71518..ba2fded16 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -197,7 +197,7 @@ u8 *sub_80EB218(u8 *, u16, u16); u16 sub_80EB2D4(); bool8 sub_80EB680(u16 *, u16, u16, u16); -void sub_80E60D8(void) +void ShowEasyChatScreen(void) { u8 r4 = 3; u16 *r1; diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 0c115ddfe..24c2340ac 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -362,7 +362,7 @@ static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID) case 1: GetMonSpriteTemplate_803C56C(GetMonSpritePalStruct(mon)->tag, r5); spriteID = CreateSprite(&gUnknown_02024E8C, 120, 70, 6); - gSprites[spriteID].invisible = 1; + gSprites[spriteID].invisible = TRUE; gSprites[spriteID].callback = SpriteCallbackDummy; break; } @@ -595,7 +595,7 @@ static void SpriteCB_Egg_0(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 1); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 1); CreateRandomEggShardSprite(); } @@ -618,7 +618,7 @@ static void SpriteCB_Egg_1(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 2); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 2); } } @@ -645,13 +645,13 @@ static void SpriteCB_Egg_2(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 2); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 2); CreateRandomEggShardSprite(); CreateRandomEggShardSprite(); } if (sprite->data[0] == 30) - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } } @@ -678,8 +678,8 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) sprite->data[0]++; if (!gPaletteFade.active) { - PlaySE(SE_TAMAGO); - sprite->invisible = 1; + PlaySE(SE_EGG_HATCH); + sprite->invisible = TRUE; sprite->callback = SpriteCB_Egg_5; sprite->data[0] = 0; } @@ -689,7 +689,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite) { if (sprite->data[0] == 0) { - gSprites[gEggHatchData->pokeSpriteID].invisible = 0; + gSprites[gEggHatchData->pokeSpriteID].invisible = FALSE; StartSpriteAffineAnim(&gSprites[gEggHatchData->pokeSpriteID], 1); } if (sprite->data[0] == 8) diff --git a/src/event_object_lock.c b/src/event_object_lock.c index 9ffea9460..26f90f813 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -6,6 +6,7 @@ #include "task.h" extern u16 gSpecialVar_Facing; +u8 gSelectedObjectEvent; bool8 walkrun_is_standing_still(void) { diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 91e9da961..2ccc15777 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1031,7 +1031,7 @@ static u16 sCurrentSpecialObjectPaletteTag; extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[]; extern u8 gReservedSpritePaletteCount; extern struct Camera gCamera; -extern struct ObjectEvent gObjectEvents[16]; +struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT]; #if DEBUG u8 gUnknown_Debug_03004BC0; #endif diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index f585b2bee..d0f9d781d 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -223,10 +223,10 @@ static void SpriteCB_PostEvoSparkleSet2(struct Sprite* sprite) sprite->subpriority = 1; else { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->subpriority = 20; if (sprite->data[6] > 112 && sprite->data[6] & 1) - sprite->invisible = 1; + sprite->invisible = TRUE; } if (matrixNum < 20) matrixNum = 20; @@ -273,7 +273,7 @@ static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID) gTasks[taskID].tFrameCounter = 0; BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 10, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePreEvoSparkleSet1; - PlaySE(SE_W025); + PlaySE(SE_M_MEGA_KICK); } static void EvoTask_CreatePreEvoSparkleSet1(u8 taskID) @@ -313,7 +313,7 @@ static void EvoTask_BeginPreSparklesSet2(u8 taskID) SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; gTasks[taskID].func = EvoTask_CreatePreEvoSparklesSet2; - PlaySE(SE_W062B); + PlaySE(SE_M_BUBBLE_BEAM2); } static void EvoTask_CreatePreEvoSparklesSet2(u8 taskID) @@ -347,7 +347,7 @@ static void EvoTask_BeginPostSparklesSet1(u8 taskID) SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet1; - PlaySE(SE_REAPOKE); + PlaySE(SE_SHINY); } static void EvoTask_CreatePostEvoSparklesSet1(u8 taskID) @@ -391,7 +391,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID) CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); BeginNormalPaletteFade(0xFFF9001C, 0, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash; - PlaySE(SE_W080); + PlaySE(SE_M_PETAL_DANCE); } static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID) @@ -439,7 +439,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID) CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); BeginNormalPaletteFade(0xFFF90001, 0, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade; - PlaySE(SE_W080); + PlaySE(SE_M_PETAL_DANCE); } static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID) @@ -501,13 +501,13 @@ u8 sub_8149E7C(u8 preEvoSpriteID, u8 postEvoSpriteID) gSprites[preEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB; gSprites[preEvoSpriteID].oam.affineMode = 1; gSprites[preEvoSpriteID].oam.matrixNum = 30; - gSprites[preEvoSpriteID].invisible = 0; + gSprites[preEvoSpriteID].invisible = FALSE; CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[preEvoSpriteID].oam.paletteNum * 16)], 16); gSprites[postEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB; gSprites[postEvoSpriteID].oam.affineMode = 1; gSprites[postEvoSpriteID].oam.matrixNum = 31; - gSprites[postEvoSpriteID].invisible = 0; + gSprites[postEvoSpriteID].invisible = FALSE; CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[postEvoSpriteID].oam.paletteNum * 16)], 16); gTasks[taskID].tEvoStopped = FALSE; @@ -591,11 +591,11 @@ static void PreEvoInVisible_PostEvoVisible_KillTask(u8 taskID) { gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0; gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 0; - gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = 1; + gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = TRUE; gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = 0; gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0; - gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = 0; + gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = FALSE; DestroyTask(taskID); } @@ -604,11 +604,11 @@ static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskID) { gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0; gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 0; - gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = 0; + gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = FALSE; gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = 0; gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0; - gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = 1; + gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = TRUE; DestroyTask(taskID); } diff --git a/src/evolution_scene.c b/src/evolution_scene.c index ba136d1cc..ea7fde015 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -238,7 +238,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gSprites[ID].callback = nullsub_37; gSprites[ID].oam.paletteNum = 1; - gSprites[ID].invisible = 1; + gSprites[ID].invisible = TRUE; // postEvo sprite DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve], @@ -254,7 +254,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30); gSprites[ID].callback = nullsub_37; gSprites[ID].oam.paletteNum = 2; - gSprites[ID].invisible = 1; + gSprites[ID].invisible = TRUE; LoadEvoSparkleSpriteAndPal(); @@ -455,7 +455,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri gSprites[ID].callback = nullsub_37; gSprites[ID].oam.paletteNum = 2; - gSprites[ID].invisible = 1; + gSprites[ID].invisible = TRUE; LoadEvoSparkleSpriteAndPal(); @@ -542,7 +542,7 @@ static void Task_EvolutionScene(u8 taskID) { case 0: BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); - gSprites[sEvoInfo.preEvoSpriteID].invisible = 0; + gSprites[sEvoInfo.preEvoSpriteID].invisible = FALSE; gTasks[taskID].tState++; break; case 1: // print 'whoa, poke is evolving!!!' msg @@ -563,14 +563,14 @@ static void Task_EvolutionScene(u8 taskID) case 3: // wait for cry, play tu du SE if (IsCryFinished()) { - PlaySE(MUS_ME_SHINKA); + PlaySE(MUS_EVOLUTION_INTRO); gTasks[taskID].tState++; } break; case 4: // play evolution music and fade screen black if (!IsSEPlaying()) { - PlayNewMapMusic(MUS_SHINKA); + PlayNewMapMusic(MUS_EVOLUTION); gTasks[taskID].tState++; BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0)); } @@ -638,7 +638,7 @@ static void Task_EvolutionScene(u8 taskID) { StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo); Text_InitWindow8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15); - PlayBGM(MUS_FANFA5); + PlayBGM(MUS_EVOLVED); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); CalculateMonStats(mon); @@ -715,7 +715,7 @@ static void Task_EvolutionScene(u8 taskID) if (gUnknown_03004210.state == 0 && !IsSEPlaying()) { sub_8024CEC(); - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]); Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter @@ -904,15 +904,15 @@ static void Task_TradeEvolutionScene(u8 taskID) case 2: if (IsCryFinished()) { - m4aSongNumStop(MUS_SHINKA); - PlaySE(MUS_ME_SHINKA); + m4aSongNumStop(MUS_EVOLUTION); + PlaySE(MUS_EVOLUTION_INTRO); gTasks[taskID].tState++; } break; case 3: if (!IsSEPlaying()) { - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); gTasks[taskID].tState++; BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0)); } @@ -980,7 +980,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo); Text_InitWindow8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); CalculateMonStats(mon); @@ -1012,7 +1012,7 @@ static void Task_TradeEvolutionScene(u8 taskID) } else { - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); Text_InitWindow8002EB0(&gUnknown_03004828->window, gOtherText_LinkStandby2, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tState++; } @@ -1029,7 +1029,7 @@ static void Task_TradeEvolutionScene(u8 taskID) if (gUnknown_03004828->window.state == 0 && !IsSEPlaying()) { sub_8024CEC(); - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]); Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter diff --git a/src/field_camera.c b/src/field_camera.c index 2a314dc2f..9c93a51f6 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -24,9 +24,9 @@ static s16 sVerticalCameraPan; static u8 gUnknown_0300059C; static void (*sFieldCameraPanningCallback)(void); -extern struct FieldCamera gFieldCamera; -extern u16 gTotalCameraPixelOffsetY; -extern u16 gTotalCameraPixelOffsetX; +struct FieldCamera gFieldCamera; +u16 gTotalCameraPixelOffsetY; +u16 gTotalCameraPixelOffsetX; static void RedrawMapSliceNorth(struct FieldCameraOffset*, struct MapLayout*); static void RedrawMapSliceSouth(struct FieldCameraOffset*, struct MapLayout*); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index bca856e9e..d33292e87 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -43,46 +43,43 @@ extern u8 gUnknown_020297ED; static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; -u8 gSelectedObjectEvent; +extern u8 gSelectedObjectEvent; //scripts extern u8 gUnknown_081A2C51[]; extern u8 gUnknown_0815281E[]; extern u8 gUnknown_08152C39[]; -extern u8 gUnknown_0815F36C[]; -extern u8 gUnknown_0815F43A[]; -extern u8 gUnknown_081A0009[]; +extern u8 SecretBase_EventScript_PC[]; +extern u8 SecretBase_EventScript_RecordMixingPC[]; +extern u8 EventScript_PC[]; extern u8 gUnknown_081C6C02[]; -extern u8 HiddenItemScript[]; +extern u8 EventScript_HiddenItem[]; extern u8 Event_TV[]; -extern u8 gUnknown_081A0009[]; extern u8 ClosedSootopolisDoorScript[]; extern u8 gUnknown_081A4363[]; extern u8 gUnknown_081C346A[]; extern u8 gUnknown_081616E1[]; -extern u8 Event_WorldMap[]; +extern u8 EventScript_RegionMap[]; extern u8 S_RunningShoesManual[]; -extern u8 PictureBookShelfScript[]; -extern u8 BookshelfScript[]; -extern u8 PokemonCenterBookshelfScript[]; -extern u8 VaseScript[]; -extern u8 TrashCanScript[]; -extern u8 ShopShelfScript[]; -extern u8 BlueprintScript[]; -extern u8 gUnknown_0815F36C[]; -extern u8 gUnknown_0815F43A[]; -extern u8 gUnknown_0815F523[]; -extern u8 gUnknown_0815F528[]; -extern u8 UseSurfScript[]; +extern u8 EventScript_PictureBookshelf[]; +extern u8 EventScript_Bookshelf[]; +extern u8 EventScript_PokemonCenterBookshelf[]; +extern u8 EventScript_Vase[]; +extern u8 EventScript_EmptyTrashCan[]; +extern u8 EventScript_ShopShelf[]; +extern u8 EventScript_Blueprint[]; +extern u8 SecretBase_EventScript_SandOrnament[]; +extern u8 SecretBase_EventScript_ShieldOrToyTV[]; +extern u8 EventScript_UseSurf[]; extern u8 S_UseWaterfall[]; extern u8 S_CannotUseWaterfall[]; extern u8 UseDiveScript[]; extern u8 S_UseDiveUnderwater[]; -extern u8 S_FallDownHole[]; +extern u8 EventScript_FallDownHole[]; extern u8 gUnknown_081A14B8[]; extern u8 S_EggHatch[]; extern u8 gUnknown_0815FD0D[]; -extern u8 gUnknown_081C6BDE[]; +extern u8 EventScript_FallDownHoleMtPyre[]; static void GetPlayerPosition(struct MapPosition *); static void GetInFrontOfPlayerPosition(struct MapPosition *); @@ -228,7 +225,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) #if DEBUG !input->input_field_1_1 && #endif - mapheader_run_first_tag2_script_list_match() == 1) + TryRunOnFrameMapScript() == TRUE) return TRUE; if (input->pressedBButton && TrySetupDiveEmergeScript() == TRUE) @@ -320,9 +317,9 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil // Play computer noise for PC-related scripts. if (script != gUnknown_0815281E && script != gUnknown_08152C39 - && script != gUnknown_0815F36C - && script != gUnknown_0815F43A - && script != gUnknown_081A0009) + && script != SecretBase_EventScript_PC + && script != SecretBase_EventScript_RecordMixingPC + && script != EventScript_PC) PlaySE(5); ScriptContext1_SetupScript(script); @@ -437,7 +434,7 @@ static u8 *GetInteractedBackgroundEventScript(struct MapPosition *position, u8 m gSpecialVar_0x8005 = (u32)bgEvent->bgUnion.script; if (FlagGet(gSpecialVar_0x8004) == TRUE) return NULL; - return HiddenItemScript; + return EventScript_HiddenItem; case BG_EVENT_SECRET_BASE: if (direction == DIR_NORTH) { @@ -458,7 +455,7 @@ static u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatile if (MetatileBehavior_IsPlayerFacingTVScreen(metatileBehavior, direction) == TRUE) return Event_TV; if (MetatileBehavior_IsPC(metatileBehavior) == TRUE) - return gUnknown_081A0009; + return EventScript_PC; if (MetatileBehavior_IsClosedSootopolisDoor(metatileBehavior) == TRUE) return ClosedSootopolisDoorScript; if (MetatileBehavior_IsLinkBattleRecords(metatileBehavior) == TRUE) @@ -468,35 +465,35 @@ static u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatile if (MetatileBehavior_IsTrickHousePuzzleDoor(metatileBehavior) == TRUE) return gUnknown_081616E1; if (MetatileBehavior_IsRegionMap(metatileBehavior) == TRUE) - return Event_WorldMap; + return EventScript_RegionMap; if (MetatileBehavior_IsRunningShoesManual(metatileBehavior) == TRUE) return S_RunningShoesManual; if (MetatileBehavior_IsPictureBookShelf(metatileBehavior) == TRUE) - return PictureBookShelfScript; + return EventScript_PictureBookshelf; if (MetatileBehavior_IsBookShelf(metatileBehavior) == TRUE) - return BookshelfScript; + return EventScript_Bookshelf; if (MetatileBehavior_IsPokeCenterBookShelf(metatileBehavior) == TRUE) - return PokemonCenterBookshelfScript; + return EventScript_PokemonCenterBookshelf; if (MetatileBehavior_IsVase(metatileBehavior) == TRUE) - return VaseScript; + return EventScript_Vase; if (MetatileBehavior_IsTrashCan(metatileBehavior) == TRUE) - return TrashCanScript; + return EventScript_EmptyTrashCan; if (MetatileBehavior_IsShopShelf(metatileBehavior) == TRUE) - return ShopShelfScript; + return EventScript_ShopShelf; if (MetatileBehavior_IsBlueprint(metatileBehavior) == TRUE) - return BlueprintScript; + return EventScript_Blueprint; height = position->height; if (height == MapGridGetZCoordAt(position->x, position->y)) { if (MetatileBehavior_IsSecretBasePC(metatileBehavior) == TRUE) - return gUnknown_0815F36C; + return SecretBase_EventScript_PC; if (MetatileBehavior_IsRecordMixingSecretBasePC(metatileBehavior) == TRUE) - return gUnknown_0815F43A; + return SecretBase_EventScript_RecordMixingPC; if (MetatileBehavior_IsSecretBaseSandOrnament(metatileBehavior) == TRUE) - return gUnknown_0815F523; + return SecretBase_EventScript_SandOrnament; if (MetatileBehavior_IsSecretBaseShieldOrToyTV(metatileBehavior) == TRUE) - return gUnknown_0815F528; + return SecretBase_EventScript_ShieldOrToyTV; } return NULL; @@ -505,7 +502,7 @@ static u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatile static u8 *GetInteractedWaterScript(struct MapPosition *unused1, u8 metatileBehavior, u8 direction) { if (FlagGet(FLAG_BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE) - return UseSurfScript; + return EventScript_UseSurf; if (MetatileBehavior_IsWaterfall(metatileBehavior) == TRUE) { @@ -566,7 +563,7 @@ bool8 TryStartCrackedFloorHoleScript(u16 metatileBehavior) { if (MetatileBehavior_IsCrackedFloorHole(metatileBehavior)) { - ScriptContext1_SetupScript(S_FallDownHole); + ScriptContext1_SetupScript(EventScript_FallDownHole); return TRUE; } return FALSE; @@ -720,7 +717,7 @@ bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileBehavior } if (MetatileBehavior_IsMtPyreHole(metatileBehavior) == TRUE) { - ScriptContext1_SetupScript(gUnknown_081C6BDE); + ScriptContext1_SetupScript(EventScript_FallDownHoleMtPyre); return TRUE; } sub_8080E88(); @@ -898,7 +895,7 @@ bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior) { StoreInitialPlayerAvatarState(); sp13E_warp_to_last_warp(); - PlaySE(SE_W291); + PlaySE(SE_M_DIVE); return TRUE; } } @@ -908,7 +905,7 @@ bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior) { StoreInitialPlayerAvatarState(); sp13E_warp_to_last_warp(); - PlaySE(SE_W291); + PlaySE(SE_M_DIVE); return TRUE; } } diff --git a/src/field_door.c b/src/field_door.c index db840e663..e7d68f546 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -599,5 +599,5 @@ u32 GetDoorSoundEffect(u32 x, u32 y) if (cur_mapdata_get_door_x2_at(gDoorAnimGraphicsTable, x, y) == 0) return SE_DOOR; else - return SE_JIDO_DOA; + return SE_SLIDING_DOOR; } diff --git a/src/field_effect.c b/src/field_effect.c index 7daa00bf1..280eb20bc 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -772,7 +772,7 @@ void PokeballGlowEffect_0(struct Sprite *sprite) gSprites[endSpriteId].data[0] = sprite->data[7]; sprite->data[2]++; sprite->data[6]--; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } if (sprite->data[6] == 0) { @@ -791,7 +791,7 @@ void PokeballGlowEffect_1(struct Sprite *sprite) sprite->data[3] = 0; if (sprite->data[5]) { - PlayFanfare(MUS_ME_ASA); + PlayFanfare(MUS_HEAL); } } } @@ -888,7 +888,7 @@ u8 PokecenterHealEffectHelper(s16 x, s16 y) spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F220, x, y, 0); sprite = &gSprites[spriteIdAtEnd]; sprite->oam.priority = 2; - sprite->invisible = 1; + sprite->invisible = TRUE; SetSubspriteTables(sprite, &gUnknown_0839F1A0); return spriteIdAtEnd; } @@ -898,7 +898,7 @@ void SpriteCB_PokecenterMonitor(struct Sprite *sprite) if (sprite->data[0] != 0) { sprite->data[0] = 0; - sprite->invisible = 0; + sprite->invisible = FALSE; StartSpriteAnim(sprite, 1); } if (sprite->animEnded) @@ -918,7 +918,7 @@ void HallOfFameRecordEffectHelper(s16 a0, s16 a1, s16 a2, u8 a3) { spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F250, a1, a2, 0); } - gSprites[spriteIdAtEnd].invisible = 1; + gSprites[spriteIdAtEnd].invisible = TRUE; gSprites[spriteIdAtEnd].data[0] = a0; } @@ -992,7 +992,7 @@ void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; if (gPlayerAvatar.flags & 0x08) { ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST); @@ -1051,7 +1051,7 @@ bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0] playerObject = &gObjectEvents[gPlayerAvatar.objectEventId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; gPlayerAvatar.preventStep = TRUE; ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[4] = playerSprite->subspriteMode; @@ -1080,8 +1080,8 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; - PlaySE(SE_RU_HYUU); + gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; + PlaySE(SE_FALL); task->data[0]++; return FALSE; } @@ -1111,7 +1111,7 @@ bool8 sub_80868E4(struct Task *task) } if (sprite->pos2.y >= 0) { - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); objectEvent->triggerGroundEffectsOnStop = 1; objectEvent->landingJump = 1; sprite->pos2.y = 0; @@ -1210,7 +1210,7 @@ bool8 sub_8086AC0(struct Task *task) { task->data[0] = 4; } - PlaySE(SE_ESUKA); + PlaySE(SE_ESCALATOR); } return FALSE; } @@ -1588,7 +1588,7 @@ bool8 sub_8087298(struct Task *task, struct ObjectEvent *objectEvent, struct Spr gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP); - PlaySE(SE_W153); + PlaySE(SE_M_EXPLOSION); task->data[0]++; return TRUE; } @@ -1677,7 +1677,7 @@ bool8 sub_80874CC(struct Task *task, struct ObjectEvent *objectEvent, struct Spr CameraObjectReset2(); FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; - objectEvent->invisible = 1; + objectEvent->invisible = TRUE; task->data[0]++; return FALSE; } @@ -1702,9 +1702,9 @@ bool8 sub_8087548(struct Task *task, struct ObjectEvent *objectEvent, struct Spr if (sprite->animCmdIndex > 1) { task->data[0]++; - objectEvent->invisible = 0; + objectEvent->invisible = FALSE; CameraObjectReset1(); - PlaySE(SE_W091); + PlaySE(SE_M_DIG); ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); } return FALSE; @@ -1781,7 +1781,7 @@ bool8 sub_80876F8(struct Task *task, struct ObjectEvent *objectEvent, struct Spr { task->data[1]++; ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); - PlaySE(SE_FU_ZUZUZU); + PlaySE(SE_LAVARIDGE_FALL_WARP); } } return FALSE; @@ -1791,7 +1791,7 @@ bool8 sub_8087774(struct Task *task, struct ObjectEvent *objectEvent, struct Spr { if (gSprites[task->data[1]].animCmdIndex == 2) { - objectEvent->invisible = 1; + objectEvent->invisible = TRUE; task->data[0]++; } return FALSE; @@ -1914,7 +1914,7 @@ void mapldr_080859D4(void) ScriptContext2_Enable(); FreezeObjectEvents(); gFieldCallback = NULL; - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; CreateTask(sub_8087A74, 0); } @@ -1944,7 +1944,7 @@ void sub_8087AC8(struct Task *task) } if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) { - objectEvent->invisible = 0; + objectEvent->invisible = FALSE; ScriptContext2_Disable(); UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_8087A74)); @@ -2009,7 +2009,7 @@ static void TeleportFieldEffectTask2(struct Task *task) task->data[1] = 4; task->data[2] = 8; task->data[3] = 1; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } } @@ -2062,7 +2062,7 @@ static void mapldr_08085D88(void) ScriptContext2_Enable(); FreezeObjectEvents(); gFieldCallback = NULL; - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; CameraObjectReset2(); CreateTask(sub_8087E1C, 0); } @@ -2087,13 +2087,13 @@ void sub_8087E4C(struct Task *task) sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; task->data[0]++; task->data[1] = 8; task->data[2] = 1; task->data[14] = sprite->subspriteMode; task->data[15] = GetPlayerFacingDirection(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } } @@ -2581,7 +2581,7 @@ u8 FldEff_UseSurf(void) taskId = CreateTask(sub_8088954, 0xff); gTasks[taskId].data[15] = gFieldEffectArguments[0]; Overworld_ClearSavedMusic(); - Overworld_ChangeMusicTo(MUS_NAMINORI); + Overworld_ChangeMusicTo(MUS_SURF); return FALSE; } @@ -2679,7 +2679,7 @@ u8 FldEff_NPCFlyOut(void) sprite->oam.priority = 1; sprite->callback = sub_8088BC4; sprite->data[1] = gFieldEffectArguments[0]; - PlaySE(SE_W019); + PlaySE(SE_M_FLY); return spriteId; } @@ -2799,7 +2799,7 @@ void sub_8088DD8(struct Task *task) if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; - PlaySE(SE_W019); + PlaySE(SE_M_FLY); sub_8088FC0(task->data[1]); } } @@ -3001,7 +3001,7 @@ void sub_808914C(struct Sprite *sprite) sprite->data[7]++; sprite->oam.affineMode = 0; FreeOamMatrix(sprite->oam.matrixNum); - sprite->invisible = 1; + sprite->invisible = TRUE; } } } @@ -3054,7 +3054,7 @@ void sub_80892A0(struct Task *task) CameraObjectReset2(); ObjectEventTurn(objectEvent, DIR_WEST); StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); - objectEvent->invisible = 0; + objectEvent->invisible = FALSE; task->data[1] = sub_8088F60(); sub_8088FC0(task->data[1]); sub_8088FFC(task->data[1], objectEvent->spriteId); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index c757a4798..9ba7787e0 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -614,7 +614,7 @@ u32 FldEff_Splash(void) sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; sprite->pos2.y = (graphicsInfo->height >> 1) - 4; - PlaySE(SE_MIZU); + PlaySE(SE_PUDDLE); } return 0; } @@ -724,7 +724,7 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite) sprite->data[4] = objectEvent->currentCoords.y; if (!sprite->invisible) { - PlaySE(SE_MIZU); + PlaySE(SE_PUDDLE); } } } @@ -1403,4 +1403,4 @@ static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset) } } } -}
\ No newline at end of file +} diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index ee1b334a8..fea93f215 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -207,7 +207,7 @@ void sub_8080B78(void) { Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); CreateTask(task_map_chg_seq_0807E2CC, 10); ScriptContext2_Enable(); } @@ -379,7 +379,7 @@ void sub_8080E88(void) TryFadeOutOldMapMusic(); WarpFadeScreen(); PlayRainSoundEffect(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); gFieldCallback = mapldr_default; CreateTask(task0A_fade_n_map_maybe, 10); } @@ -401,7 +401,7 @@ void sub_8080EF0(void) CreateTask(sub_808115C, 10); } -void sp13F_fall_to_last_warp(void) +void DoFallWarp(void) { sp13E_warp_to_last_warp(); gFieldCallback = sub_8086748; @@ -430,7 +430,7 @@ void sub_8080F68(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); CreateTask(task0A_fade_n_map_maybe, 10); gFieldCallback = sub_8080B78; } @@ -470,7 +470,7 @@ void DoCableClubWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeScreen(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); CreateTask(WaitCableClubWarp, 10); } @@ -484,7 +484,7 @@ void sub_8081050(u8 taskId) ClearLinkCallback_2(); FadeScreen(FADE_TO_BLACK, 0); TryFadeOutOldMapMusic(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); data[0]++; break; case 1: @@ -637,7 +637,7 @@ void sub_8081334(void) TryFadeOutOldMapMusic(); WarpFadeScreen(); PlayRainSoundEffect(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); gFieldCallback = sub_8080B60; CreateTask(sub_80812C8, 10); } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index cb0bf760f..c0c4aad5d 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -878,7 +878,7 @@ void PlayerTurnInPlace(u8 direction) void PlayerJumpLedge(u8 direction) { - PlaySE(SE_DANSA); + PlaySE(SE_LEDGE); PlayerSetAnimId(GetJump2MovementAction(direction), 8); } @@ -912,28 +912,28 @@ void PlayerEndWheelie(u8 direction) // wheelie hopping standing void PlayerStandingHoppingWheelie(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieHopFaceDirectionMovementAction(a), 1); } // wheelie hopping moving void PlayerMovingHoppingWheelie(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieHopDirectionMovementAction(a), 2); } // wheelie hopping ledge void PlayerLedgeHoppingWheelie(u8 a) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieJumpDirectionMovementAction(a), 8); } // acro turn jump void PlayerAcroTurnJump(u8 direction) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1); } @@ -1302,7 +1302,7 @@ static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject gFieldEffectArguments[2] = strengthObject->previousElevation; gFieldEffectArguments[3] = gSprites[strengthObject->spriteId].oam.priority; FieldEffectStart(FLDEFF_DUST); - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); task->data[0]++; } return FALSE; @@ -1341,7 +1341,7 @@ static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent gPlayerAvatar.preventStep = TRUE; if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - PlaySE(SE_DANSA); + PlaySE(SE_LEDGE); ObjectEventSetHeldMovement(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection)); task->data[1]++; if (task->data[1] > 1) @@ -1375,7 +1375,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct Objec task->data[1] = objectEvent->movementDirection; gPlayerAvatar.preventStep = TRUE; ScriptContext2_Enable(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); return TRUE; } diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 78c425bc5..0fb0ca097 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -196,7 +196,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); + PlaySE(SE_TRUCK_MOVE); } break; case 1: @@ -216,7 +216,7 @@ void Task_HandleTruckSequence(u8 taskId) DestroyTask(data[2]); data[3] = CreateTask(Task_Truck2, 0xA); data[0] = 3; - PlaySE(SE_TRACK_STOP); + PlaySE(SE_TRUCK_STOP); } break; case 3: @@ -231,7 +231,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1]++; if (data[1] == 90) { - PlaySE(SE_TRACK_HAIK); + PlaySE(SE_TRUCK_UNLOAD); data[1] = 0; data[0] = 5; } @@ -244,7 +244,7 @@ void Task_HandleTruckSequence(u8 taskId) MapGridSetMetatileIdAt(11, 9, METATILE_ID(InsideOfTruck, ExitLight_Mid)); MapGridSetMetatileIdAt(11, 10, METATILE_ID(InsideOfTruck, ExitLight_Bottom)); DrawWholeMapView(); - PlaySE(SE_TRACK_DOOR); + PlaySE(SE_TRUCK_DOOR); DestroyTask(taskId); ScriptContext2_Disable(); } @@ -338,7 +338,7 @@ void Task_HandlePorthole(u8 taskId) } break; case EXIT_PORTHOLE: // exit porthole. - FlagClear(FLAG_SPECIAL_FLAG_1); + FlagClear(FLAG_DONT_TRANSITION_MUSIC); FlagClear(FLAG_SPECIAL_FLAG_0); copy_saved_warp2_bank_and_enter_x_to_warp1(0); sp13E_warp_to_last_warp(); @@ -375,7 +375,7 @@ void sub_80C791C(void) void sub_80C7958(void) { FlagSet(FLAG_SYS_CRUISE_MODE); - FlagSet(FLAG_SPECIAL_FLAG_1); + FlagSet(FLAG_DONT_TRANSITION_MUSIC); FlagSet(FLAG_SPECIAL_FLAG_0); saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1); sub_80C7754(); diff --git a/src/field_specials.c b/src/field_specials.c index 972b63a0d..9c444f93b 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -218,7 +218,7 @@ void UpdateCyclingRoadState(void) { if (VarGet(VAR_CYCLING_CHALLENGE_STATE) == 2 || VarGet(VAR_CYCLING_CHALLENGE_STATE) == 3) { VarSet(VAR_CYCLING_CHALLENGE_STATE, 0); - Overworld_SetSavedMusic(SE_STOP); + Overworld_SetSavedMusic(MUS_DUMMY); } } @@ -571,7 +571,7 @@ void PetalburgGymSlideOpenDoors(void) { gUnknown_02039258 = 0; gPetalburgGymSlidingDoorIndex = 0; - PlaySE(SE_KI_GASYAN); + PlaySE(SE_UNLOCK); CreateTask(Task_SlideOpenPetalburgGymDoors, 8); } @@ -722,7 +722,7 @@ void CableCarWarp(void) } } -void SetFlagInVar(void) +void SetHiddenItemFlag(void) { FlagSet(gSpecialVar_0x8004); } @@ -1228,7 +1228,7 @@ void ShakeScreenInElevator(void) gTasks[taskId].data[5] = 3; SetCameraPanningCallback(NULL); sub_810ECFC(); - PlaySE(SE_ELEBETA); + PlaySE(SE_ELEVATOR); } void sub_810EC34(u8 taskId) @@ -1245,7 +1245,7 @@ void sub_810EC34(u8 taskId) SetCameraPanning(0, task->data[4]); if (task->data[2] == 23) { - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); sub_810EC9C(taskId); InstallCameraPanAheadCallback(); } @@ -1596,7 +1596,7 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems) void SpawnCameraDummy(void) { u8 objectEventId = SpawnSpecialObjectEventParametrized(7, MOVEMENT_TYPE_FACE_DOWN, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); - gObjectEvents[objectEventId].invisible = 1; + gObjectEvents[objectEventId].invisible = TRUE; CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId); } @@ -1791,7 +1791,7 @@ bool8 IsPokerusInParty(void) static void sub_810F7A8(u8); static void sub_810F814(u8); -void sub_810F758(void) +void ShakeCamera(void) { u8 taskId = CreateTask(sub_810F7A8, 9); gTasks[taskId].data[0] = gSpecialVar_0x8005; @@ -1801,7 +1801,7 @@ void sub_810F758(void) gTasks[taskId].data[4] = gSpecialVar_0x8004; gTasks[taskId].data[5] = 5; SetCameraPanningCallback(NULL); - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); } static void sub_810F7A8(u8 taskId) @@ -1966,7 +1966,7 @@ void sub_810FA74(void) } } -void sub_810FAA0(void) +void UpdateTrainerFanClubGameClear(void) { if (!((gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 1)) { diff --git a/src/field_tasks.c b/src/field_tasks.c index abc4e1505..5709cb998 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -336,7 +336,7 @@ void PerStepCallback_8069864(u8 taskId) data[3] = y; if (MetatileBehavior_IsPacifidlogLog(MapGridGetMetatileBehaviorAt(x, y))) { - PlaySE(SE_MIZU); + PlaySE(SE_PUDDLE); } } break; @@ -427,7 +427,7 @@ void PerStepCallback_8069AA0(u8 taskId) } if (flag && (isFortreeBridgeCur == 1 || isFortreeBridgePrev == 1)) { - PlaySE(SE_HASHI); + PlaySE(SE_BRIDGE_WALK); } if (isFortreeBridgePrev) { @@ -603,7 +603,7 @@ void PerStepCallback_8069DD4(u8 taskId) { x = data[4]; y = data[5]; - PlaySE(SE_RU_BARI); + PlaySE(SE_ICE_CRACK); MapGridSetMetatileIdAt(x, y, METATILE_ID(SootopolisGym, Ice_Cracked)); CurrentMapDrawMetatileAt(x, y); sub_8069CFC(x - 7, y - 7); @@ -619,7 +619,7 @@ void PerStepCallback_8069DD4(u8 taskId) { x = data[4]; y = data[5]; - PlaySE(SE_RU_GASYAN); + PlaySE(SE_ICE_BREAK); MapGridSetMetatileIdAt(x, y, METATILE_ID(SootopolisGym, Ice_Broken)); CurrentMapDrawMetatileAt(x, y); data[1] = 1; diff --git a/src/field_weather.c b/src/field_weather.c index 340445fd2..c05fa3d3b 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -15,6 +15,7 @@ #include "task.h" #include "trig.h" #include "ewram.h" +#include "constants/field_weather.h" #define MACRO1(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00)) @@ -1193,13 +1194,13 @@ void SetRainStrengthFromSoundEffect(u16 soundEffect) { switch (soundEffect) { - case SE_T_KOAME: + case SE_RAIN: gWeatherPtr->rainStrength = 0; break; - case SE_T_OOAME: + case SE_DOWNPOUR: gWeatherPtr->rainStrength = 1; break; - case SE_T_AME: + case SE_THUNDERSTORM: gWeatherPtr->rainStrength = 2; break; default: @@ -1217,14 +1218,14 @@ void PlayRainSoundEffect(void) switch (gWeatherPtr->rainStrength) { case 0: - PlaySE(SE_T_KOAME_E); + PlaySE(SE_RAIN_STOP); break; case 1: - PlaySE(SE_T_OOAME_E); + PlaySE(SE_DOWNPOUR_STOP); break; case 2: default: - PlaySE(SE_T_AME_E); + PlaySE(SE_THUNDERSTORM_STOP); break; } } diff --git a/src/field_weather_effects.c b/src/field_weather_effects.c index db67be4de..56b802b83 100644 --- a/src/field_weather_effects.c +++ b/src/field_weather_effects.c @@ -367,7 +367,7 @@ void LightRain_InitVars(void) gWeatherPtr->unknown_6D9 = 10; gWeatherPtr->gammaTargetIndex = 3; gWeatherPtr->gammaStepDelay = 20; - SetRainStrengthFromSoundEffect(SE_T_KOAME); + SetRainStrengthFromSoundEffect(SE_RAIN); } void LightRain_Main(void); @@ -1075,7 +1075,7 @@ void MedRain_InitVars(void) gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment gWeatherPtr->unknown_6ED = 0; - SetRainStrengthFromSoundEffect(SE_T_AME); + SetRainStrengthFromSoundEffect(SE_THUNDERSTORM); } void Rain_Main(void); @@ -1102,7 +1102,7 @@ void HeavyRain_InitVars(void) gWeatherPtr->gammaTargetIndex = 3; gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment - SetRainStrengthFromSoundEffect(SE_T_OOAME); + SetRainStrengthFromSoundEffect(SE_DOWNPOUR); } void HeavyRain_InitAll(void) @@ -1269,9 +1269,9 @@ void UpdateThunderSound(void) if (IsSEPlaying()) return; if (Random() & 1) - PlaySE(SE_T_KAMI); + PlaySE(SE_THUNDER); else - PlaySE(SE_T_KAMI2); + PlaySE(SE_THUNDER2); gWeatherPtr->unknown_6ED = 0; } else diff --git a/src/fieldmap.c b/src/fieldmap.c index 1241f85c9..f50bba140 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -20,12 +20,12 @@ struct Coords32 s32 y; }; -EWRAM_DATA static u16 gUnknown_02029828[0x2800] = {0}; +EWRAM_DATA static u16 gBackupMapData[MAX_MAP_DATA_SIZE] = {0}; EWRAM_DATA struct MapHeader gMapHeader = {0}; EWRAM_DATA struct Camera gCamera = {0}; -EWRAM_DATA static struct ConnectionFlags gUnknown_0202E850 = {0}; +EWRAM_DATA static struct ConnectionFlags gMapConnectionFlags = {0}; -struct BackupMapLayout gUnknown_03004870; +struct BackupMapLayout gBackupMapLayout; static const struct ConnectionFlags sDummyConnectionFlags = {0}; @@ -38,7 +38,7 @@ void not_trainer_hill_battle_pyramid(void) { mapheader_copy_mapdata_with_padding(&gMapHeader); sub_80BB970(gMapHeader.events); - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); } void sub_8055FC0(void) @@ -47,8 +47,8 @@ void sub_8055FC0(void) sub_80BBCCC(0); sub_80BB970(gMapHeader.events); sub_8056670(); - mapheader_run_script_with_tag_x1(); - UpdateTVScreensOnMap(gUnknown_03004870.width, gUnknown_03004870.height); + RunOnLoadMapScript(); + UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height); } void mapheader_copy_mapdata_with_padding(struct MapHeader *mapHeader) @@ -57,13 +57,13 @@ void mapheader_copy_mapdata_with_padding(struct MapHeader *mapHeader) int width; int height; mapLayout = mapHeader->mapLayout; - CpuFastFill16(0x03ff, gUnknown_02029828, sizeof(gUnknown_02029828)); - gUnknown_03004870.map = gUnknown_02029828; + CpuFastFill16(0x03ff, gBackupMapData, sizeof(gBackupMapData)); + gBackupMapLayout.map = gBackupMapData; width = mapLayout->width + 15; - gUnknown_03004870.width = width; + gBackupMapLayout.width = width; height = mapLayout->height + 14; - gUnknown_03004870.height = height; - if (width * height <= 0x2800) + gBackupMapLayout.height = height; + if (width * height <= MAX_MAP_DATA_SIZE) { map_copy_with_padding(mapLayout->map, mapLayout->width, mapLayout->height); sub_80560AC(mapHeader); @@ -74,8 +74,8 @@ void map_copy_with_padding(u16 *map, u16 width, u16 height) { u16 *dest; int y; - dest = gUnknown_03004870.map; - dest += gUnknown_03004870.width * 7 + 7; + dest = gBackupMapLayout.map; + dest += gBackupMapLayout.width * 7 + 7; for (y = 0; y < height; y++) { CpuCopy16(map, dest, width * 2); @@ -94,7 +94,7 @@ void sub_80560AC(struct MapHeader *mapHeader) struct MapConnection *connection = mapHeader->connections->connections; int i; - gUnknown_0202E850 = sDummyConnectionFlags; + gMapConnectionFlags = sDummyConnectionFlags; for (i = 0; i < count; i++, connection++) { struct MapHeader *cMap = mapconnection_get_mapheader(connection); @@ -104,19 +104,19 @@ void sub_80560AC(struct MapHeader *mapHeader) { case CONNECTION_SOUTH: fillSouthConnection(mapHeader, cMap, offset); - gUnknown_0202E850.south = 1; + gMapConnectionFlags.south = 1; break; case CONNECTION_NORTH: fillNorthConnection(mapHeader, cMap, offset); - gUnknown_0202E850.north = 1; + gMapConnectionFlags.north = 1; break; case CONNECTION_WEST: fillWestConnection(mapHeader, cMap, offset); - gUnknown_0202E850.west = 1; + gMapConnectionFlags.west = 1; break; case CONNECTION_EAST: fillEastConnection(mapHeader, cMap, offset); - gUnknown_0202E850.east = 1; + gMapConnectionFlags.east = 1; break; } } @@ -131,12 +131,12 @@ void sub_8056134(int x, int y, struct MapHeader *mapHeader, int x2, int y2, int mapWidth = mapHeader->mapLayout->width; src = &mapHeader->mapLayout->map[mapWidth * y2 + x2]; - dest = &gUnknown_03004870.map[gUnknown_03004870.width * y + x]; + dest = &gBackupMapLayout.map[gBackupMapLayout.width * y + x]; for (i = 0; i < height; i++) { CpuCopy16(src, dest, width * 2); - dest += gUnknown_03004870.width; + dest += gBackupMapLayout.width; src += mapWidth; } } @@ -157,26 +157,26 @@ void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte { x2 = -x; x += cWidth; - if (x < gUnknown_03004870.width) + if (x < gBackupMapLayout.width) { width = x; } else { - width = gUnknown_03004870.width; + width = gBackupMapLayout.width; } x = 0; } else { x2 = 0; - if (x + cWidth < gUnknown_03004870.width) + if (x + cWidth < gBackupMapLayout.width) { width = cWidth; } else { - width = gUnknown_03004870.width - x; + width = gBackupMapLayout.width - x; } } sub_8056134( @@ -204,26 +204,26 @@ void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte { x2 = -x; x += cWidth; - if (x < gUnknown_03004870.width) + if (x < gBackupMapLayout.width) { width = x; } else { - width = gUnknown_03004870.width; + width = gBackupMapLayout.width; } x = 0; } else { x2 = 0; - if (x + cWidth < gUnknown_03004870.width) + if (x + cWidth < gBackupMapLayout.width) { width = cWidth; } else { - width = gUnknown_03004870.width - x; + width = gBackupMapLayout.width - x; } } @@ -252,26 +252,26 @@ void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connected if (y < 0) { y2 = -y; - if (y + cHeight < gUnknown_03004870.height) + if (y + cHeight < gBackupMapLayout.height) { height = y + cHeight; } else { - height = gUnknown_03004870.height; + height = gBackupMapLayout.height; } y = 0; } else { y2 = 0; - if (y + cHeight < gUnknown_03004870.height) + if (y + cHeight < gBackupMapLayout.height) { height = cHeight; } else { - height = gUnknown_03004870.height - y; + height = gBackupMapLayout.height - y; } } @@ -297,26 +297,26 @@ void fillEastConnection(struct MapHeader *mapHeader, struct MapHeader *connected if (y < 0) { y2 = -y; - if (y + cHeight < gUnknown_03004870.height) + if (y + cHeight < gBackupMapLayout.height) { height = y + cHeight; } else { - height = gUnknown_03004870.height; + height = gBackupMapLayout.height; } y = 0; } else { y2 = 0; - if (y + cHeight < gUnknown_03004870.height) + if (y + cHeight < gBackupMapLayout.height) { height = cHeight; } else { - height = gUnknown_03004870.height - y; + height = gBackupMapLayout.height - y; } } @@ -345,10 +345,10 @@ u8 MapGridGetZCoordAt(int x, int y) int i; u16 *border; - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) + if (x >= 0 && x < gBackupMapLayout.width + && y >= 0 && y < gBackupMapLayout.height) { - block = gUnknown_03004870.map[x + gUnknown_03004870.width * y]; + block = gBackupMapLayout.map[x + gBackupMapLayout.width * y]; } else { @@ -371,10 +371,10 @@ u8 MapGridIsImpassableAt(int x, int y) int i; u16 *border; - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) + if (x >= 0 && x < gBackupMapLayout.width + && y >= 0 && y < gBackupMapLayout.height) { - block = gUnknown_03004870.map[x + gUnknown_03004870.width * y]; + block = gBackupMapLayout.map[x + gBackupMapLayout.width * y]; } else { @@ -400,10 +400,10 @@ u32 MapGridGetMetatileIdAt(int x, int y) u16 *border; u16 block2; - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) + if (x >= 0 && x < gBackupMapLayout.width + && y >= 0 && y < gBackupMapLayout.height) { - block = gUnknown_03004870.map[x + gUnknown_03004870.width * y]; + block = gBackupMapLayout.map[x + gBackupMapLayout.width * y]; } else { @@ -441,22 +441,22 @@ u8 MapGridGetMetatileLayerTypeAt(int x, int y) void MapGridSetMetatileIdAt(int x, int y, u16 metatile) { int i; - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) + if (x >= 0 && x < gBackupMapLayout.width + && y >= 0 && y < gBackupMapLayout.height) { - i = x + y * gUnknown_03004870.width; - gUnknown_03004870.map[i] = (gUnknown_03004870.map[i] & 0xf000) | (metatile & 0xfff); + i = x + y * gBackupMapLayout.width; + gBackupMapLayout.map[i] = (gBackupMapLayout.map[i] & 0xf000) | (metatile & 0xfff); } } void MapGridSetMetatileEntryAt(int x, int y, u16 metatile) { int i; - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) + if (x >= 0 && x < gBackupMapLayout.width + && y >= 0 && y < gBackupMapLayout.height) { - i = x + gUnknown_03004870.width * y; - gUnknown_03004870.map[i] = metatile; + i = x + gBackupMapLayout.width * y; + gBackupMapLayout.map[i] = metatile; } } @@ -486,14 +486,14 @@ void save_serialize_map(void) u16 *mapView; int width; mapView = gSaveBlock1.mapView; - width = gUnknown_03004870.width; + width = gBackupMapLayout.width; x = gSaveBlock1.pos.x; y = gSaveBlock1.pos.y; for (i = y; i < y + 14; i++) { for (j = x; j < x + 15; j++) { - *mapView++ = gUnknown_02029828[width * i + j]; + *mapView++ = gBackupMapData[width * i + j]; } } } @@ -528,14 +528,14 @@ void sub_8056670(void) mapView = gSaveBlock1.mapView; if (!sub_8056618()) { - width = gUnknown_03004870.width; + width = gBackupMapLayout.width; x = gSaveBlock1.pos.x; y = gSaveBlock1.pos.y; for (i = y; i < y + 14; i++) { for (j = x; j < x + 15; j++) { - gUnknown_02029828[width * i + j] = *mapView++; + gBackupMapData[width * i + j] = *mapView++; } } sav2_mapdata_clear(); @@ -554,7 +554,7 @@ void sub_80566F0(u8 a1) int x, y; int i, j; mapView = gSaveBlock1.mapView; - width = gUnknown_03004870.width; + width = gBackupMapLayout.width; r9 = 0; r8 = 0; x0 = gSaveBlock1.pos.x; @@ -589,7 +589,7 @@ void sub_80566F0(u8 a1) desti = width * (y + y0); srci = (y + r8) * 15 + r9; src = &mapView[srci + i]; - dest = &gUnknown_02029828[x0 + desti + j]; + dest = &gBackupMapData[x0 + desti + j]; *dest = *src; i++; j++; @@ -603,12 +603,12 @@ int GetMapBorderIdAt(int x, int y) struct MapLayout *mapLayout; u16 block, block2; int i, j; - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) + if (x >= 0 && x < gBackupMapLayout.width + && y >= 0 && y < gBackupMapLayout.height) { - i = gUnknown_03004870.width; + i = gBackupMapLayout.width; i *= y; - block = gUnknown_03004870.map[x + i]; + block = gBackupMapLayout.map[x + i]; if (block == 0x3ff) { goto fail; @@ -630,9 +630,9 @@ fail: return -1; success: - if (x >= (gUnknown_03004870.width - 8)) + if (x >= (gBackupMapLayout.width - 8)) { - if (!gUnknown_0202E850.east) + if (!gMapConnectionFlags.east) { return -1; } @@ -640,15 +640,15 @@ success: } else if (x < 7) { - if (!gUnknown_0202E850.west) + if (!gMapConnectionFlags.west) { return -1; } return CONNECTION_WEST; } - else if (y >= (gUnknown_03004870.height - 7)) + else if (y >= (gBackupMapLayout.height - 7)) { - if (!gUnknown_0202E850.south) + if (!gMapConnectionFlags.south) { return -1; } @@ -656,7 +656,7 @@ success: } else if (y < 7) { - if (!gUnknown_0202E850.north) + if (!gMapConnectionFlags.north) { return -1; } diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 567e75f2a..7b16a5a9c 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -211,7 +211,7 @@ bool8 FldEff_CutGrass(void) u8 tileBehavior; u8 i = 0, j; - PlaySE(SE_W015); + PlaySE(SE_M_CUT); PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); for (i = 0; i < 3; i++) { @@ -383,7 +383,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite) static void StartCutTreeFieldEffect(void) { - PlaySE(SE_W015); + PlaySE(SE_M_CUT); FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE); EnableBothScriptContexts(); } diff --git a/src/fldeff_decoration.c b/src/fldeff_decoration.c index 62e02df12..d9466dd7d 100644 --- a/src/fldeff_decoration.c +++ b/src/fldeff_decoration.c @@ -116,16 +116,16 @@ static void DoBalloonSoundEffect(s16 metatileId) switch (metatileId) { case 824: - PlaySE(SE_FUUSEN1); + PlaySE(SE_BALLOON_RED); break; case 828: - PlaySE(SE_FUUSEN2); + PlaySE(SE_BALLOON_BLUE); break; case 832: - PlaySE(SE_FUUSEN3); + PlaySE(SE_BALLOON_YELLOW); break; case 552: - PlaySE(SE_TOY_DANGO); + PlaySE(SE_MUD_BALL); break; } } @@ -142,7 +142,7 @@ bool8 FldEff_Nop48(void) static void sub_80C69C4(s16 x, s16 y) { - PlaySE(SE_TOY_KABE); + PlaySE(SE_BREAKABLE_DOOR); MapGridSetMetatileIdAt(x, y, 630); MapGridSetMetatileIdAt(x, y - 1, 622); CurrentMapDrawMetatileAt(x, y); @@ -185,28 +185,28 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId) switch (gTasks[taskId].data[0]) // metatileId { case 632: - PlaySE(SE_TOY_C); + PlaySE(SE_NOTE_C); break; case 633: - PlaySE(SE_TOY_D); + PlaySE(SE_NOTE_D); break; case 634: - PlaySE(SE_TOY_E); + PlaySE(SE_NOTE_E); break; case 635: - PlaySE(SE_TOY_F); + PlaySE(SE_NOTE_F); break; case 636: - PlaySE(SE_TOY_G); + PlaySE(SE_NOTE_G); break; case 637: - PlaySE(SE_TOY_A); + PlaySE(SE_NOTE_A); break; case 638: - PlaySE(SE_TOY_B); + PlaySE(SE_NOTE_B); break; case 691: - PlaySE(SE_TOY_C1); + PlaySE(SE_NOTE_C_HIGH); break; } @@ -229,7 +229,7 @@ void SpriteCB_GlitterMatSparkle(struct Sprite *sprite) { sprite->data[0]++; if (sprite->data[0] == 8) - PlaySE(SE_W215); + PlaySE(SE_M_HEAL_BELL); if (sprite->data[0] >= 32) DestroySprite(sprite); } @@ -298,7 +298,7 @@ bool8 FldEff_SandPillar(void) void SpriteCB_SandPillar_0(struct Sprite *sprite) { - PlaySE(SE_W088); + PlaySE(SE_M_ROCK_THROW); if (MapGridGetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1) == 646) MapGridSetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1, 3586); else diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index a49802af1..cf739b395 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -106,7 +106,7 @@ static void sub_810CBFC(void) static void sub_810CC34(void) { - PlaySE(SE_W115); + PlaySE(SE_M_REFLECT); FlagSet(FLAG_SYS_USE_FLASH); ScriptContext1_SetupScript(gUnknown_081B694A); } diff --git a/src/fldeff_poison.c b/src/fldeff_poison.c index 52afc2516..62c182987 100644 --- a/src/fldeff_poison.c +++ b/src/fldeff_poison.c @@ -34,7 +34,7 @@ static void Task_FieldPoisonEffect(u8 taskId) void FldeffPoison_Start(void) { - PlaySE(SE_DOKU); + PlaySE(SE_FIELD_POISON); CreateTask(Task_FieldPoisonEffect, 80); } diff --git a/src/fldeff_secretpower.c b/src/fldeff_secretpower.c index 47a8bd608..bd16adbe8 100644 --- a/src/fldeff_secretpower.c +++ b/src/fldeff_secretpower.c @@ -360,7 +360,7 @@ bool8 FldEff_SecretPowerCave(void) static void CaveEntranceSpriteCallback1(struct Sprite *sprite) { - PlaySE(SE_W088); + PlaySE(SE_M_ROCK_THROW); sprite->data[0] = 0; sprite->callback = CaveEntranceSpriteCallback2; } @@ -433,7 +433,7 @@ bool8 FldEff_SecretPowerTree(void) static void TreeEntranceSpriteCallback1(struct Sprite *sprite) { - PlaySE(SE_W010); + PlaySE(SE_M_SCRATCH); sprite->animNum = gFieldEffectArguments[7]; sprite->data[0] = 0; sprite->callback = TreeEntranceSpriteCallback2; @@ -494,7 +494,7 @@ bool8 FldEff_SecretPowerShrub(void) static void ShrubEntranceSpriteCallback1(struct Sprite *sprite) { - PlaySE(SE_W077); + PlaySE(SE_M_POISON_POWDER); sprite->data[0] = 0; sprite->callback = ShrubEntranceSpriteCallback2; } diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index 3c64ec520..1c1285ad9 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -100,7 +100,7 @@ static void sub_8133D50(u8 taskId) { return; } - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data[0]; diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 88069f6e9..a999aa47b 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -49,7 +49,7 @@ static void StartSweetScentFieldEffect(void) { u8 taskId; - PlaySE(SE_W230); + PlaySE(SE_M_SWEET_SCENT); BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB(31, 0, 0)); taskId = CreateTask(TrySweetScentEncounter, 0); gTasks[taskId].data[0] = 0; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 93532d396..2dd3266a3 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -451,7 +451,7 @@ static bool8 sub_8141E64(void) if (!gPaletteFade.active) { SetMainCallback2(CB2_HallOfFame); - PlayBGM(MUS_DENDOU); + PlayBGM(MUS_HALL_OF_FAME); return 0; } break; @@ -666,7 +666,7 @@ static void sub_8142570(u8 taskID) } Menu_EraseWindowRect(0, 14, 29, 19); sub_8143068(0, 15); - PlaySE(SE_DENDOU); + PlaySE(SE_APPLAUSE); gTasks[taskID].tFrameCount = 400; gTasks[taskID].func = sub_8142618; } diff --git a/src/hof_pc.c b/src/hof_pc.c index ba64b5f4f..767970da7 100644 --- a/src/hof_pc.c +++ b/src/hof_pc.c @@ -29,7 +29,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void) ScriptContext2_Enable(); Overworld_PlaySpecialMapMusic(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); - ScrSpecial_CreatePCMenu(); + ScriptMenu_CreatePCMultichoice(); ScriptMenu_DisplayPCStartupPrompt(); CreateTask(Task_WaitForPaletteFade, 10); } diff --git a/src/intro.c b/src/intro.c index 818c4ec54..f1904f86e 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1046,7 +1046,7 @@ static void Task_IntroScrollDownAndShowEon(u8 taskId) { u8 spriteId = CreateSprite(&gSpriteTemplate_840AFF0, 200, 160, 10); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; } } else @@ -1403,10 +1403,10 @@ static void Task_IntroPokemonBattle(u8 taskId) gSprites[gTasks[taskId].data[4]].data[0] = 3; gSprites[gTasks[taskId].data[5]].data[0] = 3; spriteId = CreateSprite(&gSpriteTemplate_840B1F4, 0x78, 0x50, 15); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; } if (gIntroFrameCounter == 800) - PlaySE(SE_OP_BASYU); + PlaySE(SE_INTRO_BLAST); if (gIntroFrameCounter == 850) BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, FADE_COLOR_WHITE); if (gIntroFrameCounter == 946) @@ -2207,7 +2207,7 @@ static void sub_813DE70(struct Sprite *sprite) case 3: if (sprite->pos1.y > 160) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0] = 1; } else diff --git a/src/item.c b/src/item.c index 470b4d430..8483e6d3f 100644 --- a/src/item.c +++ b/src/item.c @@ -64,7 +64,7 @@ void CopyItemName(u16 itemId, u8 *string) { if (itemId == ITEM_ENIGMA_BERRY) { - StringCopy(string, GetBerryInfo(GETBERRYID(ITEM_ENIGMA_BERRY))->name); + StringCopy(string, GetBerryInfo(ITEM_TO_BERRY(ITEM_ENIGMA_BERRY))->name); StringAppend(string, gOtherText_Berry2); } else diff --git a/src/item_menu.c b/src/item_menu.c index 23e07ef02..54ad4518b 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -141,8 +141,8 @@ static const u8 *sPopupMenuActionList; // common void (*gFieldItemUseCallback)(u8) = NULL; extern u16 gBattle_BG1_Y; -extern struct PocketScrollState gBagPocketScrollStates[]; -extern struct ItemSlot *gCurrentBagPocketItemSlots; // selected pocket item slots +struct PocketScrollState gBagPocketScrollStates[5]; +struct ItemSlot *gCurrentBagPocketItemSlots; // selected pocket item slots extern const u8 Event_NoRegisteredItem[]; // TODO: decompile the debug code so we can use static in this file @@ -2853,7 +2853,7 @@ static void sub_80A6548(u8 taskId) static void sub_80A6574(u8 taskId) { - PlaySE(SE_REGI); + PlaySE(SE_SHOP); sub_80A6870(gSpecialVar_ItemId, gTasks[taskId].data[1]); gTasks[taskId].func = sub_80A6548; } diff --git a/src/item_use.c b/src/item_use.c index 348806e06..3920ae5bd 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -312,7 +312,7 @@ void RunItemfinderResults(u8 taskId) } return; } - PlaySE(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder. + PlaySE(SE_ITEMFINDER); // play the itemfinder jingle 4 times before executing the itemfinder. data[4]++; } data[3] = (data[3] + 1) & 0x1F; @@ -744,7 +744,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId) static void BootTMHM(u8 taskId) { - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); gTasks[taskId].func = WaitButtonPressAndDisplayTMHMInfo; } @@ -803,7 +803,7 @@ static void PlayBlackWhiteFluteSound(u8 taskId) { if(++gTasks[taskId].data[15] > 7) { - PlaySE(SE_BIDORO); + PlaySE(SE_GLASS_FLUTE); DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1); } } @@ -896,7 +896,7 @@ void sub_80CA2BC(u8 taskId) { if(++gTasks[taskId].data[15] > 7) { - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); RemoveBagItem(gSpecialVar_ItemId, 1); DisplayItemMessageOnField(taskId, sub_803F378(gSpecialVar_ItemId), sub_80CA294, 1); } diff --git a/src/libs/agb_flash.c b/src/libs/agb_flash.c index 5b171abcb..cda693412 100644 --- a/src/libs/agb_flash.c +++ b/src/libs/agb_flash.c @@ -139,9 +139,9 @@ void ReadFlash(u16 sectorNum, u32 offset, void *dest, u32 size) { u8 *src; u16 i; - u16 readFlash_Core_Buffer[0x40]; - u16 *funcSrc; - u16 *funcDest; + vu16 readFlash_Core_Buffer[0x40]; + vu16 *funcSrc; + vu16 *funcDest; void (*readFlash_Core)(u8 *, u8 *, u32); REG_WAITCNT = (REG_WAITCNT & ~WAITCNT_SRAM_MASK) | WAITCNT_SRAM_8; @@ -152,8 +152,8 @@ void ReadFlash(u16 sectorNum, u32 offset, void *dest, u32 size) sectorNum %= SECTORS_PER_BANK; } - funcSrc = (u16 *)ReadFlash_Core; - funcSrc = (u16 *)((s32)funcSrc ^ 1); + funcSrc = (vu16 *)ReadFlash_Core; + funcSrc = (vu16 *)((s32)funcSrc ^ 1); funcDest = readFlash_Core_Buffer; i = ((s32)ReadFlash - (s32)ReadFlash_Core) >> 1; @@ -185,9 +185,9 @@ u32 VerifyFlashSector_Core(u8 *src, u8 *tgt, u32 size) u32 VerifyFlashSector(u16 sectorNum, u8 *src) { u16 i; - u16 verifyFlashSector_Core_Buffer[0x80]; - u16 *funcSrc; - u16 *funcDest; + vu16 verifyFlashSector_Core_Buffer[0x80]; + vu16 *funcSrc; + vu16 *funcDest; u8 *tgt; u16 size; u32 (*verifyFlashSector_Core)(u8 *, u8 *, u32); @@ -200,8 +200,8 @@ u32 VerifyFlashSector(u16 sectorNum, u8 *src) sectorNum %= SECTORS_PER_BANK; } - funcSrc = (u16 *)VerifyFlashSector_Core; - funcSrc = (u16 *)((s32)funcSrc ^ 1); + funcSrc = (vu16 *)VerifyFlashSector_Core; + funcSrc = (vu16 *)((s32)funcSrc ^ 1); funcDest = verifyFlashSector_Core_Buffer; i = ((s32)VerifyFlashSector - (s32)VerifyFlashSector_Core) >> 1; @@ -223,9 +223,9 @@ u32 VerifyFlashSector(u16 sectorNum, u8 *src) u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n) { u16 i; - u16 verifyFlashSector_Core_Buffer[0x80]; - u16 *funcSrc; - u16 *funcDest; + vu16 verifyFlashSector_Core_Buffer[0x80]; + vu16 *funcSrc; + vu16 *funcDest; u8 *tgt; u32 (*verifyFlashSector_Core)(u8 *, u8 *, u32); @@ -237,8 +237,8 @@ u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n) REG_WAITCNT = (REG_WAITCNT & ~WAITCNT_SRAM_MASK) | WAITCNT_SRAM_8; - funcSrc = (u16 *)VerifyFlashSector_Core; - funcSrc = (u16 *)((s32)funcSrc ^ 1); + funcSrc = (vu16 *)VerifyFlashSector_Core; + funcSrc = (vu16 *)((s32)funcSrc ^ 1); funcDest = verifyFlashSector_Core_Buffer; i = ((s32)VerifyFlashSector - (s32)VerifyFlashSector_Core) >> 1; diff --git a/src/libs/m4a.c b/src/libs/m4a.c index 267a72657..66f563bd4 100644 --- a/src/libs/m4a.c +++ b/src/libs/m4a.c @@ -22,8 +22,7 @@ u8 gMPlayMemAccArea[0x10]; u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust) { - u32 val1; - u32 val2; + u32 val1, val2; u32 fineAdjustShifted = fineAdjust << 24; if (key > 178) @@ -315,7 +314,7 @@ void MPlayExtender(struct CgbChannel *cgbChans) void MusicPlayerJumpTableCopy(void) { - asm("swi 0x2A"); + asm("svc 0x2A"); } void ClearChain(void *x) @@ -352,25 +351,25 @@ void SoundInit(struct SoundInfo *soundInfo) | SOUND_ALL_MIX_FULL; REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | 0x40; - REG_DMA1SAD = (s32)soundInfo->pcmBuffer; - REG_DMA1DAD = (s32)®_FIFO_A; - REG_DMA2SAD = (s32)soundInfo->pcmBuffer + PCM_DMA_BUF_SIZE; - REG_DMA2DAD = (s32)®_FIFO_B; + REG_DMA1SAD = (u32)soundInfo->pcmBuffer; + REG_DMA1DAD = (u32)®_FIFO_A; + REG_DMA2SAD = (u32)soundInfo->pcmBuffer + PCM_DMA_BUF_SIZE; + REG_DMA2DAD = (u32)®_FIFO_B; SOUND_INFO_PTR = soundInfo; CpuFill32(0, soundInfo, sizeof(struct SoundInfo)); soundInfo->maxChans = 8; soundInfo->masterVolume = 15; - soundInfo->plynote = (u32)ply_note; + soundInfo->plynote = ply_note; soundInfo->CgbSound = DummyFunc; soundInfo->CgbOscOff = (void (*)(u8))DummyFunc; soundInfo->MidiKeyToCgbFreq = (u32 (*)(u8, u8, u8))DummyFunc; - soundInfo->ExtVolPit = (u32)DummyFunc; + soundInfo->ExtVolPit = (void (*)(struct MusicPlayerInfo *, struct MusicPlayerTrack *))DummyFunc; MPlayJumpTableCopy(gMPlayJumpTable); - soundInfo->MPlayJumpTable = (u32)gMPlayJumpTable; + soundInfo->MPlayJumpTable = (void (**)())gMPlayJumpTable; SampleFreqSet(SOUND_MODE_FREQ_13379); @@ -381,7 +380,7 @@ void SampleFreqSet(u32 freq) { struct SoundInfo *soundInfo = SOUND_INFO_PTR; - freq = (freq & 0xF0000) >> 16; + freq = (freq & SOUND_MODE_FREQ) >> SOUND_MODE_FREQ_SHIFT; soundInfo->freq = freq; soundInfo->pcmSamplesPerVBlank = gPcmSamplesPerVBlankTable[freq - 1]; soundInfo->pcmDmaPeriod = PCM_DMA_BUF_SIZE / soundInfo->pcmSamplesPerVBlank; @@ -433,13 +432,10 @@ void m4aSoundMode(u32 mode) soundInfo->maxChans = temp >> SOUND_MODE_MAXCHN_SHIFT; temp = MAX_DIRECTSOUND_CHANNELS; - chan = &soundInfo->chans[0]; - while (temp != 0) + for (temp = MAX_DIRECTSOUND_CHANNELS, chan = soundInfo->chans; temp != 0; temp--,chan++) { chan->status = 0; - temp--; - chan++; } } @@ -469,37 +465,28 @@ void m4aSoundMode(u32 mode) void SoundClear(void) { - struct SoundInfo *soundInfo = SOUND_INFO_PTR; s32 i; - void *chan; + struct SoundInfo *soundInfo = SOUND_INFO_PTR; + struct SoundChannel *chan; if (soundInfo->ident != ID_NUMBER) return; soundInfo->ident++; - i = MAX_DIRECTSOUND_CHANNELS; - chan = &soundInfo->chans[0]; - - while (i > 0) + for (i = MAX_DIRECTSOUND_CHANNELS, chan = soundInfo->chans; i > 0; i--,chan++) { - ((struct SoundChannel *)chan)->status = 0; - i--; - chan = (void *)((s32)chan + sizeof(struct SoundChannel)); + chan->status = 0; } - chan = soundInfo->cgbChans; + chan = (struct SoundChannel *)soundInfo->cgbChans; if (chan) { - i = 1; - - while (i <= 4) + for (i=1; i<=4; i++,chan++) { soundInfo->CgbOscOff(i); - ((struct CgbChannel *)chan)->sf = 0; - i++; - chan = (void *)((s32)chan + sizeof(struct CgbChannel)); + chan->status = 0; } } @@ -510,27 +497,26 @@ void m4aSoundVSyncOff(void) { struct SoundInfo *soundInfo = SOUND_INFO_PTR; - if (soundInfo->ident >= ID_NUMBER && soundInfo->ident <= ID_NUMBER + 1) - { - soundInfo->ident += 10; + if (soundInfo->ident < ID_NUMBER || soundInfo->ident > ID_NUMBER + 1) + return; + soundInfo->ident += 10; - if (REG_DMA1CNT & (DMA_REPEAT << 16)) - REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; + if (REG_DMA1CNT & (DMA_REPEAT << 16)) + REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; - if (REG_DMA2CNT & (DMA_REPEAT << 16)) - REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; + if (REG_DMA2CNT & (DMA_REPEAT << 16)) + REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4; - REG_DMA1CNT_H = DMA_32BIT; - REG_DMA2CNT_H = DMA_32BIT; + REG_DMA1CNT_H = DMA_32BIT; + REG_DMA2CNT_H = DMA_32BIT; - CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer)); - } + CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer)); } void m4aSoundVSyncOn(void) { struct SoundInfo *soundInfo = SOUND_INFO_PTR; - u32 ident = soundInfo->ident; + const u32 ident = soundInfo->ident; if (ident == ID_NUMBER) return; @@ -580,7 +566,7 @@ void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track } soundInfo->intp = (u32)mplayInfo; - soundInfo->func = (u32)MPlayMain; + soundInfo->func = MPlayMain; soundInfo->ident = ID_NUMBER; mplayInfo->ident = ID_NUMBER; } @@ -614,28 +600,21 @@ void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader mplayInfo->tempoC = 0; mplayInfo->fadeOI = 0; - i = 0; - track = mplayInfo->tracks; - - while (i < songHeader->trackCount && i < mplayInfo->trackCount) + for (i = 0, track = mplayInfo->tracks; i < songHeader->trackCount && i < mplayInfo->trackCount; i++, track++) { TrackStop(mplayInfo, track); track->flags = MPT_FLG_EXIST | MPT_FLG_START; track->chan = 0; track->cmdPtr = songHeader->part[i]; - i++; - track++; } - while (i < mplayInfo->trackCount) + for (; i < mplayInfo->trackCount; i++, track++) { TrackStop(mplayInfo, track); track->flags = 0; - i++; - track++; } - if (songHeader->reverb & 0x80) + if (songHeader->reverb & SOUND_MODE_REVERB_SET) m4aSoundMode(songHeader->reverb); mplayInfo->ident = ID_NUMBER; @@ -653,14 +632,9 @@ void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo) mplayInfo->ident++; mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE; - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - - while (i > 0) + for (i = mplayInfo->trackCount, track = mplayInfo->tracks; i > 0; i--, track++) { TrackStop(mplayInfo, track); - i--; - track++; } mplayInfo->ident = ID_NUMBER; @@ -704,10 +678,8 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo) if ((s16)(mplayInfo->fadeOV & mask) <= 0) { - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - while (i > 0) + for (i = mplayInfo->trackCount, track = mplayInfo->tracks; i > 0; i--, track++) { u32 val; @@ -719,9 +691,6 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo) if (!val) track->flags = 0; - - i--; - track++; } if (mplayInfo->fadeOV & TEMPORARY_FADE) @@ -734,10 +703,7 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo) } } - i = mplayInfo->trackCount; - track = mplayInfo->tracks; - - while (i > 0) + for (i = mplayInfo->trackCount, track = mplayInfo->tracks; i > 0; i--, track++) { if (track->flags & MPT_FLG_EXIST) { @@ -746,9 +712,6 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo) track->volX = (fadeOV >> FADE_VOL_SHIFT); track->flags |= MPT_FLG_VOLCHG; } - - i--; - track++; } } @@ -756,7 +719,7 @@ void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tr { if (track->flags & MPT_FLG_VOLSET) { - s32 x; + u32 x; s32 y; x = (u32)(track->vol * track->volX) >> 5; @@ -904,7 +867,9 @@ void CgbModVol(struct CgbChannel *chan) // Force chan->rightVolume and chan->leftVolume to be read from memory again, // even though there is no reason to do so. // The command line option "-fno-gcse" achieves the same result as this. - asm("" : : : "memory"); + #ifndef NONMATCHING + asm("" : : : "memory"); + #endif chan->eg = (u32)(chan->rightVolume + chan->leftVolume) >> 4; if (chan->eg > 15) diff --git a/src/mail.c b/src/mail.c index 9a56d73cc..65c85e39b 100644 --- a/src/mail.c +++ b/src/mail.c @@ -868,7 +868,7 @@ u8 debug_sub_810CEA4(void) if (!gPaletteFade.active) { gSpecialVar_0x8004 = 4; - sub_80E60D8(); + ShowEasyChatScreen(); return 1; } return 0; diff --git a/src/main.c b/src/main.c index a4335425d..d8779b90c 100644 --- a/src/main.c +++ b/src/main.c @@ -24,14 +24,7 @@ static void VCountIntr(void); static void SerialIntr(void); static void IntrDummy(void); -#ifdef SAPPHIRE -#define GAME_VERSION VERSION_SAPPHIRE -#else -#define GAME_VERSION VERSION_RUBY -#endif - const u8 gGameVersion = GAME_VERSION; - const u8 gGameLanguage = GAME_LANGUAGE; // International versions of the debug menu use a different format. diff --git a/src/main_menu.c b/src/main_menu.c index 33bffcb93..3237663a5 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -766,7 +766,7 @@ static void Task_NewGameSpeech1(u8 taskId) gTasks[taskId].data[3] = 0xFF; gTasks[taskId].tFrameCounter = 216; //Wait 3.6 seconds (216 frames) before starting speech - PlayBGM(MUS_DOORO_X4); + PlayBGM(MUS_ROUTE122); } static void Task_NewGameSpeech2(u8 taskId) @@ -782,7 +782,7 @@ static void Task_NewGameSpeech2(u8 taskId) gSprites[spriteId].pos1.x = 136; gSprites[spriteId].pos1.y = 60; - gSprites[spriteId].invisible = 0; + gSprites[spriteId].invisible = FALSE; gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; StartSpriteFadeIn(taskId, 10); StartBackgroundFadeIn(taskId, 20); @@ -833,7 +833,7 @@ static void Task_NewGameSpeech6(u8 taskId) gSprites[spriteId].pos1.x = 104; gSprites[spriteId].pos1.y = 72; - gSprites[spriteId].invisible = 0; + gSprites[spriteId].invisible = FALSE; gSprites[spriteId].data[0] = 0; CreatePokeballSprite(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF); gTasks[taskId].func = Task_NewGameSpeech7; @@ -1439,26 +1439,26 @@ void AddBirchSpeechObjects(u8 taskId) spriteId = CreateBirchSprite(136, 60, 1); gSprites[spriteId].callback = nullsub_34; gSprites[spriteId].oam.priority = 0; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gTasks[taskId].tBirchSpriteId = spriteId; spriteId = CreateAzurillSprite(0x68, 0x48); gSprites[spriteId].callback = nullsub_34; gSprites[spriteId].oam.priority = 0; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gTasks[taskId].tAzurillSpriteId = spriteId; //Create Brendan sprite spriteId = CreateTrainerSprite(0, 120, 60, 0, eBrendanSprite); gSprites[spriteId].callback = nullsub_34; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gSprites[spriteId].oam.priority = 0; gTasks[taskId].tBrendanSpriteId = spriteId; //Create May sprite spriteId = CreateTrainerSprite(1, 120, 60, 0, eMaySprite); gSprites[spriteId].callback = nullsub_34; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gSprites[spriteId].oam.priority = 0; gTasks[taskId].tMaySpriteId = spriteId; } diff --git a/src/mauville_man.c b/src/mauville_man.c index 7b317e08b..a71ce5fe8 100644 --- a/src/mauville_man.c +++ b/src/mauville_man.c @@ -134,7 +134,7 @@ extern const u8 gTextStoryteller_Story36Title[]; extern const u8 gTextStoryteller_Story36Action[]; extern const u8 gTextStoryteller_Story36Text[]; -extern struct BardSong gUnknown_03005DA0; +struct BardSong gUnknown_03005DA0; EWRAM_DATA static u16 gUnknown_020388BC = 0; // set but not used? @@ -745,7 +745,7 @@ static void Task_BardSong(u8 taskId) case 3: if (gStringVar4[task->tCharIndex] == EOS) { - FadeInNewBGM(MUS_POKECEN, 6); + FadeInNewBGM(MUS_POKE_CENTER, 6); m4aMPlayFadeOutTemporarily(&gMPlayInfo_SE2, 2); EnableBothScriptContexts(); DestroyTask(taskId); diff --git a/src/menu_cursor.c b/src/menu_cursor.c index 32578d1a4..254723f17 100644 --- a/src/menu_cursor.c +++ b/src/menu_cursor.c @@ -136,7 +136,7 @@ void MenuCursor_SetPos814A880(u8 a1, u8 a2) if (gUnknown_0203A3D0 != 0x40) { spr = &gSprites[gUnknown_0203A3D0]; - spr->invisible = 0; + spr->invisible = FALSE; spr->centerToCornerVecX = 0; spr->centerToCornerVecY = 0; spr->pos1.x = a1; @@ -146,7 +146,7 @@ void MenuCursor_SetPos814A880(u8 a1, u8 a2) if (gUnknown_0203A3D1 != 0x40) { spr = &gSprites[gUnknown_0203A3D1]; - spr->invisible = 0; + spr->invisible = FALSE; spr->centerToCornerVecX = 0; spr->centerToCornerVecY = 0; spr->pos1.x = a1; @@ -163,13 +163,13 @@ void sub_814A904(void) if (gUnknown_0203A3D0 != 0x40) { spr = &gSprites[gUnknown_0203A3D0]; - spr->invisible = 1; + spr->invisible = TRUE; } if (gUnknown_0203A3D1 != 0x40) { spr = &gSprites[gUnknown_0203A3D1]; - spr->invisible = 1; + spr->invisible = TRUE; } return; @@ -744,7 +744,7 @@ void MenuCursor_SetPos814AD7C(u8 a1, u8 a2) if (gUnknown_0203A3D2 != 0x40) { spr = &gSprites[gUnknown_0203A3D2]; - spr->invisible = 0; + spr->invisible = FALSE; spr->centerToCornerVecX = 0; spr->centerToCornerVecY = 0; spr->pos1.x = a1; @@ -759,7 +759,7 @@ void sub_814ADC8() if (gUnknown_0203A3D2 != 0x40) { spr = &gSprites[gUnknown_0203A3D2]; - spr->invisible = 1; + spr->invisible = TRUE; } return; } diff --git a/src/money.c b/src/money.c index bf93f6dd1..c48a160cf 100644 --- a/src/money.c +++ b/src/money.c @@ -72,7 +72,7 @@ void AddMoney(u32 *arg0, u32 arg1) return; } - *arg0 = *arg0 + arg1; + *arg0 += arg1; if (*arg0 > 999999) { *arg0 = 999999; @@ -87,7 +87,7 @@ void RemoveMoney(u32 *arg0, u32 arg1) } else { - *arg0 = *arg0 - arg1; + *arg0 -= arg1; } } diff --git a/src/move_tutor_menu.c b/src/move_tutor_menu.c index 666eec0da..e17a1d3ea 100644 --- a/src/move_tutor_menu.c +++ b/src/move_tutor_menu.c @@ -602,13 +602,13 @@ static void MoveTutorMain(void) PrintMainMoveTutorMenuText(gOtherText_ForgotOrDidNotLearnMove); #endif sMoveTutorMenu->state = 31; - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); } break; case 31: if (Menu_UpdateWindowText()) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); sMoveTutorMenu->state = 32; } break; diff --git a/src/naming_screen.c b/src/naming_screen.c index bfd9cd54f..eb0d5fd22 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1361,7 +1361,7 @@ static void DeleteTextCharacter(void) var2 = GetKeyRoleAtCursorPos(); if (var2 == 0 || var2 == 2) sub_80B6460(1, 0, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } static bool8 sub_80B7004(void) diff --git a/src/new_game.c b/src/new_game.c index 683a22801..63a13be5e 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -38,7 +38,7 @@ extern u8 gPlayerPartyCount; extern u8 gUnknown_03005CE8; extern u16 gSaveFileStatus; -extern u8 gUnknown_0819FA81[]; +extern u8 EventScript_ResetAllMapFlags[]; static const struct ContestWinner sEmptyMuseumPortrait = { @@ -202,7 +202,7 @@ void NewGameInitData(void) ResetFanClub(); ResetLotteryCorner(); WarpToTruck(); - ScriptContext2_RunNewScript(gUnknown_0819FA81); + ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags); } #if DEBUG diff --git a/src/overworld.c b/src/overworld.c index 67bf498c5..a0e7939f5 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -51,17 +51,17 @@ #include "constants/species.h" #ifdef SAPPHIRE -#define LEGENDARY_MUSIC MUS_OOAME // Heavy Rain +#define LEGENDARY_MUSIC MUS_WEATHER_KYOGRE // Heavy Rain #else -#define LEGENDARY_MUSIC MUS_HIDERI // Drought +#define LEGENDARY_MUSIC MUS_WEATHER_GROUDON // Drought #endif extern u8 gUnknown_020297ED; extern u16 gTotalCameraPixelOffsetY; extern u16 gTotalCameraPixelOffsetX; -extern u8 S_WhiteOut[]; -extern u8 gUnknown_0819FC9F[]; +extern u8 EventScript_WhiteOut[]; +extern u8 EventScript_ResetMrBriney[]; extern u8 SingleBattleColosseum_EventScript_1A436F[]; extern u8 SingleBattleColosseum_EventScript_1A4379[]; extern u8 DoubleBattleColosseum_EventScript_1A4383[]; @@ -208,7 +208,7 @@ static void (*const gUnknown_082166D8[])(struct LinkPlayerObjectEvent *, struct static void DoWhiteOut(void) { - ScriptContext2_RunNewScript(S_WhiteOut); + ScriptContext2_RunNewScript(EventScript_WhiteOut); gSaveBlock1.money /= 2; ScrSpecial_HealPlayerParty(); Overworld_ResetStateAfterWhiteOut(); @@ -234,7 +234,7 @@ void Overworld_ResetStateAfterTeleport(void) FlagClear(FLAG_SYS_SAFARI_MODE); FlagClear(FLAG_SYS_USE_STRENGTH); FlagClear(FLAG_SYS_USE_FLASH); - ScriptContext2_RunNewScript(gUnknown_0819FC9F); + ScriptContext2_RunNewScript(EventScript_ResetMrBriney); } void Overworld_ResetStateAfterDigEscRope(void) @@ -582,7 +582,7 @@ static bool8 SetDiveWarp(u8 direction, u16 x, u16 y) } else { - mapheader_run_script_with_tag_x6(); + RunOnDiveWarpMapScript(); if (IsDummyWarp(&gFixedDiveWarp)) return FALSE; @@ -620,7 +620,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) ChooseAmbientCrySpecies(); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); - mapheader_run_script_with_tag_x3(); + RunOnTransitionMapScript(); not_trainer_hill_battle_pyramid(); sub_8056D38(gMapHeader.mapLayout); apply_map_tileset2_palette(gMapHeader.mapLayout); @@ -633,7 +633,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) RoamerMove(); DoCurrentWeather(); ResetFieldTasksArgs(); - mapheader_run_script_with_tag_x5(); + RunOnResumeMapScript(); ShowMapNamePopup(); } @@ -658,13 +658,13 @@ void sub_8053994(u32 a1) FlagClear(FLAG_SYS_USE_FLASH); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); - mapheader_run_script_with_tag_x3(); + RunOnTransitionMapScript(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); not_trainer_hill_battle_pyramid(); if (a1 != 1 && v3) { - UpdateTVScreensOnMap(gUnknown_03004870.width, gUnknown_03004870.height); + UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height); sub_80BBCCC(1); } } @@ -845,7 +845,7 @@ static u16 GetLocationMusic(struct WarpData *warp) if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE) return LEGENDARY_MUSIC; else if (IsInfiltratedWeatherInstitute(warp) == TRUE) - return MUS_TOZAN; + return MUS_MT_CHIMNEY; else return Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum)->music; } @@ -858,7 +858,7 @@ u16 GetCurrLocationDefaultMusic(void) if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE111) && gSaveBlock1.location.mapNum == MAP_NUM(ROUTE111) && GetSav1Weather() == 8) - return MUS_ASHROAD; + return MUS_ROUTE111; music = GetLocationMusic(&gSaveBlock1.location); if (music != 0x7FFF) @@ -868,9 +868,9 @@ u16 GetCurrLocationDefaultMusic(void) else { if (gSaveBlock1.pos.x < 24) - return MUS_DOORO_X1; + return MUS_ROUTE110; else - return MUS_GRANROAD; + return MUS_ROUTE119; } } @@ -885,9 +885,9 @@ u16 GetWarpDestinationMusic(void) { if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAUVILLE_CITY) && gSaveBlock1.location.mapNum == MAP_NUM(MAUVILLE_CITY)) - return MUS_DOORO_X1; + return MUS_ROUTE110; else - return MUS_GRANROAD; + return MUS_ROUTE119; } } @@ -905,9 +905,9 @@ void Overworld_PlaySpecialMapMusic(void) if (gSaveBlock1.savedMusic) music = gSaveBlock1.savedMusic; else if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER) - music = MUS_DEEPDEEP; + music = MUS_UNDERWATER; else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - music = MUS_NAMINORI; + music = MUS_SURF; } if (music != GetCurrentMapMusic()) @@ -926,16 +926,16 @@ void Overworld_ClearSavedMusic(void) void sub_8053F0C(void) { - if (FlagGet(FLAG_SPECIAL_FLAG_1) != TRUE) + if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); if (newMusic != LEGENDARY_MUSIC) { - if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI) + if (currentMusic == MUS_UNDERWATER || currentMusic == MUS_SURF) return; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - newMusic = MUS_NAMINORI; + newMusic = MUS_SURF; } if (newMusic != currentMusic) { @@ -973,7 +973,7 @@ u8 GetMapMusicFadeoutSpeed(void) void TryFadeOutOldMapMusic(void) { u16 music = GetWarpDestinationMusic(); - if (FlagGet(FLAG_SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic()) + if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE && music != GetCurrentMapMusic()) { u8 speed = GetMapMusicFadeoutSpeed(); FadeOutMapMusic(speed); @@ -1829,7 +1829,7 @@ void sub_8054D4C(u32 a1) sub_8080750(); if (!a1) SetUpFieldTasks(); - mapheader_run_script_with_tag_x5(); + RunOnResumeMapScript(); } void sub_8054D90(void) @@ -1838,7 +1838,7 @@ void sub_8054D90(void) gTotalCameraPixelOffsetY = 0; ResetObjectEvents(); TrySpawnObjectEvents(0, 0); - mapheader_run_first_tag4_script_list_match(); + TryRunOnWarpIntoMapScript(); } void mli4_mapscripts_and_other(void) @@ -1855,7 +1855,7 @@ void mli4_mapscripts_and_other(void) ResetInitialPlayerAvatarState(); TrySpawnObjectEvents(0, 0); ResetBerryTreeSparkleFlags(); - mapheader_run_first_tag4_script_list_match(); + TryRunOnWarpIntoMapScript(); } void sub_8054E20(void) diff --git a/src/party_menu.c b/src/party_menu.c index 2095db331..b5b00c947 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -102,6 +102,8 @@ static void sub_806BF24(const u8 *a, u8 monIndex, u8 c, u8 d); static void sub_806BB9C(u8 a); static void sub_806BBEC(u8 a); +void (*gPokemonItemUseCallback)(u8 taskId, u16 itemId, TaskFunc taskFunc); + extern u16 Random(); EWRAM_DATA u8 gUnknown_0202E8F4 = 0; @@ -2883,11 +2885,11 @@ void SpriteCB_HeldItemIcon(struct Sprite *sprite) if (gSprites[data7].invisible) { - sprite->invisible = 1; + sprite->invisible = TRUE; } else { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->pos1.x = gSprites[data7].pos1.x + gSprites[data7].pos2.x; sprite->pos1.y = gSprites[data7].pos1.y + gSprites[data7].pos2.y; } @@ -2977,7 +2979,7 @@ void CreateHeldItemIcon_806DCD4(u8 taskId, u8 monIndex, u16 item) if (!item) { - gSprites[heldItemSpriteId].invisible = 1; + gSprites[heldItemSpriteId].invisible = TRUE; } else { @@ -2986,7 +2988,7 @@ void CreateHeldItemIcon_806DCD4(u8 taskId, u8 monIndex, u16 item) else StartSpriteAnim(&gSprites[heldItemSpriteId], 0); - gSprites[heldItemSpriteId].invisible = 0; + gSprites[heldItemSpriteId].invisible = FALSE; } gSprites[heldItemSpriteId].callback(&gSprites[heldItemSpriteId]); @@ -3157,7 +3159,7 @@ void SetHeldItemIconVisibility(u8 taskId, u8 monIndex) spriteId = GetMonHeldItemIconSpriteId(taskId, monIndex); if (!GetMonData(&gPlayerParty[monIndex], MON_DATA_HELD_ITEM)) { - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; } else { @@ -3179,7 +3181,7 @@ void SetHeldItemIconVisibility(u8 taskId, u8 monIndex) animNum = 0; } StartSpriteAnim(sprite2, animNum); - sprite->invisible = 0; + sprite->invisible = FALSE; } } @@ -3901,7 +3903,7 @@ void Task_TeamMonTMMove3(u8 taskId) { if (gUnknown_0202E8F6 == 0) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); gTasks[taskId].func = Task_TeamMonTMMove4; } } @@ -4111,7 +4113,7 @@ s16 sub_806F7E8(u8 taskId, struct BattleInterfaceStruct1 *b, s8 c) if (hpBarLevel < 2) b->unkC_0 = 6; vramPtr = gUnknown_08376858[IsDoubleBattle()][ewram1C000.primarySelectedMonIndex]; - return sub_80460C8(b, &ewram1C000.unkC, vramPtr, 0); + return sub_80460C8(b, (int *)&ewram1C000.unkC, vramPtr, 0); } void sub_806F8AC(u8 taskId) @@ -4157,7 +4159,7 @@ void sub_806FA18(u8 taskId) ewram1B000.unk282 = sub_806F7E8(taskId, &sp0, 1); if (ewram1B000.unk282 == -1) { - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); ewram1C000.unkC = 0; gTasks[taskId].data[11] -= gTasks[taskId].data[12]; SetMonData(ewram1C000.pokemon, MON_DATA_HP, &gTasks[taskId].data[11]); @@ -4341,9 +4343,9 @@ void UseMedicine(u8 taskId, u16 item, TaskFunc func) gUnknown_0202E8F4 = 1; if (!IsBlueYellowRedFlute(item)) - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); else - PlaySE(SE_BIDORO); + PlaySE(SE_GLASS_FLUTE); statusAndPkrs = GetMonStatusAndPokerus(ewram1C000.pokemon); if (statusAndPkrs == STATUS_PRIMARY_POKERUS || statusAndPkrs == STATUS_PRIMARY_NONE) PartyMenuUpdateLevelOrStatus(ewram1C000.pokemon, ewram1C000.primarySelectedMonIndex); @@ -4421,7 +4423,7 @@ void sub_8070088(u8 taskId) { gUnknown_0202E8F4 = 1; Menu_EraseWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); PartyMenuUpdateLevelOrStatus(ewram1C000.pokemon, ewram1C000.primarySelectedMonIndex); task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle() * 12 + ewram1C000.primarySelectedMonIndex * 2], 9); ewram1B000.unk261 = 2; @@ -4573,7 +4575,7 @@ void DoRecoverPP(u8 taskId) else { gUnknown_0202E8F4 = 1; - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); RemoveBagItem(ewram1C000.secondarySelectedIndex, 1); r5 = GetMonData(ewram1C000.pokemon, MON_DATA_MOVE1 + gTasks[taskId].data[11]); StringCopy(gStringVar1, gMoveNames[r5]); diff --git a/src/pokeball.c b/src/pokeball.c index 8a11440ff..58c1bbaa9 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -404,7 +404,7 @@ static void SendOutMonAnimation(u8 taskId) gSprites[spriteId].oam.affineParam = taskId; gTasks[taskId].data[4] = gBattlerTarget; gTasks[taskId].func = TaskDummy; - PlaySE(SE_NAGERU); + PlaySE(SE_BALL_THROW); } static void objc_0804ABD4(struct Sprite *sprite) @@ -455,7 +455,7 @@ static void sub_8046760(struct Sprite *sprite) { sprite->data[5]++; if (sprite->data[5] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); if (gSprites[gBattlerSpriteIds[sprite->data[6]]].affineAnimEnded) { StartSpriteAnim(sprite, 2); @@ -505,16 +505,16 @@ static void sub_804684C(struct Sprite *sprite) switch (sprite->data[3] >> 8) { case 1: - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); break; case 2: - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); break; case 3: - PlaySE(SE_KON3); + PlaySE(SE_BALL_BOUNCE_3); break; default: - PlaySE(SE_KON4); + PlaySE(SE_BALL_BOUNCE_4); break; } } @@ -556,7 +556,7 @@ static void sub_8046944(struct Sprite *sprite) sprite->affineAnimPaused = TRUE; StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_8046984; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } @@ -625,7 +625,7 @@ static void sub_8046984(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 2); else StartSpriteAffineAnim(sprite, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } break; } @@ -822,7 +822,7 @@ static void sub_8046FBC(struct Sprite *sprite) { gDoingBattleAnim = 0; m4aMPlayAllStop(); - PlaySE(MUS_FANFA5); + PlaySE(MUS_EVOLVED); } else if (sprite->data[4] == 315) { @@ -1074,7 +1074,7 @@ static void sub_80476E0(struct Sprite *sprite) sprite->data[5]++; if (sprite->data[5] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); r1 = sprite->data[0]; if (gSprites[r1].affineAnimEnded) { diff --git a/src/pokedex.c b/src/pokedex.c index 8d7ecb896..f0be616d0 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -26,7 +26,6 @@ #include "scanline_effect.h" #include "ewram.h" - struct PokedexListItem { u16 dexNum; @@ -37,10 +36,7 @@ struct PokedexListItem struct PokedexView { struct PokedexListItem unk0[NATIONAL_DEX_COUNT]; - u16 unk608; - u8 unk60A_1:1; - u8 unk60A_2:1; - u8 unk60B; + struct PokedexListItem monData; u16 pokemonListCount; u16 selectedPokemon; u16 unk610; @@ -52,19 +48,18 @@ struct PokedexView u16 unk61C; u16 unk61E[4]; u16 selectedMonSpriteId; - u16 unk628; - u16 unk62A; + s16 unk628; + s16 unk62A; u8 unk62C; u8 unk62D; u8 unk62E; u8 unk62F; s16 unk630; s16 unk632; - u16 unk634; - u16 unk636; + s16 unk634; + s16 unk636; u16 unk638; - u16 unk63A[4]; - u8 filler642[8]; + u16 unk63A[8]; u8 unk64A; u8 unk64B; u8 unk64C_1:1; @@ -1331,9 +1326,9 @@ static void ClearPokedexView(struct PokedexView *pokedexView) pokedexView->unk0[i].seen = 0; pokedexView->unk0[i].owned = 0; } - pokedexView->unk608 = 0; - pokedexView->unk60A_1 = 0; - pokedexView->unk60A_2 = 0; + pokedexView->monData.dexNum = 0; + pokedexView->monData.seen = 0; + pokedexView->monData.owned = 0; pokedexView->pokemonListCount = 0; pokedexView->selectedPokemon = 0; pokedexView->unk610 = 0; @@ -1343,7 +1338,7 @@ static void ClearPokedexView(struct PokedexView *pokedexView) pokedexView->unk618 = 0; pokedexView->unk61A = 0; pokedexView->unk61C = 0; - for (i = 0; i <= 3; i++) + for (i = 0; i < 4; i++) pokedexView->unk61E[i] |= 0xFFFF; pokedexView->unk628 = 0; pokedexView->unk62A = 0; @@ -1356,7 +1351,7 @@ static void ClearPokedexView(struct PokedexView *pokedexView) pokedexView->unk634 = 0; pokedexView->unk636 = 0; pokedexView->unk638 = 0; - for (i = 0; i <= 3; i++) + for (i = 0; i < 4; i++) pokedexView->unk63A[i] = 0; pokedexView->unk64A = 0; pokedexView->unk64B = 0; @@ -1366,9 +1361,9 @@ static void ClearPokedexView(struct PokedexView *pokedexView) pokedexView->menuIsOpen = 0; pokedexView->menuCursorPos = 0; pokedexView->menuY = 0; - for (i = 0; i <= 7; i++) + for (i = 0; i < 8; i++) pokedexView->unk656[i] = 0; - for (i = 0; i <= 7; i++) + for (i = 0; i < 8; i++) pokedexView->unk65E[i] = 0; } @@ -1534,7 +1529,7 @@ void Task_PokedexMainScreen(u8 taskId) gPokedexView->unk614 = gPokedexView->dexMode; gPokedexView->unk618 = gPokedexView->dexOrder; gTasks[taskId].func = sub_808CB8C; - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); } else if (gMain.newKeys & B_BUTTON) { @@ -1725,7 +1720,7 @@ static void Task_PokedexResultsScreen(u8 taskId) gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; gTasks[taskId].func = sub_808CB8C; - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); } else if (gMain.newKeys & B_BUTTON) { @@ -1784,7 +1779,7 @@ static void Task_PokedexResultsScreenMenu(u8 taskId) case 3: //BACK TO POKEDEX BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; - PlaySE(SE_TRACK_DOOR); + PlaySE(SE_TRUCK_DOOR); break; case 4: //CLOSE POKEDEX BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); @@ -1961,8 +1956,8 @@ static void sub_808D640(void) static void SortPokedex(u8 dexMode, u8 sortMode) { + s16 i, r5, r10; u16 vars[3]; //I have no idea why three regular variables are stored in an array, but whatever. - s16 i; gPokedexView->pokemonListCount = 0; @@ -2004,18 +1999,13 @@ static void SortPokedex(u8 dexMode, u8 sortMode) } else { - bool32 r10; - s16 r5; - - r10 = r5 = i = 0; - for (i = 0; i < vars[0]; i++) + for (i = 0, r5= 0, r10 = 0; i < vars[0]; i++) { vars[2] = i + 1; if (GetSetPokedexFlag(vars[2], 0)) r10 = 1; if (r10) { - asm(""); //Needed to match for some reason gPokedexView->unk0[r5].dexNum = vars[2]; gPokedexView->unk0[r5].seen = GetSetPokedexFlag(vars[2], 0); gPokedexView->unk0[r5].owned = GetSetPokedexFlag(vars[2], 1); @@ -2206,8 +2196,8 @@ static void sub_808DEB0(u16 a, u8 b, u8 c, u16 d) text[1] = CHAR_0 + (r7 % 100) / 10; text[2] = CHAR_0 + (r7 % 100) % 10; text[3] = EOS; - *(u16 *)(VRAM + d * 0x800 + c * 0x40 + b * 2) = unk[0]; - *(u16 *)(VRAM + d * 0x800 + (c + 1) * 0x40 + b * 2) = unk[1]; + *(u16 *)(BG_VRAM + d * 0x800 + c * 0x40 + b * 2) = unk[0]; + *(u16 *)(BG_VRAM + d * 0x800 + (c + 1) * 0x40 + b * 2) = unk[1]; Menu_PrintText(text, b - 15, c); } @@ -2225,13 +2215,13 @@ static void sub_808DF88(u16 a, u8 b, u8 c, u16 d) unk[0] = 0; unk[1] = 0; } - *(u16 *)(VRAM + d * 0x800 + c * 0x40 + b * 2) = unk[0]; - *(u16 *)(VRAM + d * 0x800 + (c + 1) * 0x40 + b * 2) = unk[1]; + *(u16 *)(BG_VRAM + d * 0x800 + c * 0x40 + b * 2) = unk[0]; + *(u16 *)(BG_VRAM + d * 0x800 + (c + 1) * 0x40 + b * 2) = unk[1]; } static u8 sub_808DFE4(u16 num, u8 b, u8 c) { - u8 text[10]; + u8 text[POKEMON_NAME_LENGTH + (MODERN ? 1 : 0)]; u8 i; for (i = 0; i < 10; i++) @@ -2242,11 +2232,11 @@ static u8 sub_808DFE4(u16 num, u8 b, u8 c) switch (num) { default: - for (i = 0; gSpeciesNames[num][i] != EOS && i < 10; i++) + for (i = 0; gSpeciesNames[num][i] != EOS && i < POKEMON_NAME_LENGTH; i++) text[i] = gSpeciesNames[num][i]; break; case 0: - for (i = 0; i < 10; i++) + for (i = 0; i < POKEMON_NAME_LENGTH; i++) text[i] = CHAR_HYPHEN; break; } @@ -2260,8 +2250,8 @@ static void sub_808E090(u8 a, u8 b, u16 c) for (i = 0; i < 12; i++) { - *(u16 *)(VRAM + c * 0x800 + b * 64 + (a + i) * 2) = 0; - *(u16 *)(VRAM + c * 0x800 + (b + 1) * 64 + (a + i) * 2) = 0; + *(u16 *)(BG_VRAM + c * 0x800 + b * 64 + (a + i) * 2) = 0; + *(u16 *)(BG_VRAM + c * 0x800 + (b + 1) * 64 + (a + i) * 2) = 0; } } @@ -3012,7 +3002,7 @@ static void Task_PageScreenProcessInput(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_808F888; - PlaySE(SE_Z_SCROLL); + PlaySE(SE_DEX_SCROLL); return; } if (gMain.newKeys & B_BUTTON) @@ -3042,7 +3032,7 @@ static void Task_PageScreenProcessInput(u8 taskId) case SIZE_SCREEN: if (!gUnknown_0202FFBC->owned) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } else { @@ -3060,7 +3050,7 @@ static void Task_PageScreenProcessInput(u8 taskId) { gPokedexView->selectedScreen--; sub_8090584(gPokedexView->selectedScreen, 0xD); - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); return; } if (((gMain.newKeys & DPAD_RIGHT) @@ -3069,7 +3059,7 @@ static void Task_PageScreenProcessInput(u8 taskId) { gPokedexView->selectedScreen++; sub_8090584(gPokedexView->selectedScreen, 0xD); - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); return; } } @@ -3273,7 +3263,7 @@ static void Task_CryScreenProcessInput(u8 taskId) m4aMPlayContinue(&gMPlayInfo_BGM); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_808FFBC; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); return; } if ((gMain.newKeys & DPAD_RIGHT) @@ -3281,7 +3271,7 @@ static void Task_CryScreenProcessInput(u8 taskId) { if (!gUnknown_0202FFBC->owned) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } else { @@ -3289,7 +3279,7 @@ static void Task_CryScreenProcessInput(u8 taskId) m4aMPlayContinue(&gMPlayInfo_BGM); gPokedexView->unk64F = 3; gTasks[taskId].func = sub_808FFBC; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } return; } @@ -3433,7 +3423,7 @@ static void Task_SizeScreenProcessInput(u8 taskId) BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_8090498; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } } @@ -3800,7 +3790,7 @@ static void sub_8090750(u8 taskId) #ifndef NONMATCHING asm(""); #endif - *(u16 *)(VRAM + 0x7800 + 2 * i) += 0x2000; + *(u16 *)(BG_VRAM + 0x7800 + 2 * i) += 0x2000; } sub_8091738(gTasks[taskId].data[1], 2, 0x3FC); ResetPaletteFade(); @@ -3875,8 +3865,8 @@ static void sub_8090A3C(u8 taskId) Menu_EraseWindowRect(2, 13, 27, 19); Menu_PrintText(gPokedexEntries[r4].descriptionPage2, 2, 13); - (*(u16 *)(VRAM + 0x7ACA))++; - (*(u16 *)(VRAM + 0x7B0A))++; + (*(u16 *)(BG_VRAM + 0x7ACA))++; + (*(u16 *)(BG_VRAM + 0x7B0A))++; gTasks[taskId].data[4] = 1; PlaySE(SE_PIN); } @@ -3940,8 +3930,8 @@ static void sub_8090C68(void) Menu_EraseWindowRect(2, 13, 27, 19); Menu_PrintText(gPokedexEntries[gUnknown_0202FFBC->dexNum].descriptionPage2, 2, 13); gPokedexView->descriptionPageNum = 1; - (*(u16 *)(VRAM + 0x7ACA))++; - (*(u16 *)(VRAM + 0x7B0A))++; + (*(u16 *)(BG_VRAM + 0x7ACA))++; + (*(u16 *)(BG_VRAM + 0x7B0A))++; PlaySE(SE_PIN); } else @@ -3949,8 +3939,8 @@ static void sub_8090C68(void) Menu_EraseWindowRect(2, 13, 27, 19); Menu_PrintText(gPokedexEntries[gUnknown_0202FFBC->dexNum].descriptionPage1, 2, 13); gPokedexView->descriptionPageNum = 0; - (*(u16 *)(VRAM + 0x7ACA))--; - (*(u16 *)(VRAM + 0x7B0A))--; + (*(u16 *)(BG_VRAM + 0x7ACA))--; + (*(u16 *)(BG_VRAM + 0x7B0A))--; PlaySE(SE_PIN); } } @@ -4177,16 +4167,15 @@ static u8 sub_80911C8(u16 num, u8 b, u8 c) for (i = 0; i < 11; i++) str[i] = EOS; num = NationalPokedexNumToSpecies(num); - switch (num) + if (num) { - default: for (i = 0; gSpeciesNames[num][i] != EOS && i < 10; i++) str[i] = gSpeciesNames[num][i]; - break; - case 0: + } + else + { for (i = 0; i < 10; i++) str[i] = 0xAE; - break; } Menu_PrintText(str, b, c); return i; @@ -4436,42 +4425,36 @@ static void sub_8091564(u16 arg0, u8 left, u8 top) void sub_8091738(u16 num, u16 b, u16 c) { u8 arr[0x80]; - u16 i; - u16 j; + u16 i, j, r7; const u8 *r12; - u16 r7; - u8 r3; + u8 r3, r1; - r12 = sMonFootprintTable[NationalPokedexNumToSpecies(num)]; - for (r7 = 0, i = 0; i < 32; i++) + r12 = (const u8*)sMonFootprintTable[NationalPokedexNumToSpecies(num)]; + r7 = 0; + for (i = 0; i < 32; i++) { r3 = r12[i]; for (j = 0; j < 4; j++) { - u32 r1 = j * 2; - s32 r2 = (r3 >> r1) & 1; - - if (r3 & (2 << r1)) - r2 |= 0x10; - -// Needed to match -#ifndef NONMATCHING - asm("");asm("");asm("");asm("");asm(""); -#endif + r1 = 0; + if (r3 & (1 << (j * 2))) + r1 |= 0x01; + if (r3 & (2 << (j * 2))) + r1 |= 0x10; - arr[r7] = r2; + arr[r7] = r1; r7++; } } - CpuCopy16(arr, (u16 *)(VRAM + b * 0x4000 + c * 0x20), 0x80); + CpuCopy16((void*)arr, (void *)(BG_VRAM + b * 0x4000 + c * 0x20), 0x80); } static void sub_80917CC(u16 a, u16 b) { - *(u16 *)(VRAM + a * 0x800 + 0x232) = 0xF000 + b + 0; - *(u16 *)(VRAM + a * 0x800 + 0x234) = 0xF000 + b + 1; - *(u16 *)(VRAM + a * 0x800 + 0x272) = 0xF000 + b + 2; - *(u16 *)(VRAM + a * 0x800 + 0x274) = 0xF000 + b + 3; + *(u16 *)(BG_VRAM + a * 0x800 + 0x232) = 0xF000 + b + 0; + *(u16 *)(BG_VRAM + a * 0x800 + 0x234) = 0xF000 + b + 1; + *(u16 *)(BG_VRAM + a * 0x800+ 0x272) = 0xF000 + b + 2; + *(u16 *)(BG_VRAM + a * 0x800 + 0x274) = 0xF000 + b + 3; } static u16 sub_8091818(u8 a, u16 b, u16 c, u16 d) @@ -4815,13 +4798,13 @@ static void sub_809207C(u8 taskId) } if ((gMain.newKeys & DPAD_LEFT) && gTasks[taskId].data[0] > 0) { - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); gTasks[taskId].data[0]--; sub_8092AB0(gTasks[taskId].data[0]); } if ((gMain.newKeys & DPAD_RIGHT) && gTasks[taskId].data[0] < 2) { - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); gTasks[taskId].data[0]++; sub_8092AB0(gTasks[taskId].data[0]); } @@ -4855,7 +4838,7 @@ static void sub_80921B0(u8 taskId) if (gMain.newKeys & B_BUTTON) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); sub_8092EB0(taskId); gTasks[taskId].func = sub_809204C; return; @@ -4883,7 +4866,7 @@ static void sub_80921B0(u8 taskId) { sub_8091E20(gDexText_Searching); gTasks[taskId].func = sub_80923FC; - PlaySE(SE_Z_SEARCH); + PlaySE(SE_DEX_SEARCH); } } else @@ -4939,12 +4922,12 @@ static void sub_80924A4(u8 taskId) { if (gPokedexView->pokemonListCount != 0) { - PlaySE(SE_SEIKAI); + PlaySE(SE_SUCCESS); sub_8091E20(gDexText_SearchComplete); } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); sub_8091E20(gDexText_NoMatching); } gTasks[taskId].func = sub_8092508; @@ -4966,7 +4949,7 @@ static void sub_8092508(u8 taskId) else { gTasks[taskId].func = sub_809217C; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } } @@ -5020,7 +5003,7 @@ static void sub_8092644(u8 taskId) if (gMain.newKeys & B_BUTTON) { sub_814ADC8(); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); Menu_EraseWindowRect(18, 1, 28, 12); sub_8092C8C(1); *p1 = gTasks[taskId].data[14]; @@ -5089,74 +5072,25 @@ static void sub_80927F0(u8 taskId) DestroyTask(taskId); } -#ifdef NONMATCHING +#define VRAM_ADDR(a, b, c) *(u16 *)(BG_VRAM + (15 * 0x800) + (c) * 64 + ((b) + (a))*2) void sub_8092810(u8 a, u8 b, u8 c, u8 d) { - u16 i; + u16 i, j; for (i = 0; i < d; i++) { - ((u16 *)VRAM)[15 * 0x400 + c * 32 + i + b] &= 0xFFF; - ((u16 *)VRAM)[15 * 0x400 + c * 32 + i + b] |= a << 12; + j = VRAM_ADDR(i, b, c); + j &= 0xFFF; + j |= a << 12; + + VRAM_ADDR(i, b, c) = j; - ((u16 *)VRAM)[15 * 0x400 + (c + 1) * 32 + i + b] &= 0xFFF; - ((u16 *)VRAM)[15 * 0x400 + (c + 1) * 32 + i + b] |= a << 12; + j = VRAM_ADDR(i, b, c + 1); + j &= 0xFFF; + j |= a << 12; + VRAM_ADDR(i, b, c + 1) = j; } } -#else -NAKED -void sub_8092810(u8 a, u8 b, u8 c, u8 d) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r12, r1\n\ - lsls r2, 24\n\ - lsrs r1, r2, 24\n\ - lsls r3, 24\n\ - lsrs r5, r3, 8\n\ - movs r3, 0\n\ - cmp r5, 0\n\ - beq _0809285A\n\ - lsls r7, r1, 6\n\ - ldr r6, _08092860 @ =0x00000fff\n\ - lsls r4, r0, 12\n\ -_08092830:\n\ - mov r0, r12\n\ - adds r1, r0, r3\n\ - lsls r1, 1\n\ - adds r1, r7, r1\n\ - ldr r0, _08092864 @ =0x06007800\n\ - adds r2, r1, r0\n\ - ldrh r0, [r2]\n\ - ands r0, r6\n\ - orrs r0, r4\n\ - strh r0, [r2]\n\ - ldr r0, _08092868 @ =0x06007840\n\ - adds r1, r0\n\ - ldrh r0, [r1]\n\ - ands r0, r6\n\ - orrs r0, r4\n\ - strh r0, [r1]\n\ - adds r0, r3, 0x1\n\ - lsls r0, 16\n\ - lsrs r3, r0, 16\n\ - cmp r0, r5\n\ - bcc _08092830\n\ -_0809285A:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_08092860: .4byte 0x00000fff\n\ -_08092864: .4byte 0x06007800\n\ -_08092868: .4byte 0x06007840\n\ - .syntax divided\n"); -} -#endif static void sub_809286C(u8 a, u8 b, u8 c) { diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index cd697270c..1dbfdf6aa 100644 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -1285,7 +1285,7 @@ static void Task_PokedexAreaScreen_1(u8 taskId) else if (gMain.newKeys & DPAD_RIGHT || (gMain.newKeys & R_BUTTON && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { gTasks[taskId].data[1] = 2; - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); } else return; diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index 0574ca45b..9abea27a1 100644 --- a/src/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c @@ -41,7 +41,7 @@ void sub_811A350(u8, u16, u8); void sub_811A534(struct Sprite *); void sub_811A6D8(s8); -extern u8 gUnknown_03005E98; +u8 gUnknown_03005E98; // data/pokedex_cry_screen.o diff --git a/src/pokemon_2.c b/src/pokemon_2.c index a92d12fd9..9fd145b80 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -1031,14 +1031,14 @@ u8 CalculateEnemyPartyCount(void) return gEnemyPartyCount; } -u8 sub_803DAA0(void) +u8 GetMonsStateToDoubles(void) { s32 aliveCount = 0; s32 i; CalculatePlayerPartyCount(); if (gPlayerPartyCount == 1) - return gPlayerPartyCount; + return gPlayerPartyCount; // PLAYER_HAS_ONE_MON for (i = 0; i < gPlayerPartyCount; i++) { @@ -1048,7 +1048,7 @@ u8 sub_803DAA0(void) aliveCount++; } - return (aliveCount > 1) ? 0 : 2; + return (aliveCount > 1) ? PLAYER_HAS_TWO_USABLE_MONS : PLAYER_HAS_ONE_USABLE_MON; } u8 GetAbilityBySpecies(u16 species, bool8 altAbility) diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 393d76dbc..16c2f3738 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1112,38 +1112,38 @@ void ClearBattleMonForms(void) u16 GetMUS_ForBattle(void) { if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) - return MUS_BATTLE34; + return MUS_VS_KYOGRE_GROUDON; if (gBattleTypeFlags & BATTLE_TYPE_REGI) - return MUS_BATTLE36; + return MUS_VS_REGI; if (gBattleTypeFlags & BATTLE_TYPE_LINK) - return MUS_BATTLE20; + return MUS_VS_TRAINER; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { switch (gTrainers[gTrainerBattleOpponent].trainerClass) { case 2: case 0x31: - return MUS_BATTLE30; + return MUS_VS_AQUA_MAGMA_LEADER; case 3: case 4: case 0x32: case 0x33: - return MUS_BATTLE31; + return MUS_VS_AQUA_MAGMA; case 0x19: - return MUS_BATTLE32; + return MUS_VS_GYM_LEADER; case 0x20: - return MUS_BATTLE33; + return MUS_VS_CHAMPION; case 0x2E: if (!StringCompare(gTrainers[gTrainerBattleOpponent].trainerName, BattleText_Wally)) - return MUS_BATTLE20; - return MUS_BATTLE35; + return MUS_VS_TRAINER; + return MUS_VS_RIVAL; case 0x18: - return MUS_BATTLE38; + return MUS_VS_ELITE_FOUR; default: - return MUS_BATTLE20; + return MUS_VS_TRAINER; } } - return MUS_BATTLE27; + return MUS_VS_WILD; } void sub_80408BC(void) diff --git a/src/pokemon_item_effect.c b/src/pokemon_item_effect.c index d59e8d77c..3ab351367 100644 --- a/src/pokemon_item_effect.c +++ b/src/pokemon_item_effect.c @@ -96,7 +96,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo sp34 = 4; } - if (!IS_POKEMON_ITEM(item)) + if (!ITEM_HAS_EFFECT(item)) return TRUE; if (gItemEffectTable[item - 13] == NULL && item != ITEM_ENIGMA_BERRY) return TRUE; diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c index 8f22586a2..78922e80f 100644 --- a/src/pokemon_menu.c +++ b/src/pokemon_menu.c @@ -1030,7 +1030,7 @@ void sub_808B0C0(u8 taskID) case A_BUTTON: gLastFieldPokeMenuOpened = sub_806CA38(taskID); if (GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_IS_EGG)) - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); else { sub_806D5A4(); diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index 6ebb8ff8a..79ebc93ee 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -412,7 +412,7 @@ void sub_8096BF0(void) gPokemonStorageSystemPtr->unk_0004++; break; case 1: - PlaySE(SE_PC_LOGON); + PlaySE(SE_PC_LOGIN); gPokemonStorageSystemPtr->unk_000c.tileTag = 14; gPokemonStorageSystemPtr->unk_000c.paletteTag = 0xdad0; gPokemonStorageSystemPtr->unk_000c.unk04 = 0; @@ -586,12 +586,12 @@ void sub_8096C84(void) } break; case 4: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_LAST_POKE); gPokemonStorageSystemPtr->unk_0004 = 6; break; case 5: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); gPokemonStorageSystemPtr->unk_0004 = 6; break; @@ -751,17 +751,17 @@ void sub_8097078(void) } break; case 2: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_LAST_POKE); gPokemonStorageSystemPtr->unk_0004 = 5; break; case 4: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG); gPokemonStorageSystemPtr->unk_0004 = 5; break; case 3: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); gPokemonStorageSystemPtr->unk_0004 = 5; break; @@ -1305,7 +1305,7 @@ void sub_8097BA0(void) case 0: if (sub_809BF20()) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_HOLDING_POKE); gPokemonStorageSystemPtr->unk_0004 = 1; } @@ -1364,7 +1364,7 @@ void sub_8097CC0(void) case 0: if (sub_809BF20()) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_HOLDING_POKE); gPokemonStorageSystemPtr->unk_0004 = 1; } diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 6a1b78192..40e0e850b 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -2386,7 +2386,7 @@ void sub_809CC04(void) gPokemonStorageSystemPtr->unk_11c4 = &gSprites[spriteId]; gPokemonStorageSystemPtr->unk_11c4->oam.priority = priority; if (sBoxCursorArea) - gPokemonStorageSystemPtr->unk_11c4->invisible = 1; + gPokemonStorageSystemPtr->unk_11c4->invisible = TRUE; } else { diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index a6e007618..63a65a6f0 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -125,7 +125,7 @@ extern u8 StorageSystemGetNextMonIndex(struct BoxPokemon *, u8, u8, u8); extern struct MusicPlayerInfo gMPlayInfo_BGM; extern u8 gPPUpReadMasks[]; -extern TaskFunc gUnknown_03005CF0; +TaskFunc gUnknown_03005CF0; extern struct SpriteTemplate gUnknown_02024E8C; extern const u8 gStatusPal_Icons[]; @@ -1010,7 +1010,7 @@ static void sub_809E260(u8 taskId) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); sub_809F9D0(taskId, pssData.selectedMoveIndex); } } @@ -1043,7 +1043,7 @@ static void SummaryScreen_MoveSelect_HandleInput(u8 taskId) { if (!MonKnowsMultipleMoves(&pssData.loadedMon)) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); } else { @@ -4125,7 +4125,7 @@ static void sub_80A1BC0(struct Sprite *sprite) else { sprite->data[1] = 0; - sprite->invisible = 0; + sprite->invisible = FALSE; } if (sprite->data[0] == 9) diff --git a/src/pokenav.c b/src/pokenav.c index 82b9a0f01..1db1ec6cc 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -3505,7 +3505,7 @@ void sub_80F3008(u8 arg0) if (spriteId != MAX_SPRITES) { gPokenavStructPtr->unk87D0[i] = &gSprites[spriteId]; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gSprites[spriteId].data[0] = 0; gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[2] = i == 0 ? -1 : 1; @@ -4030,7 +4030,7 @@ void sub_80F3D00(void) if (spriteId != MAX_SPRITES) { gPokenavStructPtr->unk8800[i] = &gSprites[spriteId]; - gPokenavStructPtr->unk8800[i]->invisible = 1; + gPokenavStructPtr->unk8800[i]->invisible = TRUE; } else { @@ -4099,13 +4099,13 @@ void sub_80F3E9C(struct Sprite *sprite) return; SeekSpriteAnim(sprite, 0); - sprite->invisible = 0; + sprite->invisible = FALSE; } sub_80F3E24(sprite); if (sprite->animEnded) { - sprite->invisible = 1; + sprite->invisible = TRUE; if (sprite->data[3] == sprite->data[2]) { if (sprite->data[3] == 9) @@ -4147,7 +4147,7 @@ void sub_80F3F20(u8 arg0, u8 arg1) sub_80F3E24(gPokenavStructPtr->unk8800[i]); sub_80F3FAC(); gPokenavStructPtr->unk8800[i]->callback = sub_80F3E04; - gPokenavStructPtr->unk8800[i]->invisible = 0; + gPokenavStructPtr->unk8800[i]->invisible = FALSE; } } } @@ -4162,7 +4162,7 @@ void sub_80F3FAC(void) if (gPokenavStructPtr->unk8800[i]) { SeekSpriteAnim(gPokenavStructPtr->unk8800[i], 0); - gPokenavStructPtr->unk8800[i]->invisible = 0; + gPokenavStructPtr->unk8800[i]->invisible = FALSE; } } } @@ -4230,7 +4230,7 @@ void sub_80F4138(struct Sprite *sprite) { if (sprite->data[0] == 0) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0] = 1; } } @@ -4238,7 +4238,7 @@ void sub_80F4138(struct Sprite *sprite) { if (sprite->data[0] == 1) { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->data[0] = 0; } } @@ -4648,135 +4648,31 @@ void sub_80F492C(void) gPokenavStructPtr->unk8FE4 = 0; } -#ifdef NONMATCHING -// registers r3/r4 are swapped -void sub_80F4944(struct UnkUsePokeblockSub *arg0) +void sub_80F4944(struct UnkUsePokeblockSub *arg0) // This looks like a sorting algorithm. Proposal: Make local variables min, max, and currPos { - u16 i; - u16 r3; - u16 r4; + u16 min, max, currPos; - i = 0; - r4 = gPokenavStructPtr->unk8FE4; - r3 = r4 / 2; - while (r3 != r4) + min = 0; + max = gPokenavStructPtr->unk8FE4; + currPos = min + (max - min)/ 2; + while (max != currPos) { - if (arg0->unk0 > gPokenavStructPtr->unk893c[r3].unk0) - r4 = r3; + if (arg0->unk0 > gPokenavStructPtr->unk893c[currPos].unk0) + max = currPos; else - i = r3 + 1; + min = currPos + 1; - r3 = ((r4 - i) / 2) + i; + currPos = min + (max - min) / 2; } - r4 = gPokenavStructPtr->unk8FE4; - while (r4 > r3) + for ( max = gPokenavStructPtr->unk8FE4; max > currPos; max--) { - gPokenavStructPtr->unk893c[r4] = gPokenavStructPtr->unk893c[r4 - 1]; - r4--; + gPokenavStructPtr->unk893c[max] = gPokenavStructPtr->unk893c[max - 1]; } - gPokenavStructPtr->unk893c[r3] = *arg0; + gPokenavStructPtr->unk893c[currPos] = *arg0; gPokenavStructPtr->unk8FE4++; } -#else -NAKED -void sub_80F4944(struct UnkUsePokeblockSub *arg0) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - mov r12, r0\n\ - movs r2, 0\n\ - ldr r1, _080F4978 @ =gPokenavStructPtr\n\ - ldr r5, [r1]\n\ - ldr r3, _080F497C @ =0x00008fe4\n\ - adds r0, r5, r3\n\ - ldrh r4, [r0]\n\ - lsrs r3, r4, 1\n\ - mov r8, r1\n\ - cmp r4, r3\n\ - beq _080F499C\n\ - adds r6, r5, 0\n\ - mov r0, r12\n\ - ldrb r5, [r0]\n\ - ldr r7, _080F4980 @ =0x0000893c\n\ -_080F4968:\n\ - lsls r0, r3, 2\n\ - adds r0, r6, r0\n\ - adds r0, r7\n\ - ldrb r0, [r0]\n\ - cmp r5, r0\n\ - bls _080F4984\n\ - adds r4, r3, 0\n\ - b _080F498A\n\ - .align 2, 0\n\ -_080F4978: .4byte gPokenavStructPtr\n\ -_080F497C: .4byte 0x00008fe4\n\ -_080F4980: .4byte 0x0000893c\n\ -_080F4984:\n\ - adds r0, r3, 0x1\n\ - lsls r0, 16\n\ - lsrs r2, r0, 16\n\ -_080F498A:\n\ - subs r0, r4, r2\n\ - lsrs r1, r0, 31\n\ - adds r0, r1\n\ - asrs r0, 1\n\ - adds r0, r2, r0\n\ - lsls r0, 16\n\ - lsrs r3, r0, 16\n\ - cmp r4, r3\n\ - bne _080F4968\n\ -_080F499C:\n\ - mov r1, r8\n\ - ldr r2, [r1]\n\ - ldr r1, _080F49EC @ =0x00008fe4\n\ - adds r0, r2, r1\n\ - ldrh r4, [r0]\n\ - lsls r6, r3, 2\n\ - cmp r4, r3\n\ - bls _080F49C6\n\ - ldr r0, _080F49F0 @ =0x0000893c\n\ - adds r5, r2, r0\n\ -_080F49B0:\n\ - lsls r2, r4, 2\n\ - adds r2, r5, r2\n\ - subs r1, r4, 0x1\n\ - lsls r0, r1, 2\n\ - adds r0, r5, r0\n\ - ldr r0, [r0]\n\ - str r0, [r2]\n\ - lsls r1, 16\n\ - lsrs r4, r1, 16\n\ - cmp r4, r3\n\ - bhi _080F49B0\n\ -_080F49C6:\n\ - mov r1, r8\n\ - ldr r2, [r1]\n\ - ldr r3, _080F49F0 @ =0x0000893c\n\ - adds r0, r2, r3\n\ - adds r0, r6\n\ - mov r3, r12\n\ - ldr r1, [r3]\n\ - str r1, [r0]\n\ - ldr r0, _080F49EC @ =0x00008fe4\n\ - adds r2, r0\n\ - ldrh r0, [r2]\n\ - adds r0, 0x1\n\ - strh r0, [r2]\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080F49EC: .4byte 0x00008fe4\n\ -_080F49F0: .4byte 0x0000893c\n\ - .syntax divided\n"); -} -#endif // NONMATCHING void sub_80F49F4(void) { diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 2ff282458..4f29681ac 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -1176,7 +1176,7 @@ void sub_80EBA5C() break; case 14: gPokenavStructPtr->unk6DAB = 1; - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); SetMainCallback2(&sub_80EBD90); SetVBlankCallback(&sub_80EBD18); sub_80F1A74(); diff --git a/src/record_mixing.c b/src/record_mixing.c index 8588bf637..1bf92bb41 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -44,7 +44,7 @@ struct BattleTowerRecord *gBattleTowerPlayerRecord = &gSaveBlock2.battleTower.pl #define BUFFER_CHUNK_SIZE 200 -void sub_80B929C(void) +void RecordMixingPlayerSpotTriggered(void) { sub_8083A84(Task_RecordMixing_Main); } @@ -100,7 +100,7 @@ void Task_RecordMixing_SoundEffect(u8 taskId) gTasks[taskId].tCounter++; if (gTasks[taskId].tCounter == 50) { - PlaySE(SE_W213); + PlaySE(SE_M_ATTRACT); gTasks[taskId].tCounter = 0; } } @@ -139,7 +139,7 @@ void Task_RecordMixing_Main(u8 taskId) case 2: data[10] = CreateTask(sub_80BA00C, 10); tState = 3; - PlaySE(SE_W226); + PlaySE(SE_M_BATON_PASS); break; case 3: // wait for sub_80BA00C if (!gTasks[data[10]].isActive) diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index e33caed82..71f3fa0c8 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -562,7 +562,7 @@ void Task_ResetRtcScreen(u8 taskId) if (Save_WriteData(0) == SAVE_STATUS_OK) { ResetRtcScreen_ShowMessage(gSystemText_SaveCompleted); - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); } else { diff --git a/src/rom6.c b/src/rom6.c index af823ae9c..32c12b502 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -167,7 +167,7 @@ int FldEff_RockSmash(void) static void sub_810B58C(void) { - PlaySE(SE_W088); + PlaySE(SE_M_ROCK_THROW); FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH); EnableBothScriptContexts(); } diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 2d2d4437d..16aac66be 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -790,7 +790,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite) if (GetPlayerSpeed() != 1) affineAnimation += 8; - PlaySE(SE_HI_TURUN); + PlaySE(SE_ROTATING_GATE); StartSpriteAffineAnim(sprite, affineAnimation); } else if (rotationDirection == ROTATE_CLOCKWISE) @@ -800,7 +800,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite) if (GetPlayerSpeed() != 1) affineAnimation += 8; - PlaySE(SE_HI_TURUN); + PlaySE(SE_ROTATING_GATE); StartSpriteAffineAnim(sprite, affineAnimation); } diff --git a/src/roulette.c b/src/roulette.c index 40acd41c8..d261e7e41 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -801,7 +801,7 @@ void sub_8115E14(u8 taskid) PlaySE(SE_BOO); else { - m4aSongNumStart(SE_REGI); + m4aSongNumStart(SE_SHOP); gTasks[taskid].func = sub_8115DA0; } } @@ -983,7 +983,7 @@ void sub_8116308(u8 taskid) gTasks[taskid].data[6]++; gTasks[taskid].data[8]++; sub_81182F8(6 - gTasks[taskid].data[6]); - m4aSongNumStart(SE_TAMAKORO); + m4aSongNumStart(SE_ROULETTE_BALL); gTasks[taskid].func = sub_811637C; } @@ -1100,20 +1100,20 @@ void sub_8116638(u8 taskid) case 2: if (gTasks[taskid].data[2] == 12) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); Menu_DrawStdWindowFrame(0, 14, 29, 19); Menu_PrintText(&gUnknown_081C41A5, 1, 15); } else { - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); Menu_DrawStdWindowFrame(0, 14, 29, 19); Menu_PrintText(&gUnknown_081C4199, 1, 15); } break; case 0: default: - m4aSongNumStart(SE_HAZURE); + m4aSongNumStart(SE_FAILURE); Menu_DrawStdWindowFrame(0, 14, 29, 19); Menu_PrintText(&gUnknown_081C41AE, 1, 15); } diff --git a/src/roulette_gfx.c b/src/roulette_gfx.c index 46188123b..b94b18c9c 100644 --- a/src/roulette_gfx.c +++ b/src/roulette_gfx.c @@ -1200,7 +1200,7 @@ void sub_811889C(struct Sprite *sprite) sub_811866C(sprite); sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = sub_8118834; - m4aSongNumStartOrChange(SE_HASHI); + m4aSongNumStartOrChange(SE_BRIDGE_WALK); eRoulette->var9C = eRoulette->var98 = 0.0f; eRoulette->var8C = -1.0f; } @@ -1217,7 +1217,7 @@ void sub_811889C(struct Sprite *sprite) sub_811866C(sprite); sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = sub_8118834; - m4aSongNumStartOrChange(SE_HASHI); + m4aSongNumStartOrChange(SE_BRIDGE_WALK); eRoulette->var9C = eRoulette->var98 = 0.0f; eRoulette->var8C = -1.0f; } @@ -1286,7 +1286,7 @@ void sub_8118B30(struct Sprite *sprite) sub_811866C(sprite); sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = sub_8118834; - m4aSongNumStartOrChange(SE_HASHI); + m4aSongNumStartOrChange(SE_BRIDGE_WALK); eRoulette->var03_6 = TRUE; } } @@ -1322,7 +1322,7 @@ void sub_8118BD8(struct Sprite *sprite) sprite->animEnded = FALSE; sprite->data[2] = 0; sprite->callback = sub_8118B30; - m4aSongNumStart(SE_NAGERU); + m4aSongNumStart(SE_BALL_THROW); } } } @@ -1383,12 +1383,12 @@ void sub_8118D2C(struct Sprite *sprite) sub_811866C(sprite); sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = sub_8118834; - m4aSongNumStartOrChange(SE_HASHI); + m4aSongNumStartOrChange(SE_BRIDGE_WALK); } else { sprite->animPaused = TRUE; - m4aSongNumStart(SE_KON); + m4aSongNumStart(SE_BALL_BOUNCE_1); sub_811952C(sprite); } } @@ -1401,7 +1401,7 @@ void debug_sub_812E698(struct Sprite *sprite) sub_8118724(sprite); sprite->data[2] = 0; sub_81186B8(sprite); - m4aSongNumStart(SE_KON); + m4aSongNumStart(SE_BALL_BOUNCE_1); if (Random() & 1) { eRoulette->var8C = 0; @@ -1436,13 +1436,13 @@ void sub_8118DE4(struct Sprite *sprite) sub_811866C(sprite); sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = sub_8118834; - m4aSongNumStartOrChange(SE_HASHI); + m4aSongNumStartOrChange(SE_BRIDGE_WALK); } else { u8 t; u32 z; - m4aSongNumStart(SE_KON); + m4aSongNumStart(SE_BALL_BOUNCE_1); if ((z = (Random() & 1))) { u32 o; @@ -1547,7 +1547,7 @@ void sub_8119134(struct Sprite *sprite) sub_8118724(sprite); if (!(eRoulette->var94 > 60.0f)) { - m4aSongNumStartOrChange(SE_TAMAKORO_E); + m4aSongNumStartOrChange(SE_ROULETTE_BALL2); eRoulette->var98 = - ( 20.0f / (float)((u16)eRoulette->var84)); eRoulette->var90 = ((1.0f - eRoulette->var8C) / (float)((u16)eRoulette->var84)); sprite->animNum = 1; @@ -1785,7 +1785,7 @@ void sub_8119898(struct Sprite *sprite) gSprites[sprite->data[6]].data[1] = -2; gSprites[sprite->data[5]].invisible = FALSE; gSprites[sprite->data[5]].callback = sub_81197D8; - m4aSongNumStart(SE_W070); + m4aSongNumStart(SE_M_STRENGTH); } } @@ -1810,7 +1810,7 @@ void sub_8119964(struct Sprite *sprite) { sprite->invisible = FALSE; sprite->data[7]++; - m4aSongNumStart(SE_RU_HYUU); + m4aSongNumStart(SE_FALL); eRoulette->var01 = 1; eRoulette->var34 = gUnknown_083FA61E[0]; } @@ -1858,7 +1858,7 @@ void sub_8119AAC(struct Sprite *sprite) sprite->callback = &SpriteCallbackDummy; sprite->invisible = TRUE; sprite->animPaused = TRUE; - m4aSongNumStop(SE_BASABASA); + m4aSongNumStop(SE_TAILLOW_WING_FLAP); DestroySprite(sprite); FreeOamMatrix(gSprites[eRoulette->var3C[56]].oam.matrixNum); DestroySprite(&gSprites[eRoulette->var3C[56]]); @@ -1889,7 +1889,7 @@ void sub_8119B24(struct Sprite *sprite) } else { - m4aSongNumStart(SE_RU_HYUU); + m4aSongNumStart(SE_FALL); StartSpriteAnim(sprite, eRoulette->var38->data[0] + 4); sprite->callback = sub_8119AAC; gSprites[sprite->data[6]].affineAnimPaused = FALSE; @@ -1929,7 +1929,7 @@ void sub_8119BCC(struct Sprite *sprite) } else { - m4aSongNumStartOrChange(SE_BASABASA); + m4aSongNumStartOrChange(SE_TAILLOW_WING_FLAP); if (eRoulette->var38->data[0] == 0) PlayCry1(SPECIES_TAILLOW, 63); else @@ -1983,5 +1983,5 @@ void sub_8119D80(struct Sprite *sprite) } gSprites[sprite->data[6]].callback = sub_8119D08; gSprites[sprite->data[4]].callback = sub_8119BCC; - m4aSongNumStart(SE_RU_HYUU); + m4aSongNumStart(SE_FALL); } diff --git a/src/scrcmd.c b/src/scrcmd.c index ec3d2c1bc..1a2d55f2e 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -483,7 +483,7 @@ bool8 ScrCmd_random(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_giveitem(struct ScriptContext *ctx) +bool8 ScrCmd_additem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -492,7 +492,7 @@ bool8 ScrCmd_giveitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_takeitem(struct ScriptContext *ctx) +bool8 ScrCmd_removeitem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -527,7 +527,7 @@ bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givepcitem(struct ScriptContext *ctx) +bool8 ScrCmd_addpcitem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u16 quantity = VarGet(ScriptReadHalfword(ctx)); @@ -545,15 +545,15 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givedecoration(struct ScriptContext *ctx) +bool8 ScrCmd_adddecoration(struct ScriptContext *ctx) { u32 decoration = VarGet(ScriptReadHalfword(ctx)); - gSpecialVar_Result = GiveDecoration(decoration); + gSpecialVar_Result = AddDecoration(decoration); return FALSE; } -bool8 ScrCmd_takedecoration(struct ScriptContext *ctx) +bool8 ScrCmd_removedecoration(struct ScriptContext *ctx) { u32 decoration = VarGet(ScriptReadHalfword(ctx)); @@ -667,7 +667,7 @@ bool8 ScrCmd_initclock(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_dodailyevents(struct ScriptContext *ctx) +bool8 ScrCmd_dotimebasedevents(struct ScriptContext *ctx) { DoTimeBasedEvents(); return FALSE; @@ -770,7 +770,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx) SetFixedHoleWarpAsDestination(x - 7, y - 7); else Overworld_SetWarpDestination(mapGroup, mapNum, -1, x - 7, y - 7); - sp13F_fall_to_last_warp(); + DoFallWarp(); ResetInitialPlayerAvatarState(); return TRUE; } @@ -1386,7 +1386,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx) } } -bool8 ScrCmd_drawmonpic(struct ScriptContext *ctx) +bool8 ScrCmd_showmonpic(struct ScriptContext *ctx) { u16 species = VarGet(ScriptReadHalfword(ctx)); u8 x = ScriptReadByte(ctx); @@ -1396,7 +1396,7 @@ bool8 ScrCmd_drawmonpic(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_erasemonpic(struct ScriptContext *ctx) +bool8 ScrCmd_hidemonpic(struct ScriptContext *ctx) { bool8 (*func)(void) = ScriptMenu_GetPicboxWaitFunc(); @@ -1406,7 +1406,7 @@ bool8 ScrCmd_erasemonpic(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_drawcontestwinner(struct ScriptContext *ctx) +bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx) { u8 v1 = ScriptReadByte(ctx); @@ -1513,7 +1513,7 @@ bool8 ScrCmd_bufferstdstring(struct ScriptContext *ctx) u8 stringVarIndex = ScriptReadByte(ctx); u16 index = VarGet(ScriptReadHalfword(ctx)); - StringCopy(sScriptStringVars[stringVarIndex], gUnknown_083CE048[index]); + StringCopy(sScriptStringVars[stringVarIndex], gStdStrings[index]); return FALSE; } @@ -1598,7 +1598,7 @@ bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givemoney(struct ScriptContext *ctx) +bool8 ScrCmd_addmoney(struct ScriptContext *ctx) { u32 amount = ScriptReadWord(ctx); u8 ignore = ScriptReadByte(ctx); @@ -1608,7 +1608,7 @@ bool8 ScrCmd_givemoney(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_takemoney(struct ScriptContext *ctx) +bool8 ScrCmd_removemoney(struct ScriptContext *ctx) { u32 amount = ScriptReadWord(ctx); u8 ignore = ScriptReadByte(ctx); @@ -1997,22 +1997,22 @@ bool8 ScrCmd_checkcoins(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_givecoins(struct ScriptContext *ctx) +bool8 ScrCmd_addcoins(struct ScriptContext *ctx) { u16 coins = VarGet(ScriptReadHalfword(ctx)); - if (GiveCoins(coins) == TRUE) + if (AddCoins(coins) == TRUE) gSpecialVar_Result = 0; else gSpecialVar_Result = 1; return FALSE; } -bool8 ScrCmd_takecoins(struct ScriptContext *ctx) +bool8 ScrCmd_removecoins(struct ScriptContext *ctx) { u16 coins = VarGet(ScriptReadHalfword(ctx)); - if (TakeCoins(coins) == TRUE) + if (RemoveCoins(coins) == TRUE) gSpecialVar_Result = 0; else gSpecialVar_Result = 1; diff --git a/src/script.c b/src/script.c index 2c6495552..cd4816a52 100644 --- a/src/script.c +++ b/src/script.c @@ -1,6 +1,7 @@ #include "global.h" #include "script.h" #include "event_data.h" +#include "constants/map_scripts.h" #define RAM_SCRIPT_MAGIC 51 #define SCRIPT_STACK_SIZE 20 @@ -256,14 +257,14 @@ static u8 *mapheader_get_tagged_pointer(u8 tag) } } -static void mapheader_run_script_by_tag(u8 tag) +static void MapHeaderRunScriptType(u8 tag) { u8 *ptr = mapheader_get_tagged_pointer(tag); if (ptr) ScriptContext2_RunNewScript(ptr); } -static u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag) +static u8 *MapHeaderCheckScriptTable(u8 tag) { u8 *ptr = mapheader_get_tagged_pointer(tag); @@ -286,29 +287,29 @@ static u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag) } } -void mapheader_run_script_with_tag_x1(void) +void RunOnLoadMapScript(void) { - mapheader_run_script_by_tag(1); + MapHeaderRunScriptType(MAP_SCRIPT_ON_LOAD); } -void mapheader_run_script_with_tag_x3(void) +void RunOnTransitionMapScript(void) { - mapheader_run_script_by_tag(3); + MapHeaderRunScriptType(MAP_SCRIPT_ON_TRANSITION); } -void mapheader_run_script_with_tag_x5(void) +void RunOnResumeMapScript(void) { - mapheader_run_script_by_tag(5); + MapHeaderRunScriptType(MAP_SCRIPT_ON_RESUME); } -void mapheader_run_script_with_tag_x6(void) +void RunOnDiveWarpMapScript(void) { - mapheader_run_script_by_tag(6); + MapHeaderRunScriptType(MAP_SCRIPT_ON_DIVE_WARP); } -bool8 mapheader_run_first_tag2_script_list_match(void) +bool8 TryRunOnFrameMapScript(void) { - u8 *ptr = mapheader_get_first_match_from_tagged_ptr_list(2); + u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_FRAME_TABLE); if (!ptr) return 0; @@ -317,9 +318,9 @@ bool8 mapheader_run_first_tag2_script_list_match(void) return 1; } -void mapheader_run_first_tag4_script_list_match(void) +void TryRunOnWarpIntoMapScript(void) { - u8 *ptr = mapheader_get_first_match_from_tagged_ptr_list(4); + u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE); if (ptr) ScriptContext2_RunNewScript(ptr); } diff --git a/src/script_menu.c b/src/script_menu.c index 1a7489c82..03aef9813 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -11,6 +11,7 @@ #include "sprite.h" #include "strings.h" #include "task.h" +#include "constants/script_menu.h" // multichoice lists const struct MenuAction MultichoiceList_00[] = @@ -555,30 +556,30 @@ const struct MultichoiceListStruct gMultichoiceLists[] = {MultichoiceList_72, ARRAY_COUNT(MultichoiceList_72)}, }; -const u8 *const gUnknown_083CE048[] = +const u8 *const gStdStrings[] = { - OtherText_Cool2, - OtherText_Beauty3, - OtherText_Cute2, - OtherText_Smart2, - OtherText_Tough2, - OtherText_Normal, - OtherText_Super, - OtherText_Hyper, - OtherText_Master, - OtherText_Cool3, - OtherText_Beauty4, - OtherText_Cute3, - OtherText_Smart3, - OtherText_Tough3, - OtherText_Items, - OtherText_KeyItems, - OtherText_Balls, - OtherText_TMsHMs, - OtherText_Berries, + [STDSTRING_COOL] = OtherText_Cool2, + [STDSTRING_BEAUTY] = OtherText_Beauty3, + [STDSTRING_CUTE] = OtherText_Cute2, + [STDSTRING_SMART] = OtherText_Smart2, + [STDSTRING_TOUGH] = OtherText_Tough2, + [STDSTRING_NORMAL] = OtherText_Normal, + [STDSTRING_SUPER] = OtherText_Super, + [STDSTRING_HYPER] = OtherText_Hyper, + [STDSTRING_MASTER] = OtherText_Master, + [STDSTRING_COOL2] = OtherText_Cool3, + [STDSTRING_BEAUTY2] = OtherText_Beauty4, + [STDSTRING_CUTE2] = OtherText_Cute3, + [STDSTRING_SMART2] = OtherText_Smart3, + [STDSTRING_TOUGH2] = OtherText_Tough3, + [STDSTRING_ITEMS] = OtherText_Items, + [STDSTRING_KEYITEMS] = OtherText_KeyItems, + [STDSTRING_POKEBALLS] = OtherText_Balls, + [STDSTRING_TMHMS] = OtherText_TMsHMs, + [STDSTRING_BERRIES] = OtherText_Berries, }; -extern u8 gPCText_WhichPCShouldBeAccessed[]; +extern u8 Text_WhichPCShouldBeAccessed[]; extern u16 gSpecialVar_Result; @@ -880,7 +881,7 @@ static void Task_HandleMultichoiceGridInput(u8 taskId) #undef tIgnoreBPress #undef tDoWrap -bool8 ScrSpecial_CreatePCMenu(void) +bool8 ScriptMenu_CreatePCMultichoice(void) { if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE) { @@ -1097,7 +1098,7 @@ _080B588C: .4byte gPCText_PlayersPC\n\ void ScriptMenu_DisplayPCStartupPrompt(void) { Menu_DisplayDialogueFrame(); - Menu_PrintText(gPCText_WhichPCShouldBeAccessed, 2, 15); + Menu_PrintText(Text_WhichPCShouldBeAccessed, 2, 15); } #define tState data[0] diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index ce6c01439..c405d9cb4 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -437,20 +437,18 @@ u8 ScriptGiveEgg(u16 species) return GiveMonToPlayer(&mon); } -void CheckForAlivePartyMons(void) +void HasEnoughMonsForDoubleBattle(void) { - u8 var = sub_803DAA0(); - - switch(var) + switch (GetMonsStateToDoubles()) { - case 1: - gSpecialVar_Result = var; + case PLAYER_HAS_TWO_USABLE_MONS: + gSpecialVar_Result = PLAYER_HAS_TWO_USABLE_MONS; break; - case 0: - gSpecialVar_Result = var; + case PLAYER_HAS_ONE_MON: + gSpecialVar_Result = PLAYER_HAS_ONE_MON; break; - case 2: - gSpecialVar_Result = var; + case PLAYER_HAS_ONE_USABLE_MON: + gSpecialVar_Result = PLAYER_HAS_ONE_USABLE_MON; break; } } diff --git a/src/secret_base.c b/src/secret_base.c index 345d3d8e5..b37da51d1 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -30,6 +30,7 @@ #include "task.h" #include "text.h" #include "constants/event_bg.h" +#include "constants/event_objects.h" #include "constants/decorations.h" #include "constants/items.h" #include "constants/map_types.h" @@ -50,9 +51,10 @@ static void sub_80BCBC0(u8); static void sub_80BCBF8(u8 taskId); static void sub_80BCC54(u8 taskId); static void Task_SecretBasePC_Registry(u8 taskId); +static u8 GetSecretBaseOwnerType(u8 secretBaseIndex); -extern u8 gUnknown_0815F399[]; -extern u8 gUnknown_0815F49A[]; +extern u8 SecretBase_EventScript_PCCancel[]; +extern u8 SecretBase_EventScript_ShowRegisterMenu[]; EWRAM_DATA u8 gCurrentSecretBaseId = 0; const struct @@ -107,8 +109,19 @@ const struct YesNoFuncTable gUnknown_083D13E4 = { sub_80BCBC0 }; -const u8 gUnknown_083D13EC[] = { - 0x23,0x24,0xF,0x1F,0x21,0x2F,0xE,0x14,0x20,0x22,0x0,0x0 +static const u8 sSecretBaseOwnerGfxIds[] = { + // Male + OBJ_EVENT_GFX_YOUNGSTER, + OBJ_EVENT_GFX_BUG_CATCHER, + OBJ_EVENT_GFX_BOY_4, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_MAN_4, + // Female + OBJ_EVENT_GFX_LASS, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_WOMAN_3, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_WOMAN_7, }; extern u8 gUnknown_081A2E14[]; @@ -380,7 +393,7 @@ void sub_80BBAF0(void) bool8 sub_80BBB24(void) { - if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_0x4097) == 0) + if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_INIT_SECRET_BASE) == 0) return FALSE; return TRUE; } @@ -462,7 +475,7 @@ void sub_80BBCCC(u8 flagIn) sub_80BB764(&x, &y, 0x220); MapGridSetMetatileIdAt(x + 7, y + 7, 0xe21); } - else if (flagIn == 1 && VarGet(VAR_0x4089) == 1) + else if (flagIn == 1 && VarGet(VAR_SECRET_BASE_INITIALIZED) == 1) { sub_80BB764(&x, &y, 0x220); MapGridSetMetatileIdAt(x + 7, y + 7, 0xe0a); @@ -512,7 +525,7 @@ void sub_80BBDD0(void) metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE) { - gSpecialVar_Result = gMapHeader.events->objectEvents[objid].graphicsId + VAR_0x3F20; + gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objid].graphicsId - OBJ_EVENT_GFX_VAR_0); VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]); gSpecialVar_Result = gMapHeader.events->objectEvents[objid].localId; FlagClear(gSpecialVar_0x8004 + 0xAE); @@ -527,10 +540,10 @@ void sub_80BBDD0(void) } } -void sub_80BBFA4(void) +void SetSecretBaseOwnerGfxId(void) { int curBase = VarGet(VAR_CURRENT_SECRET_BASE); - VarSet(VAR_OBJ_GFX_ID_F, gUnknown_083D13EC[sub_80BCCA4(curBase)]); + VarSet(VAR_OBJ_GFX_ID_F, sSecretBaseOwnerGfxIds[GetSecretBaseOwnerType(curBase)]); } void SetCurrentSecretBaseFromPosition(struct MapPosition *position, struct MapEvents *events) @@ -704,7 +717,7 @@ void sub_80BC440(void) sub_80BC0F8(); } -void SecretBasePC_PackUp(void) +void MoveOutOfSecretBase(void) { IncrementGameStat(GAME_STAT_MOVED_SECRET_BASE); sub_80BC440(); @@ -765,7 +778,7 @@ u8 sub_80BC538(void) return retVal; } -void sub_80BC56C(void) +void GetCurSecretBaseRegistrationValidity(void) { if (sub_80BC268(sub_80BC14C(gCurrentSecretBaseId)) == TRUE) gSpecialVar_Result = 1; @@ -775,10 +788,10 @@ void sub_80BC56C(void) gSpecialVar_Result = 0; } -void sub_80BC5BC(void) +void ToggleCurSecretBaseRegistry(void) { gSaveBlock1.secretBases[sub_80BC14C(gCurrentSecretBaseId)].sbr_field_1_6 ^= 1; - FlagSet(FLAG_DECORATION_16); + FlagSet(FLAG_SECRET_BASE_REGISTRY_ENABLED); } void SecretBasePC_Decoration(void) @@ -1080,14 +1093,14 @@ void sub_80BCC54(u8 taskId) DestroyVerticalScrollIndicator(BOTTOM_ARROW); if (curBaseIndex == 0) - ScriptContext1_SetupScript(gUnknown_0815F399); + ScriptContext1_SetupScript(SecretBase_EventScript_PCCancel); else - ScriptContext1_SetupScript(gUnknown_0815F49A); + ScriptContext1_SetupScript(SecretBase_EventScript_ShowRegisterMenu); DestroyTask(taskId); } -u8 sub_80BCCA4(u8 secretBaseIndex) +static u8 GetSecretBaseOwnerType(u8 secretBaseIndex) { return (gSaveBlock1.secretBases[secretBaseIndex].playerName[OT_NAME_LENGTH] % 5) + gSaveBlock1.secretBases[secretBaseIndex].gender * 5; @@ -1095,7 +1108,7 @@ u8 sub_80BCCA4(u8 secretBaseIndex) const u8 *GetSecretBaseTrainerLoseText(void) { - u8 param = sub_80BCCA4(VarGet(VAR_CURRENT_SECRET_BASE)); + u8 param = GetSecretBaseOwnerType(VarGet(VAR_CURRENT_SECRET_BASE)); if (param == 0) return UnknownString_81A1BB2; if (param == 1) return UnknownString_81A1F67; if (param == 2) return UnknownString_81A2254; @@ -1151,7 +1164,7 @@ void sub_80BCE90() FlagSet(FLAG_DAILY_UNKNOWN_8C2); } - gSpecialVar_0x8004 = sub_80BCCA4(curBaseIndex); + gSpecialVar_0x8004 = GetSecretBaseOwnerType(curBaseIndex); gSpecialVar_Result = gSaveBlock1.secretBases[curBaseIndex].sbr_field_1_5; } diff --git a/src/shop.c b/src/shop.c index d5c5e55c5..032297f71 100644 --- a/src/shop.c +++ b/src/shop.c @@ -303,7 +303,7 @@ static void DrawFirstMartScrollIndicators(void) { ClearVerticalScrollIndicatorPalettes(); - if (gMartInfo.itemCount > 7) + if (gMartInfo.itemCount >= 8) { CreateVerticalScrollIndicators(TOP_ARROW, 172, 12); CreateVerticalScrollIndicators(BOTTOM_ARROW, 172, 148); @@ -340,45 +340,42 @@ static void BuyMenuDrawMapMetatileLayer(u16 *array, s16 offset1, s16 offset2, u1 array[offset1 + offset2 + 33] = array2[3]; // bottom right } -static void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s32 var4) +static void BuyMenuDrawMapMetatile(s16 var1, s16 var2, u16 *var3, u8 var4) { - u8 tempVar4 = var4; - s16 offset1 = var1 * 2; - s16 offset2 = (var2 * 0x40) + 0x40; + var1 <<= 1; + var2 = (var2 <<6) + 0x40; - switch (tempVar4) + switch (var4) { case 0: - BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3); - BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[1], offset1, offset2, var3 + 4); + BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], var1, var2, var3); + BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[1], var1, var2, var3 + 4); break; case 1: - BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], offset1, offset2, var3); - BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3 + 4); + BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], var1, var2, var3); + BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], var1, var2, var3 + 4); break; case 2: - BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], offset1, offset2, var3); - BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[1], offset1, offset2, var3 + 4); + BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], var1, var2, var3); + BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[1], var1, var2, var3 + 4); break; } } // used to draw the border tiles around the viewport. -static void BuyMenuDrawMapPartialMetatile(s16 var1, int var2, u16 *var3) +static void BuyMenuDrawMapPartialMetatile(s16 var1, s16 var2, u16 *var3) { - s16 offset1 = var1 * 2; - s16 offset2 = (var2 * 0x40) + 0x40; + var1 <<=1; + var2 = (var2 << 6) + 0x40; - BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], offset1, offset2, var3); - BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3 + 4); + BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], var1, var2, var3); + BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], var1, var2, var3 + 4); } static void Shop_DrawViewportTiles(void) { - s16 facingX; - s16 facingY; - s16 x; - s16 y; + s16 facingX, facingY; + s16 x, y; GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY); facingX -= 3; @@ -392,7 +389,7 @@ static void Shop_DrawViewportTiles(void) if (y != 5 && x != 6) { - s32 r3 = MapGridGetMetatileLayerTypeAt(facingX + x, facingY + y); + u8 r3 = MapGridGetMetatileLayerTypeAt(facingX + x, facingY + y); if (metatileId < 512) BuyMenuDrawMapMetatile(x, y, (u16 *)gMapHeader.mapLayout->primaryTileset->metatiles + metatileId * 8, r3); @@ -423,11 +420,9 @@ static void Shop_DrawViewport(void) static void Shop_LoadViewportObjects(void) { - s16 facingX; - s16 facingY; + s16 facingX, facingY; u8 playerHeight; - u8 y; - u8 x; + u8 y, x; u8 r8 = 0; GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY); @@ -643,7 +638,7 @@ static void Shop_DoItemTransaction(u8 taskId) { IncrementGameStat(GAME_STAT_SHOPPED); RemoveMoney(&gSaveBlock1.money, gMartTotalCost); - PlaySE(SE_REGI); + PlaySE(SE_SHOP); UpdateMoneyWindow(gSaveBlock1.money, 0, 0); gTasks[taskId].func = Shop_DoPremierBallCheck; } @@ -677,7 +672,7 @@ static void Task_DoItemPurchase(u8 taskId) } else // a normal mart is only type 0, so types 1 and 2 are decoration marts. { - if (GiveDecoration(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor])) + if (AddDecoration(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor])) { if (gMartInfo.martType == MART_TYPE_1) DisplayItemMessageOnField(taskId, gOtherText_HereYouGo2, Shop_DoItemTransaction, 0xC3E1); diff --git a/src/slot_machine.c b/src/slot_machine.c index c6cbdb1c8..fd3e2580d 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -707,7 +707,7 @@ static bool8 sub_8101E3C(struct Task *task) eSlotMachine->coins -= (3 - eSlotMachine->bet); eSlotMachine->bet = 3; eSlotMachine->state = 9; - PlaySE(SE_REGI); + PlaySE(SE_SHOP); } else { @@ -718,7 +718,7 @@ static bool8 sub_8101E3C(struct Task *task) { if (gMain.newKeys & DPAD_DOWN && eSlotMachine->coins != 0) { - PlaySE(SE_REGI); + PlaySE(SE_SHOP); sub_8103D50(eSlotMachine->bet); eSlotMachine->coins--; eSlotMachine->bet++; @@ -834,7 +834,7 @@ static bool8 sub_8102058(struct Task *task) if (gMain.newKeys & A_BUTTON) { - PlaySE(SE_JYUNI); + PlaySE(SE_CONTEST_PLACE); sub_8102E1C(eSlotMachine->unk18); sub_8103C14(eSlotMachine->unk18); eSlotMachine->state = 13; @@ -927,17 +927,17 @@ bool8 sub_81020C8(struct Task *task) } if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); sub_8104CAC(6); } else if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_MIXED)) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); sub_8104CAC(5); } else { - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); sub_8104CAC(2); } if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_MIXED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) @@ -2682,7 +2682,7 @@ static void sub_810437C(struct Task *task) sub_810545C(); sub_8102680(); StopMapMusic(); - PlayNewMapMusic(MUS_BD_TIME); + PlayNewMapMusic(MUS_ROULETTE); } static void sub_81043EC(struct Task *task) @@ -2818,7 +2818,7 @@ static void sub_81046C0(struct Task *task) { task->data[4] = 0xa0; StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 5); - PlayFanfare(MUS_ME_ZANNEN); + PlayFanfare(MUS_TOO_BAD); } else { @@ -2830,7 +2830,7 @@ static void sub_81046C0(struct Task *task) sub_8104098(); eSlotMachine->pikaPower = 0; } - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); } } } @@ -2906,8 +2906,8 @@ static void sub_81048CC(struct Task *task) task->data[4] = 4; task->data[5] = 0; StopMapMusic(); - PlayFanfare(MUS_ME_ZANNEN); - PlaySE(SE_W153); + PlayFanfare(MUS_TOO_BAD); + PlaySE(SE_M_EXPLOSION); } static void sub_8104940(struct Task *task) diff --git a/src/sound.c b/src/sound.c index 73040c4df..b365e0ca7 100644 --- a/src/sound.c +++ b/src/sound.c @@ -37,18 +37,18 @@ extern struct ToneData gCryTable2[]; static const struct Fanfare sFanfares[] = { - { MUS_FANFA1, 80 }, - { MUS_FANFA4, 160 }, - { MUS_FANFA5, 220 }, - { MUS_ME_WAZA, 220 }, - { MUS_ME_ASA, 160 }, - { MUS_ME_BACHI, 340 }, - { MUS_ME_WASURE, 180 }, - { MUS_ME_KINOMI, 120 }, - { MUS_ME_TAMA, 710 }, - { MUS_ME_B_BIG, 250 }, - { MUS_ME_B_SMALL, 150 }, - { MUS_ME_ZANNEN, 160 }, + { MUS_LEVEL_UP, 80 }, + { MUS_OBTAIN_ITEM, 160 }, + { MUS_EVOLVED, 220 }, + { MUS_OBTAIN_TMHM, 220 }, + { MUS_HEAL, 160 }, + { MUS_OBTAIN_BADGE, 340 }, + { MUS_MOVE_DELETED, 180 }, + { MUS_OBTAIN_BERRY, 120 }, + { MUS_AWAKEN_LEGEND, 710 }, + { MUS_SLOTS_JACKPOT, 250 }, + { MUS_SLOTS_WIN, 150 }, + { MUS_TOO_BAD, 160 }, }; static void Task_Fanfare(u8 taskId); @@ -198,7 +198,7 @@ bool8 WaitFanfare(bool8 stop) if (!stop) m4aMPlayContinue(&gMPlayInfo_BGM); else - m4aSongNumStart(SE_STOP); + m4aSongNumStart(MUS_DUMMY); return TRUE; } diff --git a/src/start_menu.c b/src/start_menu.c index 747f13b3a..c87ad6330 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -613,7 +613,7 @@ static u8 RunSaveDialogCallback(void) return saveDialogCallback(); } -void ScrSpecial_DoSaveDialog(void) +void SaveGame(void) { sub_807160C(); CreateTask(Task_SaveDialog, 0x50); diff --git a/src/strings.c b/src/strings.c index 7d77d503a..acdbcd9cb 100644 --- a/src/strings.c +++ b/src/strings.c @@ -355,7 +355,7 @@ const u8 gOtherText_WantsToLearn[] = _("{STR_VAR_1} wants to learn the\nmove {ST const u8 gOtherText_StopTryingTo[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gOtherText_DidNotLearnMove2[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_WhichMoveToForget2[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}"); -const u8 gOtherText_ForgetMove123_2[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}... {PAUSE 15}... {PAUSE 15}... {PAUSE 15}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}"); +const u8 gOtherText_ForgetMove123_2[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}... {PAUSE 15}... {PAUSE 15}... {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_AlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_HPRestoredBy[] = _("{STR_VAR_1}'s HP was restored by\n{STR_VAR_2} points.{PAUSE_UNTIL_PRESS}"); const u8 gOtherText_CuredPoisoning[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}"); diff --git a/src/trade.c b/src/trade.c index 8d57cd60b..41c63e929 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1194,7 +1194,7 @@ static void sub_8047EC0(void) sub_8048C70(); gMain.state ++; nullsub_5(7, 0); - PlayBGM(MUS_P_SCHOOL); + PlayBGM(MUS_SCHOOL); break; case 14: sub_804ACF4(1); @@ -3379,7 +3379,7 @@ static void sub_804B058(struct Sprite *sprite) { if (++ sprite->data[0] == 10) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); sprite->data[0] = 0; } } @@ -3414,7 +3414,7 @@ static void sub_804B104(struct Sprite *sprite) { if (++ sprite->data[0] == 15) { - PlaySE(SE_W107); + PlaySE(SE_M_MINIMIZE); sprite->data[0] = 0; } } @@ -4356,7 +4356,7 @@ static bool8 sub_804C29C(void) gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[0]].y_offset; gUnknown_03004828->unk_00c4 ++; gUnknown_03004828->unk_0124 = GetCurrentMapMusic(); - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); break; case 1: if (gUnknown_03004828->bg2hofs > 0) @@ -4509,7 +4509,7 @@ static bool8 sub_804C29C(void) case 32: if (!gPaletteFade.active) { - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); gUnknown_03004828->unk_00c4 ++; } gSprites[gUnknown_03004828->unk_00ba].pos2.y -= 3; @@ -4563,7 +4563,7 @@ static bool8 sub_804C29C(void) gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos2.y += 3; if (-0xa0 > gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y && gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y >= -0xa3) { - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } if (gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y < -0xde) { @@ -4659,7 +4659,7 @@ static bool8 sub_804C29C(void) DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]); sub_804BBE8(6); gUnknown_03004828->unk_00c4 ++; - PlaySE(SE_W028); + PlaySE(SE_M_SAND_ATTACK); } break; case 51: @@ -4739,7 +4739,7 @@ static bool8 sub_804C29C(void) case 68: if (++ gUnknown_03004828->unk_00c0 == 4) { - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); } if (gUnknown_03004828->unk_00c0 == 0xf0) { @@ -4872,10 +4872,10 @@ static void sub_804D738(struct Sprite *sprite) { sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]]; if (sprite->data[0] == 22) - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); if (++ sprite->data[0] == 44) { - PlaySE(SE_W025); + PlaySE(SE_M_MEGA_KICK); sprite->callback = sub_804D7AC; sprite->data[0] = 0; BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, FADE_COLOR_WHITE); @@ -4905,17 +4905,17 @@ static void sub_804D80C(struct Sprite *sprite) { sprite->data[2] ++; sprite->data[0] = 0x16; - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); } } else { if (sprite->data[0] == 0x42) - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); if (sprite->data[0] == 0x5c) - PlaySE(SE_KON3); + PlaySE(SE_BALL_BOUNCE_3); if (sprite->data[0] == 0x6b) - PlaySE(SE_KON4); + PlaySE(SE_BALL_BOUNCE_4); sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]]; if (++sprite->data[0] == 0x6c) sprite->callback = SpriteCallbackDummy; diff --git a/src/trader.c b/src/trader.c index f8606d499..5403f53eb 100644 --- a/src/trader.c +++ b/src/trader.c @@ -249,7 +249,7 @@ void ScrSpecial_TraderDoDecorationTrade(void) struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader; RemoveDecorationFromInventory(gSpecialVar_0x8006); - GiveDecoration(gSpecialVar_0x8004); + AddDecoration(gSpecialVar_0x8004); StringCopy(trader->unk5[gSpecialVar_0x8005], gSaveBlock2.playerName); trader->unk1[gSpecialVar_0x8005] = gSpecialVar_0x8006; sub_810993C(); diff --git a/src/trainer_see.c b/src/trainer_see.c index caeb22a79..30d8d2794 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -449,7 +449,7 @@ void sub_8084794(struct ObjectEvent *var) static void Task_DestroyTrainerApproachTask(u8); -void ScrSpecial_EndTrainerApproach(void) +void EndTrainerApproach(void) { sub_80842FC(Task_DestroyTrainerApproachTask); } @@ -43,6 +43,7 @@ #include "constants/moves.h" #include "constants/region_map_sections.h" #include "constants/metatile_labels.h" +#include "constants/script_menu.h" struct UnkTvStruct { @@ -573,7 +574,7 @@ void SetTVMetatilesOnMap(int width, int height, u16 tileId) void TurnOffTVScreen(void) { - SetTVMetatilesOnMap(gUnknown_03004870.width, gUnknown_03004870.height, METATILE_ID(Building, TV_Off)); + SetTVMetatilesOnMap(gBackupMapLayout.width, gBackupMapLayout.height, METATILE_ID(Building, TV_Off)); DrawWholeMapView(); } @@ -1512,16 +1513,16 @@ void sub_80BEF10(u8 strvaridx, u8 rank) switch (rank) { case NORMAL_RANK: - StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[NORMAL_RANK + 5]); + StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_NORMAL]); break; case SUPER_RANK: - StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[SUPER_RANK + 5]); + StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_SUPER]); break; case HYPER_RANK: - StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[HYPER_RANK + 5]); + StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_HYPER]); break; case MASTER_RANK: - StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[MASTER_RANK + 5]); + StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_MASTER]); break; } } @@ -1531,19 +1532,19 @@ void CopyContestCategoryToStringVar(u8 strvaridx, u8 category) switch (category) { case CONTEST_COOL: - StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_COOL]); + StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_COOL]); break; case CONTEST_BEAUTY: - StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_BEAUTY]); + StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_BEAUTY]); break; case CONTEST_CUTE: - StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_CUTE]); + StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_CUTE]); break; case CONTEST_SMART: - StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_SMART]); + StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_SMART]); break; case CONTEST_TOUGH: - StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_TOUGH]); + StringCopy(gUnknown_083D1464[strvaridx], gStdStrings[STDSTRING_TOUGH]); break; } } diff --git a/src/unk_text_8095904.c b/src/unk_text_8095904.c index b619cbbe4..6d79b2586 100644 --- a/src/unk_text_8095904.c +++ b/src/unk_text_8095904.c @@ -11,18 +11,17 @@ extern const u32 gFont3LatinGlyphs[]; // text - -// some CSE stuff + register swaps (possibly DUE to CSE) -#ifdef NONMATCHING void sub_8095904(const u8 *src, u8 *dest, u8 bgOverride, u16 width, u8 bg, u8 *buffer) { - u16 strlen = StringLength(src); + const u8 *glyphs; + u16 i, strlen = StringLength(src); + if (bgOverride == 0) { - u16 i; for (i = 0; i < strlen; i++) { - const u8 *glyphs = (const u8 *)(gFont3LatinGlyphs + ((src[i] & 0xfff0) * 16) + ((src[i] & 0xf) * 8)); + glyphs = (const u8 *)((u32)(gFont3LatinGlyphs) + + (u32)((src[i] & 0xfff0) * 0x40 + (src[i] & 0xf) * 0x20)); CpuCopy16(glyphs, dest, 32); CpuCopy16(glyphs + 0x200, dest + width, 32); dest += 32; @@ -30,22 +29,23 @@ void sub_8095904(const u8 *src, u8 *dest, u8 bgOverride, u16 width, u8 bg, u8 *b } else { - u16 i; // sp18 - u16 r9 = 0; - u8 bgHi = bg << 4; - u16 size = strlen * 32; - for (i = 0; i < 2; i++) + u8 bgHi, r3, r2; + u16 size, j, r9, k; + k = 0; + bgHi = bg << 4; + size = strlen * 32; + for (j = 0; j < 2; j++) { - u16 j; - for (j = 0; j < strlen; j++) // r5 + for (i = 0; i < strlen; i++) // r5 { - const u32 *glyphs = (const u32 *)(gFont3LatinGlyphs + (i * 0x80) + ((src[j] & 0xfff0) * 16) + ((src[j] & 0xf) * 8)); + glyphs = (const u8 *)((u32)(gFont3LatinGlyphs) + + (u32)((src[i] & 0xfff0) * 0x40 + (src[i] & 0xf) * 0x20)) + + (j * 0x200); - u16 k; // r6 - for (k = 0; k < 32; k++) + for (r9 = 0; r9 < 32; r9++) { - u8 r3 = *glyphs & 0xf0; - u8 r2 = *glyphs & 0x0f; + r3 = *glyphs & 0xf0; + r2 = *glyphs & 0x0f; if (r3 == 0) { r3 = bgHi; @@ -54,184 +54,16 @@ void sub_8095904(const u8 *src, u8 *dest, u8 bgOverride, u16 width, u8 bg, u8 *b { r2 = bg; } - buffer[r9++] = r3 | r2; + buffer[k++] = r3 | r2; glyphs++; } } CpuCopy16(buffer, dest, size); dest += width; - r9 = 0; + k = 0; } } } -#else -NAKED void sub_8095904(const u8 *src, u8 *dest, u8 bgOverride, u16 width, u8 bg, u8 *buffer) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tmov r7, r10\n" - "\tmov r6, r9\n" - "\tmov r5, r8\n" - "\tpush {r5-r7}\n" - "\tsub sp, 0x1C\n" - "\tstr r0, [sp]\n" - "\tadds r7, r1, 0\n" - "\tadds r4, r2, 0\n" - "\tldr r0, [sp, 0x3C]\n" - "\tlsls r4, 24\n" - "\tlsrs r4, 24\n" - "\tlsls r3, 16\n" - "\tlsrs r3, 16\n" - "\tstr r3, [sp, 0x4]\n" - "\tlsls r0, 24\n" - "\tlsrs r0, 24\n" - "\tstr r0, [sp, 0x8]\n" - "\tldr r0, [sp]\n" - "\tbl StringLength\n" - "\tlsls r0, 16\n" - "\tlsrs r0, 16\n" - "\tmov r8, r0\n" - "\tcmp r4, 0\n" - "\tbne _08095988\n" - "\tmovs r5, 0\n" - "\tcmp r5, r8\n" - "\tbcs _08095A2E\n" - "_0809593E:\n" - "\tldr r1, [sp]\n" - "\tadds r0, r1, r5\n" - "\tldrb r2, [r0]\n" - "\tldr r0, _08095980 @ =0x0000fff0\n" - "\tands r0, r2\n" - "\tlsls r0, 6\n" - "\tmovs r1, 0xF\n" - "\tands r2, r1\n" - "\tlsls r2, 5\n" - "\tadds r0, r2\n" - "\tldr r1, _08095984 @ =gFont3LatinGlyphs\n" - "\tadds r4, r0, r1\n" - "\tadds r0, r4, 0\n" - "\tadds r1, r7, 0\n" - "\tmovs r2, 0x10\n" - "\tbl CpuSet\n" - "\tmovs r2, 0x80\n" - "\tlsls r2, 2\n" - "\tadds r0, r4, r2\n" - "\tldr r3, [sp, 0x4]\n" - "\tadds r1, r7, r3\n" - "\tmovs r2, 0x10\n" - "\tbl CpuSet\n" - "\tadds r7, 0x20\n" - "\tadds r0, r5, 0x1\n" - "\tlsls r0, 16\n" - "\tlsrs r5, r0, 16\n" - "\tcmp r5, r8\n" - "\tbcc _0809593E\n" - "\tb _08095A2E\n" - "\t.align 2, 0\n" - "_08095980: .4byte 0x0000fff0\n" - "_08095984: .4byte gFont3LatinGlyphs\n" - "_08095988:\n" - "\tmovs r0, 0\n" - "\tmov r9, r0\n" - "\tldr r1, [sp, 0x8]\n" - "\tlsls r0, r1, 28\n" - "\tlsrs r0, 24\n" - "\tstr r0, [sp, 0xC]\n" - "\tmov r2, r8\n" - "\tlsls r0, r2, 21\n" - "\tmovs r1, 0\n" - "\tlsrs r0, 1\n" - "\tstr r0, [sp, 0x10]\n" - "_0809599E:\n" - "\tmovs r5, 0\n" - "\tldr r3, [sp, 0x4]\n" - "\tadds r3, r7, r3\n" - "\tstr r3, [sp, 0x14]\n" - "\tadds r0, r1, 0x1\n" - "\tstr r0, [sp, 0x18]\n" - "\tcmp r5, r8\n" - "\tbcs _08095A12\n" - "\tmovs r2, 0xF\n" - "\tmov r12, r2\n" - "\tlsls r1, 9\n" - "\tldr r0, _08095A40 @ =gFont3LatinGlyphs\n" - "\tadds r1, r0\n" - "\tmov r10, r1\n" - "_080959BA:\n" - "\tldr r3, [sp]\n" - "\tadds r0, r3, r5\n" - "\tldrb r1, [r0]\n" - "\tldr r0, _08095A44 @ =0x0000fff0\n" - "\tands r0, r1\n" - "\tlsls r0, 6\n" - "\tmov r2, r12\n" - "\tands r1, r2\n" - "\tlsls r1, 5\n" - "\tadds r0, r1\n" - "\tmov r3, r10\n" - "\tadds r4, r0, r3\n" - "\tmovs r6, 0\n" - "\tadds r5, 0x1\n" - "_080959D6:\n" - "\tldrb r0, [r4]\n" - "\tmovs r3, 0xF0\n" - "\tands r3, r0\n" - "\tmov r2, r12\n" - "\tands r2, r0\n" - "\tcmp r3, 0\n" - "\tbne _080959E6\n" - "\tldr r3, [sp, 0xC]\n" - "_080959E6:\n" - "\tcmp r2, 0\n" - "\tbne _080959EC\n" - "\tldr r2, [sp, 0x8]\n" - "_080959EC:\n" - "\tmov r0, r9\n" - "\tadds r1, r0, 0x1\n" - "\tlsls r1, 16\n" - "\tlsrs r1, 16\n" - "\tmov r9, r1\n" - "\tldr r1, [sp, 0x40]\n" - "\tadds r0, r1, r0\n" - "\torrs r3, r2\n" - "\tstrb r3, [r0]\n" - "\tadds r4, 0x1\n" - "\tadds r0, r6, 0x1\n" - "\tlsls r0, 16\n" - "\tlsrs r6, r0, 16\n" - "\tcmp r6, 0x1F\n" - "\tbls _080959D6\n" - "\tlsls r0, r5, 16\n" - "\tlsrs r5, r0, 16\n" - "\tcmp r5, r8\n" - "\tbcc _080959BA\n" - "_08095A12:\n" - "\tldr r0, [sp, 0x40]\n" - "\tadds r1, r7, 0\n" - "\tldr r3, [sp, 0x10]\n" - "\tlsrs r2, r3, 16\n" - "\tbl CpuSet\n" - "\tldr r7, [sp, 0x14]\n" - "\tmovs r0, 0\n" - "\tmov r9, r0\n" - "\tldr r1, [sp, 0x18]\n" - "\tlsls r0, r1, 16\n" - "\tlsrs r1, r0, 16\n" - "\tcmp r1, 0x1\n" - "\tbls _0809599E\n" - "_08095A2E:\n" - "\tadd sp, 0x1C\n" - "\tpop {r3-r5}\n" - "\tmov r8, r3\n" - "\tmov r9, r4\n" - "\tmov r10, r5\n" - "\tpop {r4-r7}\n" - "\tpop {r0}\n" - "\tbx r0\n" - "\t.align 2, 0\n" - "_08095A40: .4byte gFont3LatinGlyphs\n" - "_08095A44: .4byte 0x0000fff0"); -} -#endif void unref_sub_8095A48(const u8 *src, u8 *dest, u8 bgOverride, u8 width, u8 *buffer) { |