diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-21 16:48:06 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-21 16:48:06 -0800 |
| commit | bcaab977727ded65c9eeaef9dbef9e9441d26fb7 (patch) | |
| tree | b93f1df1194ebbe96e6b331b8387d75eeb19f4cb | |
| parent | a8b6cad54a9e0abadd61d3d71d5e9ee9f279382b (diff) | |
formatting
52 files changed, 5823 insertions, 4977 deletions
diff --git a/src/battle_ai.c b/src/battle_ai.c index 26db24f14..4509ca8db 100644 --- a/src/battle_ai.c +++ b/src/battle_ai.c @@ -67,11 +67,11 @@ extern u8 *gAIScriptPtr; struct UnknownStruct1 { -/* 0x00 */ u16 unk0[2][8]; -/* 0x20 */ u8 unk20[2]; -/* 0x22 */ u8 unk22[2]; -/* 0x24 */ u16 items[4]; -/* 0x2C */ u8 unk8; + /*0x00*/ u16 unk0[2][8]; + /*0x20*/ u8 unk20[2]; + /*0x22*/ u8 unk22[2]; + /*0x24*/ u16 items[4]; + /*0x2C*/ u8 unk8; }; struct UnknownStruct3 @@ -352,18 +352,18 @@ void BattleAI_SetupAIData(void) u8 r7; // clear AI data and set default move score to 100. - for(i = 0; (u32)i < 28; i++) + for (i = 0; (u32)i < 28; i++) data[i] = 0; - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) gAIThinkingSpace.score[i] = 100; r7 = sub_8015A98(gUnknown_02024A60, 0, 0xFF); - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { u16 rand; - if(gBitTable[i] & r7) + if (gBitTable[i] & r7) gAIThinkingSpace.score[i] = 0; rand = Random(); gAIThinkingSpace.unk18[i] = 100 - (rand & 0xF); @@ -372,22 +372,22 @@ void BattleAI_SetupAIData(void) unk_2016C00.unk20 = 0; gUnknown_02024C07 = gUnknown_02024A60; - if(gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { gUnknown_02024C08 = Random() & 2; - if(gUnknown_02024C0C & gBitTable[gUnknown_02024C08]) + if (gUnknown_02024C0C & gBitTable[gUnknown_02024C08]) gUnknown_02024C08 ^= 2; } else gUnknown_02024C08 = gUnknown_02024A60 ^ 1; // special AI flag cases. - if(gBattleTypeFlags & BATTLE_TYPE_SAFARI) + if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) gAIThinkingSpace.aiFlags = 0x40000000; - else if(gBattleTypeFlags & BATTLE_TYPE_ROAMER) + else if (gBattleTypeFlags & BATTLE_TYPE_ROAMER) gAIThinkingSpace.aiFlags = 0x20000000; - else if(gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) + else if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) gAIThinkingSpace.aiFlags = 0x80000000; else // otherwise, just set aiFlags to whatever flags the trainer has set in their data. gAIThinkingSpace.aiFlags = gTrainers[gTrainerBattleOpponent].aiFlags; @@ -401,9 +401,9 @@ u8 BattleAI_GetAIActionToUse(void) s32 i; sub_810745C(); - while(gAIThinkingSpace.aiFlags != 0) + while (gAIThinkingSpace.aiFlags != 0) { - if(gAIThinkingSpace.aiFlags & 1) + if (gAIThinkingSpace.aiFlags & 1) { gAIThinkingSpace.unk0 = 0; BattleAI_DoAIProcessing(); @@ -414,24 +414,24 @@ u8 BattleAI_GetAIActionToUse(void) } // will KO, need to use item or switch. - if(gAIThinkingSpace.unk10 & 2) + if (gAIThinkingSpace.unk10 & 2) return 4; - if(gAIThinkingSpace.unk10 & 4) + if (gAIThinkingSpace.unk10 & 4) return 5; r5 = 1; arr1[0] = gAIThinkingSpace.score[0]; arr2[0] = 0; - for(i = 1; i < 4; i++) + for (i = 1; i < 4; i++) { - if(arr1[0] < (s8)gAIThinkingSpace.score[i]) + if (arr1[0] < (s8)gAIThinkingSpace.score[i]) { r5 = 1; arr1[0] = gAIThinkingSpace.score[i]; arr2[0] = i; } - if(arr1[0] == (s8)gAIThinkingSpace.score[i]) + if (arr1[0] == (s8)gAIThinkingSpace.score[i]) { arr1[r5] = gAIThinkingSpace.score[i]; arr2[r5++] = i; @@ -443,15 +443,15 @@ u8 BattleAI_GetAIActionToUse(void) void BattleAI_DoAIProcessing(void) { - while(gAIThinkingSpace.unk0 != 2) + while (gAIThinkingSpace.unk0 != 2) { - switch(gAIThinkingSpace.unk0) + switch (gAIThinkingSpace.unk0) { case 3: //Needed to match. break; case 0: gAIScriptPtr = BattleAIs[gAIThinkingSpace.aiLogicId]; - if(gBattleMons[gUnknown_02024C07].pp[gAIThinkingSpace.moveConsidered] == 0) + if (gBattleMons[gUnknown_02024C07].pp[gAIThinkingSpace.moveConsidered] == 0) { gAIThinkingSpace.unk2 = 0; } @@ -462,17 +462,17 @@ void BattleAI_DoAIProcessing(void) gAIThinkingSpace.unk0++; break; case 1: - if(gAIThinkingSpace.unk2 != 0) + if (gAIThinkingSpace.unk2 != 0) sBattleAICmdTable[*(u8 *)gAIScriptPtr](); // run AI command. else { gAIThinkingSpace.score[gAIThinkingSpace.moveConsidered] = 0; gAIThinkingSpace.unk10 |= 1; } - if(gAIThinkingSpace.unk10 & 1) + if (gAIThinkingSpace.unk10 & 1) { gAIThinkingSpace.moveConsidered++; - if(gAIThinkingSpace.moveConsidered < 4 && !(gAIThinkingSpace.unk10 & 8)) + if (gAIThinkingSpace.moveConsidered < 4 && !(gAIThinkingSpace.unk10 & 8)) gAIThinkingSpace.unk0 = 0; else gAIThinkingSpace.unk0++; @@ -487,10 +487,10 @@ void sub_810745C(void) { s32 i; - for(i = 0; i < 8; i++) + for (i = 0; i < 8; i++) { // this is the same as dividing it by 2, but for some reason, >> 1 is needed to match the asm. - if(unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] == 0) + if (unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] == 0) { unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] = gUnknown_02024C34[gUnknown_02024C08]; return; @@ -502,19 +502,19 @@ void unref_sub_81074A0(u8 a) { s32 i; - for(i = 0; i < 8; i++) + for (i = 0; i < 8; i++) unk_2016A00.unk0[a / 2][i] = 0; } void sub_81074C4(u8 a, u8 b) { - if(battle_side_get_owner(a) == 0) + if (battle_side_get_owner(a) == 0) unk_2016A00.unk20[battle_get_per_side_status(a) & 1] = b; } void sub_81074F8(u8 a, u8 b) { - if(battle_side_get_owner(a) == 0) + if (battle_side_get_owner(a) == 0) unk_2016A00.unk22[battle_get_per_side_status(a) & 1] = b; } @@ -562,7 +562,7 @@ static void BattleAICmd_score(void) { gAIThinkingSpace.score[gAIThinkingSpace.moveConsidered] += gAIScriptPtr[1]; // add the result to the array of the move consider's score. - if(gAIThinkingSpace.score[gAIThinkingSpace.moveConsidered] < 0) // if the score is negative, flatten it to 0. + if (gAIThinkingSpace.score[gAIThinkingSpace.moveConsidered] < 0) // if the score is negative, flatten it to 0. gAIThinkingSpace.score[gAIThinkingSpace.moveConsidered] = 0; gAIScriptPtr += 2; // AI return. @@ -712,7 +712,7 @@ static void BattleAICmd_if_status3(void) temp = AIScriptRead32(gAIScriptPtr + 2); - if ( gUnknown_02024C98[var] & temp ) + if (gUnknown_02024C98[var] & temp) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -750,7 +750,7 @@ static void BattleAICmd_if_status4(void) temp = battle_get_per_side_status(var) & 1; temp2 = AIScriptRead32(gAIScriptPtr + 2); - if ( gUnknown_02024C7A[temp] & temp2 ) + if (gUnknown_02024C7A[temp] & temp2) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -872,96 +872,96 @@ static void BattleAICmd_if_in_bytes(void) { u8 *ptr = AIScriptReadPtr(gAIScriptPtr + 1); - while(*ptr != 0xFF) - { - if(gAIThinkingSpace.funcResult == *ptr) - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5); - return; - } - ptr++; - } - gAIScriptPtr += 9; + while (*ptr != 0xFF) + { + if (gAIThinkingSpace.funcResult == *ptr) + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5); + return; + } + ptr++; + } + gAIScriptPtr += 9; } static void BattleAICmd_if_not_in_bytes(void) { u8 *ptr = AIScriptReadPtr(gAIScriptPtr + 1); - while(*ptr != 0xFF) - { - if(gAIThinkingSpace.funcResult == *ptr) - { - gAIScriptPtr += 9; - return; - } - ptr++; - } - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5); + while (*ptr != 0xFF) + { + if (gAIThinkingSpace.funcResult == *ptr) + { + gAIScriptPtr += 9; + return; + } + ptr++; + } + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5); } static void BattleAICmd_if_in_words(void) { u16 *ptr = (u16 *)AIScriptReadPtr(gAIScriptPtr + 1); - while(*ptr != 0xFFFF) - { - if(gAIThinkingSpace.funcResult == *ptr) - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5); - return; - } - ptr++; - } - gAIScriptPtr += 9; + while (*ptr != 0xFFFF) + { + if (gAIThinkingSpace.funcResult == *ptr) + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5); + return; + } + ptr++; + } + gAIScriptPtr += 9; } static void BattleAICmd_if_not_in_words(void) { u16 *ptr = (u16 *)AIScriptReadPtr(gAIScriptPtr + 1); - while(*ptr != 0xFFFF) - { - if(gAIThinkingSpace.funcResult == *ptr) - { - gAIScriptPtr += 9; - return; - } - ptr++; - } - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5); + while (*ptr != 0xFFFF) + { + if (gAIThinkingSpace.funcResult == *ptr) + { + gAIScriptPtr += 9; + return; + } + ptr++; + } + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5); } static void BattleAICmd_if_user_can_damage(void) { - s32 i; + s32 i; - for(i = 0; i < 4; i++) - { - if (gBattleMons[gUnknown_02024C07].moves[i] != 0 - && gBattleMoves[gBattleMons[gUnknown_02024C07].moves[i]].power != 0) - break; - } - if(i == 4) - gAIScriptPtr += 5; - else - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); + for (i = 0; i < 4; i++) + { + if (gBattleMons[gUnknown_02024C07].moves[i] != 0 + && gBattleMoves[gBattleMons[gUnknown_02024C07].moves[i]].power != 0) + break; + } + if (i == 4) + gAIScriptPtr += 5; + else + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); } static void BattleAICmd_if_user_cant_damage(void) { - s32 i; + s32 i; - for(i = 0; i < 4; i++) - { - if (gBattleMons[gUnknown_02024C07].moves[i] != 0 - && gBattleMoves[gBattleMons[gUnknown_02024C07].moves[i]].power != 0) - break; - } - if(i != 4) - gAIScriptPtr += 5; - else - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); + for (i = 0; i < 4; i++) + { + if (gBattleMons[gUnknown_02024C07].moves[i] != 0 + && gBattleMoves[gBattleMons[gUnknown_02024C07].moves[i]].power != 0) + break; + } + if (i != 4) + gAIScriptPtr += 5; + else + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); } static void BattleAICmd_unk_21(void) @@ -974,23 +974,23 @@ static void BattleAICmd_get_type(void) { u8 typeVar = gAIScriptPtr[1]; - switch(typeVar) + switch (typeVar) { - case 1: - gAIThinkingSpace.funcResult = gBattleMons[gUnknown_02024C07].type1; - break; - case 0: - gAIThinkingSpace.funcResult = gBattleMons[gUnknown_02024C08].type1; - break; - case 3: - gAIThinkingSpace.funcResult = gBattleMons[gUnknown_02024C07].type2; - break; - case 2: - gAIThinkingSpace.funcResult = gBattleMons[gUnknown_02024C08].type2; - break; - case 4: - gAIThinkingSpace.funcResult = gBattleMoves[gAIThinkingSpace.unk2].type; - break; + case 1: + gAIThinkingSpace.funcResult = gBattleMons[gUnknown_02024C07].type1; + break; + case 0: + gAIThinkingSpace.funcResult = gBattleMons[gUnknown_02024C08].type1; + break; + case 3: + gAIThinkingSpace.funcResult = gBattleMons[gUnknown_02024C07].type2; + break; + case 2: + gAIThinkingSpace.funcResult = gBattleMons[gUnknown_02024C08].type2; + break; + case 4: + gAIThinkingSpace.funcResult = gBattleMoves[gAIThinkingSpace.unk2].type; + break; } gAIScriptPtr += 2; } @@ -1322,7 +1322,7 @@ static void BattleAICmd_get_move(void) static void BattleAICmd_if_type(void) { - if ( gAIScriptPtr[1] == gAIThinkingSpace.funcResult ) + if (gAIScriptPtr[1] == gAIThinkingSpace.funcResult) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1330,7 +1330,7 @@ static void BattleAICmd_if_type(void) static void BattleAICmd_unk_27(void) // if_not_type { - if ( gAIScriptPtr[1] != gAIThinkingSpace.funcResult ) + if (gAIScriptPtr[1] != gAIThinkingSpace.funcResult) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1338,7 +1338,7 @@ static void BattleAICmd_unk_27(void) // if_not_type static void BattleAICmd_if_would_go_first(void) { - if ( b_first_side(gUnknown_02024C07, gUnknown_02024C08, 1) == gAIScriptPtr[1] ) + if (b_first_side(gUnknown_02024C07, gUnknown_02024C08, 1) == gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1346,17 +1346,19 @@ static void BattleAICmd_if_would_go_first(void) static void BattleAICmd_if_would_not_go_first(void) { - if ( b_first_side(gUnknown_02024C07, gUnknown_02024C08, 1) != gAIScriptPtr[1] ) + if (b_first_side(gUnknown_02024C07, gUnknown_02024C08, 1) != gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; } static void BattleAICmd_unk_2A(void) -{} +{ +} static void BattleAICmd_unk_2B(void) -{} +{ +} static void BattleAICmd_count_alive_pokemon(void) { @@ -1422,16 +1424,16 @@ static void BattleAICmd_get_ability(void) { u8 var; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) var = gUnknown_02024C07; else var = gUnknown_02024C08; - if(battle_side_get_owner(var) == TARGET) + if (battle_side_get_owner(var) == TARGET) { u16 unk = battle_get_per_side_status(var) & 1; - if(unk_2016A00.unk20[unk] != 0) + if (unk_2016A00.unk20[unk] != 0) { ((struct AI_ThinkingStruct *)((u8 *)&unk_2016A00 - 0x200))->funcResult = unk_2016A00.unk20[unk]; gAIScriptPtr += 2; @@ -1439,19 +1441,19 @@ static void BattleAICmd_get_ability(void) } // abilities that prevent fleeing. - if(gBattleMons[var].ability == ABILITY_SHADOW_TAG || gBattleMons[var].ability == ABILITY_MAGNET_PULL || gBattleMons[var].ability == ABILITY_ARENA_TRAP) + if (gBattleMons[var].ability == ABILITY_SHADOW_TAG || gBattleMons[var].ability == ABILITY_MAGNET_PULL || gBattleMons[var].ability == ABILITY_ARENA_TRAP) { gAIThinkingSpace.funcResult = gBattleMons[var].ability; gAIScriptPtr += 2; return; } - if(gBaseStats[gBattleMons[var].species].ability1 != ABILITY_NONE) + if (gBaseStats[gBattleMons[var].species].ability1 != ABILITY_NONE) { - if(gBaseStats[gBattleMons[var].species].ability2 != ABILITY_NONE) + if (gBaseStats[gBattleMons[var].species].ability2 != ABILITY_NONE) { // AI is guessing what ability? - if(Random() & 1) + if (Random() & 1) { ((struct AI_ThinkingStruct *)((u8 *)&unk_2016A00 - 0x200))->funcResult = gBaseStats[gBattleMons[var].species].ability1; gAIScriptPtr += 2; @@ -1501,7 +1503,7 @@ static void BattleAICmd_unk_30(void) ai = &battle_2000000.ai; ai->funcResult = 0; - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { gBattleMoveDamage = 40; gUnknown_02024BE6 = gBattleMons[gUnknown_02024C07].moves[i]; @@ -1513,14 +1515,14 @@ static void BattleAICmd_unk_30(void) // reduce by 1/3. if (gBattleMoveDamage == 120) gBattleMoveDamage = 80; - if(gBattleMoveDamage == 240) + if (gBattleMoveDamage == 240) gBattleMoveDamage = 160; - if(gBattleMoveDamage == 30) + if (gBattleMoveDamage == 30) gBattleMoveDamage = 20; - if(gBattleMoveDamage == 15) + if (gBattleMoveDamage == 15) gBattleMoveDamage = 10; - if(gBattleMoveFlags & 8) + if (gBattleMoveFlags & 8) gBattleMoveDamage = 0; ai2 = &battle_2000000.ai; @@ -1549,29 +1551,31 @@ static void BattleAICmd_if_damage_bonus(void) if (gBattleMoveDamage == 120) gBattleMoveDamage = 80; - if(gBattleMoveDamage == 240) + if (gBattleMoveDamage == 240) gBattleMoveDamage = 160; - if(gBattleMoveDamage == 30) + if (gBattleMoveDamage == 30) gBattleMoveDamage = 20; - if(gBattleMoveDamage == 15) + if (gBattleMoveDamage == 15) gBattleMoveDamage = 10; - if(gBattleMoveFlags & 8) + if (gBattleMoveFlags & 8) gBattleMoveDamage = 0; // i have to store 2024BEC in a local variable before the comparison or else it will not match. damageVar = gBattleMoveDamage; - if(damageVar == gAIScriptPtr[1]) + if (damageVar == gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; } static void BattleAICmd_unk_32(void) -{} +{ +} static void BattleAICmd_unk_33(void) -{} +{ +} static void BattleAICmd_if_status_in_party(void) { @@ -1585,7 +1589,7 @@ static void BattleAICmd_if_status_in_party(void) } else if (0) { - // what is going on here? + // what is going on here? follow_jump: gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6); return; @@ -1618,16 +1622,16 @@ static void BattleAICmd_if_status_not_in_party(void) u8 *partyPtr; // what weird code. needed to match - switch(gAIScriptPtr[1]) + switch (gAIScriptPtr[1]) { - case 1: - partyPtr = (u8 *)gEnemyParty; - party = (struct Pokemon *)partyPtr; - break; - default: - partyPtr = (u8 *)gPlayerParty; - party = (struct Pokemon *)partyPtr; - break; + case 1: + partyPtr = (u8 *)gEnemyParty; + party = (struct Pokemon *)partyPtr; + break; + default: + partyPtr = (u8 *)gPlayerParty; + party = (struct Pokemon *)partyPtr; + break; } statusToCompareTo = AIScriptRead32(gAIScriptPtr + 2); @@ -1647,13 +1651,13 @@ static void BattleAICmd_if_status_not_in_party(void) static void BattleAICmd_unk_36(void) { - if(gBattleWeather & 7) + if (gBattleWeather & 7) gAIThinkingSpace.funcResult = 1; - if(gBattleWeather & 0x18) + if (gBattleWeather & 0x18) gAIThinkingSpace.funcResult = 2; - if(gBattleWeather & 0x60) + if (gBattleWeather & 0x60) gAIThinkingSpace.funcResult = 0; - if(gBattleWeather & 0x80) + if (gBattleWeather & 0x80) gAIThinkingSpace.funcResult = 3; gAIScriptPtr += 1; @@ -1661,7 +1665,7 @@ static void BattleAICmd_unk_36(void) static void BattleAICmd_if_effect(void) { - if(gBattleMoves[gAIThinkingSpace.unk2].effect == gAIScriptPtr[1]) + if (gBattleMoves[gAIThinkingSpace.unk2].effect == gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1669,7 +1673,7 @@ static void BattleAICmd_if_effect(void) static void BattleAICmd_if_not_effect(void) { - if(gBattleMoves[gAIThinkingSpace.unk2].effect != gAIScriptPtr[1]) + if (gBattleMoves[gAIThinkingSpace.unk2].effect != gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1679,12 +1683,12 @@ static void BattleAICmd_if_stat_level_less_than(void) { u32 party; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) party = gUnknown_02024C07; else party = gUnknown_02024C08; - if(gBattleMons[party].statStages[gAIScriptPtr[2]] < gAIScriptPtr[3]) + if (gBattleMons[party].statStages[gAIScriptPtr[2]] < gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); else gAIScriptPtr += 8; @@ -1694,12 +1698,12 @@ static void BattleAICmd_if_stat_level_more_than(void) { u32 party; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) party = gUnknown_02024C07; else party = gUnknown_02024C08; - if(gBattleMons[party].statStages[gAIScriptPtr[2]] > gAIScriptPtr[3]) + if (gBattleMons[party].statStages[gAIScriptPtr[2]] > gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); else gAIScriptPtr += 8; @@ -1709,12 +1713,12 @@ static void BattleAICmd_if_stat_level_equal(void) { u32 party; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) party = gUnknown_02024C07; else party = gUnknown_02024C08; - if(gBattleMons[party].statStages[gAIScriptPtr[2]] == gAIScriptPtr[3]) + if (gBattleMons[party].statStages[gAIScriptPtr[2]] == gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); else gAIScriptPtr += 8; @@ -1724,12 +1728,12 @@ static void BattleAICmd_if_stat_level_not_equal(void) { u32 party; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) party = gUnknown_02024C07; else party = gUnknown_02024C08; - if(gBattleMons[party].statStages[gAIScriptPtr[2]] != gAIScriptPtr[3]) + if (gBattleMons[party].statStages[gAIScriptPtr[2]] != gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); else gAIScriptPtr += 8; @@ -1737,7 +1741,7 @@ static void BattleAICmd_if_stat_level_not_equal(void) static void BattleAICmd_if_can_faint(void) { - if(gBattleMoves[gAIThinkingSpace.unk2].power < 2) + if (gBattleMoves[gAIThinkingSpace.unk2].power < 2) { gAIScriptPtr += 5; return; @@ -1754,10 +1758,10 @@ static void BattleAICmd_if_can_faint(void) gBattleMoveDamage = gBattleMoveDamage * gAIThinkingSpace.unk18[gAIThinkingSpace.moveConsidered] / 100; // moves always do at least 1 damage. - if(gBattleMoveDamage == 0) + if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - if(gBattleMons[gUnknown_02024C08].hp <= gBattleMoveDamage) + if (gBattleMons[gUnknown_02024C08].hp <= gBattleMoveDamage) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1765,7 +1769,7 @@ static void BattleAICmd_if_can_faint(void) static void BattleAICmd_if_cant_faint(void) { - if(gBattleMoves[gAIThinkingSpace.unk2].power < 2) + if (gBattleMoves[gAIThinkingSpace.unk2].power < 2) { gAIScriptPtr += 5; return; @@ -1784,7 +1788,7 @@ static void BattleAICmd_if_cant_faint(void) // this macro is missing the damage 0 = 1 assumption. - if(gBattleMons[gUnknown_02024C08].hp > gBattleMoveDamage) + if (gBattleMons[gUnknown_02024C08].hp > gBattleMoveDamage) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1795,42 +1799,42 @@ static void BattleAICmd_unk_3F(void) int i; u16 *temp_ptr = (u16 *)(gAIScriptPtr + 2); - switch(gAIScriptPtr[1]) + switch (gAIScriptPtr[1]) { - case 1: - case 3: - for(i = 0; i < 4; i++) - { - if(gBattleMons[gUnknown_02024C07].moves[i] == *temp_ptr) - break; - } - if(i == 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); - return; - } - case 0: - case 2: - for(i = 0; i < 8; i++) - { - if(unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] == *temp_ptr) - break; - } - if(i == 8) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); - return; - } + case 1: + case 3: + for (i = 0; i < 4; i++) + { + if (gBattleMons[gUnknown_02024C07].moves[i] == *temp_ptr) + break; + } + if (i == 4) + { + gAIScriptPtr += 8; + return; + } + else + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); + return; + } + case 0: + case 2: + for (i = 0; i < 8; i++) + { + if (unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] == *temp_ptr) + break; + } + if (i == 8) + { + gAIScriptPtr += 8; + return; + } + else + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); + return; + } } } @@ -1839,42 +1843,42 @@ static void BattleAICmd_unk_40(void) int i; u16 *temp_ptr = (u16 *)(gAIScriptPtr + 2); - switch(gAIScriptPtr[1]) + switch (gAIScriptPtr[1]) { - case 1: - case 3: - for(i = 0; i < 4; i++) - { - if(gBattleMons[gUnknown_02024C07].moves[i] == *temp_ptr) - break; - } - if(i != 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); - return; - } - case 0: - case 2: - for(i = 0; i < 8; i++) - { - if(unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] == *temp_ptr) - break; - } - if(i != 8) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); - return; - } + case 1: + case 3: + for (i = 0; i < 4; i++) + { + if (gBattleMons[gUnknown_02024C07].moves[i] == *temp_ptr) + break; + } + if (i != 4) + { + gAIScriptPtr += 8; + return; + } + else + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); + return; + } + case 0: + case 2: + for (i = 0; i < 8; i++) + { + if (unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] == *temp_ptr) + break; + } + if (i != 8) + { + gAIScriptPtr += 8; + return; + } + else + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); + return; + } } } @@ -1882,28 +1886,28 @@ static void BattleAICmd_if_move_effect(void) { int i; - switch(gAIScriptPtr[1]) + switch (gAIScriptPtr[1]) { - case 1: - case 3: - for(i = 0; i < 4; i++) - { - if(gBattleMons[gUnknown_02024C07].moves[i] != 0 && gBattleMoves[gBattleMons[gUnknown_02024C07].moves[i]].effect == gAIScriptPtr[2]) - break; - } - if(i != 4) - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); - else - gAIScriptPtr += 7; - break; - case 0: - case 2: - for(i = 0; i < 8; i++) - { - if(gBattleMons[gUnknown_02024C07].moves[i] != 0 && gBattleMoves[unk_2016A00.unk0[gUnknown_02024C08 >> 1][i]].effect == gAIScriptPtr[2]) - break; - } + case 1: + case 3: + for (i = 0; i < 4; i++) + { + if (gBattleMons[gUnknown_02024C07].moves[i] != 0 && gBattleMoves[gBattleMons[gUnknown_02024C07].moves[i]].effect == gAIScriptPtr[2]) + break; + } + if (i != 4) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; + break; + case 0: + case 2: + for (i = 0; i < 8; i++) + { + if (gBattleMons[gUnknown_02024C07].moves[i] != 0 && gBattleMoves[unk_2016A00.unk0[gUnknown_02024C08 >> 1][i]].effect == gAIScriptPtr[2]) + break; + } + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); } } @@ -1911,28 +1915,28 @@ static void BattleAICmd_if_not_move_effect(void) { int i; - switch(gAIScriptPtr[1]) + switch (gAIScriptPtr[1]) { - case 1: - case 3: - for(i = 0; i < 4; i++) - { - if(gBattleMons[gUnknown_02024C07].moves[i] != 0 && gBattleMoves[gBattleMons[gUnknown_02024C07].moves[i]].effect == gAIScriptPtr[2]) - break; - } - if(i != 4) - gAIScriptPtr += 7; - else - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); - break; - case 0: - case 2: - for(i = 0; i < 8; i++) - { - if(unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] != 0 && gBattleMoves[unk_2016A00.unk0[gUnknown_02024C08 >> 1][i]].effect == gAIScriptPtr[2]) - break; - } + case 1: + case 3: + for (i = 0; i < 4; i++) + { + if (gBattleMons[gUnknown_02024C07].moves[i] != 0 && gBattleMoves[gBattleMons[gUnknown_02024C07].moves[i]].effect == gAIScriptPtr[2]) + break; + } + if (i != 4) gAIScriptPtr += 7; + else + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); + break; + case 0: + case 2: + for (i = 0; i < 8; i++) + { + if (unk_2016A00.unk0[gUnknown_02024C08 >> 1][i] != 0 && gBattleMoves[unk_2016A00.unk0[gUnknown_02024C08 >> 1][i]].effect == gAIScriptPtr[2]) + break; + } + gAIScriptPtr += 7; } } @@ -1940,14 +1944,14 @@ static void BattleAICmd_if_last_move_did_damage(void) { u8 var; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) var = gUnknown_02024C07; else var = gUnknown_02024C08; - if(gAIScriptPtr[2] == 0) + if (gAIScriptPtr[2] == 0) { - if(gUnknown_02024CA8[var].unk4 == 0) + if (gUnknown_02024CA8[var].unk4 == 0) { gAIScriptPtr += 7; return; @@ -1955,12 +1959,12 @@ static void BattleAICmd_if_last_move_did_damage(void) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); return; } - else if(gAIScriptPtr[2] != 1) + else if (gAIScriptPtr[2] != 1) { gAIScriptPtr += 7; return; } - else if(gUnknown_02024CA8[var].unk6 != 0) + else if (gUnknown_02024CA8[var].unk6 != 0) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); return; @@ -1970,27 +1974,27 @@ static void BattleAICmd_if_last_move_did_damage(void) static void BattleAICmd_if_encored(void) { - switch(gAIScriptPtr[1]) + switch (gAIScriptPtr[1]) { - case 0: // _08109348 - if(gUnknown_02024CA8[gUnknown_02024A60].unk4 == gAIThinkingSpace.unk2) - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; - case 1: // _08109370 - if(gUnknown_02024CA8[gUnknown_02024A60].unk6 == gAIThinkingSpace.unk2) - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; + case 0: // _08109348 + if (gUnknown_02024CA8[gUnknown_02024A60].unk4 == gAIThinkingSpace.unk2) + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; - default: - gAIScriptPtr += 6; + } + gAIScriptPtr += 6; + return; + case 1: // _08109370 + if (gUnknown_02024CA8[gUnknown_02024A60].unk6 == gAIThinkingSpace.unk2) + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; + } + gAIScriptPtr += 6; + return; + default: + gAIScriptPtr += 6; + return; } } @@ -2003,7 +2007,7 @@ static void BattleAICmd_if_random_2(void) { u8 var = battle_2000000.unk88 * 5; - if((u8)(Random() % 100) < var) + if ((u8)(Random() % 100) < var) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -2020,12 +2024,12 @@ static void BattleAICmd_get_hold_effect(void) u16 status; u8 *aiPtr; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) var = gUnknown_02024C07; else var = gUnknown_02024C08; - if(battle_side_get_owner(var) == 0) + if (battle_side_get_owner(var) == 0) { // weird pointer arithmetic is needed to match. status = (battle_get_per_side_status(var) & 1); @@ -2042,7 +2046,7 @@ static void BattleAICmd_get_gender(void) { u8 var; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) var = gUnknown_02024C07; else var = gUnknown_02024C08; @@ -2056,7 +2060,7 @@ static void BattleAICmd_is_first_turn(void) { u8 var; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) var = gUnknown_02024C07; else var = gUnknown_02024C08; @@ -2070,7 +2074,7 @@ static void BattleAICmd_get_stockpile_count(void) { u8 var; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) var = gUnknown_02024C07; else var = gUnknown_02024C08; @@ -2127,7 +2131,7 @@ static void BattleAICmd_get_protect_count(void) { u8 var; - if(gAIScriptPtr[1] == USER) + if (gAIScriptPtr[1] == USER) var = gUnknown_02024C07; else var = gUnknown_02024C08; @@ -2137,17 +2141,29 @@ static void BattleAICmd_get_protect_count(void) gAIScriptPtr += 2; } -static void BattleAICmd_unk_52(void) {} +static void BattleAICmd_unk_52(void) +{ +} -static void BattleAICmd_unk_53(void) {} +static void BattleAICmd_unk_53(void) +{ +} -static void BattleAICmd_unk_54(void) {} +static void BattleAICmd_unk_54(void) +{ +} -static void BattleAICmd_unk_55(void) {} +static void BattleAICmd_unk_55(void) +{ +} -static void BattleAICmd_unk_56(void) {} +static void BattleAICmd_unk_56(void) +{ +} -static void BattleAICmd_unk_57(void) {} +static void BattleAICmd_unk_57(void) +{ +} static void BattleAICmd_call(void) { @@ -2162,44 +2178,44 @@ static void BattleAICmd_jump(void) static void BattleAICmd_unk_5A(void) { - if(sub_8109908() == 0) + if (sub_8109908() == 0) gAIThinkingSpace.unk10 |= 1; } static void BattleAICmd_if_level_cond(void) { - switch(gAIScriptPtr[1]) + switch (gAIScriptPtr[1]) { - case 0: - if(gBattleMons[gUnknown_02024C07].level > gBattleMons[gUnknown_02024C08].level) - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; + case 0: + if (gBattleMons[gUnknown_02024C07].level > gBattleMons[gUnknown_02024C08].level) + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; - case 1: - if(gBattleMons[gUnknown_02024C07].level < gBattleMons[gUnknown_02024C08].level) - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; + } + gAIScriptPtr += 6; + return; + case 1: + if (gBattleMons[gUnknown_02024C07].level < gBattleMons[gUnknown_02024C08].level) + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; - case 2: - if(gBattleMons[gUnknown_02024C07].level == gBattleMons[gUnknown_02024C08].level) - { - gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; + } + gAIScriptPtr += 6; + return; + case 2: + if (gBattleMons[gUnknown_02024C07].level == gBattleMons[gUnknown_02024C08].level) + { + gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; + } + gAIScriptPtr += 6; + return; } } static void BattleAICmd_if_taunted(void) { - if(gUnknown_02024CA8[gUnknown_02024C08].taunt) + if (gUnknown_02024CA8[gUnknown_02024C08].taunt) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -2207,7 +2223,7 @@ static void BattleAICmd_if_taunted(void) static void BattleAICmd_if_not_taunted(void) { - if(!(gUnknown_02024CA8[gUnknown_02024C08].taunt)) + if (!(gUnknown_02024CA8[gUnknown_02024C08].taunt)) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -2225,7 +2241,7 @@ void unref_sub_81098E4(void) bool8 sub_8109908(void) { - if(unk_2016C00.unk20 != 0) + if (unk_2016C00.unk20 != 0) { --unk_2016C00.unk20; gAIScriptPtr = unk_2016C00.ptr[unk_2016C00.unk20]; diff --git a/src/battle_anim_80A7E7C.c b/src/battle_anim_80A7E7C.c index f6c3d70c3..8cb6fdf9c 100644 --- a/src/battle_anim_80A7E7C.c +++ b/src/battle_anim_80A7E7C.c @@ -19,7 +19,7 @@ extern void move_anim_task_del(u8 task); extern bool8 b_side_obj__get_some_boolean(u8 side); extern u8 battle_get_side_with_given_state(u8 state); extern u8 battle_side_get_owner(u8 side); -extern void oamt_set_x3A_32(struct Sprite *sprite, void (*callback)(struct Sprite*)); +extern void oamt_set_x3A_32(struct Sprite *sprite, void(*callback)(struct Sprite*)); extern void sub_8078458(struct Sprite *sprite); extern void move_anim_8072740(struct Sprite *sprite); extern void sub_8078A5C(struct Sprite *sprite); @@ -46,732 +46,910 @@ static void sub_80A8D8C(u8 task); void sub_80A8FD8(u8 task); static void sub_80A913C(u8 taskId); -void sub_80A7E7C(u8 task) { - u8 sprite; - sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); - if (sprite == 0xff) { - move_anim_task_del(task); - return; - } - gSprites[sprite].pos2.x = gBattleAnimArgs[1]; - gSprites[sprite].pos2.y = gBattleAnimArgs[2]; - TASK.data[0] = sprite; - TASK.data[1] = gBattleAnimArgs[3]; - TASK.data[2] = gBattleAnimArgs[4]; - TASK.data[3] = gBattleAnimArgs[4]; - TASK.data[4] = gBattleAnimArgs[1]; - TASK.data[5] = gBattleAnimArgs[2]; - TASK.func = sub_80A7EF0; - sub_80A7EF0(task); -} - -static void sub_80A7EF0(u8 task) { - if (TASK.data[3] == 0) { - if (SPRITE.pos2.x == 0) { - SPRITE.pos2.x = TASK.data[4]; - } else { - SPRITE.pos2.x = 0; - } - if (SPRITE.pos2.y == 0) { - SPRITE.pos2.y = TASK.data[5]; - } else { - SPRITE.pos2.y = 0; - } - TASK.data[3] = TASK.data[2]; - if (--TASK.data[1] == 0) { - SPRITE.pos2.x = 0; - SPRITE.pos2.y = 0; - move_anim_task_del(task); - return; - } - } else { - TASK.data[3]--; - } -} - - -void sub_80A7FA0(u8 task) { - u8 sprite; - bool8 r6; - u8 side; - r6 = 0; - if (gBattleAnimArgs[0] < 4) { - sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); - if (sprite == 0xff) { - move_anim_task_del(task); - return; - } - } else if (gBattleAnimArgs[0] != 8) { - switch (gBattleAnimArgs[0]) { - case 4: - side = battle_get_side_with_given_state(0); - break; - case 5: - side = battle_get_side_with_given_state(2); - break; - case 6: - side = battle_get_side_with_given_state(1); - break; - case 7: - default: - side = battle_get_side_with_given_state(3); - break; - } - if (b_side_obj__get_some_boolean(side) == FALSE) { - r6 = 1; - } - sprite = gUnknown_02024BE0[side]; - } else { - sprite = gUnknown_02024BE0[gUnknown_0202F7C8]; - } - if (r6) { - move_anim_task_del(task); - return; - } - gSprites[sprite].pos2.x = gBattleAnimArgs[1]; - gSprites[sprite].pos2.y = gBattleAnimArgs[2]; - TASK.data[0] = sprite; - TASK.data[1] = gBattleAnimArgs[3]; - TASK.data[2] = gBattleAnimArgs[4]; - TASK.data[3] = gBattleAnimArgs[4]; - TASK.data[4] = gBattleAnimArgs[1]; - TASK.data[5] = gBattleAnimArgs[2]; - TASK.func = sub_80A808C; - sub_80A808C(task); -} - -static void sub_80A808C(u8 task) { - if (TASK.data[3] == 0) { - if (SPRITE.pos2.x == TASK.data[4]) { - SPRITE.pos2.x = -TASK.data[4]; - } else { - SPRITE.pos2.x = TASK.data[4]; - } - if (SPRITE.pos2.y == TASK.data[5]) { - SPRITE.pos2.y = -TASK.data[5]; - } else { - SPRITE.pos2.y = TASK.data[5]; - } - TASK.data[3] = TASK.data[2]; - if (--TASK.data[1] == 0) { - SPRITE.pos2.x = 0; - SPRITE.pos2.y = 0; - move_anim_task_del(task); - return; - } - } else { - TASK.data[3]--; - } -} - -void sub_80A8154(u8 task) { - u8 sprite; - sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); - if (sprite == 0xff) { - move_anim_task_del(task); - return; - } - gSprites[sprite].pos2.x += gBattleAnimArgs[1]; - gSprites[sprite].pos2.y += gBattleAnimArgs[2]; - TASK.data[0] = sprite; - TASK.data[1] = 0; - TASK.data[2] = gBattleAnimArgs[3]; - TASK.data[3] = 0; - TASK.data[4] = gBattleAnimArgs[4]; - TASK.data[5] = gBattleAnimArgs[1] * 2; - TASK.data[6] = gBattleAnimArgs[2] * 2; - TASK.func = sub_80A81D8; - sub_80A81D8(task); -} - -static void sub_80A81D8(u8 task) { - if (TASK.data[3] == 0) { - if (TASK.data[1] & 1) { - SPRITE.pos2.x += TASK.data[5]; - SPRITE.pos2.y += TASK.data[6]; - } else { - SPRITE.pos2.x -= TASK.data[5]; - SPRITE.pos2.y -= TASK.data[6]; - } - TASK.data[3] = TASK.data[4]; - if (++TASK.data[1] >= TASK.data[2]) { - if (TASK.data[1] & 1) { - SPRITE.pos2.x += TASK.data[5] / 2; - SPRITE.pos2.y += TASK.data[6] / 2; - } else { - SPRITE.pos2.x -= TASK.data[5] / 2; - SPRITE.pos2.y -= TASK.data[6] / 2; - } - move_anim_task_del(task); - return; - } - } else { - TASK.data[3]--; - } -} - -void sub_80A8314(u8 task) { - u8 sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); - gSprites[sprite].pos2.x = gBattleAnimArgs[1]; - TASK.data[0] = sprite; - TASK.data[1] = gBattleAnimArgs[1]; - TASK.data[2] = gBattleAnimArgs[2]; - TASK.data[3] = gBattleAnimArgs[3]; - TASK.data[4] = gBattleAnimArgs[4]; - TASK.func = sub_80A8374; - sub_80A8374(task); -} - -static void sub_80A8374(u8 task) { - s16 x; - u8 sprite; - sprite = TASK.data[0]; - x = TASK.data[1]; - if (TASK.data[2] == TASK.data[8]++) { - TASK.data[8] = 0; - if (gSprites[sprite].pos2.x == x) { - x = -x; - } - gSprites[sprite].pos2.x += x; - } - TASK.data[1] = x; - TASK.data[9] += TASK.data[3]; - gSprites[sprite].pos2.y = TASK.data[9] >> 8; - if (--TASK.data[4] == 0) { - move_anim_task_del(task); - return; - } -} - -void sub_80A8408(u8 task) { - u8 i; - u8 sprite; - u8 v1; - v1 = 1; - sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); - if (gBattleAnimArgs[4] > 5) { - gBattleAnimArgs[4] = 5; - } - for (i = 0; i < gBattleAnimArgs[4]; i++) { - v1 <<= 1; - } - TASK.data[0] = sprite; - TASK.data[1] = gBattleAnimArgs[1]; - TASK.data[2] = gBattleAnimArgs[2]; - TASK.data[3] = gBattleAnimArgs[3]; - TASK.data[4] = v1; - TASK.func = sub_80A8488; - sub_80A8488(task); -} - -static void sub_80A8488(u8 task) { - u8 sprite; - sprite = TASK.data[0]; - gSprites[sprite].pos2.x = Sin(TASK.data[5], TASK.data[1]); - gSprites[sprite].pos2.y = -Cos(TASK.data[5], TASK.data[2]); - gSprites[sprite].pos2.y += TASK.data[2]; - TASK.data[5] += TASK.data[4]; - TASK.data[5] &= 0xff; - if (TASK.data[5] == 0) { - TASK.data[3]--; - } - if (TASK.data[3] == 0) { - gSprites[sprite].pos2.x = 0; - gSprites[sprite].pos2.y = 0; - move_anim_task_del(task); - return; - } -} - -void sub_80A8500(u8 task) { - if (battle_side_get_owner(gUnknown_0202F7C8)) { - gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - } - sub_80A8408(task); -} - -void sub_80A8530(struct Sprite *sprite) { - sprite->invisible = TRUE; - if (battle_side_get_owner(gUnknown_0202F7C8)) { - sprite->data1 = -gBattleAnimArgs[1]; - } else { - sprite->data1 = gBattleAnimArgs[1]; - } - sprite->data0 = gBattleAnimArgs[0]; - sprite->data2 = 0; - sprite->data3 = gUnknown_02024BE0[gUnknown_0202F7C8]; - sprite->data4 = gBattleAnimArgs[0]; - oamt_set_x3A_32(sprite, sub_80A85A4); - sprite->callback = sub_8078458; -} - -static void sub_80A85A4(struct Sprite *sprite) { - sprite->data0 = sprite->data4; - sprite->data1 = -sprite->data1; - sprite->callback = sub_8078458; - oamt_set_x3A_32(sprite, move_anim_8072740); -} - -void sub_80A85C8(struct Sprite *sprite) { - u8 spriteId; - sprite->invisible = TRUE; - spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[2]); - sprite->data0 = gBattleAnimArgs[0]; - sprite->data1 = 0; - sprite->data2 = gBattleAnimArgs[1]; - sprite->data3 = spriteId; - sprite->data4 = gBattleAnimArgs[0]; - oamt_set_x3A_32(sprite, sub_80A8614); - sprite->callback = sub_8078458; -} - -void sub_80A8614(struct Sprite *sprite) { - sprite->data0 = sprite->data4; - sprite->data2 = -sprite->data2; - sprite->callback = sub_8078458; - oamt_set_x3A_32(sprite, move_anim_8072740); -} - -void sub_80A8638(struct Sprite *sprite) { - int something; - int spriteId; - if (!gBattleAnimArgs[0]) { - spriteId = gUnknown_02024BE0[gUnknown_0202F7C8]; - } else { - spriteId = gUnknown_02024BE0[gUnknown_0202F7C9]; - } - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; - sprite->data2 = gSprites[spriteId].pos1.x; - sprite->data3 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; - sprite->data4 = gSprites[spriteId].pos1.y; - something = 0; - sub_8078A5C(sprite); - sprite->data3 = something; - sprite->data4 = something; - sprite->data5 = gSprites[spriteId].pos2.x; - sprite->data6 = gSprites[spriteId].pos2.y; - sprite->invisible = TRUE; - if (gBattleAnimArgs[1] == 1) { - sprite->data2 = something; - } else if (gBattleAnimArgs[1] == 2) { - sprite->data1 = something; - } - sprite->data7 = gBattleAnimArgs[1]; - sprite->data7 |= spriteId << 8; - sprite->callback = sub_80A86F4; -} - -static void sub_80A86F4(struct Sprite *sprite) { - s8 spriteId; - u8 lo; - struct Sprite *sprite2; - lo = sprite->data7 & 0xff; - spriteId = sprite->data7 >> 8; - sprite2 = &gSprites[spriteId]; - if (sprite->data0 == 0) { - if (lo < 2) { - sprite2->pos2.x = 0; - } - if (lo == 2 || lo == 0) { - sprite2->pos2.y = 0; - } - move_anim_8072740(sprite); - } else { - sprite->data0--; - sprite->data3 += sprite->data1; - sprite->data4 += sprite->data2; - sprite2->pos2.x = (s8)(sprite->data3 >> 8) + sprite->data5; - sprite2->pos2.y = (s8)(sprite->data4 >> 8) + sprite->data6; - } -} - -void sub_80A8764(struct Sprite *sprite) { - u8 v1; - u8 spriteId; - if (!gBattleAnimArgs[0]) { - v1 = gUnknown_0202F7C8; - } else { - v1 = gUnknown_0202F7C9; - } - spriteId = gUnknown_02024BE0[v1]; - if (battle_side_get_owner(v1)) { - gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - if (gBattleAnimArgs[3] == 1) { - gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - } - } - sprite->data0 = gBattleAnimArgs[4]; - sprite->data1 = gSprites[spriteId].pos1.x; - sprite->data2 = gSprites[spriteId].pos1.x + gBattleAnimArgs[1]; - sprite->data3 = gSprites[spriteId].pos1.y; - sprite->data4 = gSprites[spriteId].pos1.y + gBattleAnimArgs[2]; - sub_8078A5C(sprite); - sprite->data3 = 0; - sprite->data4 = 0; - sprite->data5 = spriteId; - sprite->invisible = TRUE; - oamt_set_x3A_32(sprite, move_anim_8072740); - sprite->callback = sub_80784A8; -} - -void sub_80A8818(struct Sprite *sprite) { - u8 spriteId; - u8 v1; - sprite->invisible = TRUE; - if (!gBattleAnimArgs[0]) { - v1 = gUnknown_0202F7C8; - } else { - v1 = gUnknown_0202F7C9; - } - spriteId = gUnknown_02024BE0[v1]; - if (battle_side_get_owner(v1)) { - gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - if (gBattleAnimArgs[3] == 1) { - gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - } - } - sprite->data0 = gBattleAnimArgs[4]; - sprite->data1 = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; - sprite->data2 = sprite->data1 + gBattleAnimArgs[1]; - sprite->data3 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; - sprite->data4 = sprite->data3 + gBattleAnimArgs[2]; - sub_8078A5C(sprite); - sprite->data3 = gSprites[spriteId].pos2.x << 8; - sprite->data4 = gSprites[spriteId].pos2.y << 8; - sprite->data5 = spriteId; - sprite->data6 = gBattleAnimArgs[5]; - if (!gBattleAnimArgs[5]) { - oamt_set_x3A_32(sprite, move_anim_8072740); - } else { - oamt_set_x3A_32(sprite, sub_80A88F0); - } - sprite->callback = sub_80784A8; -} - - -static void sub_80A88F0(struct Sprite *sprite) { - gSprites[sprite->data5].pos2.x = 0; - gSprites[sprite->data5].pos2.y = 0; - move_anim_8072740(sprite); -} - -void sub_80A8920(u8 task) { - s16 r7; - r7 = 0x8000 / gBattleAnimArgs[3]; - if (battle_side_get_owner(gUnknown_0202F7C8)) { - gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - gBattleAnimArgs[5] = -gBattleAnimArgs[5]; - } - TASK.data[0] = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); - TASK.data[1] = (gBattleAnimArgs[1] << 8) / gBattleAnimArgs[3]; - TASK.data[2] = gBattleAnimArgs[2]; - TASK.data[3] = gBattleAnimArgs[3]; - TASK.data[4] = gBattleAnimArgs[4]; - TASK.data[5] = (gBattleAnimArgs[5] << 8) / gBattleAnimArgs[6]; - TASK.data[6] = gBattleAnimArgs[6]; - TASK.data[7] = r7; - TASK.func = sub_80A89B4; -} - -static void sub_80A89B4(u8 task) { - u8 spriteId; - spriteId = TASK.data[0]; - TASK.data[11] += TASK.data[1]; - gSprites[spriteId].pos2.x = TASK.data[11] >> 8; - gSprites[spriteId].pos2.y = Sin((u8)(TASK.data[10] >> 8), TASK.data[2]); - TASK.data[10] += TASK.data[7]; - if (--TASK.data[3] == 0) { - TASK.func = sub_80A8A18; - } -} - -static void sub_80A8A18(u8 task) { - u8 spriteId; - if (TASK.data[4] > 0) { - TASK.data[4]--; - } else { - spriteId = TASK.data[0]; - TASK.data[12] += TASK.data[5]; - gSprites[spriteId].pos2.x = (TASK.data[12] >> 8) + (TASK.data[11] >> 8); - if (--TASK.data[6] == 0) { - move_anim_task_del(task); - return; - } - } +void sub_80A7E7C(u8 task) +{ + u8 sprite; + sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); + if (sprite == 0xff) + { + move_anim_task_del(task); + return; + } + gSprites[sprite].pos2.x = gBattleAnimArgs[1]; + gSprites[sprite].pos2.y = gBattleAnimArgs[2]; + TASK.data[0] = sprite; + TASK.data[1] = gBattleAnimArgs[3]; + TASK.data[2] = gBattleAnimArgs[4]; + TASK.data[3] = gBattleAnimArgs[4]; + TASK.data[4] = gBattleAnimArgs[1]; + TASK.data[5] = gBattleAnimArgs[2]; + TASK.func = sub_80A7EF0; + sub_80A7EF0(task); +} + +static void sub_80A7EF0(u8 task) +{ + if (TASK.data[3] == 0) + { + if (SPRITE.pos2.x == 0) + { + SPRITE.pos2.x = TASK.data[4]; + } + else + { + SPRITE.pos2.x = 0; + } + if (SPRITE.pos2.y == 0) + { + SPRITE.pos2.y = TASK.data[5]; + } + else + { + SPRITE.pos2.y = 0; + } + TASK.data[3] = TASK.data[2]; + if (--TASK.data[1] == 0) + { + SPRITE.pos2.x = 0; + SPRITE.pos2.y = 0; + move_anim_task_del(task); + return; + } + } + else + { + TASK.data[3]--; + } +} + + +void sub_80A7FA0(u8 task) +{ + u8 sprite; + bool8 r6; + u8 side; + r6 = 0; + if (gBattleAnimArgs[0] < 4) + { + sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); + if (sprite == 0xff) + { + move_anim_task_del(task); + return; + } + } + else if (gBattleAnimArgs[0] != 8) + { + switch (gBattleAnimArgs[0]) + { + case 4: + side = battle_get_side_with_given_state(0); + break; + case 5: + side = battle_get_side_with_given_state(2); + break; + case 6: + side = battle_get_side_with_given_state(1); + break; + case 7: + default: + side = battle_get_side_with_given_state(3); + break; + } + if (b_side_obj__get_some_boolean(side) == FALSE) + { + r6 = 1; + } + sprite = gUnknown_02024BE0[side]; + } + else + { + sprite = gUnknown_02024BE0[gUnknown_0202F7C8]; + } + if (r6) + { + move_anim_task_del(task); + return; + } + gSprites[sprite].pos2.x = gBattleAnimArgs[1]; + gSprites[sprite].pos2.y = gBattleAnimArgs[2]; + TASK.data[0] = sprite; + TASK.data[1] = gBattleAnimArgs[3]; + TASK.data[2] = gBattleAnimArgs[4]; + TASK.data[3] = gBattleAnimArgs[4]; + TASK.data[4] = gBattleAnimArgs[1]; + TASK.data[5] = gBattleAnimArgs[2]; + TASK.func = sub_80A808C; + sub_80A808C(task); +} + +static void sub_80A808C(u8 task) +{ + if (TASK.data[3] == 0) + { + if (SPRITE.pos2.x == TASK.data[4]) + { + SPRITE.pos2.x = -TASK.data[4]; + } + else + { + SPRITE.pos2.x = TASK.data[4]; + } + if (SPRITE.pos2.y == TASK.data[5]) + { + SPRITE.pos2.y = -TASK.data[5]; + } + else + { + SPRITE.pos2.y = TASK.data[5]; + } + TASK.data[3] = TASK.data[2]; + if (--TASK.data[1] == 0) + { + SPRITE.pos2.x = 0; + SPRITE.pos2.y = 0; + move_anim_task_del(task); + return; + } + } + else + { + TASK.data[3]--; + } +} + +void sub_80A8154(u8 task) +{ + u8 sprite; + sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); + if (sprite == 0xff) + { + move_anim_task_del(task); + return; + } + gSprites[sprite].pos2.x += gBattleAnimArgs[1]; + gSprites[sprite].pos2.y += gBattleAnimArgs[2]; + TASK.data[0] = sprite; + TASK.data[1] = 0; + TASK.data[2] = gBattleAnimArgs[3]; + TASK.data[3] = 0; + TASK.data[4] = gBattleAnimArgs[4]; + TASK.data[5] = gBattleAnimArgs[1] * 2; + TASK.data[6] = gBattleAnimArgs[2] * 2; + TASK.func = sub_80A81D8; + sub_80A81D8(task); +} + +static void sub_80A81D8(u8 task) +{ + if (TASK.data[3] == 0) + { + if (TASK.data[1] & 1) + { + SPRITE.pos2.x += TASK.data[5]; + SPRITE.pos2.y += TASK.data[6]; + } + else + { + SPRITE.pos2.x -= TASK.data[5]; + SPRITE.pos2.y -= TASK.data[6]; + } + TASK.data[3] = TASK.data[4]; + if (++TASK.data[1] >= TASK.data[2]) + { + if (TASK.data[1] & 1) + { + SPRITE.pos2.x += TASK.data[5] / 2; + SPRITE.pos2.y += TASK.data[6] / 2; + } + else + { + SPRITE.pos2.x -= TASK.data[5] / 2; + SPRITE.pos2.y -= TASK.data[6] / 2; + } + move_anim_task_del(task); + return; + } + } + else + { + TASK.data[3]--; + } +} + +void sub_80A8314(u8 task) +{ + u8 sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); + gSprites[sprite].pos2.x = gBattleAnimArgs[1]; + TASK.data[0] = sprite; + TASK.data[1] = gBattleAnimArgs[1]; + TASK.data[2] = gBattleAnimArgs[2]; + TASK.data[3] = gBattleAnimArgs[3]; + TASK.data[4] = gBattleAnimArgs[4]; + TASK.func = sub_80A8374; + sub_80A8374(task); +} + +static void sub_80A8374(u8 task) +{ + s16 x; + u8 sprite; + sprite = TASK.data[0]; + x = TASK.data[1]; + if (TASK.data[2] == TASK.data[8]++) + { + TASK.data[8] = 0; + if (gSprites[sprite].pos2.x == x) + { + x = -x; + } + gSprites[sprite].pos2.x += x; + } + TASK.data[1] = x; + TASK.data[9] += TASK.data[3]; + gSprites[sprite].pos2.y = TASK.data[9] >> 8; + if (--TASK.data[4] == 0) + { + move_anim_task_del(task); + return; + } +} + +void sub_80A8408(u8 task) +{ + u8 i; + u8 sprite; + u8 v1; + v1 = 1; + sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); + if (gBattleAnimArgs[4] > 5) + { + gBattleAnimArgs[4] = 5; + } + for (i = 0; i < gBattleAnimArgs[4]; i++) + { + v1 <<= 1; + } + TASK.data[0] = sprite; + TASK.data[1] = gBattleAnimArgs[1]; + TASK.data[2] = gBattleAnimArgs[2]; + TASK.data[3] = gBattleAnimArgs[3]; + TASK.data[4] = v1; + TASK.func = sub_80A8488; + sub_80A8488(task); +} + +static void sub_80A8488(u8 task) +{ + u8 sprite; + sprite = TASK.data[0]; + gSprites[sprite].pos2.x = Sin(TASK.data[5], TASK.data[1]); + gSprites[sprite].pos2.y = -Cos(TASK.data[5], TASK.data[2]); + gSprites[sprite].pos2.y += TASK.data[2]; + TASK.data[5] += TASK.data[4]; + TASK.data[5] &= 0xff; + if (TASK.data[5] == 0) + { + TASK.data[3]--; + } + if (TASK.data[3] == 0) + { + gSprites[sprite].pos2.x = 0; + gSprites[sprite].pos2.y = 0; + move_anim_task_del(task); + return; + } +} + +void sub_80A8500(u8 task) +{ + if (battle_side_get_owner(gUnknown_0202F7C8)) + { + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + } + sub_80A8408(task); +} + +void sub_80A8530(struct Sprite *sprite) +{ + sprite->invisible = TRUE; + if (battle_side_get_owner(gUnknown_0202F7C8)) + { + sprite->data1 = -gBattleAnimArgs[1]; + } + else + { + sprite->data1 = gBattleAnimArgs[1]; + } + sprite->data0 = gBattleAnimArgs[0]; + sprite->data2 = 0; + sprite->data3 = gUnknown_02024BE0[gUnknown_0202F7C8]; + sprite->data4 = gBattleAnimArgs[0]; + oamt_set_x3A_32(sprite, sub_80A85A4); + sprite->callback = sub_8078458; +} + +static void sub_80A85A4(struct Sprite *sprite) +{ + sprite->data0 = sprite->data4; + sprite->data1 = -sprite->data1; + sprite->callback = sub_8078458; + oamt_set_x3A_32(sprite, move_anim_8072740); +} + +void sub_80A85C8(struct Sprite *sprite) +{ + u8 spriteId; + sprite->invisible = TRUE; + spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[2]); + sprite->data0 = gBattleAnimArgs[0]; + sprite->data1 = 0; + sprite->data2 = gBattleAnimArgs[1]; + sprite->data3 = spriteId; + sprite->data4 = gBattleAnimArgs[0]; + oamt_set_x3A_32(sprite, sub_80A8614); + sprite->callback = sub_8078458; +} + +void sub_80A8614(struct Sprite *sprite) +{ + sprite->data0 = sprite->data4; + sprite->data2 = -sprite->data2; + sprite->callback = sub_8078458; + oamt_set_x3A_32(sprite, move_anim_8072740); +} + +void sub_80A8638(struct Sprite *sprite) +{ + int something; + int spriteId; + if (!gBattleAnimArgs[0]) + { + spriteId = gUnknown_02024BE0[gUnknown_0202F7C8]; + } + else + { + spriteId = gUnknown_02024BE0[gUnknown_0202F7C9]; + } + sprite->data0 = gBattleAnimArgs[2]; + sprite->data1 = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; + sprite->data2 = gSprites[spriteId].pos1.x; + sprite->data3 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; + sprite->data4 = gSprites[spriteId].pos1.y; + something = 0; + sub_8078A5C(sprite); + sprite->data3 = something; + sprite->data4 = something; + sprite->data5 = gSprites[spriteId].pos2.x; + sprite->data6 = gSprites[spriteId].pos2.y; + sprite->invisible = TRUE; + if (gBattleAnimArgs[1] == 1) + { + sprite->data2 = something; + } + else if (gBattleAnimArgs[1] == 2) + { + sprite->data1 = something; + } + sprite->data7 = gBattleAnimArgs[1]; + sprite->data7 |= spriteId << 8; + sprite->callback = sub_80A86F4; +} + +static void sub_80A86F4(struct Sprite *sprite) +{ + s8 spriteId; + u8 lo; + struct Sprite *sprite2; + lo = sprite->data7 & 0xff; + spriteId = sprite->data7 >> 8; + sprite2 = &gSprites[spriteId]; + if (sprite->data0 == 0) + { + if (lo < 2) + { + sprite2->pos2.x = 0; + } + if (lo == 2 || lo == 0) + { + sprite2->pos2.y = 0; + } + move_anim_8072740(sprite); + } + else + { + sprite->data0--; + sprite->data3 += sprite->data1; + sprite->data4 += sprite->data2; + sprite2->pos2.x = (s8)(sprite->data3 >> 8) + sprite->data5; + sprite2->pos2.y = (s8)(sprite->data4 >> 8) + sprite->data6; + } +} + +void sub_80A8764(struct Sprite *sprite) +{ + u8 v1; + u8 spriteId; + if (!gBattleAnimArgs[0]) + { + v1 = gUnknown_0202F7C8; + } + else + { + v1 = gUnknown_0202F7C9; + } + spriteId = gUnknown_02024BE0[v1]; + if (battle_side_get_owner(v1)) + { + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + if (gBattleAnimArgs[3] == 1) + { + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + } + } + sprite->data0 = gBattleAnimArgs[4]; + sprite->data1 = gSprites[spriteId].pos1.x; + sprite->data2 = gSprites[spriteId].pos1.x + gBattleAnimArgs[1]; + sprite->data3 = gSprites[spriteId].pos1.y; + sprite->data4 = gSprites[spriteId].pos1.y + gBattleAnimArgs[2]; + sub_8078A5C(sprite); + sprite->data3 = 0; + sprite->data4 = 0; + sprite->data5 = spriteId; + sprite->invisible = TRUE; + oamt_set_x3A_32(sprite, move_anim_8072740); + sprite->callback = sub_80784A8; +} + +void sub_80A8818(struct Sprite *sprite) +{ + u8 spriteId; + u8 v1; + sprite->invisible = TRUE; + if (!gBattleAnimArgs[0]) + { + v1 = gUnknown_0202F7C8; + } + else + { + v1 = gUnknown_0202F7C9; + } + spriteId = gUnknown_02024BE0[v1]; + if (battle_side_get_owner(v1)) + { + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + if (gBattleAnimArgs[3] == 1) + { + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + } + } + sprite->data0 = gBattleAnimArgs[4]; + sprite->data1 = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; + sprite->data2 = sprite->data1 + gBattleAnimArgs[1]; + sprite->data3 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; + sprite->data4 = sprite->data3 + gBattleAnimArgs[2]; + sub_8078A5C(sprite); + sprite->data3 = gSprites[spriteId].pos2.x << 8; + sprite->data4 = gSprites[spriteId].pos2.y << 8; + sprite->data5 = spriteId; + sprite->data6 = gBattleAnimArgs[5]; + if (!gBattleAnimArgs[5]) + { + oamt_set_x3A_32(sprite, move_anim_8072740); + } + else + { + oamt_set_x3A_32(sprite, sub_80A88F0); + } + sprite->callback = sub_80784A8; +} + + +static void sub_80A88F0(struct Sprite *sprite) +{ + gSprites[sprite->data5].pos2.x = 0; + gSprites[sprite->data5].pos2.y = 0; + move_anim_8072740(sprite); +} + +void sub_80A8920(u8 task) +{ + s16 r7; + r7 = 0x8000 / gBattleAnimArgs[3]; + if (battle_side_get_owner(gUnknown_0202F7C8)) + { + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + gBattleAnimArgs[5] = -gBattleAnimArgs[5]; + } + TASK.data[0] = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); + TASK.data[1] = (gBattleAnimArgs[1] << 8) / gBattleAnimArgs[3]; + TASK.data[2] = gBattleAnimArgs[2]; + TASK.data[3] = gBattleAnimArgs[3]; + TASK.data[4] = gBattleAnimArgs[4]; + TASK.data[5] = (gBattleAnimArgs[5] << 8) / gBattleAnimArgs[6]; + TASK.data[6] = gBattleAnimArgs[6]; + TASK.data[7] = r7; + TASK.func = sub_80A89B4; +} + +static void sub_80A89B4(u8 task) +{ + u8 spriteId; + spriteId = TASK.data[0]; + TASK.data[11] += TASK.data[1]; + gSprites[spriteId].pos2.x = TASK.data[11] >> 8; + gSprites[spriteId].pos2.y = Sin((u8)(TASK.data[10] >> 8), TASK.data[2]); + TASK.data[10] += TASK.data[7]; + if (--TASK.data[3] == 0) + { + TASK.func = sub_80A8A18; + } +} + +static void sub_80A8A18(u8 task) +{ + u8 spriteId; + if (TASK.data[4] > 0) + { + TASK.data[4]--; + } + else + { + spriteId = TASK.data[0]; + TASK.data[12] += TASK.data[5]; + gSprites[spriteId].pos2.x = (TASK.data[12] >> 8) + (TASK.data[11] >> 8); + if (--TASK.data[6] == 0) + { + move_anim_task_del(task); + return; + } + } } static void sub_80A8B3C(u8 task); -void sub_80A8A80(u8 task) { - u8 spriteId; - switch (gBattleAnimArgs[0]) { - case 0: - case 1: - spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); - break; - case 2: - if (!b_side_obj__get_some_boolean(gUnknown_0202F7C8 ^ 2)) { - move_anim_task_del(task); - return; - } - spriteId = gUnknown_02024BE0[gUnknown_0202F7C8 ^ 2]; - break; - case 3: - if (!b_side_obj__get_some_boolean(gUnknown_0202F7C9 ^ 2)) { - move_anim_task_del(task); - return; - } - spriteId = gUnknown_02024BE0[gUnknown_0202F7C9 ^ 2]; - break; - default: - move_anim_task_del(task); - return; - } - TASK.data[0] = spriteId; - if (battle_side_get_owner(gUnknown_0202F7C9)) { - TASK.data[1] = gBattleAnimArgs[1]; - } else { - TASK.data[1] = -gBattleAnimArgs[1]; - } - TASK.func = sub_80A8B3C; -} - -static void sub_80A8B3C(u8 task) { - u8 spriteId = TASK.data[0]; - gSprites[spriteId].pos2.x += TASK.data[1]; - if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x + 0x20 > 0x130u) { - move_anim_task_del(task); - return; - } -} - -void sub_80A8B88(u8 task) { - u8 spriteId; - if (battle_side_get_owner(gUnknown_0202F7C8)) { - gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - } - spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[4]); - TASK.data[0] = gBattleAnimArgs[0]; - TASK.data[1] = gBattleAnimArgs[1]; - TASK.data[2] = gBattleAnimArgs[2]; - TASK.data[3] = gBattleAnimArgs[3]; - TASK.data[4] = spriteId; - if (gBattleAnimArgs[4] == 0) { - TASK.data[5] = gUnknown_0202F7C8; - } else { - TASK.data[5] = gUnknown_0202F7C9; - } - TASK.data[12] = 1; - TASK.func = sub_80A8C0C; -} - -static void sub_80A8C0C(u8 task) { - s16 y; - u8 spriteId; - int index; - u16 val; - spriteId = TASK.data[4]; - val = TASK.data[10] + TASK.data[2]; - TASK.data[10] = val; - index = val >> 8; - y = Sin(index, TASK.data[1]); - if (TASK.data[0] == 0) { - gSprites[spriteId].pos2.x = y; - } else { - if (battle_side_get_owner(TASK.data[5]) == 0) { - gSprites[spriteId].pos2.y = (y >= 0) ? y : -y; - } else { - gSprites[spriteId].pos2.y = (y >= 0) ? -y : y; - } - } - if (((index >= 0x80u) && (TASK.data[11] == 0) && (TASK.data[12] == 1)) - || ((index < 0x7fu) && (TASK.data[11] == 1) && (TASK.data[12] == 0))) { - TASK.data[11] ^= 1; - TASK.data[12] ^= 1; - if (--TASK.data[3] == 0) { - gSprites[spriteId].pos2.x = 0; - gSprites[spriteId].pos2.y = 0; - move_anim_task_del(task); - return; - } - } -} - -void sub_80A8D34(u8 task) { - u8 spriteId; - spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[3]); - sub_8078E70(spriteId, gBattleAnimArgs[4]); - TASK.data[0] = gBattleAnimArgs[0]; - TASK.data[1] = gBattleAnimArgs[1]; - TASK.data[2] = gBattleAnimArgs[2]; - TASK.data[3] = gBattleAnimArgs[2]; - TASK.data[4] = spriteId; - TASK.data[10] = 0x100; - TASK.data[11] = 0x100; - TASK.func = sub_80A8D8C; -} - -static void sub_80A8D8C(u8 task) { - u8 spriteId; - TASK.data[10] += TASK.data[0]; - TASK.data[11] += TASK.data[1]; - spriteId = TASK.data[4]; - obj_id_set_rotscale(spriteId, TASK.data[10], TASK.data[11], 0); - if (--TASK.data[2] == 0) { - if (TASK.data[3] > 0) { - TASK.data[0] = -TASK.data[0]; - TASK.data[1] = -TASK.data[1]; - TASK.data[2] = TASK.data[3]; - TASK.data[3] = 0; - } else { - sub_8078F40(spriteId); - move_anim_task_del(task); - return; - } - } -} - -void sub_80A8E04(u8 task) { - u8 spriteId; - spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[2]); - sub_8078E70(spriteId, 0); - TASK.data[1] = 0; - TASK.data[2] = gBattleAnimArgs[0]; - if (gBattleAnimArgs[3] != 1) { - TASK.data[3] = 0; - } else { - TASK.data[3] = gBattleAnimArgs[0] * gBattleAnimArgs[1]; - } - TASK.data[4] = gBattleAnimArgs[1]; - TASK.data[5] = spriteId; - TASK.data[6] = gBattleAnimArgs[3]; - if (sub_8076BE0()) { - TASK.data[7] = 1; - } else { - if (gBattleAnimArgs[2] == 0) { - TASK.data[7] = !battle_side_get_owner(gUnknown_0202F7C8); - } else { - TASK.data[7] = !battle_side_get_owner(gUnknown_0202F7C9); - } - } - if (TASK.data[7]) { - if (!sub_8076BE0()) { - TASK.data[3] *= -1; - TASK.data[4] *= -1; - } - } - TASK.func = sub_80A8FD8; -} - -void sub_80A8EFC(u8 task) { - u8 spriteId; - spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[2]); - sub_8078E70(spriteId, 0); - TASK.data[1] = 0; - TASK.data[2] = gBattleAnimArgs[0]; - if (gBattleAnimArgs[2] == 0) { - if (battle_side_get_owner(gUnknown_0202F7C8)) { - gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - } - } else { - if (battle_side_get_owner(gUnknown_0202F7C9)) { - gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - } - } - if (gBattleAnimArgs[3] != 1) { - TASK.data[3] = 0; - } else { - TASK.data[3] = gBattleAnimArgs[0] * gBattleAnimArgs[1]; - } - TASK.data[4] = gBattleAnimArgs[1]; - TASK.data[5] = spriteId; - TASK.data[6] = gBattleAnimArgs[3]; - TASK.data[7] = 1; - TASK.data[3] *= -1; - TASK.data[4] *= -1; - TASK.func = sub_80A8FD8; -} - -void sub_80A8FD8(u8 task) { - TASK.data[3] += TASK.data[4]; - obj_id_set_rotscale(TASK.data[5], 0x100, 0x100, TASK.data[3]); - if (TASK.data[7]) { - sub_8078F9C(TASK.data[5]); - } - if (++TASK.data[1] >= TASK.data[2]) { - switch (TASK.data[6]) { - case 1: - sub_8078F40(TASK.data[5]); - case 0: - default: - move_anim_task_del(task); - return; - case 2: - TASK.data[1] = 0; - TASK.data[4] *= -1; - TASK.data[6] = 1; - break; - } - } -} - -void sub_80A9058(u8 task) { - if (!gBattleAnimArgs[0]) { - TASK.data[15] = gUnknown_0202F7BC / 12; - if (TASK.data[15] < 1) { - TASK.data[15] = 1; - } - if (TASK.data[15] > 16) { - TASK.data[15] = 16; - } - } else { - TASK.data[15] = gUnknown_0202F7B8 / 12; - if (TASK.data[15] < 1) { - TASK.data[15] = 1; - } - if (TASK.data[15] > 16) { - TASK.data[15] = 16; - } - } - TASK.data[14] = TASK.data[15] / 2; - TASK.data[13] = TASK.data[14] + (TASK.data[15] & 1); - TASK.data[12] = 0; - TASK.data[10] = gBattleAnimArgs[3]; - TASK.data[11] = gBattleAnimArgs[4]; - TASK.data[7] = obj_id_for_side_relative_to_move(1); - TASK.data[8] = gSprites[TASK.data[7]].pos2.x; - TASK.data[9] = gSprites[TASK.data[7]].pos2.y; - TASK.data[0] = 0; - TASK.data[1] = gBattleAnimArgs[1]; - TASK.data[2] = gBattleAnimArgs[2]; - TASK.func = sub_80A913C; -} - -static void sub_80A913C(u8 taskId) { - struct Task *task = &gTasks[taskId]; - if (++task->data[0] > task->data[1]) { - task->data[0] = 0; - task->data[12] = (task->data[12] + 1) & 1; - if (task->data[10]) { - if (task->data[12]) { - gSprites[task->data[7]].pos2.x = task->data[8] + task->data[13]; - } else { - gSprites[task->data[7]].pos2.x = task->data[8] - task->data[14]; - } - } - if (task->data[11]) { - if (task->data[12]) { - gSprites[task->data[7]].pos2.y = task->data[15]; - } else { - gSprites[task->data[7]].pos2.y = 0; - } - } - if (!--task->data[2]) { - gSprites[task->data[7]].pos2.x = 0; - gSprites[task->data[7]].pos2.y = 0; - move_anim_task_del(taskId); - return; - } - } +void sub_80A8A80(u8 task) +{ + u8 spriteId; + switch (gBattleAnimArgs[0]) + { + case 0: + case 1: + spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); + break; + case 2: + if (!b_side_obj__get_some_boolean(gUnknown_0202F7C8 ^ 2)) + { + move_anim_task_del(task); + return; + } + spriteId = gUnknown_02024BE0[gUnknown_0202F7C8 ^ 2]; + break; + case 3: + if (!b_side_obj__get_some_boolean(gUnknown_0202F7C9 ^ 2)) + { + move_anim_task_del(task); + return; + } + spriteId = gUnknown_02024BE0[gUnknown_0202F7C9 ^ 2]; + break; + default: + move_anim_task_del(task); + return; + } + TASK.data[0] = spriteId; + if (battle_side_get_owner(gUnknown_0202F7C9)) + { + TASK.data[1] = gBattleAnimArgs[1]; + } + else + { + TASK.data[1] = -gBattleAnimArgs[1]; + } + TASK.func = sub_80A8B3C; +} + +static void sub_80A8B3C(u8 task) +{ + u8 spriteId = TASK.data[0]; + gSprites[spriteId].pos2.x += TASK.data[1]; + if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x + 0x20 > 0x130u) + { + move_anim_task_del(task); + return; + } +} + +void sub_80A8B88(u8 task) +{ + u8 spriteId; + if (battle_side_get_owner(gUnknown_0202F7C8)) + { + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + } + spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[4]); + TASK.data[0] = gBattleAnimArgs[0]; + TASK.data[1] = gBattleAnimArgs[1]; + TASK.data[2] = gBattleAnimArgs[2]; + TASK.data[3] = gBattleAnimArgs[3]; + TASK.data[4] = spriteId; + if (gBattleAnimArgs[4] == 0) + { + TASK.data[5] = gUnknown_0202F7C8; + } + else + { + TASK.data[5] = gUnknown_0202F7C9; + } + TASK.data[12] = 1; + TASK.func = sub_80A8C0C; +} + +static void sub_80A8C0C(u8 task) +{ + s16 y; + u8 spriteId; + int index; + u16 val; + spriteId = TASK.data[4]; + val = TASK.data[10] + TASK.data[2]; + TASK.data[10] = val; + index = val >> 8; + y = Sin(index, TASK.data[1]); + if (TASK.data[0] == 0) + { + gSprites[spriteId].pos2.x = y; + } + else + { + if (battle_side_get_owner(TASK.data[5]) == 0) + { + gSprites[spriteId].pos2.y = (y >= 0) ? y : -y; + } + else + { + gSprites[spriteId].pos2.y = (y >= 0) ? -y : y; + } + } + if (((index >= 0x80u) && (TASK.data[11] == 0) && (TASK.data[12] == 1)) + || ((index < 0x7fu) && (TASK.data[11] == 1) && (TASK.data[12] == 0))) + { + TASK.data[11] ^= 1; + TASK.data[12] ^= 1; + if (--TASK.data[3] == 0) + { + gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].pos2.y = 0; + move_anim_task_del(task); + return; + } + } +} + +void sub_80A8D34(u8 task) +{ + u8 spriteId; + spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[3]); + sub_8078E70(spriteId, gBattleAnimArgs[4]); + TASK.data[0] = gBattleAnimArgs[0]; + TASK.data[1] = gBattleAnimArgs[1]; + TASK.data[2] = gBattleAnimArgs[2]; + TASK.data[3] = gBattleAnimArgs[2]; + TASK.data[4] = spriteId; + TASK.data[10] = 0x100; + TASK.data[11] = 0x100; + TASK.func = sub_80A8D8C; +} + +static void sub_80A8D8C(u8 task) +{ + u8 spriteId; + TASK.data[10] += TASK.data[0]; + TASK.data[11] += TASK.data[1]; + spriteId = TASK.data[4]; + obj_id_set_rotscale(spriteId, TASK.data[10], TASK.data[11], 0); + if (--TASK.data[2] == 0) + { + if (TASK.data[3] > 0) + { + TASK.data[0] = -TASK.data[0]; + TASK.data[1] = -TASK.data[1]; + TASK.data[2] = TASK.data[3]; + TASK.data[3] = 0; + } + else + { + sub_8078F40(spriteId); + move_anim_task_del(task); + return; + } + } +} + +void sub_80A8E04(u8 task) +{ + u8 spriteId; + spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[2]); + sub_8078E70(spriteId, 0); + TASK.data[1] = 0; + TASK.data[2] = gBattleAnimArgs[0]; + if (gBattleAnimArgs[3] != 1) + { + TASK.data[3] = 0; + } + else + { + TASK.data[3] = gBattleAnimArgs[0] * gBattleAnimArgs[1]; + } + TASK.data[4] = gBattleAnimArgs[1]; + TASK.data[5] = spriteId; + TASK.data[6] = gBattleAnimArgs[3]; + if (sub_8076BE0()) + { + TASK.data[7] = 1; + } + else + { + if (gBattleAnimArgs[2] == 0) + { + TASK.data[7] = !battle_side_get_owner(gUnknown_0202F7C8); + } + else + { + TASK.data[7] = !battle_side_get_owner(gUnknown_0202F7C9); + } + } + if (TASK.data[7]) + { + if (!sub_8076BE0()) + { + TASK.data[3] *= -1; + TASK.data[4] *= -1; + } + } + TASK.func = sub_80A8FD8; +} + +void sub_80A8EFC(u8 task) +{ + u8 spriteId; + spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[2]); + sub_8078E70(spriteId, 0); + TASK.data[1] = 0; + TASK.data[2] = gBattleAnimArgs[0]; + if (gBattleAnimArgs[2] == 0) + { + if (battle_side_get_owner(gUnknown_0202F7C8)) + { + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + } + } + else + { + if (battle_side_get_owner(gUnknown_0202F7C9)) + { + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + } + } + if (gBattleAnimArgs[3] != 1) + { + TASK.data[3] = 0; + } + else + { + TASK.data[3] = gBattleAnimArgs[0] * gBattleAnimArgs[1]; + } + TASK.data[4] = gBattleAnimArgs[1]; + TASK.data[5] = spriteId; + TASK.data[6] = gBattleAnimArgs[3]; + TASK.data[7] = 1; + TASK.data[3] *= -1; + TASK.data[4] *= -1; + TASK.func = sub_80A8FD8; +} + +void sub_80A8FD8(u8 task) +{ + TASK.data[3] += TASK.data[4]; + obj_id_set_rotscale(TASK.data[5], 0x100, 0x100, TASK.data[3]); + if (TASK.data[7]) + { + sub_8078F9C(TASK.data[5]); + } + if (++TASK.data[1] >= TASK.data[2]) + { + switch (TASK.data[6]) + { + case 1: + sub_8078F40(TASK.data[5]); + case 0: + default: + move_anim_task_del(task); + return; + case 2: + TASK.data[1] = 0; + TASK.data[4] *= -1; + TASK.data[6] = 1; + break; + } + } +} + +void sub_80A9058(u8 task) +{ + if (!gBattleAnimArgs[0]) + { + TASK.data[15] = gUnknown_0202F7BC / 12; + if (TASK.data[15] < 1) + { + TASK.data[15] = 1; + } + if (TASK.data[15] > 16) + { + TASK.data[15] = 16; + } + } + else + { + TASK.data[15] = gUnknown_0202F7B8 / 12; + if (TASK.data[15] < 1) + { + TASK.data[15] = 1; + } + if (TASK.data[15] > 16) + { + TASK.data[15] = 16; + } + } + TASK.data[14] = TASK.data[15] / 2; + TASK.data[13] = TASK.data[14] + (TASK.data[15] & 1); + TASK.data[12] = 0; + TASK.data[10] = gBattleAnimArgs[3]; + TASK.data[11] = gBattleAnimArgs[4]; + TASK.data[7] = obj_id_for_side_relative_to_move(1); + TASK.data[8] = gSprites[TASK.data[7]].pos2.x; + TASK.data[9] = gSprites[TASK.data[7]].pos2.y; + TASK.data[0] = 0; + TASK.data[1] = gBattleAnimArgs[1]; + TASK.data[2] = gBattleAnimArgs[2]; + TASK.func = sub_80A913C; +} + +static void sub_80A913C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + if (++task->data[0] > task->data[1]) + { + task->data[0] = 0; + task->data[12] = (task->data[12] + 1) & 1; + if (task->data[10]) + { + if (task->data[12]) + { + gSprites[task->data[7]].pos2.x = task->data[8] + task->data[13]; + } + else + { + gSprites[task->data[7]].pos2.x = task->data[8] - task->data[14]; + } + } + if (task->data[11]) + { + if (task->data[12]) + { + gSprites[task->data[7]].pos2.y = task->data[15]; + } + else + { + gSprites[task->data[7]].pos2.y = 0; + } + } + if (!--task->data[2]) + { + gSprites[task->data[7]].pos2.x = 0; + gSprites[task->data[7]].pos2.y = 0; + move_anim_task_del(taskId); + return; + } + } } diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index 2d6399b8a..c6d39d5a0 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -352,7 +352,7 @@ static void Task_809538C(void) SetMainCallback2(sub_806AEDC); return; } - } while(sub_80F9344() != 1); + } while (sub_80F9344() != 1); } static void Task_HandlePopupMenuInput(u8 taskId) diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 6eec09c53..040b9acd1 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -191,42 +191,42 @@ bool8 sub_81462B8(void) switch (unk_2000000.var_1FFFF) { - case 0: - LZDecompressVram(gBerryCheck_Gfx, (void *) VRAM); - unk_2000000.var_1FFFF += 1; - break; - case 1: - LZDecompressVram(gUnknown_08E788E4, (void *) VRAM + 0x2800); - unk_2000000.var_1FFFF += 1; - break; - case 2: - LZDecompressVram(gUnknown_08E78A84, (void *) VRAM + 0x3000); - unk_2000000.var_1FFFF += 1; - break; - case 3: - for (i = 0; i < 0x400; i++) - { - if (gSaveBlock2.playerGender == MALE) - gBGTilemapBuffers[2][i] = 0x4042; - else - gBGTilemapBuffers[2][i] = 0x5042; - } - addr = (void *)(VRAM + 0x3800); - DmaCopy16(3, gBGTilemapBuffers[2], addr, 0x800); - unk_2000000.var_1FFFF += 1; - break; - case 4: - LoadCompressedPalette(gBerryCheck_Pal, 0, 96 * 2); - unk_2000000.var_1FFFF += 1; - break; - case 5: - LoadCompressedObjectPic(&gUnknown_083C1F74); - unk_2000000.var_1FFFF += 1; - break; - case 6: - LoadCompressedObjectPalette(&gUnknown_083C1F7C); - unk_2000000.var_1FFFF = 0; - return TRUE; + case 0: + LZDecompressVram(gBerryCheck_Gfx, (void *)VRAM); + unk_2000000.var_1FFFF += 1; + break; + case 1: + LZDecompressVram(gUnknown_08E788E4, (void *)VRAM + 0x2800); + unk_2000000.var_1FFFF += 1; + break; + case 2: + LZDecompressVram(gUnknown_08E78A84, (void *)VRAM + 0x3000); + unk_2000000.var_1FFFF += 1; + break; + case 3: + for (i = 0; i < 0x400; i++) + { + if (gSaveBlock2.playerGender == MALE) + gBGTilemapBuffers[2][i] = 0x4042; + else + gBGTilemapBuffers[2][i] = 0x5042; + } + addr = (void *)(VRAM + 0x3800); + DmaCopy16(3, gBGTilemapBuffers[2], addr, 0x800); + unk_2000000.var_1FFFF += 1; + break; + case 4: + LoadCompressedPalette(gBerryCheck_Pal, 0, 96 * 2); + unk_2000000.var_1FFFF += 1; + break; + case 5: + LoadCompressedObjectPic(&gUnknown_083C1F74); + unk_2000000.var_1FFFF += 1; + break; + case 6: + LoadCompressedObjectPalette(&gUnknown_083C1F7C); + unk_2000000.var_1FFFF = 0; + return TRUE; } return FALSE; @@ -309,7 +309,7 @@ static void sub_8146600(u8 berry) struct Berry *berryInfo; u16 i; - berryInfo = GetBerryInfo(berry +1); + berryInfo = GetBerryInfo(berry + 1); for (i = 0; i < 5; i++) gUnknown_0203932E.circles[i] = (u16)gUnknown_0203932E.circles[i] | 0xFFFF; @@ -341,7 +341,8 @@ void sub_81466A0(void) } __attribute__((naked)) -static void sub_81466E8(u8 taskId, s8 direction) { +static void sub_81466E8(u8 taskId, s8 direction) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r8\n\ @@ -440,7 +441,7 @@ _0814678C:\n\ void sub_8146798(u8 taskId) { s16 *taskData = gTasks[taskId].data; - + gUnknown_030041B4 = (gUnknown_030041B4 + taskData[0]) & 0xFF; if ((taskData[0] > 0 && gUnknown_030041B4 == 144) || (taskData[0] < 0 && gUnknown_030041B4 == 112)) @@ -457,7 +458,8 @@ void sub_8146798(u8 taskId) } __attribute__((naked)) -static void sub_8146810(s8 berry) { +static void sub_8146810(s8 berry) +{ asm(".syntax unified\n\ push {r4-r6,lr}\n\ lsls r0, 24\n\ diff --git a/src/bike.c b/src/bike.c index e9b765b31..ce175bc66 100644 --- a/src/bike.c +++ b/src/bike.c @@ -892,7 +892,7 @@ static bool8 sub_80E5E70(u8 var1, u8 var2) static bool8 sub_80E5EC0(u8 var1, u8 var2) { - if((u8)(var2 - 1) < 2) + if ((u8)(var2 - 1) < 2) { if (var1 == 10 || var1 == 12) return FALSE; @@ -910,7 +910,7 @@ bool8 IsBikingDisallowedByPlayer(void) s16 x, y; u8 tileBehavior; - if(!(gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_SURFING | PLAYER_AVATAR_FLAG_4))) + if (!(gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_SURFING | PLAYER_AVATAR_FLAG_4))) { PlayerGetDestCoords(&x, &y); tileBehavior = MapGridGetMetatileBehaviorAt(x, y); @@ -957,10 +957,10 @@ void sub_80E5FCC(int var1, int var2) gPlayerAvatar.unkC = var1; gPlayerAvatar.unk10 = var2; - for(i = 0; i < 8; i++) + for (i = 0; i < 8; i++) gPlayerAvatar.unk14[i] = 0; - for(i = 0; i < 8; i++) + for (i = 0; i < 8; i++) gPlayerAvatar.unk1C[i] = 0; } diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index cf05bdf20..8bbd1ce13 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -28,13 +28,13 @@ void SealedChamberShakingEffect(u8 taskId); bool8 ShouldDoBrailleDigEffect(void) { - if(!FlagGet(SYS_BRAILLE_DIG) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x47)) + if (!FlagGet(SYS_BRAILLE_DIG) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x47)) { - if(gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 3) + if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 3) return TRUE; - else if(gSaveBlock1.pos.x == 9 && gSaveBlock1.pos.y == 3) + else if (gSaveBlock1.pos.x == 9 && gSaveBlock1.pos.y == 3) return TRUE; - else if(gSaveBlock1.pos.x == 11 && gSaveBlock1.pos.y == 3) + else if (gSaveBlock1.pos.x == 11 && gSaveBlock1.pos.y == 3) return TRUE; } @@ -57,11 +57,11 @@ void DoBrailleDigEffect(void) bool8 CheckRelicanthWailord(void) { - if(GetMonData(&gPlayerParty, MON_DATA_SPECIES2, 0) == SPECIES_RELICANTH) + if (GetMonData(&gPlayerParty, MON_DATA_SPECIES2, 0) == SPECIES_RELICANTH) { CalculatePlayerPartyCount(); - if(GetMonData(&gPlayerParty[gPlayerPartyCount - 1], MON_DATA_SPECIES2, 0) == SPECIES_WAILORD) + if (GetMonData(&gPlayerParty[gPlayerPartyCount - 1], MON_DATA_SPECIES2, 0) == SPECIES_WAILORD) return TRUE; } return FALSE; @@ -69,13 +69,13 @@ bool8 CheckRelicanthWailord(void) bool8 ShouldDoBrailleStrengthEffect(void) { - if(!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x6)) + if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x6)) { - if(gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23) + if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23) return TRUE; - else if(gSaveBlock1.pos.x == 9 && gSaveBlock1.pos.y == 23) + else if (gSaveBlock1.pos.x == 9 && gSaveBlock1.pos.y == 23) return TRUE; - else if(gSaveBlock1.pos.x == 11 && gSaveBlock1.pos.y == 23) + else if (gSaveBlock1.pos.x == 11 && gSaveBlock1.pos.y == 23) return TRUE; } @@ -99,9 +99,9 @@ void DoBrailleStrengthEffect(void) bool8 ShouldDoBrailleFlyEffect(void) { - if(!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x44)) + if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x44)) { - if(gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25) + if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25) return TRUE; } @@ -145,7 +145,7 @@ void UseFlyAncientTomb_Finish(void) void DoBrailleWait(void) { - if(!FlagGet(SYS_BRAILLE_WAIT)) + if (!FlagGet(SYS_BRAILLE_WAIT)) CreateTask(Task_BrailleWait, 0x50); } @@ -153,14 +153,14 @@ void Task_BrailleWait(u8 taskId) { s16 *data = gTasks[taskId].data; - switch(data[0]) + switch (data[0]) { case 0: data[1] = 7200; data[0] = 1; break; case 1: - if(BrailleWait_CheckButtonPress() != FALSE) + if (BrailleWait_CheckButtonPress() != FALSE) { MenuZeroFillScreen(); PlaySE(5); @@ -169,7 +169,7 @@ void Task_BrailleWait(u8 taskId) else { data[1] = data[1] - 1; - if(data[1] == 0) + if (data[1] == 0) { MenuZeroFillScreen(); data[0] = 3; @@ -178,10 +178,10 @@ void Task_BrailleWait(u8 taskId) } break; case 2: - if(BrailleWait_CheckButtonPress() == FALSE) + if (BrailleWait_CheckButtonPress() == FALSE) { data[1] = data[1] - 1; - if(data[1] == 0) + if (data[1] == 0) data[0] = 4; break; } @@ -191,7 +191,7 @@ void Task_BrailleWait(u8 taskId) break; case 3: data[1] = data[1] - 1; - if(data[1] == 0) + if (data[1] == 0) data[0] = 4; break; case 4: @@ -206,12 +206,12 @@ bool32 BrailleWait_CheckButtonPress(void) { u16 var = 0xFF; - if(gSaveBlock2.optionsButtonMode == 1) + if (gSaveBlock2.optionsButtonMode == 1) var |= 0x300; - if(gSaveBlock2.optionsButtonMode == 2) + if (gSaveBlock2.optionsButtonMode == 2) var |= 0x200; - if((var & gMain.newKeys) != FALSE) + if ((var & gMain.newKeys) != FALSE) return TRUE; else return FALSE; @@ -247,13 +247,13 @@ void SealedChamberShakingEffect(u8 taskId) task->data[1]++; - if(!(task->data[1] % task->data[5])) + if (!(task->data[1] % task->data[5])) { task->data[1] = 0; task->data[2]++; task->data[4] = -task->data[4]; SetCameraPanning(0, task->data[4]); - if(task->data[2] == task->data[6]) + if (task->data[2] == task->data[6]) { DestroyTask(taskId); EnableBothScriptContexts(); diff --git a/src/coins.c b/src/coins.c index 18b11a9d9..193ea249e 100644 --- a/src/coins.c +++ b/src/coins.c @@ -35,7 +35,7 @@ void PrintCoins(s32 a, u8 b, u8 c, u8 d) c = c - r1 / 8; foo = r1 % 8; ptr = gStringVar1; - if(foo) + if (foo) { ptr[0] = 0xFC; ptr[1] = 0x11; @@ -59,15 +59,15 @@ bool8 GiveCoins(u16 coins) { u32 newCoins; - if(GetCoins() >= MAX_COINS) + if (GetCoins() >= MAX_COINS) return FALSE; newCoins = coins + gSaveBlock1.coins; - if(gSaveBlock1.coins > (u16)newCoins) + if (gSaveBlock1.coins > (u16)newCoins) gSaveBlock1.coins = MAX_COINS; else { gSaveBlock1.coins = newCoins; - if((u16)newCoins > MAX_COINS) + if ((u16)newCoins > MAX_COINS) gSaveBlock1.coins = MAX_COINS; } return TRUE; @@ -75,7 +75,7 @@ bool8 GiveCoins(u16 coins) bool8 TakeCoins(u16 coins) { - if(GetCoins() >= coins) + if (GetCoins() >= coins) { gSaveBlock1.coins -= coins; return TRUE; diff --git a/src/contest_painting.c b/src/contest_painting.c index 7de005a46..b77041f41 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -379,40 +379,45 @@ struct MonCoords }; #ifdef NONMATCHING -static void sub_8106AC4(u16 species, u8 arg1) { +static void sub_8106AC4(u16 species, u8 arg1) +{ void *pal; // Unsure what gUnknown_03005E8C->var0 is supposed to be. pal = species_and_otid_get_pal(species, gUnknown_03005E8C->var4, gUnknown_03005E8C->var0); LZDecompressVram(pal, gUnknown_03005E90); - if (arg1 == 1) { + if (arg1 == 1) + { HandleLoadSpecialPokePic( - &gMonFrontPicTable[species], - gMonFrontPicCoords[species].x, - gMonFrontPicCoords[species].y, - 0x2000000, - gUnknown_081FAF4C[1], - species, - (u32) gUnknown_03005E8C->var0 + &gMonFrontPicTable[species], + gMonFrontPicCoords[species].x, + gMonFrontPicCoords[species].y, + 0x2000000, + gUnknown_081FAF4C[1], + species, + (u32)gUnknown_03005E8C->var0 ); sub_8106B90(gUnknown_081FAF4C[1], gUnknown_03005E90, gUnknown_03005E10); - } else { + } + else + { HandleLoadSpecialPokePic( - &gMonBackPicTable[species], - gMonBackPicCoords[species].x, - gMonBackPicCoords[species].y, - 0x2000000, - gUnknown_081FAF4C[0], - species, - (u32) gUnknown_03005E8C->var0 + &gMonBackPicTable[species], + gMonBackPicCoords[species].x, + gMonBackPicCoords[species].y, + 0x2000000, + gUnknown_081FAF4C[0], + species, + (u32)gUnknown_03005E8C->var0 ); sub_8106B90(gUnknown_081FAF4C[0], gUnknown_03005E90, gUnknown_03005E10); } } #else __attribute__((naked)) -static void sub_8106AC4(u16 arg0, u8 arg2) { +static void sub_8106AC4(u16 arg0, u8 arg2) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r8\n\ @@ -657,28 +662,28 @@ static void sub_8106C40(u8 arg0, u8 arg1) switch (gUnknown_03005E8C->contestType / 3) { case CONTEST_COOL: - RLUnCompVram(gPictureFrameTiles_0, (void *) VRAM); + RLUnCompVram(gPictureFrameTiles_0, (void *)VRAM); RLUnCompWram(gPictureFrameTilemap_0, gUnknown_03005E10); break; case CONTEST_BEAUTY: - RLUnCompVram(gPictureFrameTiles_1, (void *) VRAM); + RLUnCompVram(gPictureFrameTiles_1, (void *)VRAM); RLUnCompWram(gPictureFrameTilemap_1, gUnknown_03005E10); break; case CONTEST_CUTE: - RLUnCompVram(gPictureFrameTiles_2, (void *) VRAM); + RLUnCompVram(gPictureFrameTiles_2, (void *)VRAM); RLUnCompWram(gPictureFrameTilemap_2, gUnknown_03005E10); break; case CONTEST_SMART: - RLUnCompVram(gPictureFrameTiles_3, (void *) VRAM); + RLUnCompVram(gPictureFrameTiles_3, (void *)VRAM); RLUnCompWram(gPictureFrameTilemap_3, gUnknown_03005E10); break; case CONTEST_TOUGH: - RLUnCompVram(gPictureFrameTiles_4, (void *) VRAM); + RLUnCompVram(gPictureFrameTiles_4, (void *)VRAM); RLUnCompWram(gPictureFrameTilemap_4, gUnknown_03005E10); break; } - #define VRAM_PICTURE_DATA(x, y) (((u16 *)(VRAM + 0x6000))[(y) * 32 + (x)]) +#define VRAM_PICTURE_DATA(x, y) (((u16 *)(VRAM + 0x6000))[(y) * 32 + (x)]) // Set the background for (y = 0; y < 20; y++) @@ -698,36 +703,36 @@ static void sub_8106C40(u8 arg0, u8 arg1) for (x = 0; x < 16; x++) VRAM_PICTURE_DATA(x + 7, 2) = (*gUnknown_03005E10)[2][7]; - #undef VRAM_PICTURE_DATA +#undef VRAM_PICTURE_DATA } else if (arg0 < 8) { - RLUnCompVram(gPictureFrameTiles_5, (void *) VRAM); - RLUnCompVram(gPictureFrameTilemap_5, (void *) (VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTiles_5, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_5, (void *)(VRAM + 0x6000)); } else { switch (gUnknown_03005E8C->contestType / 3) { case CONTEST_COOL: - RLUnCompVram(gPictureFrameTiles_0, (void *) VRAM); - RLUnCompVram(gPictureFrameTilemap_0, (void *) (VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTiles_0, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_0, (void *)(VRAM + 0x6000)); break; case CONTEST_BEAUTY: - RLUnCompVram(gPictureFrameTiles_1, (void *) VRAM); - RLUnCompVram(gPictureFrameTilemap_1, (void *) (VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTiles_1, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_1, (void *)(VRAM + 0x6000)); break; case CONTEST_CUTE: - RLUnCompVram(gPictureFrameTiles_2, (void *) VRAM); - RLUnCompVram(gPictureFrameTilemap_2, (void *) (VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTiles_2, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_2, (void *)(VRAM + 0x6000)); break; case CONTEST_SMART: - RLUnCompVram(gPictureFrameTiles_3, (void *) VRAM); - RLUnCompVram(gPictureFrameTilemap_3, (void *) (VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTiles_3, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_3, (void *)(VRAM + 0x6000)); break; case CONTEST_TOUGH: - RLUnCompVram(gPictureFrameTiles_4, (void *) VRAM); - RLUnCompVram(gPictureFrameTilemap_4, (void *) (VRAM + 0x6000)); + RLUnCompVram(gPictureFrameTiles_4, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_4, (void *)(VRAM + 0x6000)); break; } } diff --git a/src/credits.c b/src/credits.c index 52aeffbbf..eb8f45374 100644 --- a/src/credits.c +++ b/src/credits.c @@ -16,13 +16,15 @@ asm(".set REG_BLDALPHA, REG_BASE + OFFSET_REG_BLDALPHA"); u32 NationalPokedexNumToSpecies(u16 nationalNum); -struct MonCoords { +struct MonCoords +{ u8 x, y; }; extern void *species_and_otid_get_pal(u32, u16, u16); -enum { +enum +{ PAGE_TITLE, PAGE_DIRECTOR, PAGE_ART_DIRECTOR, @@ -84,7 +86,8 @@ enum { #define COLOR_DARK_GREEN 0x1967 #define COLOR_LIGHT_GREEN 0x328D -enum { +enum +{ TDA_0 = 0, TDA_TASK_C_ID = 1, TDA_TASK_E_ID = 2, @@ -122,7 +125,8 @@ enum { TDE_TASK_A_ID = 2, }; -struct Unk201C000 { +struct Unk201C000 +{ u16 unk0[8]; u8 pad_10[0x78]; u16 unk88; @@ -131,7 +135,8 @@ struct Unk201C000 { u16 unk8E; }; -struct CreditsEntry { +struct CreditsEntry +{ u8 var_0; u8 *text; }; @@ -228,13 +233,15 @@ static void spritecb_rival_8145420(struct Sprite *sprite); u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3); void sub_81458DC(void); -static void vblank_8143948(void) { +static void vblank_8143948(void) +{ LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -static void sub_814395C(void) { +static void sub_814395C(void) +{ RunTasks(); AnimateSprites(); BuildOamBuffer(); @@ -263,7 +270,8 @@ static void sub_814395C(void) { gUnknown_02039325 = 1; } -void sub_81439D0(void) { +void sub_81439D0(void) +{ u8 taskIdA; s16 taskIdC; u8 taskIdB; @@ -297,7 +305,7 @@ void sub_81439D0(void) { InitMenuWindow(&gWindowConfig_81E7208); LoadPalette(&gUnknown_0840B7BC, 0x80, sizeof(gUnknown_0840B7BC)); - CpuCopy16(&gUnknown_0840B7FC, (void *) (VRAM + 0xBEE0), sizeof(gUnknown_0840B7FC)); + CpuCopy16(&gUnknown_0840B7FC, (void *)(VRAM + 0xBEE0), sizeof(gUnknown_0840B7FC)); REG_BG0VOFS = 0xFFFC; @@ -331,7 +339,8 @@ void sub_81439D0(void) { gUnknown_02039322 = taskIdA; } -static void task_a_8143B38(u8 taskIdA) { +static void task_a_8143B38(u8 taskIdA) +{ if (gPaletteFade.active) { return; @@ -340,7 +349,8 @@ static void task_a_8143B38(u8 taskIdA) { gTasks[taskIdA].func = task_a_8143B68; } -static void task_a_8143B68(u8 taskIdA) { +static void task_a_8143B68(u8 taskIdA) +{ u16 data11; if (gTasks[taskIdA].data[TDA_4]) @@ -374,7 +384,8 @@ static void task_a_8143B68(u8 taskIdA) { } } -static void task_a_8143BFC(u8 taskIdA) { +static void task_a_8143BFC(u8 taskIdA) +{ if (gPaletteFade.active) { return; @@ -385,7 +396,8 @@ static void task_a_8143BFC(u8 taskIdA) { gTasks[taskIdA].func = task_a_80C9BFC; } -static void task_a_80C9BFC(u8 taskIdA) { +static void task_a_80C9BFC(u8 taskIdA) +{ u16 backup; SetVBlankCallback(NULL); @@ -407,7 +419,8 @@ static void task_a_80C9BFC(u8 taskIdA) { gTasks[taskIdA].func = task_a_8143B38; } -static void task_a_8143CC0(u8 taskIdA) { +static void task_a_8143CC0(u8 taskIdA) +{ if (gPaletteFade.active) { return; @@ -430,8 +443,8 @@ void task_a_8143D04(u8 taskIdA) ResetSpriteData(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 8; - LZ77UnCompVram(&gBirchHelpGfx, (void *) VRAM); - LZ77UnCompVram(&gBirchGrassTilemap, (void *) (VRAM + 0x3800)); + LZ77UnCompVram(&gBirchHelpGfx, (void *)VRAM); + LZ77UnCompVram(&gBirchGrassTilemap, (void *)(VRAM + 0x3800)); LoadPalette(gBirchBagGrassPal + 1, 1, 31 * 2); for (i = 0; i < 0x800; i++) @@ -471,7 +484,8 @@ void task_a_8143D04(u8 taskIdA) } } -static void task_a_8143EBC(u8 taskIdA) { +static void task_a_8143EBC(u8 taskIdA) +{ if (gTasks[taskIdA].data[TDA_12]) { gTasks[taskIdA].data[TDA_12] -= 1; @@ -482,7 +496,8 @@ static void task_a_8143EBC(u8 taskIdA) { gTasks[taskIdA].func = task_a_8143F04; } -static void task_a_8143F04(u8 taskIdA) { +static void task_a_8143F04(u8 taskIdA) +{ if (gPaletteFade.active) { return; @@ -492,7 +507,8 @@ static void task_a_8143F04(u8 taskIdA) { gTasks[taskIdA].func = task_a_8143F3C; } -static void task_a_8143F3C(u8 taskIdA) { +static void task_a_8143F3C(u8 taskIdA) +{ u16 backup; sub_8144130(); @@ -514,7 +530,8 @@ static void task_a_8143F3C(u8 taskIdA) { gTasks[taskIdA].func = task_a_8143FDC; } -static void task_a_8143FDC(u8 taskIdA) { +static void task_a_8143FDC(u8 taskIdA) +{ if (gTasks[taskIdA].data[TDA_0]) { gTasks[taskIdA].data[TDA_0] -= 1; @@ -525,7 +542,8 @@ static void task_a_8143FDC(u8 taskIdA) { gTasks[taskIdA].func = task_a_8144024; } -static void task_a_8144024(u8 taskIdA) { +static void task_a_8144024(u8 taskIdA) +{ if (gPaletteFade.active) { return; @@ -538,7 +556,8 @@ static void task_a_8144024(u8 taskIdA) { gTasks[taskIdA].func = task_a_8144080; } -static void task_a_8144080(u8 taskIdA) { +static void task_a_8144080(u8 taskIdA) +{ if (gPaletteFade.active) { return; @@ -573,7 +592,8 @@ static void task_a_8144080(u8 taskIdA) { gTasks[taskIdA].data[TDA_0] -= 1; } -static void task_a_8144114(u8 taskIdA) { +static void task_a_8144114(u8 taskIdA) +{ if (gPaletteFade.active) { return; @@ -582,7 +602,8 @@ static void task_a_8144114(u8 taskIdA) { SoftReset(0xFF); } -static void sub_8144130(void) { +static void sub_8144130(void) +{ REG_DISPCNT = 0; REG_BG3HOFS = 0; @@ -598,12 +619,13 @@ static void sub_8144130(void) { REG_BLDALPHA = 0; REG_BLDY = 0; - DmaFill16(3, 0, (void *) VRAM, VRAM_SIZE); - DmaFill32(3, 0, (void *) OAM, OAM_SIZE); - DmaFill16(3, 0, (void *) (PLTT + 2), PLTT_SIZE - 2); + DmaFill16(3, 0, (void *)VRAM, VRAM_SIZE); + DmaFill32(3, 0, (void *)OAM, OAM_SIZE); + DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2); } -static void task_b_81441B8(u8 taskIdB) { +static void task_b_81441B8(u8 taskIdB) +{ u16 i; switch (gTasks[taskIdB].data[TDB_0]) @@ -645,7 +667,7 @@ static void task_b_81441B8(u8 taskIdB) { for (i = 0; i < 5; i++) { sub_8072BD8(gCreditsEntryPointerTable[gTasks[taskIdB].data[TDB_CURRENT_PAGE]][i]->text, 0, - 9 + i * 2, 240); + 9 + i * 2, 240); } gTasks[taskIdB].data[TDB_CURRENT_PAGE] += 1; @@ -691,7 +713,7 @@ static void task_b_81441B8(u8 taskIdB) { return; } - if (sub_8144454((u8) gTasks[taskIdB].data[TDB_CURRENT_PAGE], (u8) gTasks[taskIdB].data[TDB_TASK_A_ID])) + if (sub_8144454((u8)gTasks[taskIdB].data[TDB_CURRENT_PAGE], (u8)gTasks[taskIdB].data[TDB_TASK_A_ID])) { gTasks[taskIdB].data[TDB_0] += 1; return; @@ -729,7 +751,8 @@ static void task_b_81441B8(u8 taskIdB) { #define LAST_PAGE (PAGE_TEXT_EDITOR) -static u8 sub_8144454(u8 page, u8 taskIdA) { +static u8 sub_8144454(u8 page, u8 taskIdA) +{ // Starts with bike + ocean + morning if (page == PAGE_PROGRAMMERS_1) @@ -844,7 +867,8 @@ static void task_d_8144514(u8 taskIdD) } __attribute__((naked)) -void task_c_8144664(u8 taskIdC) { +void task_c_8144664(u8 taskIdC) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ lsls r0, 24\n\ @@ -1171,7 +1195,8 @@ _0814492C:\n\ #define UNK_DEF_1F3 (499) -void task_e_8144934(u8 taskIdE) { +void task_e_8144934(u8 taskIdE) +{ s16 taskIdC; switch (gTasks[taskIdE].data[TDE_0]) @@ -1201,7 +1226,7 @@ void task_e_8144934(u8 taskIdE) { taskIdC = gTasks[gTasks[taskIdE].data[TDE_TASK_A_ID]].data[TDA_TASK_C_ID]; // Floor to multiple of 128 - if ((gTasks[taskIdC].data[TDC_5] & - 128) == 640) + if ((gTasks[taskIdC].data[TDC_5] & -128) == 640) { gTasks[taskIdC].data[TDC_0] = 1; gTasks[taskIdE].data[TDE_1] = 0x7FFF; @@ -1236,7 +1261,8 @@ void task_e_8144934(u8 taskIdE) { #define UNK_DEFINE_45 (0x45) -static void sub_8144A68(u8 data, u8 taskIdA) { +static void sub_8144A68(u8 data, u8 taskIdA) +{ switch (data) { case 0: @@ -1279,7 +1305,7 @@ static void sub_8144A68(u8 data, u8 taskIdA) { 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]].pos1.x = 120; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = - 32; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = -32; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data0 = 0; @@ -1318,7 +1344,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) { } } -static bool8 sub_8144ECC(u8 data, u8 taskIdA) { +static bool8 sub_8144ECC(u8 data, u8 taskIdA) +{ u8 spriteId; switch (gMain.state) @@ -1395,7 +1422,8 @@ static bool8 sub_8144ECC(u8 data, u8 taskIdA) { return FALSE; } -static void sub_81450AC(u8 taskIdA) { +static void sub_81450AC(u8 taskIdA) +{ if (gTasks[taskIdA].data[TDA_0] != 0) { DestroyTask(gTasks[taskIdA].data[TDA_0]); @@ -1424,7 +1452,8 @@ static void sub_81450AC(u8 taskIdA) { } __attribute__((naked)) -void sub_8145128(u16 arg0, u16 arg1, u16 arg2) { +void sub_8145128(u16 arg0, u16 arg1, u16 arg2) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ adds r3, r0, 0\n\ @@ -1537,7 +1566,8 @@ _08145204: .4byte 0x06000348\n\ .syntax divided\n"); } -u16 sub_8145208(u8 arg0) { +u16 sub_8145208(u8 arg0) +{ u16 out = (arg0 & 0x3F) + 80; @@ -1560,7 +1590,8 @@ u16 sub_8145208(u8 arg0) { } __attribute__((naked)) -void sub_814524C(void *arg0, u8 arg1, u8 arg2, u16 arg3, int arg4) { +void sub_814524C(void *arg0, u8 arg1, u8 arg2, u16 arg3, int arg4) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r10\n\ @@ -1638,7 +1669,7 @@ static void sub_81452D0(u16 arg0, u16 arg1) u16 foo = arg1 / 16; u16 bar = foo * 4096; - for (i = 0; i < 0x400; i ++) + for (i = 0; i < 0x400; i++) ((u16 *)(VRAM + arg0))[i] = bar + 1; sub_814524C(&gUnknown_0840B83C, 3, 7, arg0, arg1); @@ -1649,7 +1680,8 @@ static void sub_81452D0(u16 arg0, u16 arg1) sub_814524C(&gUnknown_0840B878, 24, 7, arg0, arg1); } -static void spritecb_player_8145378(struct Sprite *sprite) { +static void spritecb_player_8145378(struct Sprite *sprite) +{ if (gUnknown_0203935C != 0) { DestroySprite(sprite); @@ -1664,7 +1696,7 @@ static void spritecb_player_8145378(struct Sprite *sprite) { case 1: StartSpriteAnimIfDifferent(sprite, 1); - if (sprite->pos1.x > - 32) + if (sprite->pos1.x > -32) { sprite->pos1.x -= 1; } @@ -1688,7 +1720,7 @@ static void spritecb_player_8145378(struct Sprite *sprite) { case 5: StartSpriteAnimIfDifferent(sprite, 0); - if (sprite->pos1.x > - 32) + if (sprite->pos1.x > -32) { sprite->pos1.x -= 1; } @@ -1696,7 +1728,8 @@ static void spritecb_player_8145378(struct Sprite *sprite) { } } -static void spritecb_rival_8145420(struct Sprite *sprite) { +static void spritecb_rival_8145420(struct Sprite *sprite) +{ if (gUnknown_0203935C != 0) { DestroySprite(sprite); @@ -1720,12 +1753,12 @@ static void spritecb_rival_8145420(struct Sprite *sprite) { StartSpriteAnimIfDifferent(sprite, 2); } - if (sprite->pos1.x > - 32) + if (sprite->pos1.x > -32) { sprite->pos1.x -= 2; } - sprite->pos2.y = - gUnknown_0203935A; + sprite->pos2.y = -gUnknown_0203935A; break; case 2: @@ -1741,7 +1774,7 @@ static void spritecb_rival_8145420(struct Sprite *sprite) { case 3: StartSpriteAnimIfDifferent(sprite, 0); - if (sprite->pos1.x > - 32) + if (sprite->pos1.x > -32) { sprite->pos1.x -= 1; } @@ -1752,7 +1785,8 @@ static void spritecb_rival_8145420(struct Sprite *sprite) { } __attribute__((naked)) -void spritecb_81454E0(struct Sprite *sprite) { +void spritecb_81454E0(struct Sprite *sprite) +{ asm(".syntax unified\n\ push {r4,r5,lr}\n\ sub sp, 0x4\n\ @@ -1991,7 +2025,8 @@ _081456B0: .4byte REG_BLDCNT\n\ } #ifdef NONMATCHING -u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3) { +u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3) +{ u32 species; u32 personality; void *palette; @@ -1999,7 +2034,8 @@ u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3) { u8 spriteId2; species = NationalPokedexNumToSpecies(nationalNum); - switch (species) { + switch (species) + { case SPECIES_UNOWN: personality = gSaveBlock2.pokedex.unownPersonality; break; @@ -2014,14 +2050,14 @@ u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3) { } LoadSpecialPokePic( - &gMonFrontPicTable[species], - gMonFrontPicCoords[species].x, - gMonFrontPicCoords[species].y, - 0x2000000, - gUnknown_0840B5A0[arg3], - species, - personality, - 1 + &gMonFrontPicTable[species], + gMonFrontPicCoords[species].x, + gMonFrontPicCoords[species].y, + 0x2000000, + gUnknown_0840B5A0[arg3], + species, + personality, + 1 ); palette = species_and_otid_get_pal(species, 0, 0xFFFF); @@ -2044,7 +2080,8 @@ u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3) { } #else __attribute__((naked)) -u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3) { +u8 sub_81456B4(u16 nationalNum, u16 x, u16 y, u16 arg3) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r10\n\ @@ -2208,7 +2245,8 @@ _08145808: .4byte gSpriteTemplate_840CAEC\n\ } #endif -void spritecb_814580C(struct Sprite *sprite) { +void spritecb_814580C(struct Sprite *sprite) +{ if (gSprites[sprite->data0].data0 == 10 || gUnknown_0203935C) { DestroySprite(sprite); @@ -2224,7 +2262,8 @@ void spritecb_814580C(struct Sprite *sprite) { } __attribute__((naked)) -void sub_81458DC(void) { +void sub_81458DC(void) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r10\n\ diff --git a/src/daycare.c b/src/daycare.c index 23f0305d8..1729efb2a 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -4,30 +4,28 @@ u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest) { - s8 nickname[POKEMON_NAME_LENGTH * 2]; + s8 nickname[POKEMON_NAME_LENGTH * 2]; - GetMonData(mon, MON_DATA_NICKNAME, nickname); - return StringCopy10(dest, nickname); + GetMonData(mon, MON_DATA_NICKNAME, nickname); + return StringCopy10(dest, nickname); } u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest) { - s8 nickname[POKEMON_NAME_LENGTH * 2]; + s8 nickname[POKEMON_NAME_LENGTH * 2]; - GetBoxMonData(mon, MON_DATA_NICKNAME, nickname); - return StringCopy10(dest, nickname); + GetBoxMonData(mon, MON_DATA_NICKNAME, nickname); + return StringCopy10(dest, nickname); } u8 daycare_count_pokemon(struct BoxPokemon *daycare_data) { - u8 i, count; - count = 0; + u8 i, count; + count = 0; - for(i = 0;i <= 1;i++) { - if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) { - count++; - } - } + for (i = 0; i <= 1; i++) + if (GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) + count++; - return count; + return count; } diff --git a/src/decoration.c b/src/decoration.c index cf137799a..279a7568b 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -12,14 +12,15 @@ void sub_80FEC94(u8 arg0); void sub_80FECB8(u8 arg0); void sub_80FECE0(u8 arg0); -void sub_80FE7EC(u8 arg0) { +void sub_80FE7EC(u8 arg0) +{ sub_8072DEC(); MenuZeroFillWindowRect(0, 0, 29, 19); sub_80FEC94(arg0); sub_80FECB8(gUnknown_020388F6); - MenuDrawTextWindow(15, 12, 29, 19); + MenuDrawTextWindow(15, 12, 29, 19); sub_80FECE0(gUnknown_020388F2 + gUnknown_020388F4); InitMenu(0, 1, 2, gUnknown_020388F3 + 1, gUnknown_020388F2, 13); diff --git a/src/dewford_trend.c b/src/dewford_trend.c index f302e0599..babdea45a 100644 --- a/src/dewford_trend.c +++ b/src/dewford_trend.c @@ -24,11 +24,11 @@ void sub_80FA17C(void) { u16 i; - for(i = 0; i < 5; i++) + for (i = 0; i < 5; i++) { gSaveBlock1.easyChatPairs[i].words[0] = sub_80EB72C(10); - if(Random() & 1) + if (Random() & 1) gSaveBlock1.easyChatPairs[i].words[1] = sub_80EB72C(12); else gSaveBlock1.easyChatPairs[i].words[1] = sub_80EB72C(13); @@ -46,22 +46,22 @@ void sub_80FA220(u16 a) u32 sp0; u32 sp4; - if(a != 0) + if (a != 0) { sp0 = a * 5; - for(i = 0; i < 5; i++) + for (i = 0; i < 5; i++) { //_080FA24A u32 r2 = sp0; u32 r4; - if(gSaveBlock1.easyChatPairs[i].unk1_6 == 0) + if (gSaveBlock1.easyChatPairs[i].unk1_6 == 0) { - if(gSaveBlock1.easyChatPairs[i].unk0_0 >= r2) + if (gSaveBlock1.easyChatPairs[i].unk0_0 >= r2) { gSaveBlock1.easyChatPairs[i].unk0_0 -= r2; - if(gSaveBlock1.easyChatPairs[i].unk0_0 == 0) + if (gSaveBlock1.easyChatPairs[i].unk0_0 == 0) gSaveBlock1.easyChatPairs[i].unk1_6 = 1; continue; } @@ -71,18 +71,18 @@ void sub_80FA220(u16 a) } //_080FA2A0 r4 = gSaveBlock1.easyChatPairs[i].unk0_0 + r2; - if(r4 > gSaveBlock1.easyChatPairs[i].unk0_7) + if (r4 > gSaveBlock1.easyChatPairs[i].unk0_7) { sp4 = r4 % gSaveBlock1.easyChatPairs[i].unk0_7; r4 = r4 / gSaveBlock1.easyChatPairs[i].unk0_7; - if(r4 == 0) + if (r4 == 0) gSaveBlock1.easyChatPairs[i].unk1_6 = 1; else gSaveBlock1.easyChatPairs[i].unk1_6 = 0; - if(gSaveBlock1.easyChatPairs[i].unk1_6) + if (gSaveBlock1.easyChatPairs[i].unk1_6) { gSaveBlock1.easyChatPairs[i].unk0_0 += sp4; continue; @@ -94,7 +94,7 @@ void sub_80FA220(u16 a) //_080FA310 gSaveBlock1.easyChatPairs[i].unk0_0 = r4; - if(gSaveBlock1.easyChatPairs[i].unk0_0 == gSaveBlock1.easyChatPairs[i].unk0_7) + if (gSaveBlock1.easyChatPairs[i].unk0_0 == gSaveBlock1.easyChatPairs[i].unk0_7) gSaveBlock1.easyChatPairs[i].unk1_6 = 0; } sub_80FA46C(gSaveBlock1.easyChatPairs, 5, 0); @@ -282,12 +282,12 @@ bool8 sub_80FA364(u16 *a) struct EasyChatPair s = {0}; u16 i; - if(!SB1ContainsWords(a)) + if (!SB1ContainsWords(a)) { - if(!FlagGet(SYS_POPWORD_INPUT)) + if (!FlagGet(SYS_POPWORD_INPUT)) { FlagSet(SYS_POPWORD_INPUT); - if(!FlagGet(SYS_MIX_RECORD)) + if (!FlagGet(SYS_MIX_RECORD)) { gSaveBlock1.easyChatPairs[0].words[0] = a[0]; gSaveBlock1.easyChatPairs[0].words[1] = a[1]; @@ -301,13 +301,13 @@ bool8 sub_80FA364(u16 *a) s.unk1_6 = 1; sub_80FA740(&s); - for(i = 0; i < 5; i++) + for (i = 0; i < 5; i++) { - if(sub_80FA670(&s, &gSaveBlock1.easyChatPairs[i], 0)) + if (sub_80FA670(&s, &gSaveBlock1.easyChatPairs[i], 0)) { u16 r3 = 4; - while(r3 > i) + while (r3 > i) { gSaveBlock1.easyChatPairs[r3] = gSaveBlock1.easyChatPairs[r3 - 1]; r3--; @@ -326,13 +326,13 @@ static void sub_80FA46C(struct EasyChatPair *s, u16 b, u8 c) { u16 h; - for(h = 0; h < b; h++) + for (h = 0; h < b; h++) { u16 i; - for(i = h + 1; i < b; i++) + for (i = h + 1; i < b; i++) { - if(sub_80FA670(&s[i], &s[h], c)) + if (sub_80FA670(&s[i], &s[h], c)) { struct EasyChatPair temp; @@ -353,24 +353,24 @@ void sub_80FA4E4(void *a, u32 b, u8 unused) struct EasyChatPair *dst; u16 players = GetLinkPlayerCount(); - for(i = 0; i < players; i++) + for (i = 0; i < players; i++) memcpy(&ARRAY_2007800[i * 5], (u8 *)a + i * b, 40); src = ARRAY_2007800; dst = ARRAY_2007900; r7 = 0; - for(i = 0; i < players; i++) + for (i = 0; i < players; i++) { - for(j = 0; j < 5; j++) + for (j = 0; j < 5; j++) { s16 foo = sub_80FA828(src, r7); - if(foo < 0) + if (foo < 0) { *(dst++) = *src; r7++; } else { - if(ARRAY_2007900[foo].unk0_0 < src->unk0_0) + if (ARRAY_2007900[foo].unk0_0 < src->unk0_0) { ARRAY_2007900[foo] = *src; } @@ -381,7 +381,7 @@ void sub_80FA4E4(void *a, u32 b, u8 unused) sub_80FA46C(ARRAY_2007900, r7, 2); src = ARRAY_2007900; dst = gSaveBlock1.easyChatPairs; - for(i = 0; i < 5; i++) + for (i = 0; i < 5; i++) *(dst++) = *(src++); } @@ -412,48 +412,48 @@ void sub_80FA648(void) static bool8 sub_80FA670(struct EasyChatPair *a, struct EasyChatPair *b, u8 c) { - switch(c) + switch (c) { case 0: - if(a->unk0_0 > b->unk0_0) + if (a->unk0_0 > b->unk0_0) return 1; - if(a->unk0_0 < b->unk0_0) + if (a->unk0_0 < b->unk0_0) return 0; - if(a->unk0_7 > b->unk0_7) + if (a->unk0_7 > b->unk0_7) return 1; - if(a->unk0_7 < b->unk0_7) + if (a->unk0_7 < b->unk0_7) return 0; break; case 1: - if(a->unk0_7 > b->unk0_7) + if (a->unk0_7 > b->unk0_7) return 1; - if(a->unk0_7 < b->unk0_7) + if (a->unk0_7 < b->unk0_7) return 0; - if(a->unk0_0 > b->unk0_0) + if (a->unk0_0 > b->unk0_0) return 1; - if(a->unk0_0 < b->unk0_0) + if (a->unk0_0 < b->unk0_0) return 0; break; case 2: - if(a->unk0_0 > b->unk0_0) + if (a->unk0_0 > b->unk0_0) return 1; - if(a->unk0_0 < b->unk0_0) + if (a->unk0_0 < b->unk0_0) return 0; - if(a->unk0_7 > b->unk0_7) + if (a->unk0_7 > b->unk0_7) return 1; - if(a->unk0_7 < b->unk0_7) + if (a->unk0_7 < b->unk0_7) return 0; - if(a->unk2 > b->unk2) + if (a->unk2 > b->unk2) return 1; - if(a->unk2 < b->unk2) + if (a->unk2 < b->unk2) return 0; - if(a->words[0] > b->words[0]) + if (a->words[0] > b->words[0]) return 1; - if(a->words[0] < b->words[0]) + if (a->words[0] < b->words[0]) return 0; - if(a->words[1] > b->words[1]) + if (a->words[1] > b->words[1]) return 1; - if(a->words[1] < b->words[1]) + if (a->words[1] < b->words[1]) return 0; return 1; } @@ -465,10 +465,10 @@ static void sub_80FA740(struct EasyChatPair *s) u16 r4; r4 = Random() % 98; - if(r4 > 50) + if (r4 > 50) { r4 = Random() % 98; - if(r4 > 80) + if (r4 > 80) r4 = Random() % 98; } s->unk0_7 = r4 + 30; @@ -480,9 +480,9 @@ static bool8 SB1ContainsWords(u16 *a) { u16 i; - for(i = 0; i < 5; i++) + for (i = 0; i < 5; i++) { - if(IsEasyChatPairEqual(a, gSaveBlock1.easyChatPairs[i].words) != 0) + if (IsEasyChatPairEqual(a, gSaveBlock1.easyChatPairs[i].words) != 0) return TRUE; } return FALSE; @@ -492,9 +492,9 @@ static bool8 IsEasyChatPairEqual(u16 *words1, u16 *words2) { u16 i; - for(i = 0; i < 2; i++) + for (i = 0; i < 2; i++) { - if(*(words1++) != *(words2++)) + if (*(words1++) != *(words2++)) return FALSE; } return TRUE; @@ -505,9 +505,9 @@ static s16 sub_80FA828(struct EasyChatPair *a, u16 b) s16 i; struct EasyChatPair *s = ARRAY_2007900; - for(i = 0; i < b; i++) + for (i = 0; i < b; i++) { - if(IsEasyChatPairEqual(a->words, s->words)) + if (IsEasyChatPairEqual(a->words, s->words)) return i; s++; } diff --git a/src/diploma.c b/src/diploma.c index cab528bec..270d69ce1 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -97,13 +97,13 @@ static void MainCB2(void) static void Task_DiplomaFadeIn(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) gTasks[taskId].func = Task_DiplomaWaitForKeyPress; } static void Task_DiplomaWaitForKeyPress(u8 taskId) { - if(gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_DiplomaFadeOut; @@ -112,7 +112,7 @@ static void Task_DiplomaWaitForKeyPress(u8 taskId) static void Task_DiplomaFadeOut(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { DestroyTask(taskId); SetMainCallback2(sub_80546F0); @@ -121,7 +121,7 @@ static void Task_DiplomaFadeOut(u8 taskId) static void DisplayDiplomaText(void) { - if(sub_8090FF4()) + if (sub_8090FF4()) { REG_BG3HOFS = 256; StringCopy(gStringVar1, gOtherText_NationalDex); diff --git a/src/field_camera.c b/src/field_camera.c index 72dcbd721..442bc095b 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -90,7 +90,7 @@ void sub_8057A58(void) *gBGHOffsetRegs[3] = gUnknown_03000590.unk0 + gUnknown_03000598; *gBGVOffsetRegs[3] = gUnknown_03000590.unk1 + gUnknown_0300059A + 8; - if(gUnknown_03000590.unk4) + if (gUnknown_03000590.unk4) { DmaCopy16(3, gBGTilemapBuffers[1], (void *)(VRAM + 0xE800), 0x800); DmaCopy16(3, gBGTilemapBuffers[2], (void *)(VRAM + 0xE000), 0x800); @@ -118,16 +118,16 @@ static void DrawWholeMapViewInternal(int x, int y, struct MapData *mapData) u32 r6; u8 temp; - for(i = 0; i < 32; i += 2) + for (i = 0; i < 32; i += 2) { temp = gUnknown_03000590.unk3 + i; - if(temp >= 32) + if (temp >= 32) temp -= 32; r6 = temp * 32; - for(j = 0; j < 32; j += 2) + for (j = 0; j < 32; j += 2) { temp = gUnknown_03000590.unk2 + j; - if(temp >= 32) + if (temp >= 32) temp -= 32; DrawMetatileAt(mapData, r6 + temp, x + j / 2, y + i / 2); } @@ -138,13 +138,13 @@ static void RedrawMapSlicesForCameraUpdate(struct UnknownStruct *a, int x, int y { struct MapData *mapData = gMapHeader.mapData; - if(x > 0) + if (x > 0) RedrawMapSliceWest(a, mapData); - if(x < 0) + if (x < 0) RedrawMapSliceEast(a, mapData); - if(y > 0) + if (y > 0) RedrawMapSliceNorth(a, mapData); - if(y < 0) + if (y < 0) RedrawMapSliceSouth(a, mapData); a->unk4 = TRUE; } @@ -156,13 +156,13 @@ static void RedrawMapSliceNorth(struct UnknownStruct *a, struct MapData *mapData u32 r7; temp = a->unk3 + 28; - if(temp >= 32) + if (temp >= 32) temp -= 32; r7 = temp * 32; - for(i = 0; i < 32; i += 2) + for (i = 0; i < 32; i += 2) { temp = a->unk2 + i; - if(temp >= 32) + if (temp >= 32) temp -= 32; DrawMetatileAt(mapData, r7 + temp, gSaveBlock1.pos.x + i / 2, gSaveBlock1.pos.y + 14); } @@ -174,10 +174,10 @@ static void RedrawMapSliceSouth(struct UnknownStruct *a, struct MapData *mapData u8 temp; u32 r7 = a->unk3 * 32; - for(i = 0; i < 32; i += 2) + for (i = 0; i < 32; i += 2) { temp = a->unk2 + i; - if(temp >= 32) + if (temp >= 32) temp -= 32; DrawMetatileAt(mapData, r7 + temp, gSaveBlock1.pos.x + i / 2, gSaveBlock1.pos.y); } @@ -189,10 +189,10 @@ static void RedrawMapSliceEast(struct UnknownStruct *a, struct MapData *mapData) u8 temp; u32 r6 = a->unk2; - for(i = 0; i < 32; i += 2) + for (i = 0; i < 32; i += 2) { temp = a->unk3 + i; - if(temp >= 32) + if (temp >= 32) temp -= 32; DrawMetatileAt(mapData, temp * 32 + r6, gSaveBlock1.pos.x, gSaveBlock1.pos.y + i / 2); } @@ -204,12 +204,12 @@ static void RedrawMapSliceWest(struct UnknownStruct *a, struct MapData *mapData) u8 temp; u8 r5 = a->unk2 + 28; - if(r5 >= 32) + if (r5 >= 32) r5 -= 32; - for(i = 0; i < 32; i += 2) + for (i = 0; i < 32; i += 2) { temp = a->unk3 + i; - if(temp >= 32) + if (temp >= 32) temp -= 32; DrawMetatileAt(mapData, temp * 32 + r5, gSaveBlock1.pos.x + 14, gSaveBlock1.pos.y + i / 2); } @@ -219,7 +219,7 @@ void CurrentMapDrawMetatileAt(int a, int b) { int offset = MapPosToBgTilemapOffset(&gUnknown_03000590, a, b); - if(offset >= 0) + if (offset >= 0) { DrawMetatileAt(gMapHeader.mapData, offset, a, b); gUnknown_03000590.unk4 = TRUE; @@ -230,7 +230,7 @@ void DrawDoorMetatileAt(int x, int y, u16 *arr) { int offset = MapPosToBgTilemapOffset(&gUnknown_03000590, x, y); - if(offset >= 0) + if (offset >= 0) { DrawMetatile(1, arr, offset); gUnknown_03000590.unk4 = TRUE; @@ -242,9 +242,9 @@ static void DrawMetatileAt(struct MapData *mapData, u16 b, int c, int d) u16 metatileId = MapGridGetMetatileIdAt(c, d); u16 *metatiles; - if(metatileId > 1024) + if (metatileId > 1024) metatileId = 0; - if(metatileId < 512) + if (metatileId < 512) metatiles = mapData->primaryTileset->metatiles; else { @@ -256,7 +256,7 @@ static void DrawMetatileAt(struct MapData *mapData, u16 b, int c, int d) static void DrawMetatile(s32 a, u16 *b, u16 c) { - switch(a) + switch (a) { case 2: gBGTilemapBuffers[3][c] = b[0]; @@ -313,17 +313,17 @@ static s32 MapPosToBgTilemapOffset(struct UnknownStruct *a, s32 x, s32 y) { x -= gSaveBlock1.pos.x; x *= 2; - if(x >= 32 || x < 0) + if (x >= 32 || x < 0) return -1; x = x + a->unk2; - if(x >= 32) + if (x >= 32) x -= 32; y = (y - gSaveBlock1.pos.y) * 2; - if(y >= 32 || y < 0) + if (y >= 32 || y < 0) return -1; y = y + a->unk3; - if(y >= 32) + if (y >= 32) y -= 32; return y * 32 + x; @@ -331,7 +331,7 @@ static s32 MapPosToBgTilemapOffset(struct UnknownStruct *a, s32 x, s32 y) static void CameraUpdateCallback(struct CameraSomething *a) { - if(a->unk4 != 0) + if (a->unk4 != 0) { a->unk8 = gSprites[a->unk4].data2; a->unkC = gSprites[a->unk4].data3; @@ -350,7 +350,7 @@ void ResetCameraUpdateInfo(void) u32 InitCameraUpdateCallback(u8 a) { - if(gUnknown_03004880.unk4 != 0) + if (gUnknown_03004880.unk4 != 0) DestroySprite(&gSprites[gUnknown_03004880.unk4]); gUnknown_03004880.unk4 = AddCameraObject(a); gUnknown_03004880.callback = CameraUpdateCallback; @@ -366,7 +366,7 @@ void CameraUpdate(void) int r7; int r8; - if(gUnknown_03004880.callback != NULL) + if (gUnknown_03004880.callback != NULL) gUnknown_03004880.callback(&gUnknown_03004880); r7 = gUnknown_03004880.unk8; r8 = gUnknown_03004880.unkC; @@ -376,30 +376,30 @@ void CameraUpdate(void) r0 = gUnknown_03004880.unk14; - if(r1 == 0 && r7 != 0) + if (r1 == 0 && r7 != 0) { - if(r7 > 0) + if (r7 > 0) deltaX = 1; else deltaX = -1; } - if(r0 == 0 && r8 != 0) + if (r0 == 0 && r8 != 0) { - if(r8 > 0) + if (r8 > 0) deltaY = 1; else deltaY = -1; } - if(r1 != 0 && r1 == -r7) + if (r1 != 0 && r1 == -r7) { - if(r7 > 0) + if (r7 > 0) deltaX = 1; else deltaX = -1; } - if(r0 != 0 && r0 == -r8) + if (r0 != 0 && r0 == -r8) { - if(r8 > 0) + if (r8 > 0) deltaX = 1; else deltaX = -1; @@ -410,7 +410,7 @@ void CameraUpdate(void) gUnknown_03004880.unk14 += r8; gUnknown_03004880.unk14 = gUnknown_03004880.unk14 - 16 * (gUnknown_03004880.unk14 / 16); - if(deltaX != 0 || deltaY != 0) + if (deltaX != 0 || deltaY != 0) { CameraMove(deltaX, deltaY); UpdateFieldObjectsForCameraUpdate(deltaX, deltaY); diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 32d34d54d..fa09959df 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -21,7 +21,7 @@ void npcs_clear_ids_and_state(void) { u8 i; - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) npc_clear_ids_and_state(&gMapObjects[i]); } diff --git a/src/field_poison.c b/src/field_poison.c index dff5abd31..8e49080b0 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -114,7 +114,7 @@ s32 overworld_poison(void) u32 numFainting = 0; int i; - for(i = 0; i < 6; i++) + for (i = 0; i < 6; i++) { u32 hp; @@ -123,20 +123,20 @@ s32 overworld_poison(void) && pokemon_ailments_get_primary(GetMonData(pkmn, MON_DATA_STATUS)) == 1) { hp = GetMonData(pkmn, MON_DATA_HP); - if(hp != 0) + if (hp != 0) hp--; - if(hp == 0) + if (hp == 0) numFainting++; //Pokemon will now faint due to poison SetMonData(pkmn, MON_DATA_HP, (u8 *)&hp); numPoisoned++; } pkmn++; } - if(numFainting != 0 || numPoisoned != 0) + if (numFainting != 0 || numPoisoned != 0) DoFieldPoisonEffect(); - if(numFainting != 0) + if (numFainting != 0) return 2; - if(numPoisoned != 0) + if (numPoisoned != 0) return 1; return 0; } diff --git a/src/field_special_scene.c b/src/field_special_scene.c index f90306bba..819a4ab5f 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -162,7 +162,7 @@ void Task_HandleTruckSequence(u8 taskId) break; case 2: data[1]++; - if(!gPaletteFade.active && data[1] > 300) + if (!gPaletteFade.active && data[1] > 300) { data[1] = 0; DestroyTask(data[2]); diff --git a/src/fieldmap.c b/src/fieldmap.c index 841964f18..f3794f286 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -16,22 +16,25 @@ extern void sub_8056670(); extern void UpdateTVScreensOnMap(); extern void sub_80538F0(u8 mapGroup, u8 mapNum); -struct Camera { - bool8 field_0:1; - s32 x; - s32 y; +struct Camera +{ + bool8 field_0:1; + s32 x; + s32 y; }; -struct ConnectionFlags { - u8 south:1; - u8 north:1; - u8 west:1; - u8 east:1; +struct ConnectionFlags +{ + u8 south:1; + u8 north:1; + u8 west:1; + u8 east:1; }; -struct Coords32 { - s32 x; - s32 y; +struct Coords32 +{ + s32 x; + s32 y; }; extern const struct Coords32 gUnknown_0821664C[]; @@ -56,754 +59,927 @@ struct MapConnection *sub_8056A64(u8 direction, int x, int y); bool8 sub_8056ABC(u8 direction, int x, int y, struct MapConnection *connection); bool8 sub_8056B20(int x, int src_width, int dest_width, int offset); -struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection) { - return get_mapheader_by_bank_and_number(connection->mapGroup, connection->mapNum); -} - -void not_trainer_hill_battle_pyramid(void) { - mapheader_copy_mapdata_with_padding(&gMapHeader); - sub_80BB970(gMapHeader.events); - mapheader_run_script_with_tag_x1(); -} - -void sub_8055FC0(void) { - mapheader_copy_mapdata_with_padding(&gMapHeader); - sub_80BBCCC(0); - sub_80BB970(gMapHeader.events); - sub_8056670(); - mapheader_run_script_with_tag_x1(); - UpdateTVScreensOnMap(gUnknown_03004870.width, gUnknown_03004870.height); -} - -void mapheader_copy_mapdata_with_padding(struct MapHeader *mapHeader) { - struct MapData *mapData; - int width; - int height; - mapData = mapHeader->mapData; - CpuFastFill16(0x03ff, gUnknown_02029828, sizeof(gUnknown_02029828)); - gUnknown_03004870.map = gUnknown_02029828; - width = mapData->width + 15; - gUnknown_03004870.width = width; - height = mapData->height + 14; - gUnknown_03004870.height = height; - if (width * height <= 0x2800) { - map_copy_with_padding(mapData->map, mapData->width, mapData->height); - sub_80560AC(mapHeader); - } -} - -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; - for (y = 0; y < height; y++) { - CpuCopy16(map, dest, width * 2); - dest += width + 0xf; - map += width; - } -} - -void sub_80560AC(struct MapHeader *mapHeader) { - int i; - struct MapConnection *connection; - struct MapHeader *cMap; - u32 offset; - int count; - count = mapHeader->connections->count; - connection = mapHeader->connections->connections; - gUnknown_0202E850 = sDummyConnectionFlags; - for (i = 0; i < count; i++, connection++) { - cMap = mapconnection_get_mapheader(connection); - offset = connection->offset; - switch (connection->direction) { - case CONNECTION_SOUTH: - fillSouthConnection(mapHeader, cMap, offset); - gUnknown_0202E850.south = 1; - break; - case CONNECTION_NORTH: - fillNorthConnection(mapHeader, cMap, offset); - gUnknown_0202E850.north = 1; - break; - case CONNECTION_WEST: - fillWestConnection(mapHeader, cMap, offset); - gUnknown_0202E850.west = 1; - break; - case CONNECTION_EAST: - fillEastConnection(mapHeader, cMap, offset); - gUnknown_0202E850.east = 1; - break; - } - } -} - -void sub_8056134(int x, int y, struct MapHeader *mapHeader, int x2, int y2, int width, int height) { - int i; - u16 *src; - u16 *dest; - int mapWidth; - - mapWidth = mapHeader->mapData->width; - src = &mapHeader->mapData->map[mapWidth * y2 + x2]; - dest = &gUnknown_03004870.map[gUnknown_03004870.width * y + x]; - - for (i = 0; i < height; i++) { - CpuCopy16(src, dest, width * 2); - dest += gUnknown_03004870.width; - src += mapWidth; - } -} - -void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) { - int x, y; - int x2; - int width; - int cWidth; - - if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; - x = offset + 7; - y = mapHeader->mapData->height + 7; - if (x < 0) { - x2 = -x; - x += cWidth; - if (x < gUnknown_03004870.width) { - width = x; - } else { - width = gUnknown_03004870.width; - } - x = 0; - } else { - x2 = 0; - if (x + cWidth < gUnknown_03004870.width) { - width = cWidth; - } else { - width = gUnknown_03004870.width - x; - } - } - sub_8056134( - x, y, - connectedMapHeader, - x2, /*y2*/ 0, - width, /*height*/ 7); - } -} - -void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) { - int x; - int x2, y2; - int width; - int cWidth, cHeight; - - if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; - cHeight = connectedMapHeader->mapData->height; - x = offset + 7; - y2 = cHeight - 7; - if (x < 0) { - x2 = -x; - x += cWidth; - if (x < gUnknown_03004870.width) { - width = x; - } else { - width = gUnknown_03004870.width; - } - x = 0; - } else { - x2 = 0; - if (x + cWidth < gUnknown_03004870.width) { - width = cWidth; - } else { - width = gUnknown_03004870.width - x; - } - } - - sub_8056134( - x, /*y*/ 0, - connectedMapHeader, - x2, y2, - width, /*height*/ 7); - - } -} - - -void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) { - int y; - int x2, y2; - int height; - int cWidth, cHeight; - if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; - cHeight = connectedMapHeader->mapData->height; - y = offset + 7; - x2 = cWidth - 7; - if (y < 0) { - y2 = -y; - if (y + cHeight < gUnknown_03004870.height) { - height = y + cHeight; - } else { - height = gUnknown_03004870.height; - } - y = 0; - } else { - y2 = 0; - if (y + cHeight < gUnknown_03004870.height) { - height = cHeight; - } else { - height = gUnknown_03004870.height - y; - } - } - - sub_8056134( - /*x*/ 0, y, - connectedMapHeader, - x2, y2, - /*width*/ 7, height); - } -} - -void fillEastConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) { - int x, y; - int y2; - int height; - int cHeight; - if (connectedMapHeader) { - cHeight = connectedMapHeader->mapData->height; - x = mapHeader->mapData->width + 7; - y = offset + 7; - if (y < 0) { - y2 = -y; - if (y + cHeight < gUnknown_03004870.height) { - height = y + cHeight; - } else { - height = gUnknown_03004870.height; - } - y = 0; - } else { - y2 = 0; - if (y + cHeight < gUnknown_03004870.height) { - height = cHeight; - } else { - height = gUnknown_03004870.height - y; - } - } - - sub_8056134( - x, y, - connectedMapHeader, - /*x2*/ 0, y2, - /*width*/ 8, height); - } -} - -union Block { - struct { - u16 block:10; - u16 collision:2; - u16 elevation:4; - } block; - u16 value; +struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection) +{ + return get_mapheader_by_bank_and_number(connection->mapGroup, connection->mapNum); +} + +void not_trainer_hill_battle_pyramid(void) +{ + mapheader_copy_mapdata_with_padding(&gMapHeader); + sub_80BB970(gMapHeader.events); + mapheader_run_script_with_tag_x1(); +} + +void sub_8055FC0(void) +{ + mapheader_copy_mapdata_with_padding(&gMapHeader); + sub_80BBCCC(0); + sub_80BB970(gMapHeader.events); + sub_8056670(); + mapheader_run_script_with_tag_x1(); + UpdateTVScreensOnMap(gUnknown_03004870.width, gUnknown_03004870.height); +} + +void mapheader_copy_mapdata_with_padding(struct MapHeader *mapHeader) +{ + struct MapData *mapData; + int width; + int height; + mapData = mapHeader->mapData; + CpuFastFill16(0x03ff, gUnknown_02029828, sizeof(gUnknown_02029828)); + gUnknown_03004870.map = gUnknown_02029828; + width = mapData->width + 15; + gUnknown_03004870.width = width; + height = mapData->height + 14; + gUnknown_03004870.height = height; + if (width * height <= 0x2800) + { + map_copy_with_padding(mapData->map, mapData->width, mapData->height); + sub_80560AC(mapHeader); + } +} + +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; + for (y = 0; y < height; y++) + { + CpuCopy16(map, dest, width * 2); + dest += width + 0xf; + map += width; + } +} + +void sub_80560AC(struct MapHeader *mapHeader) +{ + int i; + struct MapConnection *connection; + struct MapHeader *cMap; + u32 offset; + int count; + count = mapHeader->connections->count; + connection = mapHeader->connections->connections; + gUnknown_0202E850 = sDummyConnectionFlags; + for (i = 0; i < count; i++, connection++) + { + cMap = mapconnection_get_mapheader(connection); + offset = connection->offset; + switch (connection->direction) + { + case CONNECTION_SOUTH: + fillSouthConnection(mapHeader, cMap, offset); + gUnknown_0202E850.south = 1; + break; + case CONNECTION_NORTH: + fillNorthConnection(mapHeader, cMap, offset); + gUnknown_0202E850.north = 1; + break; + case CONNECTION_WEST: + fillWestConnection(mapHeader, cMap, offset); + gUnknown_0202E850.west = 1; + break; + case CONNECTION_EAST: + fillEastConnection(mapHeader, cMap, offset); + gUnknown_0202E850.east = 1; + break; + } + } +} + +void sub_8056134(int x, int y, struct MapHeader *mapHeader, int x2, int y2, int width, int height) +{ + int i; + u16 *src; + u16 *dest; + int mapWidth; + + mapWidth = mapHeader->mapData->width; + src = &mapHeader->mapData->map[mapWidth * y2 + x2]; + dest = &gUnknown_03004870.map[gUnknown_03004870.width * y + x]; + + for (i = 0; i < height; i++) + { + CpuCopy16(src, dest, width * 2); + dest += gUnknown_03004870.width; + src += mapWidth; + } +} + +void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) +{ + int x, y; + int x2; + int width; + int cWidth; + + if (connectedMapHeader) + { + cWidth = connectedMapHeader->mapData->width; + x = offset + 7; + y = mapHeader->mapData->height + 7; + if (x < 0) + { + x2 = -x; + x += cWidth; + if (x < gUnknown_03004870.width) + { + width = x; + } + else + { + width = gUnknown_03004870.width; + } + x = 0; + } + else + { + x2 = 0; + if (x + cWidth < gUnknown_03004870.width) + { + width = cWidth; + } + else + { + width = gUnknown_03004870.width - x; + } + } + sub_8056134( + x, y, + connectedMapHeader, + x2, /*y2*/ 0, + width, /*height*/ 7); + } +} + +void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) +{ + int x; + int x2, y2; + int width; + int cWidth, cHeight; + + if (connectedMapHeader) + { + cWidth = connectedMapHeader->mapData->width; + cHeight = connectedMapHeader->mapData->height; + x = offset + 7; + y2 = cHeight - 7; + if (x < 0) + { + x2 = -x; + x += cWidth; + if (x < gUnknown_03004870.width) + { + width = x; + } + else + { + width = gUnknown_03004870.width; + } + x = 0; + } + else + { + x2 = 0; + if (x + cWidth < gUnknown_03004870.width) + { + width = cWidth; + } + else + { + width = gUnknown_03004870.width - x; + } + } + + sub_8056134( + x, /*y*/ 0, + connectedMapHeader, + x2, y2, + width, /*height*/ 7); + + } +} + + +void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) +{ + int y; + int x2, y2; + int height; + int cWidth, cHeight; + if (connectedMapHeader) + { + cWidth = connectedMapHeader->mapData->width; + cHeight = connectedMapHeader->mapData->height; + y = offset + 7; + x2 = cWidth - 7; + if (y < 0) + { + y2 = -y; + if (y + cHeight < gUnknown_03004870.height) + { + height = y + cHeight; + } + else + { + height = gUnknown_03004870.height; + } + y = 0; + } + else + { + y2 = 0; + if (y + cHeight < gUnknown_03004870.height) + { + height = cHeight; + } + else + { + height = gUnknown_03004870.height - y; + } + } + + sub_8056134( + /*x*/ 0, y, + connectedMapHeader, + x2, y2, + /*width*/ 7, height); + } +} + +void fillEastConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) +{ + int x, y; + int y2; + int height; + int cHeight; + if (connectedMapHeader) + { + cHeight = connectedMapHeader->mapData->height; + x = mapHeader->mapData->width + 7; + y = offset + 7; + if (y < 0) + { + y2 = -y; + if (y + cHeight < gUnknown_03004870.height) + { + height = y + cHeight; + } + else + { + height = gUnknown_03004870.height; + } + y = 0; + } + else + { + y2 = 0; + if (y + cHeight < gUnknown_03004870.height) + { + height = cHeight; + } + else + { + height = gUnknown_03004870.height - y; + } + } + + sub_8056134( + x, y, + connectedMapHeader, + /*x2*/ 0, y2, + /*width*/ 8, height); + } +} + +union Block +{ + struct + { + u16 block:10; + u16 collision:2; + u16 elevation:4; + } block; + u16 value; }; -u16 MapGridGetZCoordAt(int x, int y) { - u16 block; - int i; - u16 *border; - - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) { - block = gUnknown_03004870.map[x + gUnknown_03004870.width * y]; - } else { - border = gMapHeader.mapData->border; - i = (x + 1) & 1; - i += ((y + 1) & 1) * 2; - block = gMapHeader.mapData->border[i]; - block |= 0xc00; - } - if (block == 0x3ff) { - return 0; - } - return block >> 12; -} - -u16 MapGridIsImpassableAt(int x, int y) { - u16 block; - int i; - u16 *border; - - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) { - block = gUnknown_03004870.map[x + gUnknown_03004870.width * y]; - } else { - border = gMapHeader.mapData->border; - i = (x + 1) & 1; - i += ((y + 1) & 1) * 2; - block = gMapHeader.mapData->border[i]; - block |= 0xc00; - } - if (block == 0x3ff) { - return 1; - } - return (block & 0xc00) >> 10; -} - -u16 MapGridGetMetatileIdAt(int x, int y) { - u16 block; - int i; - int j; - struct MapData *mapData; - u16 *border; - u16 block2; - - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) { - block = gUnknown_03004870.map[x + gUnknown_03004870.width * y]; - } else { - mapData = gMapHeader.mapData; - i = (x + 1) & 1; - i += ((y + 1) & 1) * 2; - block = mapData->border[i] | 0xc00; - } - if (block == 0x3ff) { - border = gMapHeader.mapData->border; - j = (x + 1) & 1; - j += ((y + 1) & 1) * 2; - block2 = gMapHeader.mapData->border[j]; - block2 |= 0xc00; - return block2 & block; - } - return block & 0x3ff; -} - -u32 MapGridGetMetatileBehaviorAt(int x, int y) { - u16 metatile; - metatile = MapGridGetMetatileIdAt(x, y); - return GetBehaviorByMetatileId(metatile) & 0xff; -} - -u16 MapGridGetMetatileLayerTypeAt(int x, int y) { - u16 metatile; - metatile = MapGridGetMetatileIdAt(x, y); - return (GetBehaviorByMetatileId(metatile) & 0xf000) >> 12; -} - -void MapGridSetMetatileIdAt(int x, int y, u16 metatile) { - int i; - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) { - i = x + y * gUnknown_03004870.width; - gUnknown_03004870.map[i] = (gUnknown_03004870.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) { - i = x + gUnknown_03004870.width * y; - gUnknown_03004870.map[i] = metatile; - } -} - -u32 GetBehaviorByMetatileId(u16 metatile) { - u16 *attributes; - if (metatile <= 0x1ff) { - attributes = gMapHeader.mapData->primaryTileset->metatileAttributes; - return attributes[metatile]; - } else if (metatile <= 0x3ff) { - attributes = gMapHeader.mapData->secondaryTileset->metatileAttributes; - return attributes[metatile - 0x200]; - } else { - return 0xff; - } -} - -void save_serialize_map(void) { - int i, j; - int x, y; - u16 *mapView; - int width; - mapView = gSaveBlock1.mapView; - width = gUnknown_03004870.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]; - } -} - -int sub_8056618(void) { - u16 i; - u32 r2; - r2 = 0; - for (i = 0; i < 0x200; i++) { - r2 |= gSaveBlock1.mapView[i]; - } - if (r2 == 0) { - return 1; - } - return 0; -} - -void sav2_mapdata_clear(void) { - CpuFill16(0, gSaveBlock1.mapView, sizeof(gSaveBlock1.mapView)); -} - -void sub_8056670(void) { - int i, j; - int x, y; - u16 *mapView; - int width; - mapView = gSaveBlock1.mapView; - if (!sub_8056618()) { - width = gUnknown_03004870.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++; - } - sav2_mapdata_clear(); - } -} - -void sub_80566F0(u8 a1) { - u16 *mapView; - int width; - int x0, y0; - int x2, y2; - u16 *src, *dest; - int srci, desti; - int r9, r8; - int x, y; - int i, j; - mapView = gSaveBlock1.mapView; - width = gUnknown_03004870.width; - r9 = 0; - r8 = 0; - x0 = gSaveBlock1.pos.x; - y0 = gSaveBlock1.pos.y; - x2 = 15; - y2 = 14; - switch (a1) { - case CONNECTION_NORTH: - y0 += 1; - y2 = 13; - break; - case CONNECTION_SOUTH: - r8 = 1; - y2 = 13; - break; - case CONNECTION_WEST: - x0 += 1; - x2 = 14; - break; - case CONNECTION_EAST: - r9 = 1; - x2 = 14; - break; - } - for (y = 0; y < y2; y++) { - i = 0; - j = 0; - for (x = 0; x < x2; x++) { - desti = width * (y + y0); - srci = (y + r8) * 15 + r9; - src = &mapView[srci + i]; - dest = &gUnknown_02029828[x0 + desti + j]; - *dest = *src; - i++; - j++; - } - } - sav2_mapdata_clear(); -} - -int GetMapBorderIdAt(int x, int y) { - struct MapData *mapData; - u16 block, block2; - int i, j; - if (x >= 0 && x < gUnknown_03004870.width - && y >= 0 && y < gUnknown_03004870.height) { - i = gUnknown_03004870.width; - i *= y; - block = gUnknown_03004870.map[x + i]; - if (block == 0x3ff) { - goto fail; - } - } else { - mapData = gMapHeader.mapData; - j = (x + 1) & 1; - j += ((y + 1) & 1) * 2; - block2 = 0xc00 | mapData->border[j]; - if (block2 == 0x3ff) { - goto fail; - } - } - goto success; +u16 MapGridGetZCoordAt(int x, int y) +{ + u16 block; + int i; + u16 *border; + + if (x >= 0 && x < gUnknown_03004870.width + && y >= 0 && y < gUnknown_03004870.height) + { + block = gUnknown_03004870.map[x + gUnknown_03004870.width * y]; + } + else + { + border = gMapHeader.mapData->border; + i = (x + 1) & 1; + i += ((y + 1) & 1) * 2; + block = gMapHeader.mapData->border[i]; + block |= 0xc00; + } + if (block == 0x3ff) + { + return 0; + } + return block >> 12; +} + +u16 MapGridIsImpassableAt(int x, int y) +{ + u16 block; + int i; + u16 *border; + + if (x >= 0 && x < gUnknown_03004870.width + && y >= 0 && y < gUnknown_03004870.height) + { + block = gUnknown_03004870.map[x + gUnknown_03004870.width * y]; + } + else + { + border = gMapHeader.mapData->border; + i = (x + 1) & 1; + i += ((y + 1) & 1) * 2; + block = gMapHeader.mapData->border[i]; + block |= 0xc00; + } + if (block == 0x3ff) + { + return 1; + } + return (block & 0xc00) >> 10; +} + +u16 MapGridGetMetatileIdAt(int x, int y) +{ + u16 block; + int i; + int j; + struct MapData *mapData; + u16 *border; + u16 block2; + + if (x >= 0 && x < gUnknown_03004870.width + && y >= 0 && y < gUnknown_03004870.height) + { + block = gUnknown_03004870.map[x + gUnknown_03004870.width * y]; + } + else + { + mapData = gMapHeader.mapData; + i = (x + 1) & 1; + i += ((y + 1) & 1) * 2; + block = mapData->border[i] | 0xc00; + } + if (block == 0x3ff) + { + border = gMapHeader.mapData->border; + j = (x + 1) & 1; + j += ((y + 1) & 1) * 2; + block2 = gMapHeader.mapData->border[j]; + block2 |= 0xc00; + return block2 & block; + } + return block & 0x3ff; +} + +u32 MapGridGetMetatileBehaviorAt(int x, int y) +{ + u16 metatile; + metatile = MapGridGetMetatileIdAt(x, y); + return GetBehaviorByMetatileId(metatile) & 0xff; +} + +u16 MapGridGetMetatileLayerTypeAt(int x, int y) +{ + u16 metatile; + metatile = MapGridGetMetatileIdAt(x, y); + return (GetBehaviorByMetatileId(metatile) & 0xf000) >> 12; +} + +void MapGridSetMetatileIdAt(int x, int y, u16 metatile) +{ + int i; + if (x >= 0 && x < gUnknown_03004870.width + && y >= 0 && y < gUnknown_03004870.height) + { + i = x + y * gUnknown_03004870.width; + gUnknown_03004870.map[i] = (gUnknown_03004870.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) + { + i = x + gUnknown_03004870.width * y; + gUnknown_03004870.map[i] = metatile; + } +} + +u32 GetBehaviorByMetatileId(u16 metatile) +{ + u16 *attributes; + if (metatile <= 0x1ff) + { + attributes = gMapHeader.mapData->primaryTileset->metatileAttributes; + return attributes[metatile]; + } + else if (metatile <= 0x3ff) + { + attributes = gMapHeader.mapData->secondaryTileset->metatileAttributes; + return attributes[metatile - 0x200]; + } + else + { + return 0xff; + } +} + +void save_serialize_map(void) +{ + int i, j; + int x, y; + u16 *mapView; + int width; + mapView = gSaveBlock1.mapView; + width = gUnknown_03004870.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]; + } + } +} + +int sub_8056618(void) +{ + u16 i; + u32 r2; + r2 = 0; + for (i = 0; i < 0x200; i++) + { + r2 |= gSaveBlock1.mapView[i]; + } + if (r2 == 0) + { + return 1; + } + return 0; +} + +void sav2_mapdata_clear(void) +{ + CpuFill16(0, gSaveBlock1.mapView, sizeof(gSaveBlock1.mapView)); +} + +void sub_8056670(void) +{ + int i, j; + int x, y; + u16 *mapView; + int width; + mapView = gSaveBlock1.mapView; + if (!sub_8056618()) + { + width = gUnknown_03004870.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++; + } + } + sav2_mapdata_clear(); + } +} + +void sub_80566F0(u8 a1) +{ + u16 *mapView; + int width; + int x0, y0; + int x2, y2; + u16 *src, *dest; + int srci, desti; + int r9, r8; + int x, y; + int i, j; + mapView = gSaveBlock1.mapView; + width = gUnknown_03004870.width; + r9 = 0; + r8 = 0; + x0 = gSaveBlock1.pos.x; + y0 = gSaveBlock1.pos.y; + x2 = 15; + y2 = 14; + switch (a1) + { + case CONNECTION_NORTH: + y0 += 1; + y2 = 13; + break; + case CONNECTION_SOUTH: + r8 = 1; + y2 = 13; + break; + case CONNECTION_WEST: + x0 += 1; + x2 = 14; + break; + case CONNECTION_EAST: + r9 = 1; + x2 = 14; + break; + } + for (y = 0; y < y2; y++) + { + i = 0; + j = 0; + for (x = 0; x < x2; x++) + { + desti = width * (y + y0); + srci = (y + r8) * 15 + r9; + src = &mapView[srci + i]; + dest = &gUnknown_02029828[x0 + desti + j]; + *dest = *src; + i++; + j++; + } + } + sav2_mapdata_clear(); +} + +int GetMapBorderIdAt(int x, int y) +{ + struct MapData *mapData; + u16 block, block2; + int i, j; + if (x >= 0 && x < gUnknown_03004870.width + && y >= 0 && y < gUnknown_03004870.height) + { + i = gUnknown_03004870.width; + i *= y; + block = gUnknown_03004870.map[x + i]; + if (block == 0x3ff) + { + goto fail; + } + } + else + { + mapData = gMapHeader.mapData; + j = (x + 1) & 1; + j += ((y + 1) & 1) * 2; + block2 = 0xc00 | mapData->border[j]; + if (block2 == 0x3ff) + { + goto fail; + } + } + goto success; fail: - return -1; + return -1; success: - if (x >= (gUnknown_03004870.width - 8)) { - if (!gUnknown_0202E850.east) { - return -1; - } - return CONNECTION_EAST; - } else if (x < 7) { - if (!gUnknown_0202E850.west) { - return -1; - } - return CONNECTION_WEST; - } else if (y >= (gUnknown_03004870.height - 7)) { - if (!gUnknown_0202E850.south) { - return -1; - } - return CONNECTION_SOUTH; - } else if (y < 7) { - if (!gUnknown_0202E850.north) { - return -1; - } - return CONNECTION_NORTH; - } else { - return 0; - } -} - -int GetPostCameraMoveMapBorderId(int x, int y) { - return GetMapBorderIdAt(gSaveBlock1.pos.x + 7 + x, gSaveBlock1.pos.y + 7 + y); -} - -int CanCameraMoveInDirection(int direction) { - int x, y; - x = gSaveBlock1.pos.x + 7 + gUnknown_0821664C[direction].x; - y = gSaveBlock1.pos.y + 7 + gUnknown_0821664C[direction].y; - if (GetMapBorderIdAt(x, y) == -1) { - return 0; - } - return 1; -} - -void sub_8056918(struct MapConnection *connection, int direction, int x, int y) { - struct MapHeader *mapHeader; - mapHeader = mapconnection_get_mapheader(connection); - switch (direction) { - case CONNECTION_EAST: - gSaveBlock1.pos.x = -x; - gSaveBlock1.pos.y -= connection->offset; - break; - case CONNECTION_WEST: - gSaveBlock1.pos.x = mapHeader->mapData->width; - gSaveBlock1.pos.y -= connection->offset; - break; - case CONNECTION_SOUTH: - gSaveBlock1.pos.x -= connection->offset; - gSaveBlock1.pos.y = -y; - break; - case CONNECTION_NORTH: - gSaveBlock1.pos.x -= connection->offset; - gSaveBlock1.pos.y = mapHeader->mapData->height; - break; - } -} - -bool8 CameraMove(int x, int y) { - unsigned int direction; - struct MapConnection *connection; - int old_x, old_y; - gUnknown_0202E844.field_0 = FALSE; - direction = GetPostCameraMoveMapBorderId(x, y); - if (direction + 1 <= 1) { - gSaveBlock1.pos.x += x; - gSaveBlock1.pos.y += y; - } else { - save_serialize_map(); - old_x = gSaveBlock1.pos.x; - old_y = gSaveBlock1.pos.y; - connection = sub_8056A64(direction, gSaveBlock1.pos.x, gSaveBlock1.pos.y); - sub_8056918(connection, direction, x, y); - sub_80538F0(connection->mapGroup, connection->mapNum); - gUnknown_0202E844.field_0 = TRUE; - gUnknown_0202E844.x = old_x - gSaveBlock1.pos.x; - gUnknown_0202E844.y = old_y - gSaveBlock1.pos.y; - gSaveBlock1.pos.x += x; - gSaveBlock1.pos.y += y; - sub_80566F0(direction); - } - return gUnknown_0202E844.field_0; -} - -struct MapConnection *sub_8056A64(u8 direction, int x, int y) { - int count; - struct MapConnection *connection; - int i; - count = gMapHeader.connections->count; - connection = gMapHeader.connections->connections; - for (i = 0; i < count; i++, connection++) { - if (connection->direction == direction) { - if (sub_8056ABC(direction, x, y, connection) == TRUE) { - return connection; - } - } - } - return NULL; -} - -bool8 sub_8056ABC(u8 direction, int x, int y, struct MapConnection *connection) { - struct MapHeader *mapHeader; - mapHeader = mapconnection_get_mapheader(connection); - switch (direction) { - case CONNECTION_SOUTH: - case CONNECTION_NORTH: - return sub_8056B20(x, gMapHeader.mapData->width, mapHeader->mapData->width, connection->offset); - case CONNECTION_WEST: - case CONNECTION_EAST: - return sub_8056B20(y, gMapHeader.mapData->height, mapHeader->mapData->height, connection->offset); - } - return FALSE; -} - -bool8 sub_8056B20(int x, int src_width, int dest_width, int offset) { - int offset2; - offset2 = offset; - if (offset2 < 0) { - offset2 = 0; - } - if (dest_width + offset < src_width) { - src_width = dest_width + offset; - } - if (offset2 <= x && x <= src_width) { - return TRUE; - } - return FALSE; -} - -int sub_8056B4C(int x, int width) { - if (x >= 0 && x < width) { - return TRUE; - } - return FALSE; -} - -int sub_8056B60(struct MapConnection *connection, int x, int y) { - struct MapHeader *mapHeader; - mapHeader = mapconnection_get_mapheader(connection); - switch (connection->direction) { - case CONNECTION_SOUTH: - case CONNECTION_NORTH: - return sub_8056B4C(x - connection->offset, mapHeader->mapData->width); - case CONNECTION_WEST: - case CONNECTION_EAST: - return sub_8056B4C(y - connection->offset, mapHeader->mapData->height); - } - return FALSE; -} - -struct MapConnection *sub_8056BA0(s16 x, s16 y) { - int count; - struct MapConnection *connection; - int i; - u8 direction; - if (!gMapHeader.connections) { - return NULL; - } else { - count = gMapHeader.connections->count; - connection = gMapHeader.connections->connections; - for (i = 0; i < count; i++, connection++) { - direction = connection->direction; - if ( - (direction == CONNECTION_DIVE || direction == CONNECTION_EMERGE) - || (direction == CONNECTION_NORTH && y > 6) - || (direction == CONNECTION_SOUTH && y < gMapHeader.mapData->height + 7) - || (direction == CONNECTION_WEST && x > 6) - || (direction == CONNECTION_EAST && x < gMapHeader.mapData->width + 7) - ) { - continue; - } - if (sub_8056B60(connection, x - 7, y - 7) == TRUE) { - return connection; - } - } - } - return NULL; -} - -void sub_8056C50(u16 x, u16 y) { - gSaveBlock1.pos.x = x - 7; - gSaveBlock1.pos.y = y - 7; -} - -void sav1_camera_get_focus_coords(u16 *x, u16 *y) { - *x = gSaveBlock1.pos.x + 7; - *y = gSaveBlock1.pos.y + 7; -} - -void unref_sub_8056C7C(u16 x, u16 y) { - gSaveBlock1.pos.x = x; - gSaveBlock1.pos.y = y; -} - -void GetCameraCoords(u16 *x, u16 *y) { - *x = gSaveBlock1.pos.x; - *y = gSaveBlock1.pos.y; -} - -void sub_8056C98(struct Tileset *tileset, void *src) { - if (tileset) { - if (!tileset->isCompressed) { - CpuFastSet(tileset->tiles, src, 0x1000); - } else { - LZ77UnCompVram(tileset->tiles, src); - } - } -} - -void sub_8056CBC(struct Tileset *tileset, int offset, int size) { - u16 black; - if (tileset) { - if (tileset->isSecondary == FALSE) { - black = 0; - LoadPalette(&black, offset, 2); - LoadPalette(tileset->palettes + 2, offset + 1, size - 2); - } else if (tileset->isSecondary == TRUE) { - LoadPalette(tileset->palettes + 0xc0, offset, size); - } else { - LZ77UnCompVram(tileset->palettes, (void*)0x2000000); - LoadPalette((void*)0x2000000, offset, size); - } - } -} - -void sub_8056D28(struct MapData *mapData) { - void *src = (void*)(BG_VRAM); - sub_8056C98(mapData->primaryTileset, src); -} - -void sub_8056D38(struct MapData *mapData) { - void *src = (void*)(BG_VRAM + 0x4000); - sub_8056C98(mapData->secondaryTileset, src); -} - -void apply_map_tileset1_palette(struct MapData *mapData) { - sub_8056CBC(mapData->primaryTileset, 0, 0xc0); -} - -void apply_map_tileset2_palette(struct MapData *mapData) { - sub_8056CBC(mapData->secondaryTileset, 0x60, 0xc0); -} - -void copy_map_tileset1_tileset2_to_vram(struct MapData *mapData) { - if (mapData) { - sub_8056D28(mapData); - sub_8056D38(mapData); - } + if (x >= (gUnknown_03004870.width - 8)) + { + if (!gUnknown_0202E850.east) + { + return -1; + } + return CONNECTION_EAST; + } + else if (x < 7) + { + if (!gUnknown_0202E850.west) + { + return -1; + } + return CONNECTION_WEST; + } + else if (y >= (gUnknown_03004870.height - 7)) + { + if (!gUnknown_0202E850.south) + { + return -1; + } + return CONNECTION_SOUTH; + } + else if (y < 7) + { + if (!gUnknown_0202E850.north) + { + return -1; + } + return CONNECTION_NORTH; + } + else + { + return 0; + } +} + +int GetPostCameraMoveMapBorderId(int x, int y) +{ + return GetMapBorderIdAt(gSaveBlock1.pos.x + 7 + x, gSaveBlock1.pos.y + 7 + y); +} + +int CanCameraMoveInDirection(int direction) +{ + int x, y; + x = gSaveBlock1.pos.x + 7 + gUnknown_0821664C[direction].x; + y = gSaveBlock1.pos.y + 7 + gUnknown_0821664C[direction].y; + if (GetMapBorderIdAt(x, y) == -1) + { + return 0; + } + return 1; +} + +void sub_8056918(struct MapConnection *connection, int direction, int x, int y) +{ + struct MapHeader *mapHeader; + mapHeader = mapconnection_get_mapheader(connection); + switch (direction) + { + case CONNECTION_EAST: + gSaveBlock1.pos.x = -x; + gSaveBlock1.pos.y -= connection->offset; + break; + case CONNECTION_WEST: + gSaveBlock1.pos.x = mapHeader->mapData->width; + gSaveBlock1.pos.y -= connection->offset; + break; + case CONNECTION_SOUTH: + gSaveBlock1.pos.x -= connection->offset; + gSaveBlock1.pos.y = -y; + break; + case CONNECTION_NORTH: + gSaveBlock1.pos.x -= connection->offset; + gSaveBlock1.pos.y = mapHeader->mapData->height; + break; + } +} + +bool8 CameraMove(int x, int y) +{ + unsigned int direction; + struct MapConnection *connection; + int old_x, old_y; + gUnknown_0202E844.field_0 = FALSE; + direction = GetPostCameraMoveMapBorderId(x, y); + if (direction + 1 <= 1) + { + gSaveBlock1.pos.x += x; + gSaveBlock1.pos.y += y; + } + else + { + save_serialize_map(); + old_x = gSaveBlock1.pos.x; + old_y = gSaveBlock1.pos.y; + connection = sub_8056A64(direction, gSaveBlock1.pos.x, gSaveBlock1.pos.y); + sub_8056918(connection, direction, x, y); + sub_80538F0(connection->mapGroup, connection->mapNum); + gUnknown_0202E844.field_0 = TRUE; + gUnknown_0202E844.x = old_x - gSaveBlock1.pos.x; + gUnknown_0202E844.y = old_y - gSaveBlock1.pos.y; + gSaveBlock1.pos.x += x; + gSaveBlock1.pos.y += y; + sub_80566F0(direction); + } + return gUnknown_0202E844.field_0; +} + +struct MapConnection *sub_8056A64(u8 direction, int x, int y) +{ + int count; + struct MapConnection *connection; + int i; + count = gMapHeader.connections->count; + connection = gMapHeader.connections->connections; + for (i = 0; i < count; i++, connection++) + { + if (connection->direction == direction) + { + if (sub_8056ABC(direction, x, y, connection) == TRUE) + { + return connection; + } + } + } + return NULL; +} + +bool8 sub_8056ABC(u8 direction, int x, int y, struct MapConnection *connection) +{ + struct MapHeader *mapHeader; + mapHeader = mapconnection_get_mapheader(connection); + switch (direction) + { + case CONNECTION_SOUTH: + case CONNECTION_NORTH: + return sub_8056B20(x, gMapHeader.mapData->width, mapHeader->mapData->width, connection->offset); + case CONNECTION_WEST: + case CONNECTION_EAST: + return sub_8056B20(y, gMapHeader.mapData->height, mapHeader->mapData->height, connection->offset); + } + return FALSE; +} + +bool8 sub_8056B20(int x, int src_width, int dest_width, int offset) +{ + int offset2; + offset2 = offset; + if (offset2 < 0) + { + offset2 = 0; + } + if (dest_width + offset < src_width) + { + src_width = dest_width + offset; + } + if (offset2 <= x && x <= src_width) + { + return TRUE; + } + return FALSE; +} + +int sub_8056B4C(int x, int width) +{ + if (x >= 0 && x < width) + { + return TRUE; + } + return FALSE; +} + +int sub_8056B60(struct MapConnection *connection, int x, int y) +{ + struct MapHeader *mapHeader; + mapHeader = mapconnection_get_mapheader(connection); + switch (connection->direction) + { + case CONNECTION_SOUTH: + case CONNECTION_NORTH: + return sub_8056B4C(x - connection->offset, mapHeader->mapData->width); + case CONNECTION_WEST: + case CONNECTION_EAST: + return sub_8056B4C(y - connection->offset, mapHeader->mapData->height); + } + return FALSE; +} + +struct MapConnection *sub_8056BA0(s16 x, s16 y) +{ + int count; + struct MapConnection *connection; + int i; + u8 direction; + if (!gMapHeader.connections) + { + return NULL; + } + else + { + count = gMapHeader.connections->count; + connection = gMapHeader.connections->connections; + for (i = 0; i < count; i++, connection++) + { + direction = connection->direction; + if ((direction == CONNECTION_DIVE || direction == CONNECTION_EMERGE) + || (direction == CONNECTION_NORTH && y > 6) + || (direction == CONNECTION_SOUTH && y < gMapHeader.mapData->height + 7) + || (direction == CONNECTION_WEST && x > 6) + || (direction == CONNECTION_EAST && x < gMapHeader.mapData->width + 7)) + { + continue; + } + if (sub_8056B60(connection, x - 7, y - 7) == TRUE) + { + return connection; + } + } + } + return NULL; +} + +void sub_8056C50(u16 x, u16 y) +{ + gSaveBlock1.pos.x = x - 7; + gSaveBlock1.pos.y = y - 7; +} + +void sav1_camera_get_focus_coords(u16 *x, u16 *y) +{ + *x = gSaveBlock1.pos.x + 7; + *y = gSaveBlock1.pos.y + 7; } - -void apply_map_tileset1_tileset2_palette(struct MapData *mapData) { - if (mapData) { - apply_map_tileset1_palette(mapData); - apply_map_tileset2_palette(mapData); - } + +void unref_sub_8056C7C(u16 x, u16 y) +{ + gSaveBlock1.pos.x = x; + gSaveBlock1.pos.y = y; +} + +void GetCameraCoords(u16 *x, u16 *y) +{ + *x = gSaveBlock1.pos.x; + *y = gSaveBlock1.pos.y; +} + +void sub_8056C98(struct Tileset *tileset, void *src) +{ + if (tileset) + { + if (!tileset->isCompressed) + { + CpuFastSet(tileset->tiles, src, 0x1000); + } + else + { + LZ77UnCompVram(tileset->tiles, src); + } + } +} + +void sub_8056CBC(struct Tileset *tileset, int offset, int size) +{ + u16 black; + if (tileset) + { + if (tileset->isSecondary == FALSE) + { + black = 0; + LoadPalette(&black, offset, 2); + LoadPalette(tileset->palettes + 2, offset + 1, size - 2); + } + else if (tileset->isSecondary == TRUE) + { + LoadPalette(tileset->palettes + 0xc0, offset, size); + } + else + { + LZ77UnCompVram(tileset->palettes, (void*)0x2000000); + LoadPalette((void*)0x2000000, offset, size); + } + } +} + +void sub_8056D28(struct MapData *mapData) +{ + void *src = (void*)(BG_VRAM); + sub_8056C98(mapData->primaryTileset, src); +} + +void sub_8056D38(struct MapData *mapData) +{ + void *src = (void*)(BG_VRAM + 0x4000); + sub_8056C98(mapData->secondaryTileset, src); +} + +void apply_map_tileset1_palette(struct MapData *mapData) +{ + sub_8056CBC(mapData->primaryTileset, 0, 0xc0); +} + +void apply_map_tileset2_palette(struct MapData *mapData) +{ + sub_8056CBC(mapData->secondaryTileset, 0x60, 0xc0); +} + +void copy_map_tileset1_tileset2_to_vram(struct MapData *mapData) +{ + if (mapData) + { + sub_8056D28(mapData); + sub_8056D38(mapData); + } +} + +void apply_map_tileset1_tileset2_palette(struct MapData *mapData) +{ + if (mapData) + { + apply_map_tileset1_palette(mapData); + apply_map_tileset2_palette(mapData); + } } diff --git a/src/heal_location.c b/src/heal_location.c index 73d6ef65a..a780ee470 100644 --- a/src/heal_location.c +++ b/src/heal_location.c @@ -11,7 +11,7 @@ u32 GetHealLocationIndexByMap(u16 mapGroup, u16 mapNum) for (i = 0; i < NUM_HEAL_LOCATIONS; i++) { - if(gHealLocations[i].group == mapGroup && gHealLocations[i].map == mapNum) + if (gHealLocations[i].group == mapGroup && gHealLocations[i].map == mapNum) return i + 1; } return 0; diff --git a/src/intro.c b/src/intro.c index d72bc7609..e2fcf3a1c 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1506,7 +1506,7 @@ void sub_813DA64(struct Sprite *sprite) { sprite->data7++; - switch(sprite->data0) + switch (sprite->data0) { case 0: default: diff --git a/src/item.c b/src/item.c index 25b538251..656563ad4 100644 --- a/src/item.c +++ b/src/item.c @@ -410,7 +410,7 @@ static void CompactPCItems(void) void SwapRegisteredBike(void) { - switch(gSaveBlock1.registeredItem) + switch (gSaveBlock1.registeredItem) { case 0x103: gSaveBlock1.registeredItem = 0x110; diff --git a/src/item_use.c b/src/item_use.c index bed1736bc..344a3bc0d 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -55,7 +55,7 @@ void ExecuteSwitchToOverworldFromItemUse(u8 taskId) { u8 taskData; - if(gScriptItemId == 0xAF) + if (gScriptItemId == 0xAF) taskData = gTasks[taskId].data[15] - 1; else taskData = ItemId_GetType(gScriptItemId) - 1; @@ -67,119 +67,119 @@ void ExecuteSwitchToOverworldFromItemUse(u8 taskId) void ItemMenu_ConfirmNormalFade(u8 var) { - ExecuteSwitchToOverworldFromItemUse(var); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + ExecuteSwitchToOverworldFromItemUse(var); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); } void ItemMenu_ConfirmComplexFade(u8 var) { - ExecuteSwitchToOverworldFromItemUse(var); - fade_screen(1, 0); + ExecuteSwitchToOverworldFromItemUse(var); + fade_screen(1, 0); } void SetUpItemUseOnFieldCallback(u8 taskId) { - if(gTasks[taskId].data[2] != 1) - { - gUnknown_0300485C = (void *)ExecuteItemUseFromBlackPalette; - ItemMenu_ConfirmNormalFade(taskId); - } - else - gUnknown_03005D00(taskId); + if (gTasks[taskId].data[2] != 1) + { + gUnknown_0300485C = (void *)ExecuteItemUseFromBlackPalette; + ItemMenu_ConfirmNormalFade(taskId); + } + else + gUnknown_03005D00(taskId); } void HandleDeniedItemUseMessage(u8 var1, u8 playerMenuStatus, const u8 *var3) { - StringExpandPlaceholders(gStringVar4, var3); - - switch(playerMenuStatus) - { - case 0: // Item Menu - MenuZeroFillWindowRect(0, 13, 13, 20); - DisplayItemMessageOnField(var1, gStringVar4, CleanUpItemMenuMessage, 1); - break; - default: // Field - DisplayItemMessageOnField(var1, gStringVar4, CleanUpOverworldMessage, 0); - break; - } + StringExpandPlaceholders(gStringVar4, var3); + + switch (playerMenuStatus) + { + case 0: // Item Menu + MenuZeroFillWindowRect(0, 13, 13, 20); + DisplayItemMessageOnField(var1, gStringVar4, CleanUpItemMenuMessage, 1); + break; + default: // Field + DisplayItemMessageOnField(var1, gStringVar4, CleanUpOverworldMessage, 0); + break; + } } void DisplayDadsAdviceCannotUseItemMessage(u8 var1, u8 playerMenuStatus) { - HandleDeniedItemUseMessage(var1, playerMenuStatus, gOtherText_DadsAdvice); + HandleDeniedItemUseMessage(var1, playerMenuStatus, gOtherText_DadsAdvice); } void DisplayCantGetOffBikeItemMessage(u8 var1, u8 playerMenuStatus) { - HandleDeniedItemUseMessage(var1, playerMenuStatus, gOtherText_CantGetOffBike); + HandleDeniedItemUseMessage(var1, playerMenuStatus, gOtherText_CantGetOffBike); } u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId) { - if(ItemId_GetFieldFunc(itemId) == ItemUseOutOfBattle_TMHM) - return 1; - else if(ItemId_GetFieldFunc(itemId) == ItemUseOutOfBattle_EvolutionStone) - return 2; - else - return 0; + if (ItemId_GetFieldFunc(itemId) == ItemUseOutOfBattle_TMHM) + return 1; + else if (ItemId_GetFieldFunc(itemId) == ItemUseOutOfBattle_EvolutionStone) + return 2; + else + return 0; } void ItemMenu_ReadMail(u8 taskId) { - struct MailStruct mailStruct; - - if(!gPaletteFade.active) - { - mailStruct.itemId = gScriptItemId; - HandleReadMail(&mailStruct, sub_80A5D04, 0); - DestroyTask(taskId); - } + struct MailStruct mailStruct; + + if (!gPaletteFade.active) + { + mailStruct.itemId = gScriptItemId; + HandleReadMail(&mailStruct, sub_80A5D04, 0); + DestroyTask(taskId); + } } void ItemUseOutOfBattle_Mail(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); - gTasks[taskId].func = ItemMenu_ReadMail; + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + gTasks[taskId].func = ItemMenu_ReadMail; } void ItemUseOutOfBattle_Bike(u8 taskId) { - s16 x, y; - u8 tileBehavior; - - PlayerGetDestCoords(&x, &y); - tileBehavior = MapGridGetMetatileBehaviorAt(x, y); - - if(FlagGet(SYS_CYCLING_ROAD) == TRUE // on cycling road? - || MetatileBehavior_IsVerticalRail(tileBehavior) == TRUE - || MetatileBehavior_IsHorizontalRail(tileBehavior) == TRUE - || MetatileBehavior_IsIsolatedVerticalRail(tileBehavior) == TRUE - || MetatileBehavior_IsIsolatedHorizontalRail(tileBehavior) == TRUE) - { - DisplayCantGetOffBikeItemMessage(taskId, gTasks[taskId].data[2]); - } - else - { - if(IsBikingAllowedByMap() == TRUE && IsBikingDisallowedByPlayer() == FALSE) - { - gUnknown_03005D00 = (void *)ItemUseOnFieldCB_Bike; - SetUpItemUseOnFieldCallback(taskId); - } - else - DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[2]); - } + s16 x, y; + u8 tileBehavior; + + PlayerGetDestCoords(&x, &y); + tileBehavior = MapGridGetMetatileBehaviorAt(x, y); + + if (FlagGet(SYS_CYCLING_ROAD) == TRUE // on cycling road? + || MetatileBehavior_IsVerticalRail(tileBehavior) == TRUE + || MetatileBehavior_IsHorizontalRail(tileBehavior) == TRUE + || MetatileBehavior_IsIsolatedVerticalRail(tileBehavior) == TRUE + || MetatileBehavior_IsIsolatedHorizontalRail(tileBehavior) == TRUE) + { + DisplayCantGetOffBikeItemMessage(taskId, gTasks[taskId].data[2]); + } + else + { + if (IsBikingAllowedByMap() == TRUE && IsBikingDisallowedByPlayer() == FALSE) + { + gUnknown_03005D00 = (void *)ItemUseOnFieldCB_Bike; + SetUpItemUseOnFieldCallback(taskId); + } + else + DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[2]); + } } void ItemUseOnFieldCB_Bike(u8 taskId) { - if(ItemId_GetSecondaryId(gScriptItemId) == 0) - GetOnOffBike(2); - if(ItemId_GetSecondaryId(gScriptItemId) == 1) - GetOnOffBike(4); - - sub_8064E2C(); - ScriptContext2_Disable(); - DestroyTask(taskId); + if (ItemId_GetSecondaryId(gScriptItemId) == 0) + GetOnOffBike(2); + if (ItemId_GetSecondaryId(gScriptItemId) == 1) + GetOnOffBike(4); + + sub_8064E2C(); + ScriptContext2_Disable(); + DestroyTask(taskId); } bool32 CanFish(void) @@ -214,31 +214,31 @@ bool32 CanFish(void) void ItemUseOutOfBattle_Rod(u8 taskId) { - if(CanFish() == TRUE) - { - gUnknown_03005D00 = (void *)ItemUseOnFieldCB_Rod; - SetUpItemUseOnFieldCallback(taskId); - } - else - DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[2]); + if (CanFish() == TRUE) + { + gUnknown_03005D00 = (void *)ItemUseOnFieldCB_Rod; + SetUpItemUseOnFieldCallback(taskId); + } + else + DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[2]); } void ItemUseOnFieldCB_Rod(u8 taskId) { - StartFishing(ItemId_GetSecondaryId(gScriptItemId)); - DestroyTask(taskId); + StartFishing(ItemId_GetSecondaryId(gScriptItemId)); + DestroyTask(taskId); } void ItemUseOutOfBattle_Itemfinder(u8 var) { - IncrementGameStat(0x27); - gUnknown_03005D00 = (void *)ItemUseOnFieldCB_Itemfinder; - SetUpItemUseOnFieldCallback(var); + IncrementGameStat(0x27); + gUnknown_03005D00 = (void *)ItemUseOnFieldCB_Itemfinder; + SetUpItemUseOnFieldCallback(var); } void ItemUseOnFieldCB_Itemfinder(u8 taskId) { - if(ItemfinderCheckForHiddenItems(gMapHeader.events, taskId) == TRUE) + if (ItemfinderCheckForHiddenItems(gMapHeader.events, taskId) == TRUE) gTasks[taskId].func = RunItemfinderResults; else DisplayItemMessageOnField(taskId, gOtherText_NoResponse, ExitItemfinder, 0); @@ -247,16 +247,16 @@ void ItemUseOnFieldCB_Itemfinder(u8 taskId) void RunItemfinderResults(u8 taskId) { u8 playerDir; - u8 playerDirToItem; + u8 playerDirToItem; u8 i; s16 *data = gTasks[taskId].data; - if(!data[3]) + if (!data[3]) { - if(data[4] == 4) + if (data[4] == 4) { playerDirToItem = GetPlayerDirectionTowardsHiddenItem(data[0], data[1]); - if(playerDirToItem) + if (playerDirToItem) { SetPlayerDirectionTowardsItem(gItemFinderDirections[playerDirToItem - 1]); gTasks[taskId].func = DisplayItemRespondingMessageAndExitItemfinder; @@ -265,7 +265,7 @@ void RunItemfinderResults(u8 taskId) { playerDir = player_get_direction_lower_nybble(); - // rotate player clockwise depending on current direction. + // rotate player clockwise depending on current direction. for (i = 0; i < 4; i++) if (playerDir == gItemFinderDirections[i]) data[5] = (i + 1) & 3; @@ -274,7 +274,7 @@ void RunItemfinderResults(u8 taskId) data[3] = 0; data[2] = 0; } - return; + return; } PlaySE(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder. data[4]++; @@ -284,131 +284,131 @@ void RunItemfinderResults(u8 taskId) void ExitItemfinder(u8 taskId) { - MenuZeroFillWindowRect(0, 14, 29, 19); - sub_8064E2C(); - ScriptContext2_Disable(); - DestroyTask(taskId); + MenuZeroFillWindowRect(0, 14, 29, 19); + sub_8064E2C(); + ScriptContext2_Disable(); + DestroyTask(taskId); } // too much struct math. __attribute__((naked)) bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, int var) { - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r9\n\ - mov r6, r8\n\ - push {r6,r7}\n\ - sub sp, 0x4\n\ - adds r5, r0, 0\n\ - lsls r1, 24\n\ - lsrs r6, r1, 24\n\ - mov r4, sp\n\ - adds r4, 0x2\n\ - mov r0, sp\n\ - adds r1, r4, 0\n\ - bl PlayerGetDestCoords\n\ - ldr r1, _080C9618 @ =gTasks\n\ - lsls r0, r6, 2\n\ - adds r0, r6\n\ - lsls r0, 3\n\ - adds r0, r1\n\ - movs r1, 0\n\ - strh r1, [r0, 0xC]\n\ - movs r3, 0\n\ - mov r9, r4\n\ - ldrb r0, [r5, 0x3]\n\ - cmp r3, r0\n\ - bge _080C95FC\n\ - subs r1, 0x5\n\ - mov r8, r1\n\ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + sub sp, 0x4\n\ + adds r5, r0, 0\n\ + lsls r1, 24\n\ + lsrs r6, r1, 24\n\ + mov r4, sp\n\ + adds r4, 0x2\n\ + mov r0, sp\n\ + adds r1, r4, 0\n\ + bl PlayerGetDestCoords\n\ + ldr r1, _080C9618 @ =gTasks\n\ + lsls r0, r6, 2\n\ + adds r0, r6\n\ + lsls r0, 3\n\ + adds r0, r1\n\ + movs r1, 0\n\ + strh r1, [r0, 0xC]\n\ + movs r3, 0\n\ + mov r9, r4\n\ + ldrb r0, [r5, 0x3]\n\ + cmp r3, r0\n\ + bge _080C95FC\n\ + subs r1, 0x5\n\ + mov r8, r1\n\ _080C9580:\n\ - lsls r3, 16\n\ - asrs r1, r3, 16\n\ - ldr r2, [r5, 0x10]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r4, r0, 2\n\ - adds r1, r4, r2\n\ - ldrb r0, [r1, 0x5]\n\ - adds r7, r3, 0\n\ - cmp r0, 0x7\n\ - bne _080C95EC\n\ - movs r2, 0x96\n\ - lsls r2, 2\n\ - adds r0, r2, 0\n\ - ldrh r1, [r1, 0xA]\n\ - adds r0, r1\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - bl FlagGet\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080C95EC\n\ - ldr r1, [r5, 0x10]\n\ - adds r1, r4, r1\n\ - ldrh r2, [r1]\n\ - adds r2, 0x7\n\ - mov r0, sp\n\ - ldrh r0, [r0]\n\ - subs r2, r0\n\ - ldrh r0, [r1, 0x2]\n\ - adds r0, 0x7\n\ - mov r3, r9\n\ - ldrh r1, [r3]\n\ - subs r0, r1\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - lsls r2, 16\n\ - asrs r1, r2, 16\n\ - movs r3, 0xE0\n\ - lsls r3, 11\n\ - adds r2, r3\n\ - lsrs r2, 16\n\ - cmp r2, 0xE\n\ - bhi _080C95EC\n\ - lsls r0, 16\n\ - asrs r2, r0, 16\n\ - cmp r2, r8\n\ - blt _080C95EC\n\ - cmp r2, 0x5\n\ - bgt _080C95EC\n\ - adds r0, r6, 0\n\ - bl sub_80C9838\n\ + lsls r3, 16\n\ + asrs r1, r3, 16\n\ + ldr r2, [r5, 0x10]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + lsls r4, r0, 2\n\ + adds r1, r4, r2\n\ + ldrb r0, [r1, 0x5]\n\ + adds r7, r3, 0\n\ + cmp r0, 0x7\n\ + bne _080C95EC\n\ + movs r2, 0x96\n\ + lsls r2, 2\n\ + adds r0, r2, 0\n\ + ldrh r1, [r1, 0xA]\n\ + adds r0, r1\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + bl FlagGet\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _080C95EC\n\ + ldr r1, [r5, 0x10]\n\ + adds r1, r4, r1\n\ + ldrh r2, [r1]\n\ + adds r2, 0x7\n\ + mov r0, sp\n\ + ldrh r0, [r0]\n\ + subs r2, r0\n\ + ldrh r0, [r1, 0x2]\n\ + adds r0, 0x7\n\ + mov r3, r9\n\ + ldrh r1, [r3]\n\ + subs r0, r1\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + lsls r2, 16\n\ + asrs r1, r2, 16\n\ + movs r3, 0xE0\n\ + lsls r3, 11\n\ + adds r2, r3\n\ + lsrs r2, 16\n\ + cmp r2, 0xE\n\ + bhi _080C95EC\n\ + lsls r0, 16\n\ + asrs r2, r0, 16\n\ + cmp r2, r8\n\ + blt _080C95EC\n\ + cmp r2, 0x5\n\ + bgt _080C95EC\n\ + adds r0, r6, 0\n\ + bl sub_80C9838\n\ _080C95EC:\n\ - movs r1, 0x80\n\ - lsls r1, 9\n\ - adds r0, r7, r1\n\ - lsrs r3, r0, 16\n\ - asrs r0, 16\n\ - ldrb r2, [r5, 0x3]\n\ - cmp r0, r2\n\ - blt _080C9580\n\ + movs r1, 0x80\n\ + lsls r1, 9\n\ + adds r0, r7, r1\n\ + lsrs r3, r0, 16\n\ + asrs r0, 16\n\ + ldrb r2, [r5, 0x3]\n\ + cmp r0, r2\n\ + blt _080C9580\n\ _080C95FC:\n\ - adds r0, r6, 0\n\ - bl sub_80C9720\n\ - ldr r0, _080C9618 @ =gTasks\n\ - lsls r1, r6, 2\n\ - adds r1, r6\n\ - lsls r1, 3\n\ - adds r1, r0\n\ - movs r3, 0xC\n\ - ldrsh r0, [r1, r3]\n\ - cmp r0, 0x1\n\ - beq _080C961C\n\ - movs r0, 0\n\ - b _080C961E\n\ - .align 2, 0\n\ + adds r0, r6, 0\n\ + bl sub_80C9720\n\ + ldr r0, _080C9618 @ =gTasks\n\ + lsls r1, r6, 2\n\ + adds r1, r6\n\ + lsls r1, 3\n\ + adds r1, r0\n\ + movs r3, 0xC\n\ + ldrsh r0, [r1, r3]\n\ + cmp r0, 0x1\n\ + beq _080C961C\n\ + movs r0, 0\n\ + b _080C961E\n\ + .align 2, 0\n\ _080C9618: .4byte gTasks\n\ _080C961C:\n\ - movs r0, 0x1\n\ + movs r0, 0x1\n\ _080C961E:\n\ - add sp, 0x4\n\ - pop {r3,r4}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .syntax divided"); + add sp, 0x4\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ + .syntax divided"); } diff --git a/src/libc.c b/src/libc.c index 370981878..920673e3e 100644 --- a/src/libc.c +++ b/src/libc.c @@ -19,13 +19,13 @@ void *memcpy(void *dst0, const void *src0, size_t len0) // If the size is small, or either src or dst is unaligned, // then go to the byte copy loop. This should be rare. - if(len >= 16 && !(UNALIGNED(src) | UNALIGNED(dst))) + if (len >= 16 && !(UNALIGNED(src) | UNALIGNED(dst))) { aligned_dst = (long *)dst; aligned_src = (long *)src; // Copy 4X long words at a time if possible. - while(len >= 16) + while (len >= 16) { *aligned_dst++ = *aligned_src++; *aligned_dst++ = *aligned_src++; @@ -35,7 +35,7 @@ void *memcpy(void *dst0, const void *src0, size_t len0) } // Copy one long word at a time if possible - while(len >= 4) + while (len >= 4) { *aligned_dst++ = *aligned_src++; len -= 4; @@ -46,7 +46,7 @@ void *memcpy(void *dst0, const void *src0, size_t len0) } // Pick up any remaining bytes with a byte copier. - while(len--) + while (len--) *dst++ = *src++; return dst0; @@ -62,7 +62,7 @@ void *memset(void *m, int c, size_t n) // If the size is small or m is unaligned, // then go to the byte copy loop. This should be rare. - if(n >= LBLOCKSIZE && !UNALIGNED(m)) + if (n >= LBLOCKSIZE && !UNALIGNED(m)) { // We know that n is large and m is word-aligned. aligned_addr = (unsigned long *)m; @@ -70,7 +70,7 @@ void *memset(void *m, int c, size_t n) // Store C into each char sized location in buffer so that // we can set large blocks quickly. c &= 0xFF; - if(LBLOCKSIZE == 4) + if (LBLOCKSIZE == 4) { buffer = (c << 8) | c; buffer |= (buffer << 16); @@ -78,11 +78,11 @@ void *memset(void *m, int c, size_t n) else { buffer = 0; - for(i = 0; i < LBLOCKSIZE; i++) + for (i = 0; i < LBLOCKSIZE; i++) buffer = (buffer << 8) | c; } - while(n >= LBLOCKSIZE * 4) + while (n >= LBLOCKSIZE * 4) { *aligned_addr++ = buffer; *aligned_addr++ = buffer; @@ -90,7 +90,7 @@ void *memset(void *m, int c, size_t n) *aligned_addr++ = buffer; n -= LBLOCKSIZE * 4; } - while(n >= LBLOCKSIZE) + while (n >= LBLOCKSIZE) { *aligned_addr++ = buffer; n -= LBLOCKSIZE; @@ -100,7 +100,7 @@ void *memset(void *m, int c, size_t n) } // Pick up the remainder with a bytewise loop. - while(n--) + while (n--) *s++ = (char)c; return m; @@ -112,16 +112,16 @@ int strcmp(const char *s1, const char *s2) unsigned long *a2; // If s1 or s2 are unaligned, then skip this and compare bytes. - if(!(UNALIGNED(s1) | UNALIGNED(s2))) + if (!(UNALIGNED(s1) | UNALIGNED(s2))) { // Compare them a word at a time. a1 = (unsigned long *)s1; a2 = (unsigned long *)s2; - while(*a1 == *a2) + while (*a1 == *a2) { // If *a1 == *a2, and we find a null in *a1, // then the strings must be equal, so return zero. - if(CONTAINSNULL(*a1)) + if (CONTAINSNULL(*a1)) return 0; a1++; @@ -133,7 +133,7 @@ int strcmp(const char *s1, const char *s2) } // Check the remaining few bytes. - while(*s1 != '\0' && *s1 == *s2) + while (*s1 != '\0' && *s1 == *s2) { s1++; s2++; diff --git a/src/load_save.c b/src/load_save.c index 56d9b2b4d..77554eb38 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -22,7 +22,7 @@ extern struct LoadedSaveData gLoadedSaveData[]; void CheckForFlashMemory(void) { - if(!IdentifyFlash()) + if (!IdentifyFlash()) { gUnknown_3004820 = 1; InitFlashTimer(); @@ -81,7 +81,7 @@ static void SaveMapObjects(void) { int i; - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gSaveBlock1.mapObjects[i] = gMapObjects[i]; } @@ -89,7 +89,7 @@ static void LoadMapObjects(void) { int i; - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gMapObjects[i] = gSaveBlock1.mapObjects[i]; } @@ -110,27 +110,27 @@ void LoadPlayerBag(void) int i; // load player items. - for(i = 0; i < 20; i++) + for (i = 0; i < 20; i++) gLoadedSaveData->items[i] = gSaveBlock1.bagPocket_Items[i]; // load player key items. - for(i = 0; i < 20; i++) + for (i = 0; i < 20; i++) gLoadedSaveData->keyItems[i] = gSaveBlock1.bagPocket_KeyItems[i]; // load player pokeballs. - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gLoadedSaveData->pokeBalls[i] = gSaveBlock1.bagPocket_PokeBalls[i]; // load player TMs and HMs. - for(i = 0; i < 64; i++) + for (i = 0; i < 64; i++) gLoadedSaveData->TMsHMs[i] = gSaveBlock1.bagPocket_TMHM[i]; // load player berries. - for(i = 0; i < 46; i++) + for (i = 0; i < 46; i++) gLoadedSaveData->berries[i] = gSaveBlock1.bagPocket_Berries[i]; // load mail. - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gLoadedSaveData->mail[i] = gSaveBlock1.mail[i]; } @@ -139,26 +139,26 @@ void SavePlayerBag(void) int i; // save player items. - for(i = 0; i < 20; i++) + for (i = 0; i < 20; i++) gSaveBlock1.bagPocket_Items[i] = gLoadedSaveData->items[i]; // save player key items. - for(i = 0; i < 20; i++) + for (i = 0; i < 20; i++) gSaveBlock1.bagPocket_KeyItems[i] = gLoadedSaveData->keyItems[i]; // save player pokeballs. - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gSaveBlock1.bagPocket_PokeBalls[i] = gLoadedSaveData->pokeBalls[i]; // save player TMs and HMs. - for(i = 0; i < 64; i++) + for (i = 0; i < 64; i++) gSaveBlock1.bagPocket_TMHM[i] = gLoadedSaveData->TMsHMs[i]; // save player berries. - for(i = 0; i < 46; i++) + for (i = 0; i < 46; i++) gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData->berries[i]; // save mail. - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gSaveBlock1.mail[i] = gLoadedSaveData->mail[i]; } diff --git a/src/lottery_corner.c b/src/lottery_corner.c index 3d456f372..66e1238ef 100644 --- a/src/lottery_corner.c +++ b/src/lottery_corner.c @@ -38,7 +38,7 @@ void SetRandomLotteryNumber(u16 i) { u32 var = Random(); - while(--i != 0xFFFF) + while (--i != 0xFFFF) var = var * 1103515245 + 12345; SetLotteryNumber(var); @@ -60,20 +60,20 @@ void PickLotteryCornerTicket(void) gSpecialVar_0x8004 = 0; slot = 0; box = 0; - for(i = 0; i < 6; i++) + for (i = 0; i < 6; i++) { struct Pokemon *pkmn = &gPlayerParty[i]; // UB: Too few arguments for function GetMonData - if(GetMonData(pkmn, MON_DATA_SPECIES) != SPECIES_NONE) + if (GetMonData(pkmn, MON_DATA_SPECIES) != SPECIES_NONE) { // do not calculate ticket values for eggs. - if(!GetMonData(pkmn, MON_DATA_IS_EGG)) + if (!GetMonData(pkmn, MON_DATA_IS_EGG)) { u32 otId = GetMonData(pkmn, MON_DATA_OT_ID); u8 numMatchingDigits = GetMatchingDigits(gScriptResult, otId); - if(numMatchingDigits > gSpecialVar_0x8004 && numMatchingDigits > 1) + if (numMatchingDigits > gSpecialVar_0x8004 && numMatchingDigits > 1) { gSpecialVar_0x8004 = numMatchingDigits - 1; box = 14; @@ -86,21 +86,21 @@ void PickLotteryCornerTicket(void) } // player has 14 boxes. - for(i = 0; i < 14; i++) + for (i = 0; i < 14; i++) { // player has 30 slots per box. - for(j = 0; j < 30; j++) + for (j = 0; j < 30; j++) { struct BoxPokemon *pkmn = &gPokemonStorage.boxes[i][j]; // UB: Too few arguments for function GetMonData - if(GetBoxMonData(pkmn, MON_DATA_SPECIES) != SPECIES_NONE && + if (GetBoxMonData(pkmn, MON_DATA_SPECIES) != SPECIES_NONE && !GetBoxMonData(pkmn, MON_DATA_IS_EGG)) { u32 otId = GetBoxMonData(pkmn, MON_DATA_OT_ID); u8 numMatchingDigits = GetMatchingDigits(gScriptResult, otId); - if(numMatchingDigits > gSpecialVar_0x8004 && numMatchingDigits > 1) + if (numMatchingDigits > gSpecialVar_0x8004 && numMatchingDigits > 1) { gSpecialVar_0x8004 = numMatchingDigits - 1; box = i; @@ -110,11 +110,11 @@ void PickLotteryCornerTicket(void) } } - if(gSpecialVar_0x8004 != 0) + if (gSpecialVar_0x8004 != 0) { gSpecialVar_0x8005 = sLotteryPrizes[gSpecialVar_0x8004 - 1]; - if(box == 14) + if (box == 14) { gSpecialVar_0x8006 = 0; GetMonData(&gPlayerParty[slot], MON_DATA_NICKNAME, gStringVar1); @@ -133,12 +133,12 @@ static u8 GetMatchingDigits(u16 winNumber, u16 otId) u8 i; u8 matchingDigits = 0; - for(i = 0; i < 5; i++) + for (i = 0; i < 5; i++) { sWinNumberDigit = winNumber % 10; sOtIdDigit = otId % 10; - if(sWinNumberDigit == sOtIdDigit) + if (sWinNumberDigit == sOtIdDigit) { winNumber = winNumber / 10; otId = otId / 10; diff --git a/src/mail.c b/src/mail.c index a0f448205..570128095 100644 --- a/src/mail.c +++ b/src/mail.c @@ -17,7 +17,8 @@ struct UnkMailStruct u8 unk_0_4:4; }; -struct MailLayout { +struct MailLayout +{ u8 var0; u8 var1; u8 var2; @@ -26,28 +27,30 @@ struct MailLayout { struct UnkMailStruct *var4; }; -struct Unk2000000 { - /* 0x00 */ u8 words[8][27]; - /* 0xEC */ u8 varD8[20]; - /* 0xEC */ MainCallback varEC; - /* 0xF0 */ MainCallback varF0; - /* 0xFF */ struct MailStruct *varF4; - /* 0xF8 */ u8 varF8; - /* 0xF9 */ u8 varF9; - /* 0xFA */ u8 varFA; - /* 0xFB */ u8 varFB; - /* 0xFC */ u8 varFC; +struct Unk2000000 +{ + /* 0x00*/ u8 words[8][27]; + /* 0xEC*/ u8 varD8[20]; + /* 0xEC*/ MainCallback varEC; + /* 0xF0*/ MainCallback varF0; + /* 0xFF*/ struct MailStruct *varF4; + /* 0xF8*/ u8 varF8; + /* 0xF9*/ u8 varF9; + /* 0xFA*/ u8 varFA; + /* 0xFB*/ u8 varFB; + /* 0xFC*/ u8 varFC; u8 padFD[1]; - /* 0xFE */ u8 varFE; - /* 0xFF */ u8 varFF; - /* 0x100 */ u8 var100; + /* 0xFE*/ u8 varFE; + /* 0xFF*/ u8 varFF; + /*0x100*/ u8 var100; u8 pad101[3]; - /* 0x104 */ MainCallback var104; - /* 0x108 */ MainCallback var108; - /* 0x10C */ struct MailLayout *var10C; + /*0x104*/ MainCallback var104; + /*0x108*/ MainCallback var108; + /*0x10C*/ struct MailLayout *var10C; }; -struct MailGraphics { +struct MailGraphics +{ u16 (*palette)[]; u8 (*tiles)[]; u8 (*tileMap)[]; @@ -78,7 +81,8 @@ static void sub_80F8F78(void); static void sub_80F8FB4(void); #ifdef NONMATCHING -void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { +void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) +{ u16 mailDesign; u8 buffer[4]; u8 local1; @@ -87,44 +91,52 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { // Compiler uses [sub 1], while asm uses [ptr + FE] unk_2000000.varFE = 1; - unk_2000000.var104 = (MainCallback) sub_80EB3FC; - unk_2000000.var108 = (MainCallback) ConvertEasyChatWordsToString; + unk_2000000.var104 = (MainCallback)sub_80EB3FC; + unk_2000000.var108 = (MainCallback)ConvertEasyChatWordsToString; mailDesign = arg0->itemId - ITEM_ORANGE_MAIL; - if (mailDesign <= 11) { + if (mailDesign <= 11) + { unk_2000000.varFA = arg0->itemId - ITEM_ORANGE_MAIL; - } else { + } + else + { unk_2000000.varFA = 0; arg2 = FALSE; } - switch (unk_2000000.var100) { - case 0: - default: - unk_2000000.var10C = &gUnknown_083E5730[unk_2000000.varFA]; - break; + switch (unk_2000000.var100) + { + case 0: + default: + unk_2000000.var10C = &gUnknown_083E5730[unk_2000000.varFA]; + break; - case 1: - unk_2000000.var10C = &gUnknown_083E57A4[unk_2000000.varFA]; - break; + case 1: + unk_2000000.var10C = &gUnknown_083E57A4[unk_2000000.varFA]; + break; } - if (((sub_80A2D64(arg0->species, buffer) << 16) +0xFFFF0000) <= (410 << 16)) { - switch (unk_2000000.varFA) { - case 6: - unk_2000000.varFB = 1; - break; + if (((sub_80A2D64(arg0->species, buffer) << 16) + 0xFFFF0000) <= (410 << 16)) + { + switch (unk_2000000.varFA) + { + case 6: + unk_2000000.varFB = 1; + break; - case 9: - unk_2000000.varFB = 2; - break; + case 9: + unk_2000000.varFB = 2; + break; - default: - unk_2000000.varFB = 0; - break; + default: + unk_2000000.varFB = 0; + break; } - } else { + } + else + { unk_2000000.varFB = 0; } @@ -137,7 +149,8 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { } #else __attribute__((naked)) -void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { +void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) +{ asm(".syntax unified\n\ push {r4-r6,lr}\n\ sub sp, 0x4\n\ @@ -287,150 +300,162 @@ _080F8A24: .4byte sub_80F8D50\n\ #define RETURN_UP_STATE break #define RETURN_SKIP_STATE return FALSE -static u8 sub_80F8A28(void) { - switch (gMain.state) { - case 0: - SetVBlankCallback(NULL); - remove_some_task(); - REG_DISPCNT = 0; - RETURN_UP_STATE; - - case 1: CpuFill16(0, (void *) OAM, OAM_SIZE); - RETURN_UP_STATE; - - case 2: - ResetPaletteFade(); - RETURN_UP_STATE; - - case 3: - ResetTasks(); - RETURN_UP_STATE; +static u8 sub_80F8A28(void) +{ + switch (gMain.state) + { + case 0: + SetVBlankCallback(NULL); + remove_some_task(); + REG_DISPCNT = 0; + RETURN_UP_STATE; + + case 1: CpuFill16(0, (void *)OAM, OAM_SIZE); + RETURN_UP_STATE; + + case 2: + ResetPaletteFade(); + RETURN_UP_STATE; + + case 3: + ResetTasks(); + RETURN_UP_STATE; + + case 4: + ResetSpriteData(); + RETURN_UP_STATE; + + case 5: + FreeAllSpritePalettes(); + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG2VOFS = 0; + REG_BG2HOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + RETURN_UP_STATE; + + case 6: + SetUpWindowConfig(&gWindowConfig_81E6DFC); + RETURN_UP_STATE; + + case 7: + MultistepInitMenuWindowBegin(&gWindowConfig_81E6DFC); + RETURN_UP_STATE; + + case 8: + if (MultistepInitMenuWindowContinue() == 0) + { + return FALSE; + } + RETURN_UP_STATE; - case 4: - ResetSpriteData(); - RETURN_UP_STATE; + case 9: + MenuZeroFillScreen(); + RETURN_UP_STATE; - case 5: - FreeAllSpritePalettes(); - REG_BG0HOFS = 0; - REG_BG0VOFS = 0; - REG_BG1HOFS = 0; - REG_BG1VOFS = 0; - REG_BG2VOFS = 0; - REG_BG2HOFS = 0; - REG_BG3HOFS = 0; - REG_BG3VOFS = 0; - REG_BLDCNT = 0; - REG_BLDALPHA = 0; - RETURN_UP_STATE; + case 10: CpuFill16(1, (void *)(VRAM + 0x4800), 0x800); + RETURN_UP_STATE; - case 6: - SetUpWindowConfig(&gWindowConfig_81E6DFC); - RETURN_UP_STATE; + case 11: + LoadPalette(gMailGraphicsTable[unk_2000000.varFA].palette, 0, 16 * 2); + RETURN_UP_STATE; - case 7: - MultistepInitMenuWindowBegin(&gWindowConfig_81E6DFC); - RETURN_UP_STATE; + case 12: + LZ77UnCompVram(gMailGraphicsTable[unk_2000000.varFA].tileMap, (void *)(VRAM + 0x4000)); + RETURN_UP_STATE; - case 8: - if (MultistepInitMenuWindowContinue() == 0) { - return FALSE; - } - RETURN_UP_STATE; + case 13: + LZ77UnCompVram(gMailGraphicsTable[unk_2000000.varFA].tiles, (void *)(VRAM)); - case 9: - MenuZeroFillScreen(); - RETURN_UP_STATE; + gPlttBufferUnfaded[241] = gMailGraphicsTable[unk_2000000.varFA].color10; + gPlttBufferUnfaded[248] = gMailGraphicsTable[unk_2000000.varFA].color12; + gPlttBufferUnfaded[10] = gUnknown_083E562C[gSaveBlock2.playerGender][0]; + gPlttBufferUnfaded[11] = gUnknown_083E562C[gSaveBlock2.playerGender][1]; + RETURN_UP_STATE; - case 10: CpuFill16(1, (void *) (VRAM + 0x4800), 0x800); - RETURN_UP_STATE; - - case 11: - LoadPalette(gMailGraphicsTable[unk_2000000.varFA].palette, 0, 16 * 2); - RETURN_UP_STATE; - - case 12: - LZ77UnCompVram(gMailGraphicsTable[unk_2000000.varFA].tileMap, (void *) (VRAM + 0x4000)); - RETURN_UP_STATE; - - case 13: - LZ77UnCompVram(gMailGraphicsTable[unk_2000000.varFA].tiles, (void *) (VRAM)); - - gPlttBufferUnfaded[241] = gMailGraphicsTable[unk_2000000.varFA].color10; - gPlttBufferUnfaded[248] = gMailGraphicsTable[unk_2000000.varFA].color12; - gPlttBufferUnfaded[10] = gUnknown_083E562C[gSaveBlock2.playerGender][0]; - gPlttBufferUnfaded[11] = gUnknown_083E562C[gSaveBlock2.playerGender][1]; - RETURN_UP_STATE; + case 14: + if (unk_2000000.varF8 != 0) + { + sub_80F8DA0(); + } + RETURN_UP_STATE; - case 14: - if (unk_2000000.varF8 != 0) { - sub_80F8DA0(); - } - RETURN_UP_STATE; + case 15: + if (unk_2000000.varF8 != 0) + { + sub_80F8E80(); + } - case 15: - if (unk_2000000.varF8 != 0) { - sub_80F8E80(); - } + SetVBlankCallback(sub_80F8F18); + gPaletteFade.bufferTransferDisabled = 1; + RETURN_UP_STATE; - SetVBlankCallback(sub_80F8F18); - gPaletteFade.bufferTransferDisabled = 1; - RETURN_UP_STATE; + case 16: + { + u16 local1; - case 16: { - u16 local1; + local1 = sub_809D4A8(unk_2000000.varF4->species); - local1 = sub_809D4A8(unk_2000000.varF4->species); + switch (unk_2000000.varFB) + { + case 1: + sub_809D580(local1); + unk_2000000.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 96, 128, 0); + break; - switch (unk_2000000.varFB) { - case 1: - sub_809D580(local1); - unk_2000000.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 96, 128, 0); - break; + case 2: + sub_809D580(local1); + unk_2000000.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 40, 128, 0); + break; + } + RETURN_UP_STATE; + } - case 2: - sub_809D580(local1); - unk_2000000.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 40, 128, 0); - break; - } + case 17: + if (sub_8055870() != TRUE) + { RETURN_UP_STATE; } - - case 17: - if (sub_8055870() != TRUE) { - RETURN_UP_STATE; - } - RETURN_SKIP_STATE; - - case 18: - REG_BG0CNT = 0x9F08; - REG_BG1CNT = 0x0801; - REG_BG2CNT = 0x0902; - REG_BLDCNT = 0; - REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; - BeginNormalPaletteFade(-1, 0, 16, 0, 0); - gPaletteFade.bufferTransferDisabled = 0; - unk_2000000.varF0 = sub_80F8F58; - return TRUE; - - default: - return FALSE; + RETURN_SKIP_STATE; + + case 18: + REG_BG0CNT = 0x9F08; + REG_BG1CNT = 0x0801; + REG_BG2CNT = 0x0902; + REG_BLDCNT = 0; + REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; + BeginNormalPaletteFade(-1, 0, 16, 0, 0); + gPaletteFade.bufferTransferDisabled = 0; + unk_2000000.varF0 = sub_80F8F58; + return TRUE; + + default: + return FALSE; } gMain.state += 1; return FALSE; } -void sub_80F8D50(void) { - do { - if (sub_80F8A28() == 1) { +void sub_80F8D50(void) +{ + do + { + if (sub_80F8A28() == 1) + { SetMainCallback2(sub_80F8F2C); return; } } while (sub_80F9344() != 1); } -u8 *sub_80F8D7C(u8 *dest, u8 *src) { +u8 *sub_80F8D7C(u8 *dest, u8 *src) +{ u16 length; StringCopy(dest, src); @@ -442,24 +467,28 @@ u8 *sub_80F8D7C(u8 *dest, u8 *src) { } #ifdef NONMATCHING -static void sub_80F8DA0(void) { +static void sub_80F8DA0(void) +{ u8 local0; local0 = unk_2000000.var10C->var0; // No idea what's happening in this loop. - if (local0 <= 0) { + if (local0 <= 0) + { u8 i; u8 i2 = 0; - for (i = 0; i < unk_2000000.var10C->var0; i++) { + for (i = 0; i < unk_2000000.var10C->var0; i++) + { ConvertEasyChatWordsToString(unk_2000000.words[i], &unk_2000000.varF4->words[i2], - ((*unk_2000000.var10C->var4)[i] << 28) >> 30, 1); + ((*unk_2000000.var10C->var4)[i] << 28) >> 30, 1); i2 += ((*unk_2000000.var10C->var4)[i] << 28) >> 30; } } - if (unk_2000000.var100 == 0) { + if (unk_2000000.var100 == 0) + { u8 *ptr; u16 length; @@ -469,7 +498,9 @@ static void sub_80F8DA0(void) { length = StringLength(unk_2000000.varD8); unk_2000000.varF9 = unk_2000000.var10C->var2 - length; - } else { + } + else + { u8 *ptr; ptr = StringCopy(unk_2000000.varD8, gOtherText_From); @@ -480,7 +511,8 @@ static void sub_80F8DA0(void) { } #else __attribute__((naked)) -static void sub_80F8DA0(void) { +static void sub_80F8DA0(void) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r8\n\ @@ -592,17 +624,21 @@ _080F8E7C: .4byte gOtherText_From\n\ } #endif -static void sub_80F8E80(void) { +static void sub_80F8E80(void) +{ u16 pos; u8 x; u8 y = 0; - for (pos = 0; pos < unk_2000000.var10C->var0; pos++) { - if (unk_2000000.words[pos][0] == 0xFF) { + for (pos = 0; pos < unk_2000000.var10C->var0; pos++) + { + if (unk_2000000.words[pos][0] == 0xFF) + { continue; } - if (unk_2000000.words[pos][0] == 0x00) { + if (unk_2000000.words[pos][0] == 0x00) + { continue; } @@ -615,14 +651,17 @@ static void sub_80F8E80(void) { MenuPrint(unk_2000000.varD8, unk_2000000.varF9, unk_2000000.var10C->var1); } -static void sub_80F8F18(void) { +static void sub_80F8F18(void) +{ LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -static void sub_80F8F2C(void) { - if(unk_2000000.varFB != 0) { +static void sub_80F8F2C(void) +{ + if (unk_2000000.varFB != 0) + { AnimateSprites(); BuildOamBuffer(); } @@ -630,38 +669,45 @@ static void sub_80F8F2C(void) { unk_2000000.varF0(); } -static void sub_80F8F58(void) { +static void sub_80F8F58(void) +{ u8 local0; local0 = UpdatePaletteFade(); - if(local0 == 0) { + if (local0 == 0) + { unk_2000000.varF0 = sub_80F8F78; } } -static void sub_80F8F78(void) { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { +static void sub_80F8F78(void) +{ + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { BeginNormalPaletteFade(-1, 0, 0, 16, 0); unk_2000000.varF0 = sub_80F8FB4; } } -static void sub_80F8FB4(void) { +static void sub_80F8FB4(void) +{ u16 local1; - if (UpdatePaletteFade()) { + if (UpdatePaletteFade()) + { return; } SetMainCallback2(unk_2000000.varEC); - switch (unk_2000000.varFB) { - case 2: - case 1: - local1 = sub_809D4A8(unk_2000000.varF4->species); - sub_809D608(local1); - - sub_809D510(&gSprites[unk_2000000.varFC]); - break; + switch (unk_2000000.varFB) + { + case 2: + case 1: + local1 = sub_809D4A8(unk_2000000.varF4->species); + sub_809D608(local1); + + sub_809D510(&gSprites[unk_2000000.varFC]); + break; } memset(&unk_2000000, 0, 0x110); diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c index a3e611020..316ece197 100644 --- a/src/matsuda_debug_menu.c +++ b/src/matsuda_debug_menu.c @@ -121,7 +121,7 @@ static bool8 sub_80A9B78(void) { s8 choice = ProcessMenuInput(); - switch(choice) + switch (choice) { case -2: return FALSE; @@ -143,11 +143,11 @@ s8 MatsudaDebugMenu_ContestResults(void) static void sub_80A9BE4(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { DestroyTask(taskId); - if(!(gIsLinkContest & 1)) + if (!(gIsLinkContest & 1)) sub_80AF668(); sub_80C2358(); @@ -198,7 +198,7 @@ static void sub_80A9CDC(u8 taskId) static void sub_80A9CF8(u8 taskId) { - if(gReceivedRemoteLinkPlayers == FALSE) + if (gReceivedRemoteLinkPlayers == FALSE) { DestroyTask(gTasks[taskId].data[10]); DestroyTask(taskId); @@ -217,7 +217,7 @@ static void sub_80A9D58(u8 taskId) int i; u8 dest[4]; - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) dest[i] = gTasks[taskId].data[5 + i]; gUnknown_0203869B = sub_80C4B34(dest); @@ -240,7 +240,7 @@ static void sub_80A9DD8(u8 taskId) static void sub_80A9E04(u8 taskId) { - if(gMain.newKeys == 2) + if (gMain.newKeys == 2) gTasks[(u8)gTasks[taskId].data[10]].func = sub_80A9D30; } @@ -250,7 +250,7 @@ static void sub_80A9E3C(u8 taskId) OpenLink(); - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) gBlockRecvBuffer[i][0] = 255; gTasks[taskId].data[0] = 0; @@ -261,15 +261,15 @@ static void sub_80A9E80(u8 taskId) { TaskFunc func; - if(gTasks[taskId].data[0] < 10) + if (gTasks[taskId].data[0] < 10) gTasks[taskId].data[0]++; else { - if(GetLinkPlayerCount_2() > 3) + if (GetLinkPlayerCount_2() > 3) { gTasks[taskId].data[0] = 0; - if(IsLinkMaster()) + if (IsLinkMaster()) { func = sub_80A9ED8; gTasks[taskId].func = (TaskFunc)func; @@ -286,7 +286,7 @@ static void sub_80A9E80(u8 taskId) static void sub_80A9ED8(u8 taskId) { gTasks[taskId].data[0] = gTasks[taskId].data[0] + 1; - if((gTasks[taskId].data[0]) == 101) + if ((gTasks[taskId].data[0]) == 101) { sub_8007F4C(); gTasks[taskId].data[0] = 0; @@ -296,10 +296,10 @@ static void sub_80A9ED8(u8 taskId) static void sub_80A9F10(u8 taskId) { - if(gReceivedRemoteLinkPlayers) + if (gReceivedRemoteLinkPlayers) { gContestPlayerMonIndex = GetMultiplayerId(); - if(GetLinkPlayerCount() == 4) + if (GetLinkPlayerCount() == 4) { gIsLinkContest = 1; SwitchTaskToFollowupFunc(taskId); @@ -340,12 +340,12 @@ static void sub_80A9FE4(void) addr = (void *)VRAM; i = VRAM_SIZE; - while(1) + while (1) { DmaFill32(3, 0, addr, 0x1000); addr += 0x1000; i -= 0x1000; - if(i <= 0x1000) + if (i <= 0x1000) { DmaFill32(3, 0, addr, i); break; @@ -361,7 +361,7 @@ static void sub_80AA064(void) BuildOamBuffer(); RunTasks(); UpdatePaletteFade(); - if(gMain.newKeys == 4) + if (gMain.newKeys == 4) SetMainCallback2(sub_805469C); } @@ -401,12 +401,12 @@ static void sub_80AA10C(void) gPaletteFade.bufferTransferDisabled = 0; gUnknown_02038694 = 0; - if(!(gContestMons[0].nickname[0])) + if (!(gContestMons[0].nickname[0])) sub_80AE398(0, 0); sub_80AE098(gUnknown_02038694); - for(i = 0; i < 6; i++) + for (i = 0; i < 6; i++) { sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList1[i], (0xA * i + 0x2A), gMatsudaDebugMenuContestTopLeft[i][0], @@ -439,9 +439,9 @@ void sub_80AA280(u8 var) StringCopy(unk_2000000, gMatsudaDebugMenu_StartText); StringAppend(unk_2000000, &gUnknown_0203857D[var][0]); - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { - if(var == i) + if (var == i) { sub_8003460(&gMenuWindow, unk_2000000, (10 * i + 2), gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]); } @@ -499,49 +499,49 @@ static void sub_80AA4F0(u8 var1, u8 var2) static void sub_80AA5BC(u8 var) { - sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList2[var], 0xC2, 3, 0x12); + sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList2[var], 0xC2, 3, 0x12); } void sub_80AA5E8(u8 var) { - sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList3[var], 0xE8, 3, 4); + sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList3[var], 0xE8, 3, 4); } static void sub_80AA614(u8 var1, u8 var2) { - u16 var = sub_80AE770(var1, var2); + u16 var = sub_80AE770(var1, var2); - ConvertIntToDecimalStringN(unk_2000000, var, STR_CONV_MODE_RIGHT_ALIGN, 3); - sub_8003460(&gMenuWindow, unk_2000000, 0xE2, 3, 0xC); + ConvertIntToDecimalStringN(unk_2000000, var, STR_CONV_MODE_RIGHT_ALIGN, 3); + sub_8003460(&gMenuWindow, unk_2000000, 0xE2, 3, 0xC); } void sub_80AA658(u8 var) { - u8 i; + u8 i; - sub_80AA340(var); - sub_80AA388(var); - sub_80AA3D0(var); - sub_80AA418(var); - sub_80AA460(var); - sub_80AA4A8(var); + sub_80AA340(var); + sub_80AA388(var); + sub_80AA3D0(var); + sub_80AA418(var); + sub_80AA460(var); + sub_80AA4A8(var); - for(i = 0; i < 4; i++) - sub_80AA4F0(var, i); + for (i = 0; i < 4; i++) + sub_80AA4F0(var, i); } void SetDebugMonForContest(void) { - SetMonData(&gPlayerParty[0], MON_DATA_COOL, &gContestMons[gContestPlayerMonIndex].cool); - SetMonData(&gPlayerParty[0], MON_DATA_CUTE, &gContestMons[gContestPlayerMonIndex].cute); - SetMonData(&gPlayerParty[0], MON_DATA_BEAUTY, &gContestMons[gContestPlayerMonIndex].beauty); - SetMonData(&gPlayerParty[0], MON_DATA_SMART, &gContestMons[gContestPlayerMonIndex].smart); - SetMonData(&gPlayerParty[0], MON_DATA_TOUGH, &gContestMons[gContestPlayerMonIndex].tough); - SetMonData(&gPlayerParty[0], MON_DATA_SHEEN, &gContestMons[gContestPlayerMonIndex].sheen); - SetMonData(&gPlayerParty[0], MON_DATA_MOVE1, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[0]); - SetMonData(&gPlayerParty[0], MON_DATA_MOVE2, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[1]); - SetMonData(&gPlayerParty[0], MON_DATA_MOVE3, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[2]); - SetMonData(&gPlayerParty[0], MON_DATA_MOVE4, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[3]); + SetMonData(&gPlayerParty[0], MON_DATA_COOL, &gContestMons[gContestPlayerMonIndex].cool); + SetMonData(&gPlayerParty[0], MON_DATA_CUTE, &gContestMons[gContestPlayerMonIndex].cute); + SetMonData(&gPlayerParty[0], MON_DATA_BEAUTY, &gContestMons[gContestPlayerMonIndex].beauty); + SetMonData(&gPlayerParty[0], MON_DATA_SMART, &gContestMons[gContestPlayerMonIndex].smart); + SetMonData(&gPlayerParty[0], MON_DATA_TOUGH, &gContestMons[gContestPlayerMonIndex].tough); + SetMonData(&gPlayerParty[0], MON_DATA_SHEEN, &gContestMons[gContestPlayerMonIndex].sheen); + SetMonData(&gPlayerParty[0], MON_DATA_MOVE1, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[0]); + SetMonData(&gPlayerParty[0], MON_DATA_MOVE2, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[1]); + SetMonData(&gPlayerParty[0], MON_DATA_MOVE3, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[2]); + SetMonData(&gPlayerParty[0], MON_DATA_MOVE4, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[3]); } void sub_80AA754(struct Sprite *sprite) @@ -590,32 +590,32 @@ void sub_80AA754(struct Sprite *sprite) static void sub_80AA8A0(struct Sprite *sprite, s8 var1, u8 var2) { - if(var1 == 1) - { - sprite->data2 = var2; - sub_80AA280(var2); - sub_80AA658(sprite->data2); - } + if (var1 == 1) + { + sprite->data2 = var2; + sub_80AA280(var2); + sub_80AA658(sprite->data2); + } } void sub_80AA8C8(struct Sprite *sprite, s8 var1) { - sub_80AA8A0(sprite, var1, 0); + sub_80AA8A0(sprite, var1, 0); } void sub_80AA8D8(struct Sprite *sprite, s8 var1) { - sub_80AA8A0(sprite, var1, 1); + sub_80AA8A0(sprite, var1, 1); } void sub_80AA8E8(struct Sprite *sprite, s8 var1) { - sub_80AA8A0(sprite, var1, 2); + sub_80AA8A0(sprite, var1, 2); } void sub_80AA8F8(struct Sprite *sprite, s8 var1) { - sub_80AA8A0(sprite, var1, 3); + sub_80AA8A0(sprite, var1, 3); } static u8 sub_80AA908(u32 a1, u8 a2, s8 a3) // first param is unused. @@ -634,48 +634,48 @@ void sub_80AA930(struct Sprite *sprite, u8 var2) { u8 val = sprite->data2; - gContestMons[sprite->data2].cool = sub_80AA908(val, gContestMons[sprite->data2].cool, var2); - sub_80AA340(sprite->data2); + gContestMons[sprite->data2].cool = sub_80AA908(val, gContestMons[sprite->data2].cool, var2); + sub_80AA340(sprite->data2); } void sub_80AA974(struct Sprite *sprite, u8 var2) { u8 val = sprite->data2; - gContestMons[sprite->data2].cute = sub_80AA908(val, gContestMons[sprite->data2].cute, var2); - sub_80AA388(sprite->data2); + gContestMons[sprite->data2].cute = sub_80AA908(val, gContestMons[sprite->data2].cute, var2); + sub_80AA388(sprite->data2); } void sub_80AA9B8(struct Sprite *sprite, u8 var2) { u8 val = sprite->data2; - gContestMons[sprite->data2].beauty = sub_80AA908(val, gContestMons[sprite->data2].beauty, var2); - sub_80AA3D0(sprite->data2); + gContestMons[sprite->data2].beauty = sub_80AA908(val, gContestMons[sprite->data2].beauty, var2); + sub_80AA3D0(sprite->data2); } void sub_80AA9FC(struct Sprite *sprite, u8 var2) { u8 val = sprite->data2; - gContestMons[sprite->data2].smart = sub_80AA908(val, gContestMons[sprite->data2].smart, var2); - sub_80AA418(sprite->data2); + gContestMons[sprite->data2].smart = sub_80AA908(val, gContestMons[sprite->data2].smart, var2); + sub_80AA418(sprite->data2); } void sub_80AAA40(struct Sprite *sprite, u8 var2) { u8 val = sprite->data2; - gContestMons[sprite->data2].tough = sub_80AA908(val, gContestMons[sprite->data2].tough, var2); - sub_80AA460(sprite->data2); + gContestMons[sprite->data2].tough = sub_80AA908(val, gContestMons[sprite->data2].tough, var2); + sub_80AA460(sprite->data2); } void sub_80AAA84(struct Sprite *sprite, u8 var2) { u8 val = sprite->data2; - gContestMons[sprite->data2].sheen = sub_80AA908(val, gContestMons[sprite->data2].sheen, var2); - sub_80AA4A8(sprite->data2); + gContestMons[sprite->data2].sheen = sub_80AA908(val, gContestMons[sprite->data2].sheen, var2); + sub_80AA4A8(sprite->data2); } // a similar function is at 0x80AA908, however, it apparently returns the wrong type (u8 vs u16). @@ -695,32 +695,32 @@ void sub_80AAAF0(struct Sprite *sprite, u8 var2) { u8 val = sprite->data2; - gContestMons[sprite->data2].moves[0] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[0], var2); - sub_80AA4F0(sprite->data2, 0); + gContestMons[sprite->data2].moves[0] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[0], var2); + sub_80AA4F0(sprite->data2, 0); } void sub_80AAB30(struct Sprite *sprite, u8 var2) { u8 val = sprite->data2; - gContestMons[sprite->data2].moves[1] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[1], var2); - sub_80AA4F0(sprite->data2, 1); + gContestMons[sprite->data2].moves[1] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[1], var2); + sub_80AA4F0(sprite->data2, 1); } void sub_80AAB70(struct Sprite *sprite, u8 var2) { u8 val = sprite->data2; - gContestMons[sprite->data2].moves[2] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[2], var2); - sub_80AA4F0(sprite->data2, 2); + gContestMons[sprite->data2].moves[2] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[2], var2); + sub_80AA4F0(sprite->data2, 2); } void sub_80AABB0(struct Sprite *sprite, u8 var2) { u8 val = sprite->data2; - gContestMons[sprite->data2].moves[3] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[3], var2); - sub_80AA4F0(sprite->data2, 3); + gContestMons[sprite->data2].moves[3] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[3], var2); + sub_80AA4F0(sprite->data2, 3); } void sub_80AABF0(struct Sprite *sprite, s8 var2) @@ -1102,12 +1102,12 @@ void unref_sub_80AB084(u8 *text) addr = (void *)VRAM; size = 0x18000; - while(1) + while (1) { DmaFill32(3, 0, addr, 0x1000); addr += 0x1000; size -= 0x1000; - if(size <= 0x1000) + if (size <= 0x1000) { DmaFill32(3, 0, addr, size); break; diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 01cf5dc6a..9a049bb40 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -13,7 +13,7 @@ bool8 MetatileBehavior_IsATile(u8 var) bool8 MetatileBehavior_IsEncounterTile(u8 var) { - if((gUnknown_08308E2C[var] & 1) != 0) + if ((gUnknown_08308E2C[var] & 1) != 0) return TRUE; else return FALSE; @@ -21,7 +21,7 @@ bool8 MetatileBehavior_IsEncounterTile(u8 var) bool8 MetatileBehavior_IsJumpEast(u8 var) { - if(var == MB_JUMP_EAST) + if (var == MB_JUMP_EAST) return TRUE; else return FALSE; @@ -29,7 +29,7 @@ bool8 MetatileBehavior_IsJumpEast(u8 var) bool8 MetatileBehavior_IsJumpWest(u8 var) { - if(var == MB_JUMP_WEST) + if (var == MB_JUMP_WEST) return TRUE; else return FALSE; @@ -37,7 +37,7 @@ bool8 MetatileBehavior_IsJumpWest(u8 var) bool8 MetatileBehavior_IsJumpNorth(u8 var) { - if(var == MB_JUMP_NORTH) + if (var == MB_JUMP_NORTH) return TRUE; else return FALSE; @@ -45,7 +45,7 @@ bool8 MetatileBehavior_IsJumpNorth(u8 var) bool8 MetatileBehavior_IsJumpSouth(u8 var) { - if(var == MB_JUMP_SOUTH) + if (var == MB_JUMP_SOUTH) return TRUE; else return FALSE; @@ -53,7 +53,7 @@ bool8 MetatileBehavior_IsJumpSouth(u8 var) bool8 MetatileBehavior_IsPokeGrass(u8 var) { - if(var == MB_TALL_GRASS || var == MB_LONG_GRASS) + if (var == MB_TALL_GRASS || var == MB_LONG_GRASS) return TRUE; else return FALSE; @@ -61,7 +61,7 @@ bool8 MetatileBehavior_IsPokeGrass(u8 var) bool8 MetatileBehavior_IsSandOrDeepSand(u8 var) { - if(var == MB_SAND || var == MB_DEEP_SAND) + if (var == MB_SAND || var == MB_DEEP_SAND) return TRUE; else return FALSE; @@ -69,7 +69,7 @@ bool8 MetatileBehavior_IsSandOrDeepSand(u8 var) bool8 MetatileBehavior_IsDeepSand(u8 var) { - if(var == MB_DEEP_SAND) + if (var == MB_DEEP_SAND) return TRUE; else return FALSE; @@ -77,7 +77,7 @@ bool8 MetatileBehavior_IsDeepSand(u8 var) bool8 MetatileBehavior_IsReflective(u8 var) { - if(var == MB_POND_WATER || var == MB_PUDDLE || var == MB_1A || var == MB_ICE || var == MB_SOOTOPOLIS_DEEP_WATER || var == MB_REFLECTION_UNDER_BRIDGE) + if (var == MB_POND_WATER || var == MB_PUDDLE || var == MB_1A || var == MB_ICE || var == MB_SOOTOPOLIS_DEEP_WATER || var == MB_REFLECTION_UNDER_BRIDGE) return TRUE; else return FALSE; @@ -85,7 +85,7 @@ bool8 MetatileBehavior_IsReflective(u8 var) bool8 MetatileBehavior_IsIce(u8 var) { - if(var == MB_ICE) + if (var == MB_ICE) return TRUE; else return FALSE; @@ -93,7 +93,7 @@ bool8 MetatileBehavior_IsIce(u8 var) bool8 MetatileBehavior_IsWarpDoor(u8 var) { - if(var == MB_ANIMATED_DOOR) + if (var == MB_ANIMATED_DOOR) return TRUE; else return FALSE; @@ -101,7 +101,7 @@ bool8 MetatileBehavior_IsWarpDoor(u8 var) bool8 MetatileBehavior_IsDoor(u8 var) { - if(var == MB_8D || var == MB_ANIMATED_DOOR) + if (var == MB_8D || var == MB_ANIMATED_DOOR) return TRUE; else return FALSE; @@ -109,7 +109,7 @@ bool8 MetatileBehavior_IsDoor(u8 var) bool8 MetatileBehavior_IsEscalator(u8 var) { - if(var == MB_UP_ESCALATOR || var == MB_DOWN_ESCALATOR) + if (var == MB_UP_ESCALATOR || var == MB_DOWN_ESCALATOR) return TRUE; else return FALSE; @@ -117,7 +117,7 @@ bool8 MetatileBehavior_IsEscalator(u8 var) bool8 unref_sub_8056EE0(u8 var) { - if(var == MB_04) + if (var == MB_04) return TRUE; else return FALSE; @@ -125,7 +125,7 @@ bool8 unref_sub_8056EE0(u8 var) bool8 MetatileBehavior_IsLadder(u8 var) { - if(var == MB_LADDER) + if (var == MB_LADDER) return TRUE; else return FALSE; @@ -133,7 +133,7 @@ bool8 MetatileBehavior_IsLadder(u8 var) bool8 MetatileBehavior_IsNonAnimDoor(u8 var) { - if(var == MB_NON_ANIMATED_DOOR || var == MB_WATER_DOOR || var == MB_DEEP_SOUTH_WARP) + if (var == MB_NON_ANIMATED_DOOR || var == MB_WATER_DOOR || var == MB_DEEP_SOUTH_WARP) return TRUE; else return FALSE; @@ -141,7 +141,7 @@ bool8 MetatileBehavior_IsNonAnimDoor(u8 var) bool8 MetatileBehavior_IsDeepSouthWarp(u8 var) { - if(var == MB_DEEP_SOUTH_WARP) + if (var == MB_DEEP_SOUTH_WARP) return TRUE; else return FALSE; @@ -149,7 +149,7 @@ bool8 MetatileBehavior_IsDeepSouthWarp(u8 var) bool8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8 var) { - if((gUnknown_08308E2C[var] & 2) != 0) + if ((gUnknown_08308E2C[var] & 2) != 0) return TRUE; else return FALSE; @@ -157,7 +157,7 @@ bool8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8 var) bool8 MetatileBehavior_IsEastArrowWarp(u8 var) { - if(var == MB_EAST_ARROW_WARP) + if (var == MB_EAST_ARROW_WARP) return TRUE; else return FALSE; @@ -165,7 +165,7 @@ bool8 MetatileBehavior_IsEastArrowWarp(u8 var) bool8 MetatileBehavior_IsWestArrowWarp(u8 var) { - if(var == MB_WEST_ARROW_WARP) + if (var == MB_WEST_ARROW_WARP) return TRUE; else return FALSE; @@ -173,7 +173,7 @@ bool8 MetatileBehavior_IsWestArrowWarp(u8 var) bool8 MetatileBehavior_IsNorthArrowWarp(u8 var) { - if(var == MB_NORTH_ARROW_WARP || var == MB_STAIRS_OUTSIDE_ABANDONED_SHIP) + if (var == MB_NORTH_ARROW_WARP || var == MB_STAIRS_OUTSIDE_ABANDONED_SHIP) return TRUE; else return FALSE; @@ -181,7 +181,7 @@ bool8 MetatileBehavior_IsNorthArrowWarp(u8 var) bool8 MetatileBehavior_IsSouthArrowWarp(u8 var) { - if(var == MB_SOUTH_ARROW_WARP || var == MB_WATER_SOUTH_ARROW_WARP || var == MB_SHOAL_CAVE_ENTRANCE) + if (var == MB_SOUTH_ARROW_WARP || var == MB_WATER_SOUTH_ARROW_WARP || var == MB_SHOAL_CAVE_ENTRANCE) return TRUE; else return FALSE; @@ -192,7 +192,7 @@ bool8 MetatileBehavior_IsArrowWarp(u8 var) { u8 var2 = 0; - if(MetatileBehavior_IsEastArrowWarp(var) + if (MetatileBehavior_IsEastArrowWarp(var) || MetatileBehavior_IsWestArrowWarp(var) || MetatileBehavior_IsNorthArrowWarp(var) || MetatileBehavior_IsSouthArrowWarp(var)) @@ -204,7 +204,7 @@ bool8 MetatileBehavior_IsArrowWarp(u8 var) bool8 MetatileBehavior_IsMoveTile(u8 var) { - if((var >= MB_WALK_EAST && var <= MB_TRICK_HOUSE_PUZZLE_8_FLOOR) || (var >= MB_EASTWARD_CURRENT && var <= MB_SOUTHWARD_CURRENT) + if ((var >= MB_WALK_EAST && var <= MB_TRICK_HOUSE_PUZZLE_8_FLOOR) || (var >= MB_EASTWARD_CURRENT && var <= MB_SOUTHWARD_CURRENT) || var == MB_MUDDY_SLOPE || var == MB_CRACKED_FLOOR || var == MB_WATERFALL || var == MB_ICE || var == MB_BB || var == MB_BC) return TRUE; else @@ -213,7 +213,7 @@ bool8 MetatileBehavior_IsMoveTile(u8 var) bool8 MetatileBehavior_IsIce_2(u8 var) { - if(var == MB_ICE) + if (var == MB_ICE) return TRUE; else return FALSE; @@ -221,7 +221,7 @@ bool8 MetatileBehavior_IsIce_2(u8 var) bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 var) { - if(var == MB_TRICK_HOUSE_PUZZLE_8_FLOOR) + if (var == MB_TRICK_HOUSE_PUZZLE_8_FLOOR) return TRUE; else return FALSE; @@ -229,7 +229,7 @@ bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 var) bool8 MetatileBehavior_0x05(u8 var) { - if(var == MB_05) + if (var == MB_05) return TRUE; else return FALSE; @@ -237,7 +237,7 @@ bool8 MetatileBehavior_0x05(u8 var) bool8 MetatileBehavior_IsWalkNorth(u8 var) { - if(var == MB_WALK_NORTH) + if (var == MB_WALK_NORTH) return TRUE; else return FALSE; @@ -245,7 +245,7 @@ bool8 MetatileBehavior_IsWalkNorth(u8 var) bool8 MetatileBehavior_IsWalkSouth(u8 var) { - if(var == MB_WALK_SOUTH) + if (var == MB_WALK_SOUTH) return TRUE; else return FALSE; @@ -253,7 +253,7 @@ bool8 MetatileBehavior_IsWalkSouth(u8 var) bool8 MetatileBehavior_IsWalkWest(u8 var) { - if(var == MB_WALK_WEST) + if (var == MB_WALK_WEST) return TRUE; else return FALSE; @@ -261,7 +261,7 @@ bool8 MetatileBehavior_IsWalkWest(u8 var) bool8 MetatileBehavior_IsWalkEast(u8 var) { - if(var == MB_WALK_EAST) + if (var == MB_WALK_EAST) return TRUE; else return FALSE; @@ -269,7 +269,7 @@ bool8 MetatileBehavior_IsWalkEast(u8 var) bool8 MetatileBehavior_IsNorthwardCurrent(u8 var) { - if(var == MB_NORTHWARD_CURRENT) + if (var == MB_NORTHWARD_CURRENT) return TRUE; else return FALSE; @@ -277,7 +277,7 @@ bool8 MetatileBehavior_IsNorthwardCurrent(u8 var) bool8 MetatileBehavior_IsSouthwardCurrent(u8 var) { - if(var == MB_SOUTHWARD_CURRENT) + if (var == MB_SOUTHWARD_CURRENT) return TRUE; else return FALSE; @@ -285,7 +285,7 @@ bool8 MetatileBehavior_IsSouthwardCurrent(u8 var) bool8 MetatileBehavior_IsWestwardCurrent(u8 var) { - if(var == MB_WESTWARD_CURRENT) + if (var == MB_WESTWARD_CURRENT) return TRUE; else return FALSE; @@ -293,7 +293,7 @@ bool8 MetatileBehavior_IsWestwardCurrent(u8 var) bool8 MetatileBehavior_IsEastwardCurrent(u8 var) { - if(var == MB_EASTWARD_CURRENT) + if (var == MB_EASTWARD_CURRENT) return TRUE; else return FALSE; @@ -301,7 +301,7 @@ bool8 MetatileBehavior_IsEastwardCurrent(u8 var) bool8 MetatileBehavior_IsSlideNorth(u8 var) { - if(var == MB_SLIDE_NORTH) + if (var == MB_SLIDE_NORTH) return TRUE; else return FALSE; @@ -309,7 +309,7 @@ bool8 MetatileBehavior_IsSlideNorth(u8 var) bool8 MetatileBehavior_IsSlideSouth(u8 var) { - if(var == MB_SLIDE_SOUTH) + if (var == MB_SLIDE_SOUTH) return TRUE; else return FALSE; @@ -317,7 +317,7 @@ bool8 MetatileBehavior_IsSlideSouth(u8 var) bool8 MetatileBehavior_IsSlideWest(u8 var) { - if(var == MB_SLIDE_WEST) + if (var == MB_SLIDE_WEST) return TRUE; else return FALSE; @@ -325,7 +325,7 @@ bool8 MetatileBehavior_IsSlideWest(u8 var) bool8 MetatileBehavior_IsSlideEast(u8 var) { - if(var == MB_SLIDE_EAST) + if (var == MB_SLIDE_EAST) return TRUE; else return FALSE; @@ -333,7 +333,7 @@ bool8 MetatileBehavior_IsSlideEast(u8 var) bool8 MetatileBehavior_IsCounter(u8 var) { - if(var == MB_COUNTER) + if (var == MB_COUNTER) return TRUE; else return FALSE; @@ -341,9 +341,9 @@ bool8 MetatileBehavior_IsCounter(u8 var) bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDir) { - if(playerDir != CONNECTION_NORTH) // if the player isn't facing north, forget about it. + if (playerDir != CONNECTION_NORTH) // if the player isn't facing north, forget about it. return FALSE; - else if(tile == MB_TELEVISION) // is the player's north tile a TV? + else if (tile == MB_TELEVISION) // is the player's north tile a TV? return TRUE; else return FALSE; @@ -351,7 +351,7 @@ bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDir) bool8 MetatileBehavior_IsPC(u8 var) { - if(var == MB_PC) + if (var == MB_PC) return TRUE; else return FALSE; @@ -359,7 +359,7 @@ bool8 MetatileBehavior_IsPC(u8 var) bool8 is_tile_x84(u8 var) { - if(var == MB_84) + if (var == MB_84) return TRUE; else return FALSE; @@ -367,7 +367,7 @@ bool8 is_tile_x84(u8 var) bool8 sub_80571C0(u8 var) { - if(var == MB_91 || var == MB_93 || var == MB_95 || var == MB_97 + if (var == MB_91 || var == MB_93 || var == MB_95 || var == MB_97 || var == MB_99 || var == MB_9B || var == MB_9D) return TRUE; else @@ -376,7 +376,7 @@ bool8 sub_80571C0(u8 var) bool8 MetatileBehavior_IsSecretBaseCave(u8 var) { - if(var == MB_SECRET_BASE_SPOT_RED_CAVE || var == MB_SECRET_BASE_SPOT_BROWN_CAVE || var == MB_SECRET_BASE_SPOT_YELLOW_CAVE || var == MB_SECRET_BASE_SPOT_BLUE_CAVE) + if (var == MB_SECRET_BASE_SPOT_RED_CAVE || var == MB_SECRET_BASE_SPOT_BROWN_CAVE || var == MB_SECRET_BASE_SPOT_YELLOW_CAVE || var == MB_SECRET_BASE_SPOT_BLUE_CAVE) return TRUE; else return FALSE; @@ -384,7 +384,7 @@ bool8 MetatileBehavior_IsSecretBaseCave(u8 var) bool8 MetatileBehavior_IsSecretBaseTree(u8 var) { - if(var == MB_SECRET_BASE_SPOT_TREE_1 || var == MB_SECRET_BASE_SPOT_TREE_2) + if (var == MB_SECRET_BASE_SPOT_TREE_1 || var == MB_SECRET_BASE_SPOT_TREE_2) return TRUE; else return FALSE; @@ -392,7 +392,7 @@ bool8 MetatileBehavior_IsSecretBaseTree(u8 var) bool8 MetatileBehavior_IsSecretBaseShrub(u8 var) { - if(var == MB_SECRET_BASE_SPOT_SHRUB) + if (var == MB_SECRET_BASE_SPOT_SHRUB) return TRUE; else return FALSE; @@ -400,7 +400,7 @@ bool8 MetatileBehavior_IsSecretBaseShrub(u8 var) bool8 MetatileBehavior_IsSecretBasePC(u8 var) { - if(var == MB_SECRET_BASE_PC) + if (var == MB_SECRET_BASE_PC) return TRUE; else return FALSE; @@ -408,7 +408,7 @@ bool8 MetatileBehavior_IsSecretBasePC(u8 var) bool8 sub_805724C(u8 var) { - if(var == MB_B1) + if (var == MB_B1) return TRUE; else return FALSE; @@ -416,7 +416,7 @@ bool8 sub_805724C(u8 var) bool8 unref_sub_8057260(u8 var) { - if(var == MB_B2) + if (var == MB_B2) return TRUE; else return FALSE; @@ -424,7 +424,7 @@ bool8 unref_sub_8057260(u8 var) bool8 sub_8057274(u8 var) { - if(var == MB_B3) + if (var == MB_B3) return TRUE; else return FALSE; @@ -432,7 +432,7 @@ bool8 sub_8057274(u8 var) bool8 sub_8057288(u8 var) { - if(var == MB_B9) + if (var == MB_B9) return TRUE; else return FALSE; @@ -440,7 +440,7 @@ bool8 sub_8057288(u8 var) bool8 sub_805729C(u8 var) { - if(var == MB_NORMAL) + if (var == MB_NORMAL) return TRUE; else return FALSE; @@ -448,7 +448,7 @@ bool8 sub_805729C(u8 var) bool8 sub_80572B0(u8 var) { - if(var == MB_B7) + if (var == MB_B7) return TRUE; else return FALSE; @@ -456,7 +456,7 @@ bool8 sub_80572B0(u8 var) bool8 unref_sub_80572C4(u8 var) { - if(var == MB_B2) + if (var == MB_B2) return TRUE; else return FALSE; @@ -464,7 +464,7 @@ bool8 unref_sub_80572C4(u8 var) bool8 sub_80572D8(u8 var) { - if(var == MB_B5) + if (var == MB_B5) return TRUE; else return FALSE; @@ -472,7 +472,7 @@ bool8 sub_80572D8(u8 var) bool8 sub_80572EC(u8 var) { - if(var == MB_C3) + if (var == MB_C3) return TRUE; else return FALSE; @@ -480,7 +480,7 @@ bool8 sub_80572EC(u8 var) bool8 sub_8057300(u8 var) { - if(var == MB_C2) + if (var == MB_C2) return TRUE; else return FALSE; @@ -488,7 +488,7 @@ bool8 sub_8057300(u8 var) bool8 sub_8057314(u8 var) { - if(var == MB_B8) + if (var == MB_B8) return TRUE; else return FALSE; @@ -496,7 +496,7 @@ bool8 sub_8057314(u8 var) bool8 sub_8057328(u8 var) { - if(var == MB_BE) + if (var == MB_BE) return TRUE; else return FALSE; @@ -504,7 +504,7 @@ bool8 sub_8057328(u8 var) bool8 sub_805733C(u8 var) { - if(var == MB_BD) + if (var == MB_BD) return TRUE; else return FALSE; @@ -512,7 +512,7 @@ bool8 sub_805733C(u8 var) bool8 sub_8057350(u8 var) { - if(var == MB_BA) + if (var == MB_BA) return TRUE; else return FALSE; @@ -520,7 +520,7 @@ bool8 sub_8057350(u8 var) bool8 sub_8057364(u8 var) { - if(var == MB_BF) + if (var == MB_BF) return TRUE; else return FALSE; @@ -528,7 +528,7 @@ bool8 sub_8057364(u8 var) bool8 sub_8057378(u8 var) { - if(var == MB_C4) + if (var == MB_C4) return TRUE; else return FALSE; @@ -536,7 +536,7 @@ bool8 sub_8057378(u8 var) bool8 sub_805738C(u8 var) { - if(var == MB_C5) + if (var == MB_C5) return TRUE; else return FALSE; @@ -544,7 +544,7 @@ bool8 sub_805738C(u8 var) bool8 MetatileBehavior_HasRipples(u8 var) { - if(var == MB_POND_WATER || var == MB_PUDDLE || var == MB_SOOTOPOLIS_DEEP_WATER) + if (var == MB_POND_WATER || var == MB_PUDDLE || var == MB_SOOTOPOLIS_DEEP_WATER) return TRUE; else return FALSE; @@ -552,7 +552,7 @@ bool8 MetatileBehavior_HasRipples(u8 var) bool8 MetatileBehavior_IsPuddle(u8 var) { - if(var == MB_PUDDLE) + if (var == MB_PUDDLE) return TRUE; else return FALSE; @@ -560,7 +560,7 @@ bool8 MetatileBehavior_IsPuddle(u8 var) bool8 MetatileBehavior_IsTallGrass(u8 var) { - if(var == MB_TALL_GRASS) + if (var == MB_TALL_GRASS) return TRUE; else return FALSE; @@ -568,7 +568,7 @@ bool8 MetatileBehavior_IsTallGrass(u8 var) bool8 MetatileBehavior_IsLongGrass(u8 var) { - if(var == MB_LONG_GRASS) + if (var == MB_LONG_GRASS) return TRUE; else return FALSE; @@ -576,7 +576,7 @@ bool8 MetatileBehavior_IsLongGrass(u8 var) bool8 MetatileBehavior_IsBerryTreeSoil(u8 var) { - if(var == MB_BERRY_TREE_SOIL) + if (var == MB_BERRY_TREE_SOIL) return TRUE; else return FALSE; @@ -584,7 +584,7 @@ bool8 MetatileBehavior_IsBerryTreeSoil(u8 var) bool8 MetatileBehavior_IsAsh(u8 var) { - if(var == MB_ASH) + if (var == MB_ASH) return TRUE; else return FALSE; @@ -592,7 +592,7 @@ bool8 MetatileBehavior_IsAsh(u8 var) bool8 MetatileBehavior_IsUnusedFootprintMetatile(u8 var) { - if(var == MB_25) + if (var == MB_25) return TRUE; else return FALSE; @@ -600,7 +600,7 @@ bool8 MetatileBehavior_IsUnusedFootprintMetatile(u8 var) bool8 MetatileBehavior_IsBridge(u8 var) { - if(var >= MB_WARP_OR_BRIDGE && var <= MB_ROUTE120_NORTH_BRIDGE_2) + if (var >= MB_WARP_OR_BRIDGE && var <= MB_ROUTE120_NORTH_BRIDGE_2) return TRUE; else return FALSE; @@ -610,7 +610,7 @@ u8 sub_8057450(u8 var) { u8 result = var - MB_WARP_OR_BRIDGE; - if(result > 3) + if (result > 3) result = 0; return result; @@ -618,7 +618,7 @@ u8 sub_8057450(u8 var) bool8 MetatileBehavior_IsLandWildEncounter(u8 var) { - if(MetatileBehavior_IsSurfableWaterOrUnderwater(var) == FALSE && MetatileBehavior_IsEncounterTile(var) == TRUE) + if (MetatileBehavior_IsSurfableWaterOrUnderwater(var) == FALSE && MetatileBehavior_IsEncounterTile(var) == TRUE) return TRUE; else return FALSE; @@ -626,7 +626,7 @@ bool8 MetatileBehavior_IsLandWildEncounter(u8 var) bool8 MetatileBehavior_IsWaterWildEncounter(u8 var) { - if(MetatileBehavior_IsSurfableWaterOrUnderwater(var) == TRUE && MetatileBehavior_IsEncounterTile(var) == TRUE) + if (MetatileBehavior_IsSurfableWaterOrUnderwater(var) == TRUE && MetatileBehavior_IsEncounterTile(var) == TRUE) return TRUE; else return FALSE; @@ -634,7 +634,7 @@ bool8 MetatileBehavior_IsWaterWildEncounter(u8 var) bool8 sub_80574C4(u8 var) { - if(var == MB_0B) + if (var == MB_0B) return TRUE; else return FALSE; @@ -642,7 +642,7 @@ bool8 sub_80574C4(u8 var) bool8 sub_80574D8(u8 var) { - if(var == MB_MOUNTAIN_TOP) + if (var == MB_MOUNTAIN_TOP) return TRUE; else return FALSE; @@ -650,7 +650,7 @@ bool8 sub_80574D8(u8 var) bool8 sub_80574EC(u8 var) { - if(var == MB_SEMI_DEEP_WATER || var == MB_DEEP_WATER || var == MB_SOOTOPOLIS_DEEP_WATER) + if (var == MB_SEMI_DEEP_WATER || var == MB_DEEP_WATER || var == MB_SOOTOPOLIS_DEEP_WATER) return TRUE; else return FALSE; @@ -658,7 +658,7 @@ bool8 sub_80574EC(u8 var) bool8 sub_805750C(u8 var) { - if(var == MB_NO_SURFACING || var == MB_SEAWEED_NO_SURFACING) + if (var == MB_NO_SURFACING || var == MB_SEAWEED_NO_SURFACING) return TRUE; else return FALSE; @@ -666,7 +666,7 @@ bool8 sub_805750C(u8 var) bool8 MetatileBehavior_IsShallowFlowingWater(u8 var) { - if(var == MB_SHALLOW_WATER || var == MB_STAIRS_OUTSIDE_ABANDONED_SHIP || var == MB_SHOAL_CAVE_ENTRANCE) + if (var == MB_SHALLOW_WATER || var == MB_STAIRS_OUTSIDE_ABANDONED_SHIP || var == MB_SHOAL_CAVE_ENTRANCE) return TRUE; else return FALSE; @@ -674,7 +674,7 @@ bool8 MetatileBehavior_IsShallowFlowingWater(u8 var) bool8 MetatileBehavior_IsThinIce(u8 var) { - if(var == MB_THIN_ICE) + if (var == MB_THIN_ICE) return TRUE; else return FALSE; @@ -682,7 +682,7 @@ bool8 MetatileBehavior_IsThinIce(u8 var) bool8 MetatileBehavior_IsCrackedIce(u8 var) { - if(var == MB_CRACKED_ICE) + if (var == MB_CRACKED_ICE) return TRUE; else return FALSE; @@ -690,7 +690,7 @@ bool8 MetatileBehavior_IsCrackedIce(u8 var) bool8 sub_8057568(u8 var) { - if(var == MB_OCEAN_WATER || var == MB_SEMI_DEEP_WATER || var == MB_DEEP_WATER) + if (var == MB_OCEAN_WATER || var == MB_SEMI_DEEP_WATER || var == MB_DEEP_WATER) return TRUE; else return FALSE; @@ -698,7 +698,7 @@ bool8 sub_8057568(u8 var) bool8 unref_sub_8057584(u8 var) { - if(var == MB_18 || var == MB_1A) + if (var == MB_18 || var == MB_1A) return TRUE; else return FALSE; @@ -706,7 +706,7 @@ bool8 unref_sub_8057584(u8 var) bool8 sub_805759C(u8 var) { - if(MetatileBehavior_IsSurfableWaterOrUnderwater(var) && MetatileBehavior_IsWaterfall(var) == FALSE) + if (MetatileBehavior_IsSurfableWaterOrUnderwater(var) && MetatileBehavior_IsWaterfall(var) == FALSE) return TRUE; else return FALSE; @@ -714,7 +714,7 @@ bool8 sub_805759C(u8 var) bool8 MetatileBehavior_IsEastBlocked(u8 var) { - if(var == MB_IMPASSABLE_EAST || var == MB_IMPASSABLE_NORTHEAST || var == MB_IMPASSABLE_SOUTHEAST || var == MB_C1 || var == MB_BE) + if (var == MB_IMPASSABLE_EAST || var == MB_IMPASSABLE_NORTHEAST || var == MB_IMPASSABLE_SOUTHEAST || var == MB_C1 || var == MB_BE) return TRUE; else return FALSE; @@ -722,7 +722,7 @@ bool8 MetatileBehavior_IsEastBlocked(u8 var) bool8 MetatileBehavior_IsWestBlocked(u8 var) { - if(var == MB_IMPASSABLE_WEST || var == MB_IMPASSABLE_NORTHWEST || var == MB_IMPASSABLE_SOUTHWEST || var == MB_C1 || var == MB_BE) + if (var == MB_IMPASSABLE_WEST || var == MB_IMPASSABLE_NORTHWEST || var == MB_IMPASSABLE_SOUTHWEST || var == MB_C1 || var == MB_BE) return TRUE; else return FALSE; @@ -730,7 +730,7 @@ bool8 MetatileBehavior_IsWestBlocked(u8 var) bool8 MetatileBehavior_IsNorthBlocked(u8 var) { - if(var == MB_IMPASSABLE_NORTH || var == MB_IMPASSABLE_NORTHEAST || var == MB_IMPASSABLE_NORTHWEST || var == MB_BED) + if (var == MB_IMPASSABLE_NORTH || var == MB_IMPASSABLE_NORTHEAST || var == MB_IMPASSABLE_NORTHWEST || var == MB_BED) return TRUE; else return FALSE; @@ -738,7 +738,7 @@ bool8 MetatileBehavior_IsNorthBlocked(u8 var) bool8 MetatileBehavior_IsSouthBlocked(u8 var) { - if(var == MB_IMPASSABLE_SOUTH || var == MB_IMPASSABLE_SOUTHEAST || var == MB_IMPASSABLE_SOUTHWEST || var == MB_BED) + if (var == MB_IMPASSABLE_SOUTH || var == MB_IMPASSABLE_SOUTHEAST || var == MB_IMPASSABLE_SOUTHWEST || var == MB_BED) return TRUE; else return FALSE; @@ -746,7 +746,7 @@ bool8 MetatileBehavior_IsSouthBlocked(u8 var) bool8 MetatileBehavior_IsShortGrass(u8 var) { - if(var == MB_SHORT_GRASS) + if (var == MB_SHORT_GRASS) return TRUE; else return FALSE; @@ -754,7 +754,7 @@ bool8 MetatileBehavior_IsShortGrass(u8 var) bool8 MetatileBehavior_IsHotSprings(u8 var) { - if(var == MB_HOT_SPRINGS) + if (var == MB_HOT_SPRINGS) return TRUE; else return FALSE; @@ -762,7 +762,7 @@ bool8 MetatileBehavior_IsHotSprings(u8 var) bool8 MetatileBehavior_IsWaterfall(u8 var) { - if(var == MB_WATERFALL) + if (var == MB_WATERFALL) return TRUE; else return FALSE; @@ -770,7 +770,7 @@ bool8 MetatileBehavior_IsWaterfall(u8 var) bool8 MetatileBehavior_IsFortreeBridge(u8 var) { - if(var == MB_FORTREE_BRIDGE) + if (var == MB_FORTREE_BRIDGE) return TRUE; else return FALSE; @@ -778,7 +778,7 @@ bool8 MetatileBehavior_IsFortreeBridge(u8 var) bool8 sub_80576A0(u8 var) { - if(var == MB_PACIFIDLOG_VERTICAL_LOG_1) + if (var == MB_PACIFIDLOG_VERTICAL_LOG_1) return TRUE; else return FALSE; @@ -786,7 +786,7 @@ bool8 sub_80576A0(u8 var) bool8 sub_80576B4(u8 var) { - if(var == MB_PACIFIDLOG_VERTICAL_LOG_2) + if (var == MB_PACIFIDLOG_VERTICAL_LOG_2) return TRUE; else return FALSE; @@ -794,7 +794,7 @@ bool8 sub_80576B4(u8 var) bool8 sub_80576C8(u8 var) { - if(var == MB_PACIFIDLOG_HORIZONTAL_LOG_1) + if (var == MB_PACIFIDLOG_HORIZONTAL_LOG_1) return TRUE; else return FALSE; @@ -802,7 +802,7 @@ bool8 sub_80576C8(u8 var) bool8 sub_80576DC(u8 var) { - if(var == MB_PACIFIDLOG_HORIZONTAL_LOG_2) + if (var == MB_PACIFIDLOG_HORIZONTAL_LOG_2) return TRUE; else return FALSE; @@ -810,7 +810,7 @@ bool8 sub_80576DC(u8 var) bool8 MetatileBehavior_IsPacifidlogLog(u8 var) { - if(var >= MB_PACIFIDLOG_VERTICAL_LOG_1 && var <= MB_PACIFIDLOG_HORIZONTAL_LOG_2) + if (var >= MB_PACIFIDLOG_VERTICAL_LOG_1 && var <= MB_PACIFIDLOG_HORIZONTAL_LOG_2) return TRUE; else return FALSE; @@ -818,7 +818,7 @@ bool8 MetatileBehavior_IsPacifidlogLog(u8 var) bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8 var) { - if(var == MB_TRICK_HOUSE_PUZZLE_DOOR) + if (var == MB_TRICK_HOUSE_PUZZLE_DOOR) return TRUE; else return FALSE; @@ -826,7 +826,7 @@ bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8 var) bool8 MetatileBehavior_IsRegionMap(u8 var) { - if(var == MB_REGION_MAP) + if (var == MB_REGION_MAP) return TRUE; else return FALSE; @@ -834,7 +834,7 @@ bool8 MetatileBehavior_IsRegionMap(u8 var) bool8 MetatileBehavior_IsClosedSootopolisGymDoor(u8 var) { - if(var == MB_CLOSED_SOOTOPOLIS_GYM_DOOR) + if (var == MB_CLOSED_SOOTOPOLIS_GYM_DOOR) return TRUE; else return FALSE; @@ -842,7 +842,7 @@ bool8 MetatileBehavior_IsClosedSootopolisGymDoor(u8 var) bool8 MetatileBehavior_IsRoulette(u8 var) { - if(var == MB_ROULETTE) + if (var == MB_ROULETTE) return TRUE; else return FALSE; @@ -850,7 +850,7 @@ bool8 MetatileBehavior_IsRoulette(u8 var) bool8 MetatileBehavior_IsPokeblockFeeder(u8 var) { - if(var == MB_POKEBLOCK_FEEDER) + if (var == MB_POKEBLOCK_FEEDER) return TRUE; else return FALSE; @@ -858,7 +858,7 @@ bool8 MetatileBehavior_IsPokeblockFeeder(u8 var) bool8 MetatileBehavior_0xBB(u8 var) { - if(var == MB_BB) + if (var == MB_BB) return TRUE; else return FALSE; @@ -866,7 +866,7 @@ bool8 MetatileBehavior_0xBB(u8 var) bool8 MetatileBehavior_0xBC(u8 var) { - if(var == MB_BC) + if (var == MB_BC) return TRUE; else return FALSE; @@ -874,7 +874,7 @@ bool8 MetatileBehavior_0xBC(u8 var) bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 var) { - if(var == MB_LAVARIDGE_GYM_B1F_WARP) + if (var == MB_LAVARIDGE_GYM_B1F_WARP) return TRUE; else return FALSE; @@ -882,7 +882,7 @@ bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 var) bool8 MetatileBehavior_IsLavaridge1FWarp(u8 var) { - if(var == MB_LAVARIDGE_GYM_1F_WARP) + if (var == MB_LAVARIDGE_GYM_1F_WARP) return TRUE; else return FALSE; @@ -890,7 +890,7 @@ bool8 MetatileBehavior_IsLavaridge1FWarp(u8 var) bool8 MetatileBehavior_IsAquaHideoutWarp(u8 var) { - if(var == MB_AQUA_HIDEOUT_WARP) + if (var == MB_AQUA_HIDEOUT_WARP) return TRUE; else return FALSE; @@ -898,7 +898,7 @@ bool8 MetatileBehavior_IsAquaHideoutWarp(u8 var) bool8 MetatileBehavior_IsSurfableFishableWater(u8 var) { - if(var == MB_POND_WATER || var == MB_OCEAN_WATER || var == MB_SEMI_DEEP_WATER || var == MB_DEEP_WATER || var == MB_SOOTOPOLIS_DEEP_WATER || (var >= MB_EASTWARD_CURRENT && var <= MB_SOUTHWARD_CURRENT)) + if (var == MB_POND_WATER || var == MB_OCEAN_WATER || var == MB_SEMI_DEEP_WATER || var == MB_DEEP_WATER || var == MB_SOOTOPOLIS_DEEP_WATER || (var >= MB_EASTWARD_CURRENT && var <= MB_SOUTHWARD_CURRENT)) return TRUE; else return FALSE; @@ -906,7 +906,7 @@ bool8 MetatileBehavior_IsSurfableFishableWater(u8 var) bool8 MetatileBehavior_IsMtPyreHole(u8 var) { - if(var == MB_MT_PYRE_HOLE) + if (var == MB_MT_PYRE_HOLE) return TRUE; else return FALSE; @@ -914,7 +914,7 @@ bool8 MetatileBehavior_IsMtPyreHole(u8 var) bool8 MetatileBehavior_IsCrackedFloorHole(u8 var) { - if(var == MB_CRACKED_FLOOR_HOLE) + if (var == MB_CRACKED_FLOOR_HOLE) return TRUE; else return FALSE; @@ -922,7 +922,7 @@ bool8 MetatileBehavior_IsCrackedFloorHole(u8 var) bool8 MetatileBehavior_IsCrackedFloor(u8 var) { - if(var == MB_CRACKED_FLOOR) + if (var == MB_CRACKED_FLOOR) return TRUE; else return FALSE; @@ -930,7 +930,7 @@ bool8 MetatileBehavior_IsCrackedFloor(u8 var) bool8 MetatileBehavior_IsMuddySlope(u8 var) { - if(var == MB_MUDDY_SLOPE) + if (var == MB_MUDDY_SLOPE) return TRUE; else return FALSE; @@ -938,7 +938,7 @@ bool8 MetatileBehavior_IsMuddySlope(u8 var) bool8 MetatileBehavior_IsBumpySlope(u8 var) { - if(var == MB_BUMPY_SLOPE) + if (var == MB_BUMPY_SLOPE) return TRUE; else return FALSE; @@ -946,7 +946,7 @@ bool8 MetatileBehavior_IsBumpySlope(u8 var) bool8 MetatileBehavior_IsIsolatedVerticalRail(u8 var) { - if(var == MB_ISOLATED_VERTICAL_RAIL) + if (var == MB_ISOLATED_VERTICAL_RAIL) return TRUE; else return FALSE; @@ -954,7 +954,7 @@ bool8 MetatileBehavior_IsIsolatedVerticalRail(u8 var) bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 var) { - if(var == MB_ISOLATED_HORIZONTAL_RAIL) + if (var == MB_ISOLATED_HORIZONTAL_RAIL) return TRUE; else return FALSE; @@ -962,7 +962,7 @@ bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 var) bool8 MetatileBehavior_IsVerticalRail(u8 var) { - if(var == MB_VERTICAL_RAIL) + if (var == MB_VERTICAL_RAIL) return TRUE; else return FALSE; @@ -970,7 +970,7 @@ bool8 MetatileBehavior_IsVerticalRail(u8 var) bool8 MetatileBehavior_IsHorizontalRail(u8 var) { - if(var == MB_HORIZONTAL_RAIL) + if (var == MB_HORIZONTAL_RAIL) return TRUE; else return FALSE; @@ -978,7 +978,7 @@ bool8 MetatileBehavior_IsHorizontalRail(u8 var) bool8 MetatileBehavior_IsSeaweed(u8 var) { - if(var == MB_SEAWEED || var == MB_SEAWEED_NO_SURFACING) + if (var == MB_SEAWEED || var == MB_SEAWEED_NO_SURFACING) return TRUE; else return FALSE; @@ -986,7 +986,7 @@ bool8 MetatileBehavior_IsSeaweed(u8 var) bool8 MetatileBehavior_IsRunningDisallowed(u8 var) { - if(var == MB_NO_RUNNING || var == MB_LONG_GRASS || var == MB_HOT_SPRINGS || MetatileBehavior_IsPacifidlogLog(var) != FALSE) + if (var == MB_NO_RUNNING || var == MB_LONG_GRASS || var == MB_HOT_SPRINGS || MetatileBehavior_IsPacifidlogLog(var) != FALSE) return TRUE; else return FALSE; @@ -994,7 +994,7 @@ bool8 MetatileBehavior_IsRunningDisallowed(u8 var) bool8 sub_80578F8(u8 var) { - if(var == MB_TALL_GRASS || var == MB_LONG_GRASS || var == MB_ASH || var == MB_LONG_GRASS_SOUTH_EDGE) + if (var == MB_TALL_GRASS || var == MB_LONG_GRASS || var == MB_ASH || var == MB_LONG_GRASS_SOUTH_EDGE) return TRUE; else return FALSE; @@ -1002,7 +1002,7 @@ bool8 sub_80578F8(u8 var) bool8 sub_805791C(u8 var) { - if(var == MB_8E) + if (var == MB_8E) return TRUE; else return FALSE; @@ -1010,7 +1010,7 @@ bool8 sub_805791C(u8 var) bool8 MetatileBehavior_IsPictureBookShelf(u8 var) { - if(var == MB_PICTURE_BOOK_SHELF) + if (var == MB_PICTURE_BOOK_SHELF) return TRUE; else return FALSE; @@ -1018,7 +1018,7 @@ bool8 MetatileBehavior_IsPictureBookShelf(u8 var) bool8 MetatileBehavior_IsBookShelf(u8 var) { - if(var == MB_BOOKSHELF) + if (var == MB_BOOKSHELF) return TRUE; else return FALSE; @@ -1026,7 +1026,7 @@ bool8 MetatileBehavior_IsBookShelf(u8 var) bool8 MetatileBehavior_IsPokeCenterBookShelf(u8 var) { - if(var == MB_POKEMON_CENTER_BOOKSHELF) + if (var == MB_POKEMON_CENTER_BOOKSHELF) return TRUE; else return FALSE; @@ -1034,7 +1034,7 @@ bool8 MetatileBehavior_IsPokeCenterBookShelf(u8 var) bool8 MetatileBehavior_IsVase(u8 var) { - if(var == MB_VASE) + if (var == MB_VASE) return TRUE; else return FALSE; @@ -1042,7 +1042,7 @@ bool8 MetatileBehavior_IsVase(u8 var) bool8 MetatileBehavior_IsTrashCan(u8 var) { - if(var == MB_TRASH_CAN) + if (var == MB_TRASH_CAN) return TRUE; else return FALSE; @@ -1050,7 +1050,7 @@ bool8 MetatileBehavior_IsTrashCan(u8 var) bool8 MetatileBehavior_IsShopShelf(u8 var) { - if(var == MB_SHOP_SHELF) + if (var == MB_SHOP_SHELF) return TRUE; else return FALSE; @@ -1058,7 +1058,7 @@ bool8 MetatileBehavior_IsShopShelf(u8 var) bool8 MetatileBehavior_IsBlueprint(u8 var) { - if(var == MB_BLUEPRINT) + if (var == MB_BLUEPRINT) return TRUE; else return FALSE; diff --git a/src/money.c b/src/money.c index 2a59cab50..e73ee506a 100644 --- a/src/money.c +++ b/src/money.c @@ -14,51 +14,74 @@ extern const struct SpriteSheet gUnknown_083CF584; extern const struct SpritePalette gUnknown_083CF58C; extern const struct SpriteTemplate gSpriteTemplate_83CF56C; -bool8 IsEnoughMoney(u32 budget, u32 cost) { - if (budget >= cost) { +bool8 IsEnoughMoney(u32 budget, u32 cost) +{ + if (budget >= cost) + { return TRUE; } return FALSE; } -void sub_80B79B8(u32 *arg0, u32 arg1) { - if (*arg0 > *arg0 + arg1) { +void sub_80B79B8(u32 *arg0, u32 arg1) +{ + if (*arg0 > *arg0 + arg1) + { *arg0 = 999999; return; } *arg0 = *arg0 + arg1; - if (*arg0 > 999999) { + if (*arg0 > 999999) + { *arg0 = 999999; } } -void sub_80B79E0(u32 *arg0, u32 arg1) { - if (*arg0 < arg1) { +void sub_80B79E0(u32 *arg0, u32 arg1) +{ + if (*arg0 < arg1) + { *arg0 = 0; - } else { + } + else + { *arg0 = *arg0 - arg1; } } -void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2) { +void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2) +{ u8 width; u8 i; - if (arg1 > 999999) { + if (arg1 > 999999) + { width = 7; - } else if (arg1 > 99999) { + } + else if (arg1 > 99999) + { width = 6; - } else if (arg1 > 10000) { + } + else if (arg1 > 10000) + { width = 5; - } else if (arg1 > 999) { + } + else if (arg1 > 999) + { width = 4; - } else if (arg1 > 99) { + } + else if (arg1 > 99) + { width = 3; - } else if (arg1 > 9) { + } + else if (arg1 > 9) + { width = 2; - } else { + } + else + { width = 1; } @@ -67,7 +90,8 @@ void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2) { buffer[2] = 0x06; buffer += 3; - for (i = 0; i < arg2 - width; i++) { + for (i = 0; i < arg2 - width; i++) + { buffer[0] = CHAR_SPACE; buffer += 1; } @@ -83,7 +107,8 @@ void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2) { buffer[3] = EOS; } -void sub_80B7A94(u32 arg0, u8 size, u8 x, u8 y) { +void sub_80B7A94(u32 arg0, u8 size, u8 x, u8 y) +{ u8 buffer[16]; u8 stringWidth; @@ -99,7 +124,8 @@ void sub_80B7A94(u32 arg0, u8 size, u8 x, u8 y) { } } -void sub_80B7AEC(u32 arg0, u8 left, u8 top) { +void sub_80B7AEC(u32 arg0, u8 left, u8 top) +{ u8 buffer[32]; u8 *ptr; @@ -119,7 +145,8 @@ void sub_80B7AEC(u32 arg0, u8 left, u8 top) { } __attribute__((naked)) -void sub_80B7B34(void) { +void sub_80B7B34(void) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r9\n\ @@ -211,11 +238,13 @@ _080B7BE8: .4byte 0x0600f840\n\ .syntax divided\n"); } -void sub_80B7BEC(u32 arg0, u8 x, u8 y) { +void sub_80B7BEC(u32 arg0, u8 x, u8 y) +{ sub_80B7A94(arg0, 6, x + 6, y + 1); } -void sub_80B7C14(u32 arg0, u8 x, u8 y) { +void sub_80B7C14(u32 arg0, u8 x, u8 y) +{ MenuDrawTextWindow(x, y, x + 13, y + 3); sub_80B7BEC(arg0, x, y); @@ -225,16 +254,19 @@ void sub_80B7C14(u32 arg0, u8 x, u8 y) { gUnknown_02038734 = CreateSprite(&gSpriteTemplate_83CF56C, x * 8 + 19, y * 8 + 11, 0); } -void RemoveMoneyLabelObject(u8 x, u8 y) { +void RemoveMoneyLabelObject(u8 x, u8 y) +{ DestroySpriteAndFreeResources(&gSprites[gUnknown_02038734]); FreeSpritePaletteByTag(SPRITE_TAG_MONEY); MenuZeroFillWindowRect(x, y, x + 13, y + 3); } -bool8 sub_80B7CE8(void) { +bool8 sub_80B7CE8(void) +{ return IsEnoughMoney(gSaveBlock1.money, gSpecialVar_0x8005); } -void sub_80B7D0C(void) { +void sub_80B7D0C(void) +{ sub_80B79E0(&gSaveBlock1.money, gSpecialVar_0x8005); } diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c index 413de6a95..9f586dcb9 100644 --- a/src/mori_debug_menu.c +++ b/src/mori_debug_menu.c @@ -106,7 +106,7 @@ s8 MoriDebugMenu_BreedEgg(void) { u8 loopCounter; - for(loopCounter = 0; loopCounter <= 5; loopCounter++) + for (loopCounter = 0; loopCounter <= 5; loopCounter++) { //UB: Too few arguments for function 'GetMonData' if ( GetMonData(&gPlayerParty[loopCounter], MON_DATA_IS_EGG) ) @@ -131,7 +131,7 @@ s8 MoriDebugMenu_PokeblockCase(void) { s32 loopCounter; - for(loopCounter = 0; loopCounter <= 39; loopCounter++) + for (loopCounter = 0; loopCounter <= 39; loopCounter++) sub_810CA6C((u8)loopCounter); CloseMenu(); diff --git a/src/option_menu.c b/src/option_menu.c index d323eb853..613012972 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -91,7 +91,7 @@ static void VBlankCB(void) void CB2_InitOptionMenu(void) { - switch(gMain.state) + switch (gMain.state) { default: case 0: @@ -112,12 +112,12 @@ void CB2_InitOptionMenu(void) REG_BG0VOFS = 0; addr = (u8 *)VRAM; size = 0x18000; - while(1) + while (1) { DmaFill16(3, 0, addr, 0x1000); addr += 0x1000; size -= 0x1000; - if(size <= 0x1000) + if (size <= 0x1000) { DmaFill16(3, 0, addr, size); break; @@ -144,7 +144,7 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 4: - if(!MultistepInitMenuWindowContinue()) + if (!MultistepInitMenuWindowContinue()) return; gMain.state++; break; @@ -227,7 +227,7 @@ void CB2_InitOptionMenu(void) static void Task_OptionMenuFadeIn(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { gTasks[taskId].func = Task_OptionMenuProcessInput; } @@ -235,26 +235,26 @@ static void Task_OptionMenuFadeIn(u8 taskId) static void Task_OptionMenuProcessInput(u8 taskId) { - if(gMain.newKeys & A_BUTTON) + if (gMain.newKeys & A_BUTTON) { - if(gTasks[taskId].data[TD_MENUSELECTION] == MENUITEM_CANCEL) + if (gTasks[taskId].data[TD_MENUSELECTION] == MENUITEM_CANCEL) gTasks[taskId].func = Task_OptionMenuSave; } - else if(gMain.newKeys & B_BUTTON) + else if (gMain.newKeys & B_BUTTON) { gTasks[taskId].func = Task_OptionMenuSave; } - else if(gMain.newKeys & DPAD_UP) + else if (gMain.newKeys & DPAD_UP) { - if(gTasks[taskId].data[TD_MENUSELECTION] > 0) + if (gTasks[taskId].data[TD_MENUSELECTION] > 0) gTasks[taskId].data[TD_MENUSELECTION]--; else gTasks[taskId].data[TD_MENUSELECTION] = 6; HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]); } - else if(gMain.newKeys & DPAD_DOWN) + else if (gMain.newKeys & DPAD_DOWN) { - if(gTasks[taskId].data[TD_MENUSELECTION] <= 5) + if (gTasks[taskId].data[TD_MENUSELECTION] <= 5) gTasks[taskId].data[TD_MENUSELECTION]++; else gTasks[taskId].data[TD_MENUSELECTION] = 0; @@ -262,7 +262,7 @@ static void Task_OptionMenuProcessInput(u8 taskId) } else { - switch(gTasks[taskId].data[TD_MENUSELECTION]) + switch (gTasks[taskId].data[TD_MENUSELECTION]) { case MENUITEM_TEXTSPEED: gTasks[taskId].data[TD_TEXTSPEED] = TextSpeed_ProcessInput(gTasks[taskId].data[TD_TEXTSPEED]); @@ -307,7 +307,7 @@ static void Task_OptionMenuSave(u8 taskId) static void Task_OptionMenuFadeOut(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { DestroyTask(taskId); SetMainCallback2(gMain.savedCallback); @@ -328,7 +328,7 @@ static void DrawOptionMenuChoice(u8 *text, u8 x, u8 y, u8 style) u8 dst[16]; u16 i; - for(i = 0; *text != EOS && i <= 14; i++) + for (i = 0; *text != EOS && i <= 14; i++) dst[i] = *(text++); dst[2] = style; @@ -338,16 +338,16 @@ static void DrawOptionMenuChoice(u8 *text, u8 x, u8 y, u8 style) static u8 TextSpeed_ProcessInput(u8 selection) { - if(gMain.newKeys & DPAD_RIGHT) + if (gMain.newKeys & DPAD_RIGHT) { - if(selection <= 1) + if (selection <= 1) selection++; else selection = 0; } - if(gMain.newKeys & DPAD_LEFT) + if (gMain.newKeys & DPAD_LEFT) { - if(selection != 0) + if (selection != 0) selection--; else selection = 2; @@ -371,7 +371,7 @@ static void TextSpeed_DrawChoices(u8 selection) static u8 BattleScene_ProcessInput(u8 selection) { - if(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) + if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) selection ^= 1; return selection; } @@ -390,7 +390,7 @@ static void BattleScene_DrawChoices(u8 selection) static u8 BattleStyle_ProcessInput(u8 selection) { - if(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) + if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) selection ^= 1; return selection; } @@ -409,7 +409,7 @@ static void BattleStyle_DrawChoices(u8 selection) static u8 Sound_ProcessInput(u8 selection) { - if(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) + if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) { selection ^= 1; SetPokemonCryStereo(selection); @@ -431,17 +431,17 @@ static void Sound_DrawChoices(u8 selection) static u8 FrameType_ProcessInput(u8 selection) { - if(gMain.newKeys & DPAD_RIGHT) + if (gMain.newKeys & DPAD_RIGHT) { - if(selection <= 18) + if (selection <= 18) selection++; else selection = 0; MenuLoadTextWindowGraphics_OverrideFrameType(selection); } - if(gMain.newKeys & DPAD_LEFT) + if (gMain.newKeys & DPAD_LEFT) { - if(selection != 0) + if (selection != 0) selection--; else selection = 19; @@ -458,11 +458,11 @@ static void FrameType_DrawChoices(u8 selection) u8 n = selection + 1; u16 i; - for(i = 0; gSystemText_Terminator[i] != EOS && i <= 5; i++) + for (i = 0; gSystemText_Terminator[i] != EOS && i <= 5; i++) text[i] = gSystemText_Terminator[i]; //Convert number to decimal string - if(n / 10 != 0) + if (n / 10 != 0) { text[i] = n / 10 + CHAR_0; i++; @@ -484,16 +484,16 @@ static void FrameType_DrawChoices(u8 selection) static u8 ButtonMode_ProcessInput(u8 selection) { - if(gMain.newKeys & DPAD_RIGHT) + if (gMain.newKeys & DPAD_RIGHT) { - if(selection <= 1) + if (selection <= 1) selection++; else selection = 0; } - if(gMain.newKeys & DPAD_LEFT) + if (gMain.newKeys & DPAD_LEFT) { - if(selection != 0) + if (selection != 0) selection--; else selection = 2; diff --git a/src/party_menu.c b/src/party_menu.c index 723f66e85..25d36bf87 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -8,23 +8,25 @@ #define DATA_COUNT (6) -struct Unk201C000 { - /* 0x00 */ struct Pokemon *pokemon; - /* 0x04 */ u8 var04; - /* 0x05 */ u8 var05; - /* 0x06 */ u16 var06; - u8 pad_08[10]; - /* 0x12 */ u16 var12; +struct Unk201C000 +{ + /*0x00*/ struct Pokemon *pokemon; + /*0x04*/ u8 var04; + /*0x05*/ u8 var05; + /*0x06*/ u16 var06; + u8 pad_08[10]; + /*0x12*/ u16 var12; }; -struct Unk201B260 { - /* 0x00 */ u8 var00; - /* 0x01 */ u8 var01; - u8 pad_02[2]; - /* 0x04 */ s16 var04[DATA_COUNT * 2]; - u8 pad_1C[2]; - /* 0x1E */ u16 var1E; - /* 0x20 */ u16 var20; +struct Unk201B260 +{ + /*0x00*/ u8 var00; + /*0x01*/ u8 var01; + u8 pad_02[2]; + /*0x04*/ s16 var04[DATA_COUNT * 2]; + u8 pad_1C[2]; + /*0x1E*/ u16 var1E; + /*0x20*/ u16 var20; }; extern struct Unk201B260 unk_201B260; @@ -44,7 +46,8 @@ void PartyMenuUpdateLevelOrStatus(struct Pokemon *, u8); u8 ExecuteTableBasedItemEffect__(u8 u8, u16 u16, int i); void sub_80701DC(u8 taskId); -u8 sub_806E834(u8 *message, u8 arg1) { +u8 sub_806E834(u8 *message, u8 arg1) +{ u8 taskId; gUnknown_0202E8F6 = 1; @@ -58,14 +61,17 @@ u8 sub_806E834(u8 *message, u8 arg1) { return taskId; } -static void sub_806E884(u8 taskId) { - if (MenuUpdateWindowText() == 0) { +static void sub_806E884(u8 taskId) +{ + if (MenuUpdateWindowText() == 0) + { return; } gUnknown_0202E8F6 = 0; - if (gTasks[taskId].data[0] == 0) { + if (gTasks[taskId].data[0] == 0) + { MenuZeroFillWindowRect(3, 14, 26, 19); } @@ -75,13 +81,15 @@ static void sub_806E884(u8 taskId) { asm(".section .text_b"); #ifdef NONMATCHING -void sub_8070088(u8 taskId) { +void sub_8070088(u8 taskId) +{ u8 dummyTaskId; struct Task *task2; gTasks[taskId].func = TaskDummy; - if (GetMonData(&gPlayerParty[unk_201C000.var04], MON_DATA_SPECIES) == 0) { + if (GetMonData(&gPlayerParty[unk_201C000.var04], MON_DATA_SPECIES) == 0) + { gTasks[taskId].func = sub_80701DC; return; } @@ -92,7 +100,8 @@ void sub_8070088(u8 taskId) { task2->data[10] = GetMonData(unk_201C000.pokemon, MON_DATA_MAX_HP); task2->data[11] = GetMonData(unk_201C000.pokemon, MON_DATA_HP); - if (ExecuteTableBasedItemEffect__(unk_201C000.var05, unk_201C000.var06, 0)) { + if (ExecuteTableBasedItemEffect__(unk_201C000.var05, unk_201C000.var06, 0)) + { DestroyTask(dummyTaskId); gTasks[taskId].func = sub_80701DC; return; @@ -107,7 +116,7 @@ void sub_8070088(u8 taskId) { unk_201B260.var01 = 2; // u8 task2->data[12] = GetMonData(unk_201C000.pokemon, MON_DATA_HP) - task2->data[11]; - task2->data[14]= 1; + task2->data[14] = 1; unk_201B260.var1E = 1; // u16 unk_201B260.var20 = 1; // u16 @@ -116,7 +125,8 @@ void sub_8070088(u8 taskId) { } #else __attribute__((naked)) -void sub_8070088(void) { +void sub_8070088(void) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r10\n\ @@ -275,12 +285,14 @@ _080701D8: .4byte sub_806F8AC\n\ asm(".section .text_c"); -void sub_8070848(u8 taskId) { +void sub_8070848(u8 taskId) +{ u8 i; MenuDrawTextWindow(11, 0, 29, 7); - for (i = 0; i < DATA_COUNT; i++) { + for (i = 0; i < DATA_COUNT; i++) + { u8 x; u8 y; u32 stat; @@ -299,9 +311,12 @@ void sub_8070848(u8 taskId) { MenuPrint_PixelCoords(gUnknown_08376D04[i], (x + 1) * 8, y * 8, 1); - if (i == 2) { + if (i == 2) + { MenuPrint_PixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 0); - } else { + } + else + { MenuPrint_PixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 1); } diff --git a/src/player_pc.c b/src/player_pc.c index 682e46b61..6ea169713 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -65,7 +65,7 @@ void NewGameInitPCItems(void) while (gNewGamePCItems[i * 2] && (gNewGamePCItems + 1)[i * 2]) { - if(AddPCItem(gNewGamePCItems[i * 2], (gNewGamePCItems + 1)[i * 2]) != 1) + if (AddPCItem(gNewGamePCItems[i * 2], (gNewGamePCItems + 1)[i * 2]) != 1) break; i++; } @@ -73,746 +73,746 @@ void NewGameInitPCItems(void) void BedroomPC(void) { - u8 taskId; + u8 taskId; - gUnknown_02039314 = gUnknown_084062B8; - gUnknown_030007B4 = 4; - taskId = CreateTask(TaskDummy, 0); - DisplayItemMessageOnField(taskId, gOtherText_WhatWillYouDo, InitPlayerPCMenu, 0); + gUnknown_02039314 = gUnknown_084062B8; + gUnknown_030007B4 = 4; + taskId = CreateTask(TaskDummy, 0); + DisplayItemMessageOnField(taskId, gOtherText_WhatWillYouDo, InitPlayerPCMenu, 0); } void PlayerPC(void) { - u8 taskId; + u8 taskId; - gUnknown_02039314 = gUnknown_084062BC; - gUnknown_030007B4 = 3; - taskId = CreateTask(TaskDummy, 0); - DisplayItemMessageOnField(taskId, gOtherText_WhatWillYouDo, InitPlayerPCMenu, 0); + gUnknown_02039314 = gUnknown_084062BC; + gUnknown_030007B4 = 3; + taskId = CreateTask(TaskDummy, 0); + DisplayItemMessageOnField(taskId, gOtherText_WhatWillYouDo, InitPlayerPCMenu, 0); } void InitPlayerPCMenu(u8 taskId) { - MenuDrawTextWindow(0, 0, 10, gUnknown_030007B4 * 2 + 1); - PrintMenuItemsReordered(1, 1, gUnknown_030007B4, gUnknown_08406298, gUnknown_02039314); - InitMenu(0, 1, 1, gUnknown_030007B4, 0, 9); - gTasks[taskId].func = PlayerPCProcessMenuInput; + MenuDrawTextWindow(0, 0, 10, gUnknown_030007B4 * 2 + 1); + PrintMenuItemsReordered(1, 1, gUnknown_030007B4, gUnknown_08406298, gUnknown_02039314); + InitMenu(0, 1, 1, gUnknown_030007B4, 0, 9); + gTasks[taskId].func = PlayerPCProcessMenuInput; } void PlayerPCProcessMenuInput(u8 taskId) { - if(gMain.newAndRepeatedKeys & 0x40) - { - PlaySE(5); - MoveMenuCursor(-1); - } - else if(gMain.newAndRepeatedKeys & 0x80) - { - PlaySE(5); - MoveMenuCursor(1); - } - else if(gMain.newKeys & 0x1) - { - sub_8072DEC(); - PlaySE(5); - gUnknown_08406298[gUnknown_02039314[GetMenuCursorPos()]].func(taskId); - } - else if(gMain.newKeys & 0x2) - { - sub_8072DEC(); - PlaySE(5); - gUnknown_08406298[gUnknown_030007B4[gUnknown_02039314 - 1]].func(taskId); - } + if (gMain.newAndRepeatedKeys & 0x40) + { + PlaySE(5); + MoveMenuCursor(-1); + } + else if (gMain.newAndRepeatedKeys & 0x80) + { + PlaySE(5); + MoveMenuCursor(1); + } + else if (gMain.newKeys & 0x1) + { + sub_8072DEC(); + PlaySE(5); + gUnknown_08406298[gUnknown_02039314[GetMenuCursorPos()]].func(taskId); + } + else if (gMain.newKeys & 0x2) + { + sub_8072DEC(); + PlaySE(5); + gUnknown_08406298[gUnknown_030007B4[gUnknown_02039314 - 1]].func(taskId); + } } void ReshowPlayerPC(u8 var) { - DisplayItemMessageOnField(var, gOtherText_WhatWillYouDo, InitPlayerPCMenu, 0); + DisplayItemMessageOnField(var, gOtherText_WhatWillYouDo, InitPlayerPCMenu, 0); } void PlayerPC_ItemStorage(u8 taskId) { - InitItemStorageMenu(0); - gTasks[taskId].func = ItemStorageMenuProcessInput; + InitItemStorageMenu(0); + gTasks[taskId].func = ItemStorageMenuProcessInput; } void PlayerPC_Mailbox(u8 taskId) { - MenuZeroFillWindowRect(0, 0, 10, 9); - unk_201FE00[3] = sub_813AF3C(); - if(!unk_201FE00[3]) - DisplayItemMessageOnField(taskId, gOtherText_NoMailHere, ReshowPlayerPC, 0); - else - { - unk_201FE00[0] = 0; - unk_201FE00[2] = 0; - sub_813AF78(); - sub_813A240(taskId); - sub_813B108(taskId); - gTasks[taskId].func = sub_813B174; - } + MenuZeroFillWindowRect(0, 0, 10, 9); + unk_201FE00[3] = sub_813AF3C(); + if (!unk_201FE00[3]) + DisplayItemMessageOnField(taskId, gOtherText_NoMailHere, ReshowPlayerPC, 0); + else + { + unk_201FE00[0] = 0; + unk_201FE00[2] = 0; + sub_813AF78(); + sub_813A240(taskId); + sub_813B108(taskId); + gTasks[taskId].func = sub_813B174; + } } void PlayerPC_Decoration(u8 var) { - MenuZeroFillWindowRect(0, 0, 10, 9); - DoPlayerPCDecoration(var); + MenuZeroFillWindowRect(0, 0, 10, 9); + DoPlayerPCDecoration(var); } void PlayerPC_TurnOff(u8 taskId) { - if(gUnknown_030007B4 == 4) - { - MenuZeroFillWindowRect(0, 0, 0x1D, 0x13); - if(!gSaveBlock2.playerGender) - ScriptContext1_SetupScript(&gUnknown_08152850); // male - else - ScriptContext1_SetupScript(&gUnknown_08152C75); // female - } - else - { - MenuZeroFillWindowRect(0, 0, 10, 9); - EnableBothScriptContexts(); - } - DestroyTask(taskId); + if (gUnknown_030007B4 == 4) + { + MenuZeroFillWindowRect(0, 0, 0x1D, 0x13); + if (!gSaveBlock2.playerGender) + ScriptContext1_SetupScript(&gUnknown_08152850); // male + else + ScriptContext1_SetupScript(&gUnknown_08152C75); // female + } + else + { + MenuZeroFillWindowRect(0, 0, 10, 9); + EnableBothScriptContexts(); + } + DestroyTask(taskId); } void InitItemStorageMenu(u8 var) { - MenuZeroFillWindowRect(0, 0, 10, 9); - MenuDrawTextWindow(0, 0, 11, 9); - PrintMenuItems(1, 1, 4, gUnknown_084062C0); - InitMenu(0, 1, 1, 4, var, 10); - ItemStorageMenuPrint((u8 *)gUnknown_08406288[var]); + MenuZeroFillWindowRect(0, 0, 10, 9); + MenuDrawTextWindow(0, 0, 11, 9); + PrintMenuItems(1, 1, 4, gUnknown_084062C0); + InitMenu(0, 1, 1, 4, var, 10); + ItemStorageMenuPrint((u8 *)gUnknown_08406288[var]); } void ItemStorageMenuPrint(u8 *textPtr) { - MenuFillWindowRectWithBlankTile(2, 15, 27, 18); - MenuPrint(textPtr, 2, 15); + MenuFillWindowRectWithBlankTile(2, 15, 27, 18); + MenuPrint(textPtr, 2, 15); } void ItemStorageMenuProcessInput(u8 var) { - if(gMain.newAndRepeatedKeys & 0x40) - { - PlaySE(5); - MoveMenuCursor(-1); - ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]); - } - else if(gMain.newAndRepeatedKeys & 0x80) - { - PlaySE(5); - MoveMenuCursor(1); - ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]); - } - else if(gMain.newKeys & 0x1) - { - PlaySE(5); - gUnknown_084062C0[GetMenuCursorPos()].func(var); - } - else if(gMain.newKeys & 0x2) - { - sub_8072DEC(); - PlaySE(5); - gUnknown_084062C0[3].func(var); - } + if (gMain.newAndRepeatedKeys & 0x40) + { + PlaySE(5); + MoveMenuCursor(-1); + ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]); + } + else if (gMain.newAndRepeatedKeys & 0x80) + { + PlaySE(5); + MoveMenuCursor(1); + ItemStorageMenuPrint((u8 *)gUnknown_08406288[GetMenuCursorPos()]); + } + else if (gMain.newKeys & 0x1) + { + PlaySE(5); + gUnknown_084062C0[GetMenuCursorPos()].func(var); + } + else if (gMain.newKeys & 0x2) + { + sub_8072DEC(); + PlaySE(5); + gUnknown_084062C0[3].func(var); + } } void Task_ItemStorage_Deposit(u8 taskId) { - if(!gPaletteFade.active) - { - sub_80A6A30(); - DestroyTask(taskId); - } + if (!gPaletteFade.active) + { + sub_80A6A30(); + DestroyTask(taskId); + } } void ItemStorage_Deposit(u8 taskId) { - gTasks[taskId].func = Task_ItemStorage_Deposit; - fade_screen(1, 0); + gTasks[taskId].func = Task_ItemStorage_Deposit; + fade_screen(1, 0); } void sub_813A0C8(u8 taskId) { - if(sub_807D770() == 1) - gTasks[taskId].func = ItemStorageMenuProcessInput; + if (sub_807D770() == 1) + gTasks[taskId].func = ItemStorageMenuProcessInput; } void sub_813A0F8(void) { - MenuDisplayMessageBox(); - InitItemStorageMenu(1); - CreateTask(sub_813A0C8, 0); - pal_fill_black(); + MenuDisplayMessageBox(); + InitItemStorageMenu(1); + CreateTask(sub_813A0C8, 0); + pal_fill_black(); } void ItemStorage_Withdraw(u8 taskId) { - u8 var; - u16 * data = gTasks[taskId].data; - - sub_8072DEC(); - MenuZeroFillWindowRect(0, 0, 11, 9); - var = CountUsedPCItemSlots(); - data[2] = var; - - if(var) - { - MenuZeroFillWindowRect(0, 14, 29, 19); - data[6] = 0; - data[0] = 0; - data[1] = 0; - sub_813A240(taskId); - sub_813AE6C(taskId, 0); - gTasks[taskId].func = sub_813A280; - } - else - DisplayItemMessageOnField(taskId, gOtherText_NoItems, PlayerPC_ItemStorage, 0); + u8 var; + u16 * data = gTasks[taskId].data; + + sub_8072DEC(); + MenuZeroFillWindowRect(0, 0, 11, 9); + var = CountUsedPCItemSlots(); + data[2] = var; + + if (var) + { + MenuZeroFillWindowRect(0, 14, 29, 19); + data[6] = 0; + data[0] = 0; + data[1] = 0; + sub_813A240(taskId); + sub_813AE6C(taskId, 0); + gTasks[taskId].func = sub_813A280; + } + else + DisplayItemMessageOnField(taskId, gOtherText_NoItems, PlayerPC_ItemStorage, 0); } void ItemStorage_Toss(u8 taskId) { - u8 var; - u16 * data = gTasks[taskId].data; - - sub_8072DEC(); - MenuZeroFillWindowRect(0, 0, 11, 9); - var = CountUsedPCItemSlots(); - data[2] = var; - - if(var) - { - MenuZeroFillWindowRect(0, 14, 29, 19); - data[6] = 2; - data[0] = 0; - data[1] = 0; - sub_813A240(taskId); - sub_813AE6C(taskId, 2); - gTasks[taskId].func = sub_813A280; - } - else - DisplayItemMessageOnField(taskId, gOtherText_NoItems, PlayerPC_ItemStorage, 0); + u8 var; + u16 * data = gTasks[taskId].data; + + sub_8072DEC(); + MenuZeroFillWindowRect(0, 0, 11, 9); + var = CountUsedPCItemSlots(); + data[2] = var; + + if (var) + { + MenuZeroFillWindowRect(0, 14, 29, 19); + data[6] = 2; + data[0] = 0; + data[1] = 0; + sub_813A240(taskId); + sub_813AE6C(taskId, 2); + gTasks[taskId].func = sub_813A280; + } + else + DisplayItemMessageOnField(taskId, gOtherText_NoItems, PlayerPC_ItemStorage, 0); } void ItemStorage_Exit(u8 var) { - sub_8072DEC(); - MenuZeroFillWindowRect(0, 0, 11, 9); - ReshowPlayerPC(var); + sub_8072DEC(); + MenuZeroFillWindowRect(0, 0, 11, 9); + ReshowPlayerPC(var); } void sub_813A240(u8 taskId) { - s16 *data = gTasks[taskId].data; + s16 *data = gTasks[taskId].data; - if (data[2] > 7) - data[4] = 8; - else - data[4] = data[2] + 1; + if (data[2] > 7) + data[4] = 8; + else + data[4] = data[2] + 1; - if(unk_201FE00[3] > 7) - unk_201FE00[1] = 8; - else - unk_201FE00[1] = unk_201FE00[3] + 1; + if (unk_201FE00[3] > 7) + unk_201FE00[1] = 8; + else + unk_201FE00[1] = unk_201FE00[3] + 1; } #ifdef NONMATCHING void sub_813A280(u8 taskId) { - s16 *data = gTasks[taskId].data; - - if(gMain.newAndRepeatedKeys & 0x40) - { - if(data[0]) - { - PlaySE(5); - data[0] = MoveMenuCursor(-1); - if(!data[9]) - { - if(data[1] + data[0] == data[2]) - { - sub_813AD58(0xFFFF); - return; - } - sub_813AD58(gSaveBlock1.pcItems[data[1] + data[0]].itemId); - } - return; - } - if(!data[1]) - return; - PlaySE(5); - sub_813AE0C(taskId); - if(data[9]) - MoveMenuCursor(0); - return; - } - if(!(gMain.newAndRepeatedKeys & 0x80)) - { - if(gMain.newKeys & 0x4) - { - if(!data[9]) - { - if(data[0] + data[1] != data[2]) - { - PlaySE(5); - data[9] = 1; - data[8] = data[0] + data[1]; - sub_813AD58(0xFFF7); - } - sub_813ABE8(taskId); - return; - } - PlaySE(5); - sub_813AA30(taskId, 0); - sub_813AE0C(taskId); - return; - } - if(gMain.newKeys & 0x1) - { - PlaySE(5); - if(data[9]) - { - sub_813AA30(taskId, 0); - sub_813AE0C(taskId); - return; - } - if(data[1] + data[0] != data[2]) - { - sub_813A4B4(taskId); - return; - } - } - else - { - if(!(gMain.newKeys & 0x2)) - return; - PlaySE(5); - if(data[9]) - { - sub_813AA30(taskId, 1); - sub_813AE0C(taskId); - return; - } - sub_8072DEC(); - } - sub_813A468(taskId); - return; - } - if(data[0] == data[4] - 1) - { - if(data[1] + data[0] == data[2]) - return; - PlaySE(5); - data[1]++; - sub_813AE0C(taskId); - if(data[9]) - MoveMenuCursor(0); - return; - } - PlaySE(5); - data[0] = MoveMenuCursor(1); - if(!data[9]) - { - if(data[1] + data[0] != data[2]) - { - sub_813AD58(gSaveBlock1.pcItems[data[1] + data[0]].itemId); - return; - } - sub_813AD58(0xFFFF); - } + s16 *data = gTasks[taskId].data; + + if (gMain.newAndRepeatedKeys & 0x40) + { + if (data[0]) + { + PlaySE(5); + data[0] = MoveMenuCursor(-1); + if (!data[9]) + { + if (data[1] + data[0] == data[2]) + { + sub_813AD58(0xFFFF); + return; + } + sub_813AD58(gSaveBlock1.pcItems[data[1] + data[0]].itemId); + } + return; + } + if (!data[1]) + return; + PlaySE(5); + sub_813AE0C(taskId); + if (data[9]) + MoveMenuCursor(0); + return; + } + if (!(gMain.newAndRepeatedKeys & 0x80)) + { + if (gMain.newKeys & 0x4) + { + if (!data[9]) + { + if (data[0] + data[1] != data[2]) + { + PlaySE(5); + data[9] = 1; + data[8] = data[0] + data[1]; + sub_813AD58(0xFFF7); + } + sub_813ABE8(taskId); + return; + } + PlaySE(5); + sub_813AA30(taskId, 0); + sub_813AE0C(taskId); + return; + } + if (gMain.newKeys & 0x1) + { + PlaySE(5); + if (data[9]) + { + sub_813AA30(taskId, 0); + sub_813AE0C(taskId); + return; + } + if (data[1] + data[0] != data[2]) + { + sub_813A4B4(taskId); + return; + } + } + else + { + if (!(gMain.newKeys & 0x2)) + return; + PlaySE(5); + if (data[9]) + { + sub_813AA30(taskId, 1); + sub_813AE0C(taskId); + return; + } + sub_8072DEC(); + } + sub_813A468(taskId); + return; + } + if (data[0] == data[4] - 1) + { + if (data[1] + data[0] == data[2]) + return; + PlaySE(5); + data[1]++; + sub_813AE0C(taskId); + if (data[9]) + MoveMenuCursor(0); + return; + } + PlaySE(5); + data[0] = MoveMenuCursor(1); + if (!data[9]) + { + if (data[1] + data[0] != data[2]) + { + sub_813AD58(gSaveBlock1.pcItems[data[1] + data[0]].itemId); + return; + } + sub_813AD58(0xFFFF); + } } #else __attribute__((naked)) void sub_813A280(u8 taskId) { - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - adds r6, r5, 0\n\ - lsls r0, r5, 2\n\ - adds r0, r5\n\ - lsls r0, 3\n\ - ldr r1, _0813A2DC @ =gTasks + 0x8\n\ - adds r4, r0, r1\n\ - ldr r2, _0813A2E0 @ =gMain\n\ - ldrh r1, [r2, 0x30]\n\ - movs r0, 0x40\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0813A306\n\ - movs r1, 0\n\ - ldrsh r0, [r4, r1]\n\ - cmp r0, 0\n\ - beq _0813A2E4\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - bl MoveMenuCursor\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - strh r0, [r4]\n\ - ldrh r1, [r4, 0x2]\n\ - adds r1, r0\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - movs r2, 0x12\n\ - ldrsh r0, [r4, r2]\n\ - cmp r0, 0\n\ - beq _0813A2CC\n\ - b _0813A460\n\ + asm(".syntax unified\n\ + push {r4-r6,lr}\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + adds r6, r5, 0\n\ + lsls r0, r5, 2\n\ + adds r0, r5\n\ + lsls r0, 3\n\ + ldr r1, _0813A2DC @ =gTasks + 0x8\n\ + adds r4, r0, r1\n\ + ldr r2, _0813A2E0 @ =gMain\n\ + ldrh r1, [r2, 0x30]\n\ + movs r0, 0x40\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0813A306\n\ + movs r1, 0\n\ + ldrsh r0, [r4, r1]\n\ + cmp r0, 0\n\ + beq _0813A2E4\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0x1\n\ + negs r0, r0\n\ + bl MoveMenuCursor\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r4]\n\ + ldrh r1, [r4, 0x2]\n\ + adds r1, r0\n\ + lsls r1, 16\n\ + lsrs r1, 16\n\ + movs r2, 0x12\n\ + ldrsh r0, [r4, r2]\n\ + cmp r0, 0\n\ + beq _0813A2CC\n\ + b _0813A460\n\ _0813A2CC:\n\ - lsls r0, r1, 16\n\ - asrs r1, r0, 16\n\ - movs r2, 0x4\n\ - ldrsh r0, [r4, r2]\n\ - cmp r1, r0\n\ - beq _0813A34C\n\ - b _0813A358\n\ - .align 2, 0\n\ + lsls r0, r1, 16\n\ + asrs r1, r0, 16\n\ + movs r2, 0x4\n\ + ldrsh r0, [r4, r2]\n\ + cmp r1, r0\n\ + beq _0813A34C\n\ + b _0813A358\n\ + .align 2, 0\n\ _0813A2DC: .4byte gTasks + 0x8\n\ _0813A2E0: .4byte gMain\n\ _0813A2E4:\n\ - movs r1, 0x2\n\ - ldrsh r0, [r4, r1]\n\ - cmp r0, 0\n\ - bne _0813A2EE\n\ - b _0813A460\n\ + movs r1, 0x2\n\ + ldrsh r0, [r4, r1]\n\ + cmp r0, 0\n\ + bne _0813A2EE\n\ + b _0813A460\n\ _0813A2EE:\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - ldrh r0, [r4, 0x2]\n\ - subs r0, 0x1\n\ - strh r0, [r4, 0x2]\n\ - adds r0, r5, 0\n\ - bl sub_813AE0C\n\ - movs r2, 0x12\n\ - ldrsh r0, [r4, r2]\n\ - b _0813A394\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + ldrh r0, [r4, 0x2]\n\ + subs r0, 0x1\n\ + strh r0, [r4, 0x2]\n\ + adds r0, r5, 0\n\ + bl sub_813AE0C\n\ + movs r2, 0x12\n\ + ldrsh r0, [r4, r2]\n\ + b _0813A394\n\ _0813A306:\n\ - movs r0, 0x80\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0813A3A0\n\ - movs r0, 0\n\ - ldrsh r1, [r4, r0]\n\ - movs r2, 0x8\n\ - ldrsh r0, [r4, r2]\n\ - subs r0, 0x1\n\ - cmp r1, r0\n\ - beq _0813A370\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r0, 0x1\n\ - bl MoveMenuCursor\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - strh r0, [r4]\n\ - ldrh r1, [r4, 0x2]\n\ - adds r1, r0\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - movs r2, 0x12\n\ - ldrsh r0, [r4, r2]\n\ - cmp r0, 0\n\ - beq _0813A340\n\ - b _0813A460\n\ + movs r0, 0x80\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0813A3A0\n\ + movs r0, 0\n\ + ldrsh r1, [r4, r0]\n\ + movs r2, 0x8\n\ + ldrsh r0, [r4, r2]\n\ + subs r0, 0x1\n\ + cmp r1, r0\n\ + beq _0813A370\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0x1\n\ + bl MoveMenuCursor\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r4]\n\ + ldrh r1, [r4, 0x2]\n\ + adds r1, r0\n\ + lsls r1, 16\n\ + lsrs r1, 16\n\ + movs r2, 0x12\n\ + ldrsh r0, [r4, r2]\n\ + cmp r0, 0\n\ + beq _0813A340\n\ + b _0813A460\n\ _0813A340:\n\ - lsls r0, r1, 16\n\ - asrs r1, r0, 16\n\ - movs r2, 0x4\n\ - ldrsh r0, [r4, r2]\n\ - cmp r1, r0\n\ - bne _0813A358\n\ + lsls r0, r1, 16\n\ + asrs r1, r0, 16\n\ + movs r2, 0x4\n\ + ldrsh r0, [r4, r2]\n\ + cmp r1, r0\n\ + bne _0813A358\n\ _0813A34C:\n\ - ldr r0, _0813A354 @ =0x0000ffff\n\ - bl sub_813AD58\n\ - b _0813A460\n\ - .align 2, 0\n\ + ldr r0, _0813A354 @ =0x0000ffff\n\ + bl sub_813AD58\n\ + b _0813A460\n\ + .align 2, 0\n\ _0813A354: .4byte 0x0000ffff\n\ _0813A358:\n\ - ldr r0, _0813A36C @ =gSaveBlock1\n\ - lsls r1, 2\n\ - adds r1, r0\n\ - movs r0, 0x93\n\ - lsls r0, 3\n\ - adds r1, r0\n\ - ldrh r0, [r1]\n\ - bl sub_813AD58\n\ - b _0813A460\n\ - .align 2, 0\n\ + ldr r0, _0813A36C @ =gSaveBlock1\n\ + lsls r1, 2\n\ + adds r1, r0\n\ + movs r0, 0x93\n\ + lsls r0, 3\n\ + adds r1, r0\n\ + ldrh r0, [r1]\n\ + bl sub_813AD58\n\ + b _0813A460\n\ + .align 2, 0\n\ _0813A36C: .4byte gSaveBlock1\n\ _0813A370:\n\ - movs r2, 0x2\n\ - ldrsh r0, [r4, r2]\n\ - adds r0, r1\n\ - movs r2, 0x4\n\ - ldrsh r1, [r4, r2]\n\ - cmp r0, r1\n\ - beq _0813A460\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - ldrh r0, [r4, 0x2]\n\ - adds r0, 0x1\n\ - strh r0, [r4, 0x2]\n\ - adds r0, r5, 0\n\ - bl sub_813AE0C\n\ - movs r1, 0x12\n\ - ldrsh r0, [r4, r1]\n\ + movs r2, 0x2\n\ + ldrsh r0, [r4, r2]\n\ + adds r0, r1\n\ + movs r2, 0x4\n\ + ldrsh r1, [r4, r2]\n\ + cmp r0, r1\n\ + beq _0813A460\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + ldrh r0, [r4, 0x2]\n\ + adds r0, 0x1\n\ + strh r0, [r4, 0x2]\n\ + adds r0, r5, 0\n\ + bl sub_813AE0C\n\ + movs r1, 0x12\n\ + ldrsh r0, [r4, r1]\n\ _0813A394:\n\ - cmp r0, 0\n\ - beq _0813A460\n\ - movs r0, 0\n\ - bl MoveMenuCursor\n\ - b _0813A460\n\ + cmp r0, 0\n\ + beq _0813A460\n\ + movs r0, 0\n\ + bl MoveMenuCursor\n\ + b _0813A460\n\ _0813A3A0:\n\ - ldrh r1, [r2, 0x2E]\n\ - movs r0, 0x4\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0813A3F0\n\ - movs r2, 0x12\n\ - ldrsh r0, [r4, r2]\n\ - cmp r0, 0\n\ - bne _0813A3E8\n\ - movs r1, 0\n\ - ldrsh r0, [r4, r1]\n\ - movs r2, 0x2\n\ - ldrsh r1, [r4, r2]\n\ - adds r0, r1\n\ - movs r2, 0x4\n\ - ldrsh r1, [r4, r2]\n\ - cmp r0, r1\n\ - beq _0813A3DC\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r0, 0x1\n\ - strh r0, [r4, 0x12]\n\ - ldrh r0, [r4]\n\ - ldrh r1, [r4, 0x2]\n\ - adds r0, r1\n\ - strh r0, [r4, 0x10]\n\ - ldr r0, _0813A3E4 @ =0x0000fff7\n\ - bl sub_813AD58\n\ + ldrh r1, [r2, 0x2E]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0813A3F0\n\ + movs r2, 0x12\n\ + ldrsh r0, [r4, r2]\n\ + cmp r0, 0\n\ + bne _0813A3E8\n\ + movs r1, 0\n\ + ldrsh r0, [r4, r1]\n\ + movs r2, 0x2\n\ + ldrsh r1, [r4, r2]\n\ + adds r0, r1\n\ + movs r2, 0x4\n\ + ldrsh r1, [r4, r2]\n\ + cmp r0, r1\n\ + beq _0813A3DC\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0x1\n\ + strh r0, [r4, 0x12]\n\ + ldrh r0, [r4]\n\ + ldrh r1, [r4, 0x2]\n\ + adds r0, r1\n\ + strh r0, [r4, 0x10]\n\ + ldr r0, _0813A3E4 @ =0x0000fff7\n\ + bl sub_813AD58\n\ _0813A3DC:\n\ - adds r0, r5, 0\n\ - bl sub_813ABE8\n\ - b _0813A460\n\ - .align 2, 0\n\ + adds r0, r5, 0\n\ + bl sub_813ABE8\n\ + b _0813A460\n\ + .align 2, 0\n\ _0813A3E4: .4byte 0x0000fff7\n\ _0813A3E8:\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - b _0813A420\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + b _0813A420\n\ _0813A3F0:\n\ - movs r0, 0x1\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0813A430\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r2, 0x12\n\ - ldrsh r0, [r4, r2]\n\ - cmp r0, 0\n\ - bne _0813A420\n\ - movs r1, 0x2\n\ - ldrsh r0, [r4, r1]\n\ - movs r2, 0\n\ - ldrsh r1, [r4, r2]\n\ - adds r0, r1\n\ - movs r2, 0x4\n\ - ldrsh r1, [r4, r2]\n\ - cmp r0, r1\n\ - beq _0813A44A\n\ - adds r0, r5, 0\n\ - bl sub_813A4B4\n\ - b _0813A460\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0813A430\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r2, 0x12\n\ + ldrsh r0, [r4, r2]\n\ + cmp r0, 0\n\ + bne _0813A420\n\ + movs r1, 0x2\n\ + ldrsh r0, [r4, r1]\n\ + movs r2, 0\n\ + ldrsh r1, [r4, r2]\n\ + adds r0, r1\n\ + movs r2, 0x4\n\ + ldrsh r1, [r4, r2]\n\ + cmp r0, r1\n\ + beq _0813A44A\n\ + adds r0, r5, 0\n\ + bl sub_813A4B4\n\ + b _0813A460\n\ _0813A420:\n\ - adds r0, r5, 0\n\ - movs r1, 0\n\ - bl sub_813AA30\n\ - adds r0, r5, 0\n\ - bl sub_813AE0C\n\ - b _0813A460\n\ + adds r0, r5, 0\n\ + movs r1, 0\n\ + bl sub_813AA30\n\ + adds r0, r5, 0\n\ + bl sub_813AE0C\n\ + b _0813A460\n\ _0813A430:\n\ - movs r0, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0813A460\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r1, 0x12\n\ - ldrsh r0, [r4, r1]\n\ - cmp r0, 0\n\ - bne _0813A452\n\ - bl sub_8072DEC\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0813A460\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r1, 0x12\n\ + ldrsh r0, [r4, r1]\n\ + cmp r0, 0\n\ + bne _0813A452\n\ + bl sub_8072DEC\n\ _0813A44A:\n\ - adds r0, r5, 0\n\ - bl sub_813A468\n\ - b _0813A460\n\ + adds r0, r5, 0\n\ + bl sub_813A468\n\ + b _0813A460\n\ _0813A452:\n\ - adds r0, r6, 0\n\ - movs r1, 0x1\n\ - bl sub_813AA30\n\ - adds r0, r6, 0\n\ - bl sub_813AE0C\n\ + adds r0, r6, 0\n\ + movs r1, 0x1\n\ + bl sub_813AA30\n\ + adds r0, r6, 0\n\ + bl sub_813AE0C\n\ _0813A460:\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided"); + pop {r4-r6}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided"); } #endif void sub_813A468(u8 taskId) { - BuyMenuFreeMemory(); - DestroyVerticalScrollIndicator(0); - DestroyVerticalScrollIndicator(1); - MenuZeroFillWindowRect(0, 0, 29, 19); - MenuDisplayMessageBox(); - InitItemStorageMenu(gTasks[taskId].data[6]); - gTasks[taskId].func = ItemStorageMenuProcessInput; + BuyMenuFreeMemory(); + DestroyVerticalScrollIndicator(0); + DestroyVerticalScrollIndicator(1); + MenuZeroFillWindowRect(0, 0, 29, 19); + MenuDisplayMessageBox(); + InitItemStorageMenu(gTasks[taskId].data[6]); + gTasks[taskId].func = ItemStorageMenuProcessInput; } #ifdef NONMATCHING void sub_813A4B4(u8 taskId) { - u16 *data = gTasks[taskId].data; - u16 var = data[2] + data[0]; - - sub_80F996C(0); - sub_80F996C(1); - - if(data[6]) - { - if(gSaveBlock1.pcItems[var].itemId == 1) - { - data[3] = 1; - sub_813A794(taskId); - return; - } - sub_813AD58(0xFFF7); - data[3] = 1; - MenuDrawTextWindow(6, 8, 13, 11); - sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3); - gTasks[taskId].func = sub_813A584; - return; - } - if(gSaveBlock1.pcItems[var].itemId != 1) - { - sub_813AD58(0xFFF7); - data[3] = 1; - MenuDrawTextWindow(6, 8, 13, 11); - sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3); - gTasks[taskId].func = sub_813A584; - return; - } - data[3] = 1; - sub_813A6FC(taskId); + u16 *data = gTasks[taskId].data; + u16 var = data[2] + data[0]; + + sub_80F996C(0); + sub_80F996C(1); + + if (data[6]) + { + if (gSaveBlock1.pcItems[var].itemId == 1) + { + data[3] = 1; + sub_813A794(taskId); + return; + } + sub_813AD58(0xFFF7); + data[3] = 1; + MenuDrawTextWindow(6, 8, 13, 11); + sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3); + gTasks[taskId].func = sub_813A584; + return; + } + if (gSaveBlock1.pcItems[var].itemId != 1) + { + sub_813AD58(0xFFF7); + data[3] = 1; + MenuDrawTextWindow(6, 8, 13, 11); + sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3); + gTasks[taskId].func = sub_813A584; + return; + } + data[3] = 1; + sub_813A6FC(taskId); } #else __attribute__((naked)) void sub_813A4B4(u8 taskId) { - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - sub sp, 0x4\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - lsls r0, r6, 2\n\ - adds r0, r6\n\ - lsls r0, 3\n\ - ldr r1, _0813A500 @ =gTasks + 0x8\n\ - adds r4, r0, r1\n\ - ldrb r0, [r4, 0x2]\n\ - ldrb r1, [r4]\n\ - adds r0, r1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - movs r0, 0\n\ - bl sub_80F996C\n\ - movs r0, 0x1\n\ - bl sub_80F996C\n\ - movs r1, 0xC\n\ - ldrsh r0, [r4, r1]\n\ - cmp r0, 0\n\ - bne _0813A518\n\ - ldr r1, _0813A504 @ =gSaveBlock1\n\ - lsls r0, r5, 2\n\ - adds r0, r1\n\ - ldr r1, _0813A508 @ =0x0000049a\n\ - adds r0, r1\n\ - ldrh r0, [r0]\n\ - cmp r0, 0x1\n\ - bne _0813A50C\n\ - strh r0, [r4, 0x6]\n\ - adds r0, r6, 0\n\ - bl sub_813A6FC\n\ - b _0813A570\n\ - .align 2, 0\n\ + asm(".syntax unified\n\ + push {r4-r6,lr}\n\ + sub sp, 0x4\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + lsls r0, r6, 2\n\ + adds r0, r6\n\ + lsls r0, 3\n\ + ldr r1, _0813A500 @ =gTasks + 0x8\n\ + adds r4, r0, r1\n\ + ldrb r0, [r4, 0x2]\n\ + ldrb r1, [r4]\n\ + adds r0, r1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + movs r0, 0\n\ + bl sub_80F996C\n\ + movs r0, 0x1\n\ + bl sub_80F996C\n\ + movs r1, 0xC\n\ + ldrsh r0, [r4, r1]\n\ + cmp r0, 0\n\ + bne _0813A518\n\ + ldr r1, _0813A504 @ =gSaveBlock1\n\ + lsls r0, r5, 2\n\ + adds r0, r1\n\ + ldr r1, _0813A508 @ =0x0000049a\n\ + adds r0, r1\n\ + ldrh r0, [r0]\n\ + cmp r0, 0x1\n\ + bne _0813A50C\n\ + strh r0, [r4, 0x6]\n\ + adds r0, r6, 0\n\ + bl sub_813A6FC\n\ + b _0813A570\n\ + .align 2, 0\n\ _0813A500: .4byte gTasks + 0x8\n\ _0813A504: .4byte gSaveBlock1\n\ _0813A508: .4byte 0x0000049a\n\ _0813A50C:\n\ - ldr r0, _0813A514 @ =0x0000fffe\n\ - bl sub_813AD58\n\ - b _0813A542\n\ - .align 2, 0\n\ + ldr r0, _0813A514 @ =0x0000fffe\n\ + bl sub_813AD58\n\ + b _0813A542\n\ + .align 2, 0\n\ _0813A514: .4byte 0x0000fffe\n\ _0813A518:\n\ - ldr r1, _0813A534 @ =gSaveBlock1\n\ - lsls r0, r5, 2\n\ - adds r0, r1\n\ - ldr r1, _0813A538 @ =0x0000049a\n\ - adds r0, r1\n\ - ldrh r0, [r0]\n\ - cmp r0, 0x1\n\ - bne _0813A53C\n\ - strh r0, [r4, 0x6]\n\ - adds r0, r6, 0\n\ - bl sub_813A794\n\ - b _0813A570\n\ - .align 2, 0\n\ + ldr r1, _0813A534 @ =gSaveBlock1\n\ + lsls r0, r5, 2\n\ + adds r0, r1\n\ + ldr r1, _0813A538 @ =0x0000049a\n\ + adds r0, r1\n\ + ldrh r0, [r0]\n\ + cmp r0, 0x1\n\ + bne _0813A53C\n\ + strh r0, [r4, 0x6]\n\ + adds r0, r6, 0\n\ + bl sub_813A794\n\ + b _0813A570\n\ + .align 2, 0\n\ _0813A534: .4byte gSaveBlock1\n\ _0813A538: .4byte 0x0000049a\n\ _0813A53C:\n\ - ldr r0, _0813A578 @ =0x0000fffc\n\ - bl sub_813AD58\n\ + ldr r0, _0813A578 @ =0x0000fffc\n\ + bl sub_813AD58\n\ _0813A542:\n\ - movs r0, 0x1\n\ - strh r0, [r4, 0x6]\n\ - movs r0, 0x6\n\ - movs r1, 0x8\n\ - movs r2, 0xD\n\ - movs r3, 0xB\n\ - bl MenuDrawTextWindow\n\ - ldrh r0, [r4, 0x6]\n\ - movs r1, 0x3\n\ - str r1, [sp]\n\ - movs r1, 0x1\n\ - movs r2, 0x8\n\ - movs r3, 0x9\n\ - bl sub_80A418C\n\ - ldr r1, _0813A57C @ =gTasks\n\ - lsls r0, r6, 2\n\ - adds r0, r6\n\ - lsls r0, 3\n\ - adds r0, r1\n\ - ldr r1, _0813A580 @ =sub_813A584\n\ - str r1, [r0]\n\ + movs r0, 0x1\n\ + strh r0, [r4, 0x6]\n\ + movs r0, 0x6\n\ + movs r1, 0x8\n\ + movs r2, 0xD\n\ + movs r3, 0xB\n\ + bl MenuDrawTextWindow\n\ + ldrh r0, [r4, 0x6]\n\ + movs r1, 0x3\n\ + str r1, [sp]\n\ + movs r1, 0x1\n\ + movs r2, 0x8\n\ + movs r3, 0x9\n\ + bl sub_80A418C\n\ + ldr r1, _0813A57C @ =gTasks\n\ + lsls r0, r6, 2\n\ + adds r0, r6\n\ + lsls r0, 3\n\ + adds r0, r1\n\ + ldr r1, _0813A580 @ =sub_813A584\n\ + str r1, [r0]\n\ _0813A570:\n\ - add sp, 0x4\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ + add sp, 0x4\n\ + pop {r4-r6}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ _0813A578: .4byte 0x0000fffc\n\ _0813A57C: .4byte gTasks\n\ _0813A580: .4byte sub_813A584\n\ - .syntax divided"); + .syntax divided"); } #endif diff --git a/src/pokedex.c b/src/pokedex.c index 458f7e9bc..bd6125f7c 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -146,7 +146,7 @@ void sub_808C02C(void) gSaveBlock2.pokedex.spindaPersonality = 0; gSaveBlock2.pokedex.unknown3 = 0; DisableNationalPokedex(); - for(i = 0; i <= 51; i++) + for (i = 0; i <= 51; i++) { gSaveBlock2.pokedex.owned[i] = 0; gSaveBlock2.pokedex.seen[i] = 0; @@ -172,7 +172,7 @@ void ClearPokedexView(struct PokedexView *pokedexView) { u16 i; - for(i = 0; i <= 385; i++) + for (i = 0; i <= 385; i++) { pokedexView->unk0[i].dexNum |= 0xFFFF; pokedexView->unk0[i].seen = 0; @@ -190,7 +190,7 @@ void ClearPokedexView(struct PokedexView *pokedexView) pokedexView->unk618 = 0; pokedexView->unk61A = 0; pokedexView->unk61C = 0; - for(i = 0; i <= 3; i++) + for (i = 0; i <= 3; i++) pokedexView->unk61E[i] |= 0xFFFF; pokedexView->unk628 = 0; pokedexView->unk62A = 0; @@ -203,7 +203,7 @@ void ClearPokedexView(struct PokedexView *pokedexView) pokedexView->unk634 = 0; pokedexView->unk636 = 0; pokedexView->unk638 = 0; - for(i = 0; i <= 3; i++) + for (i = 0; i <= 3; i++) pokedexView->unk63A[i] = 0; pokedexView->unk64A = 0; pokedexView->unk64B = 0; @@ -213,15 +213,15 @@ void ClearPokedexView(struct PokedexView *pokedexView) pokedexView->menuIsOpen = 0; pokedexView->menuCursorPos = 0; pokedexView->menuY = 0; - for(i = 0; i <= 7; i++) + for (i = 0; i <= 7; i++) pokedexView->unk656[i] = 0; - for(i = 0; i <= 7; i++) + for (i = 0; i <= 7; i++) pokedexView->unk65E[i] = 0; } void CB2_InitPokedex(void) { - switch(gMain.state) + switch (gMain.state) { case 0: default: @@ -233,12 +233,12 @@ void CB2_InitPokedex(void) sub_8091060(0); addr = (u8 *)VRAM; size = VRAM_SIZE; - while(1) + while (1) { DmaFill16(3, 0, addr, 0x1000); addr += 0x1000; size -= 0x1000; - if(size <= 0x1000) + if (size <= 0x1000) { DmaFill16(3, 0, addr, size); break; @@ -261,7 +261,7 @@ void CB2_InitPokedex(void) gMain.state++; break; case 2: - switch(Random() & 3) + switch (Random() & 3) { case 0: default: @@ -280,14 +280,14 @@ void CB2_InitPokedex(void) ClearPokedexView(gPokedexView); CreateTask(Task_PokedexShowMainScreen, 0); gPokedexView->dexMode = gSaveBlock2.pokedex.unknown1; - if(!IsNationalPokedexEnabled()) + if (!IsNationalPokedexEnabled()) gPokedexView->dexMode = DEX_MODE_HOENN; gPokedexView->dexOrder = gSaveBlock2.pokedex.order; gPokedexView->selectedPokemon = gUnknown_0202FFB8; gPokedexView->unk62C = gUnknown_0202FFBA; gPokedexView->selectedScreen = PAGE_SCREEN; gPokedexView->unk64E = 0; - if(!IsNationalPokedexEnabled()) + if (!IsNationalPokedexEnabled()) { gPokedexView->unk61A = GetHoennPokedexCount(0); gPokedexView->unk61C = GetHoennPokedexCount(1); @@ -334,7 +334,7 @@ u8 unref_sub_808C540(void (*func)(u8)) REG_DISPSTAT |= 0x8; SetVBlankCallback(sub_808C0B8); SetMainCallback2(MainCB); - if(!gPokedexView->unk64B) + if (!gPokedexView->unk64B) taskId = CreateTask(sub_808CAE4, 0); else taskId = CreateTask(sub_808D198, 0); @@ -353,7 +353,7 @@ void MainCB(void) void Task_PokedexShowMainScreen(u8 taskId) { gPokedexView->unk64C_1 = 0; - if(sub_808D344(0)) + if (sub_808D344(0)) { gTasks[taskId].func = Task_PokedexMainScreen; } @@ -365,11 +365,11 @@ void Task_PokedexMainScreen(u8 taskId) REG_BG0VOFS = gPokedexView->menuY; //If menu is open, slide it down, off screen - if(gPokedexView->menuY) + if (gPokedexView->menuY) gPokedexView->menuY -= 8; else { - if((gMain.newKeys & A_BUTTON) && gPokedexView->unk0[gPokedexView->selectedPokemon].seen) + if ((gMain.newKeys & A_BUTTON) && gPokedexView->unk0[gPokedexView->selectedPokemon].seen) { sub_808E6BC(); BeginNormalPaletteFade( @@ -379,7 +379,7 @@ void Task_PokedexMainScreen(u8 taskId) gTasks[taskId].func = sub_808CA64; PlaySE(SE_PIN); } - else if(gMain.newKeys & START_BUTTON) + else if (gMain.newKeys & START_BUTTON) { //Open menu gPokedexView->menuY = 0; @@ -388,7 +388,7 @@ void Task_PokedexMainScreen(u8 taskId) gTasks[taskId].func = Task_PokedexMainScreenMenu; PlaySE(SE_SELECT); } - else if(gMain.newKeys & SELECT_BUTTON) + else if (gMain.newKeys & SELECT_BUTTON) { PlaySE(SE_SELECT); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); @@ -401,7 +401,7 @@ void Task_PokedexMainScreen(u8 taskId) gTasks[taskId].func = sub_808CB8C; PlaySE(SE_PC_LOGON); } - else if(gMain.newKeys & B_BUTTON) + else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ClosePokedex; @@ -411,7 +411,7 @@ void Task_PokedexMainScreen(u8 taskId) { //Handle D-pad gPokedexView->selectedPokemon = sub_808E48C(gPokedexView->selectedPokemon, 0xE); - if(gPokedexView->unk62E) + if (gPokedexView->unk62E) gTasks[taskId].func = sub_808C898; } } @@ -419,7 +419,7 @@ void Task_PokedexMainScreen(u8 taskId) void sub_808C898(u8 taskId) { - if(sub_808E208(gPokedexView->unk62F, gPokedexView->unk634, gPokedexView->unk636)) + if (sub_808E208(gPokedexView->unk62F, gPokedexView->unk634, gPokedexView->unk636)) { gTasks[taskId].func = Task_PokedexMainScreen; } @@ -431,13 +431,13 @@ void Task_PokedexMainScreenMenu(u8 taskId) REG_BG0VOFS = gPokedexView->menuY; //If menu is not open, slide it up, on screen - if(gPokedexView->menuY != 80) + if (gPokedexView->menuY != 80) gPokedexView->menuY += 8; else { - if(gMain.newKeys & A_BUTTON) + if (gMain.newKeys & A_BUTTON) { - switch(gPokedexView->menuCursorPos) + switch (gPokedexView->menuCursorPos) { case 0: //BACK TO LIST default: @@ -466,18 +466,18 @@ void Task_PokedexMainScreenMenu(u8 taskId) } //Exit menu when Start or B is pressed - if(gMain.newKeys & (START_BUTTON | B_BUTTON)) + if (gMain.newKeys & (START_BUTTON | B_BUTTON)) { gPokedexView->menuIsOpen = 0; gTasks[taskId].func = Task_PokedexMainScreen; PlaySE(SE_SELECT); } - else if((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos != 0) + else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos != 0) { gPokedexView->menuCursorPos--; PlaySE(SE_SELECT); } - else if((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 2) + else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 2) { gPokedexView->menuCursorPos++; PlaySE(SE_SELECT); @@ -487,7 +487,7 @@ void Task_PokedexMainScreenMenu(u8 taskId) void sub_808CA64(u8 taskId) { - if(gSprites[gPokedexView->unk626].pos1.x == 0x30 && + if (gSprites[gPokedexView->unk626].pos1.x == 0x30 && gSprites[gPokedexView->unk626].pos1.y == 0x38) { gPokedexView->unk64B = gPokedexView->unk64A; @@ -498,9 +498,9 @@ void sub_808CA64(u8 taskId) void sub_808CAE4(u8 taskId) { - if(gTasks[gTasks[taskId].data[0]].isActive) + if (gTasks[gTasks[taskId].data[0]].isActive) { - if(gPokedexView->unk64A == 1 && + if (gPokedexView->unk64A == 1 && !sub_808F250(gTasks[taskId].data[0]) && sub_808E71C()) { @@ -519,9 +519,9 @@ void sub_808CB8C(u8 taskId) { bool8 isActive = gTasks[gTasks[taskId].data[0]].isActive; - if(!isActive) + if (!isActive) { - if(gPokedexView->unk64F) + if (gPokedexView->unk64F) { gPokedexView->selectedPokemon = isActive; gPokedexView->unk62C = 0x40; @@ -532,7 +532,7 @@ void sub_808CB8C(u8 taskId) gPokedexView->unk62C = gPokedexView->unk62A; gPokedexView->selectedPokemon = gPokedexView->unk610; gPokedexView->dexMode = gPokedexView->unk614; - if(!IsNationalPokedexEnabled()) + if (!IsNationalPokedexEnabled()) gPokedexView->dexMode = DEX_MODE_HOENN; gPokedexView->dexOrder = gPokedexView->unk618; gTasks[taskId].func = Task_PokedexShowMainScreen; @@ -542,10 +542,10 @@ void sub_808CB8C(u8 taskId) void Task_ClosePokedex(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { gSaveBlock2.pokedex.unknown1 = gPokedexView->dexMode; - if(!IsNationalPokedexEnabled()) + if (!IsNationalPokedexEnabled()) gSaveBlock2.pokedex.unknown1 = 0; gSaveBlock2.pokedex.order = gPokedexView->dexOrder; DestroyTask(taskId); @@ -557,7 +557,7 @@ void Task_ClosePokedex(u8 taskId) void sub_808CCC4(u8 taskId) { gPokedexView->unk64C_1 = 1; - if(sub_808D344(3)) + if (sub_808D344(3)) gTasks[taskId].func = Task_PokedexResultsScreen; } @@ -565,11 +565,11 @@ void Task_PokedexResultsScreen(u8 taskId) { REG_BG0VOFS = gPokedexView->menuY; - if(gPokedexView->menuY) + if (gPokedexView->menuY) gPokedexView->menuY -= 8; else { - if((gMain.newKeys & A_BUTTON) && gPokedexView->unk0[gPokedexView->selectedPokemon].seen) + if ((gMain.newKeys & A_BUTTON) && gPokedexView->unk0[gPokedexView->selectedPokemon].seen) { u32 a; @@ -580,7 +580,7 @@ void Task_PokedexResultsScreen(u8 taskId) gTasks[taskId].func = sub_808D118; PlaySE(SE_PIN); } - else if(gMain.newKeys & START_BUTTON) + else if (gMain.newKeys & START_BUTTON) { gPokedexView->menuY = 0; gPokedexView->menuIsOpen = 1; @@ -588,7 +588,7 @@ void Task_PokedexResultsScreen(u8 taskId) gTasks[taskId].func = Task_PokedexResultsScreenMenu; PlaySE(SE_SELECT); } - else if(gMain.newKeys & SELECT_BUTTON) + else if (gMain.newKeys & SELECT_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].data[0] = sub_8091E3C(); @@ -596,7 +596,7 @@ void Task_PokedexResultsScreen(u8 taskId) gTasks[taskId].func = sub_808CB8C; PlaySE(SE_PC_LOGON); } - else if(gMain.newKeys & B_BUTTON) + else if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; @@ -606,7 +606,7 @@ void Task_PokedexResultsScreen(u8 taskId) { //Handle D-pad gPokedexView->selectedPokemon = sub_808E48C(gPokedexView->selectedPokemon, 0xE); - if(gPokedexView->unk62E) + if (gPokedexView->unk62E) gTasks[taskId].func = sub_808CEF8; } } @@ -614,7 +614,7 @@ void Task_PokedexResultsScreen(u8 taskId) void sub_808CEF8(u8 taskId) { - if(sub_808E208(gPokedexView->unk62F, gPokedexView->unk634, gPokedexView->unk636)) + if (sub_808E208(gPokedexView->unk62F, gPokedexView->unk634, gPokedexView->unk636)) gTasks[taskId].func = Task_PokedexResultsScreen; } @@ -622,13 +622,13 @@ void Task_PokedexResultsScreenMenu(u8 taskId) { REG_BG0VOFS = gPokedexView->menuY; - if(gPokedexView->menuY != 0x60) + if (gPokedexView->menuY != 0x60) gPokedexView->menuY += 8; else { - if(gMain.newKeys & A_BUTTON) + if (gMain.newKeys & A_BUTTON) { - switch(gPokedexView->menuCursorPos) + switch (gPokedexView->menuCursorPos) { case 0: //BACK TO LIST default: @@ -662,18 +662,18 @@ void Task_PokedexResultsScreenMenu(u8 taskId) } //Exit menu when Start or B is pressed - if(gMain.newKeys & (START_BUTTON | B_BUTTON)) + if (gMain.newKeys & (START_BUTTON | B_BUTTON)) { gPokedexView->menuIsOpen = 0; gTasks[taskId].func = Task_PokedexResultsScreen; PlaySE(SE_SELECT); } - else if((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos) + else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gPokedexView->menuCursorPos) { gPokedexView->menuCursorPos--; PlaySE(SE_SELECT); } - else if((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 3) + else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gPokedexView->menuCursorPos <= 3) { gPokedexView->menuCursorPos++; PlaySE(SE_SELECT); @@ -683,7 +683,7 @@ void Task_PokedexResultsScreenMenu(u8 taskId) void sub_808D118(u8 taskId) { - if(gSprites[gPokedexView->unk626].pos1.x == 0x30 && + if (gSprites[gPokedexView->unk626].pos1.x == 0x30 && gSprites[gPokedexView->unk626].pos1.y == 0x38) { gPokedexView->unk64B = gPokedexView->unk64A; @@ -694,9 +694,9 @@ void sub_808D118(u8 taskId) void sub_808D198(u8 taskId) { - if(gTasks[gTasks[taskId].data[0]].isActive) + if (gTasks[gTasks[taskId].data[0]].isActive) { - if(gPokedexView->unk64A == 1 && + if (gPokedexView->unk64A == 1 && !sub_808F250(gTasks[taskId].data[0]) && sub_808E71C()) { @@ -711,12 +711,12 @@ void sub_808D198(u8 taskId) void Task_PokedexResultsScreenReturnToMainScreen(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { gPokedexView->unk62C = gPokedexView->unk62A; gPokedexView->selectedPokemon = gPokedexView->unk610; gPokedexView->dexMode = gPokedexView->unk614; - if(!IsNationalPokedexEnabled()) + if (!IsNationalPokedexEnabled()) gPokedexView->dexMode = DEX_MODE_HOENN; gPokedexView->dexOrder = gPokedexView->unk618; gTasks[taskId].func = Task_PokedexShowMainScreen; @@ -725,12 +725,12 @@ void Task_PokedexResultsScreenReturnToMainScreen(u8 taskId) void Task_PokedexResultsScreenExitPokedex(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { gPokedexView->unk62C = gPokedexView->unk62A; gPokedexView->selectedPokemon = gPokedexView->unk610; gPokedexView->dexMode = gPokedexView->unk614; - if(!IsNationalPokedexEnabled()) + if (!IsNationalPokedexEnabled()) gPokedexView->dexMode = DEX_MODE_HOENN; gPokedexView->dexOrder = gPokedexView->unk618; gTasks[taskId].func = Task_ClosePokedex; @@ -740,11 +740,11 @@ void Task_PokedexResultsScreenExitPokedex(u8 taskId) bool8 sub_808D344(u8 a) { - switch(gMain.state) + switch (gMain.state) { case 0: default: - if(gPaletteFade.active) + if (gPaletteFade.active) return 0; //_0808D39E SetVBlankCallback(NULL); @@ -755,12 +755,12 @@ bool8 sub_808D344(u8 a) LZ77UnCompVram(gUnknown_08E96738, (void *)(VRAM + 0x6800)); LZ77UnCompVram(gUnknown_08E9C6DC, (void *)(VRAM + 0x7800)); DmaClear16(3, VRAM + 0x6000, 0x500); - if(a == 0) + if (a == 0) LZ77UnCompVram(gUnknown_08E96888, (void *)(VRAM + 0x6500)); else LZ77UnCompVram(gUnknown_08E96994, (void *)(VRAM + 0x6500)); ResetPaletteFade(); - if(a == 0) + if (a == 0) gPokedexView->unk64C_1 = 0; else gPokedexView->unk64C_1 = 1; @@ -783,7 +783,7 @@ bool8 sub_808D344(u8 a) gMain.state++; break; case 3: - if(a == 0) + if (a == 0) SortPokedex(gPokedexView->dexMode, gPokedexView->dexOrder); sub_808E0CC(gPokedexView->selectedPokemon, 0xE); gPokedexView->menuIsOpen = 0; @@ -812,7 +812,7 @@ bool8 sub_808D344(u8 a) gMain.state++; break; case 6: - if(!gPaletteFade.active) + if (!gPaletteFade.active) { gMain.state = 0; return 1; @@ -825,9 +825,9 @@ bool8 sub_808D344(u8 a) void sub_808D640(void) { - if(gPokedexView->unk64C_1) + if (gPokedexView->unk64C_1) LoadPalette(gUnknown_0839F67C + 0x2, 1, 0xBE); - else if(!IsNationalPokedexEnabled()) + else if (!IsNationalPokedexEnabled()) LoadPalette(gPokedexMenu_Pal + 0x2, 1, 0xBE); else LoadPalette(gUnknown_0839F73C + 0x2, 1, 0xBE); @@ -840,7 +840,7 @@ void SortPokedex(u8 dexMode, u8 sortMode) gPokedexView->unk60C = 0; - switch(dexMode) + switch (dexMode) { default: case DEX_MODE_HOENN: @@ -848,7 +848,7 @@ void SortPokedex(u8 dexMode, u8 sortMode) vars[1] = 1; break; case DEX_MODE_NATIONAL: - if(IsNationalPokedexEnabled()) + if (IsNationalPokedexEnabled()) { vars[0] = 386; vars[1] = 0; @@ -861,19 +861,19 @@ void SortPokedex(u8 dexMode, u8 sortMode) break; } - switch(sortMode) + switch (sortMode) { case 0: { - if(vars[1]) + if (vars[1]) { - for(i = 0; i < vars[0]; i++) + for (i = 0; i < vars[0]; i++) { vars[2] = HoennToNationalOrder(i + 1); gPokedexView->unk0[i].dexNum = vars[2]; gPokedexView->unk0[i].seen = sub_8090D90(vars[2], 0); gPokedexView->unk0[i].owned = sub_8090D90(vars[2], 1); - if(gPokedexView->unk0[i].seen) + if (gPokedexView->unk0[i].seen) gPokedexView->unk60C = i + 1; } } @@ -883,18 +883,18 @@ void SortPokedex(u8 dexMode, u8 sortMode) s16 r5; r10 = r5 = i = 0; - for(i = 0; i < vars[0]; i++) + for (i = 0; i < vars[0]; i++) { vars[2] = i + 1; - if(sub_8090D90(vars[2], 0)) + if (sub_8090D90(vars[2], 0)) r10 = 1; - if(r10) + if (r10) { asm(""); //Needed to match for some reason gPokedexView->unk0[r5].dexNum = vars[2]; gPokedexView->unk0[r5].seen = sub_8090D90(vars[2], 0); gPokedexView->unk0[r5].owned = sub_8090D90(vars[2], 1); - if(gPokedexView->unk0[r5].seen) + if (gPokedexView->unk0[r5].seen) gPokedexView->unk60C = r5 + 1; r5++; } @@ -903,11 +903,11 @@ void SortPokedex(u8 dexMode, u8 sortMode) break; } case 1: - for(i = 0; i < 411; i++) + for (i = 0; i < 411; i++) { vars[2] = gPokedexOrder_Alphabetical[i]; - if(NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 0)) + if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 0)) { gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2]; gPokedexView->unk0[gPokedexView->unk60C].seen = 1; @@ -917,11 +917,11 @@ void SortPokedex(u8 dexMode, u8 sortMode) } break; case 2: - for(i = 385; i >= 0; i--) + for (i = 385; i >= 0; i--) { vars[2] = gPokedexOrder_Weight[i]; - if(NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1)) + if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1)) { gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2]; gPokedexView->unk0[gPokedexView->unk60C].seen = 1; @@ -931,11 +931,11 @@ void SortPokedex(u8 dexMode, u8 sortMode) } break; case 3: - for(i = 0; i < 386; i++) + for (i = 0; i < 386; i++) { vars[2] = gPokedexOrder_Weight[i]; - if(NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1)) + if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1)) { gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2]; gPokedexView->unk0[gPokedexView->unk60C].seen = 1; @@ -945,11 +945,11 @@ void SortPokedex(u8 dexMode, u8 sortMode) } break; case 4: - for(i = 385; i >=0; i--) + for (i = 385; i >=0; i--) { vars[2] = gPokedexOrder_Height[i]; - if(NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1)) + if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1)) { gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2]; gPokedexView->unk0[gPokedexView->unk60C].seen = 1; @@ -959,11 +959,11 @@ void SortPokedex(u8 dexMode, u8 sortMode) } break; case 5: - for(i = 0; i < 386; i++) + for (i = 0; i < 386; i++) { vars[2] = gPokedexOrder_Height[i]; - if(NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1)) + if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1)) { gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2]; gPokedexView->unk0[gPokedexView->unk60C].seen = 1; @@ -973,7 +973,7 @@ void SortPokedex(u8 dexMode, u8 sortMode) } break; } - for(i = gPokedexView->unk60C; i < 386; i++) + for (i = gPokedexView->unk60C; i < 386; i++) { gPokedexView->unk0[i].dexNum |= 0xFFFF; gPokedexView->unk0[i].seen = 0; @@ -983,7 +983,7 @@ void SortPokedex(u8 dexMode, u8 sortMode) void sub_808DBE8(u8 a, u16 b, u16 c) { - switch(a) + switch (a) { case 0: default: @@ -991,14 +991,14 @@ void sub_808DBE8(u8 a, u16 b, u16 c) u16 i; s16 _b = b - 5; - for(i = 0; i <= 10; i++) + for (i = 0; i <= 10; i++) { - if((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF) + if ((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF) sub_808E090(0x11, i * 2, c); else { sub_808E090(0x11, i * 2, c); - if(gPokedexView->unk0[_b].seen) + if (gPokedexView->unk0[_b].seen) { sub_808DEB0(_b, 0x12, i * 2, c); sub_808DF88(gPokedexView->unk0[_b].owned, 0x11, i * 2, c); @@ -1019,12 +1019,12 @@ void sub_808DBE8(u8 a, u16 b, u16 c) { s16 _b = b - 5; - if((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF) + if ((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF) sub_808E090(0x11, gPokedexView->unk630 * 2, c); else { sub_808E090(0x11, gPokedexView->unk630 * 2, c); - if(gPokedexView->unk0[_b].seen) + if (gPokedexView->unk0[_b].seen) { sub_808DEB0(_b, 0x12, gPokedexView->unk630 * 2, c); sub_808DF88(gPokedexView->unk0[_b].owned, 0x11, gPokedexView->unk630 * 2, c); @@ -1044,14 +1044,14 @@ void sub_808DBE8(u8 a, u16 b, u16 c) s16 _b = b + 5; u16 r2 = gPokedexView->unk630 + 10; - if(r2 > 15) + if (r2 > 15) r2 -= 16; - if((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF) + if ((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF) sub_808E090(0x11, r2 * 2, c); else { sub_808E090(0x11, r2 * 2, c); - if(gPokedexView->unk0[_b].seen) + if (gPokedexView->unk0[_b].seen) { sub_808DEB0(_b, 0x12, r2 * 2, c); sub_808DF88(gPokedexView->unk0[_b].owned, 0x11, r2 * 2, c); @@ -1075,7 +1075,7 @@ void sub_808DEB0(u16 a, u8 b, u8 c, u16 d) u16 unk[2]; u16 r7 = gPokedexView->unk0[a].dexNum; - if(gPokedexView->dexMode == DEX_MODE_HOENN) + if (gPokedexView->dexMode == DEX_MODE_HOENN) r7 = NationalToHoennOrder(r7); unk[0] = 0x3FC; unk[1] = 0x3FD; @@ -1092,7 +1092,7 @@ void sub_808DF88(u16 a, u8 b, u8 c, u16 d) { u16 unk[2]; - if(a) + if (a) { unk[0] = 0x3FE; unk[1] = 0x3FF; @@ -1114,18 +1114,18 @@ u8 sub_808DFE4(u16 a, u8 b, u8 c) u8 i; u32 species; - for(i = 0; i < 10; i++) + for (i = 0; i < 10; i++) text[i] = 0; text[i] = EOS; species = NationalPokedexNumToSpecies(a); - if(species) + if (species) { - for(i = 0; gSpeciesNames[species][i] != EOS && i < 10; i++) + for (i = 0; gSpeciesNames[species][i] != EOS && i < 10; i++) text[i] = gSpeciesNames[species][i]; } else { - for(i = 0; i < 10; i++) + for (i = 0; i < 10; i++) text[i] = 0xAE; } MenuPrint_PixelCoords(text, (b - 0x11) * 8 + 0xFC, c * 8, 0); @@ -1231,7 +1231,7 @@ void sub_808E090(u8 a, u8 b, u16 c) { u8 i; - for(i = 0; i < 12; i++) + for (i = 0; i < 12; i++) { *(u16 *)(VRAM + c * 0x800 + b * 64 + (a + i) * 2) = 0; *(u16 *)(VRAM + 0x40 + c * 0x800 + b * 64 + (a + i) * 2) = 0; @@ -1244,27 +1244,27 @@ void sub_808E0CC(u16 a, u16 b) u16 unk; u8 spriteId; - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) gPokedexView->unk61E[i] |= 0xFFFF; gPokedexView->unk626 = 0xFFFF; sub_808DBE8(0, a, b); REG_BG2VOFS = gPokedexView->unk62D; unk = sub_808E888(a - 1); - if(unk != 0xFFFF) + if (unk != 0xFFFF) { spriteId = sub_808E8C8(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_808EE28; gSprites[spriteId].data5 = -32; } unk = sub_808E888(a); - if(unk != 0xFFFF) + if (unk != 0xFFFF) { spriteId = sub_808E8C8(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_808EE28; gSprites[spriteId].data5 = 0; } unk = sub_808E888(a + 1); - if(unk != 0xFFFF) + if (unk != 0xFFFF) { spriteId = sub_808E8C8(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_808EE28; @@ -1279,15 +1279,15 @@ bool8 sub_808E208(u8 a, u8 b, u8 c) u16 i; u8 foo; - if(gPokedexView->unk62E) + if (gPokedexView->unk62E) { gPokedexView->unk62E--; - switch(a) + switch (a) { case 1: - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { - if(gPokedexView->unk61E[i] != 0xFFFF) + if (gPokedexView->unk61E[i] != 0xFFFF) gSprites[gPokedexView->unk61E[i]].data5 += b; } foo = 16 * (c - gPokedexView->unk62E) / c; @@ -1295,9 +1295,9 @@ bool8 sub_808E208(u8 a, u8 b, u8 c) gPokedexView->unk62C -= gPokedexView->unk628; break; case 2: - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { - if(gPokedexView->unk61E[i] != 0xFFFF) + if (gPokedexView->unk61E[i] != 0xFFFF) gSprites[gPokedexView->unk61E[i]].data5 -= b; } foo = 16 * (c - gPokedexView->unk62E) / c; @@ -1321,18 +1321,18 @@ void sub_808E398(u8 a, u16 b) u8 spriteId; gPokedexView->unk632 = gPokedexView->unk630; - switch(a) + switch (a) { case 1: { unk = sub_808E888(b - 1); - if(unk != 0xFFFF) + if (unk != 0xFFFF) { spriteId = sub_808E8C8(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_808EE28; gSprites[spriteId].data5 = 0xFFC0; } - if(gPokedexView->unk630 > 0) + if (gPokedexView->unk630 > 0) gPokedexView->unk630--; else gPokedexView->unk630 = 0xF; @@ -1341,13 +1341,13 @@ void sub_808E398(u8 a, u16 b) case 2: { unk = sub_808E888(b + 1); - if(unk != 0xFFFF) + if (unk != 0xFFFF) { spriteId = sub_808E8C8(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_808EE28; gSprites[spriteId].data5 = 0x40; } - if(gPokedexView->unk630 <= 0xE) + if (gPokedexView->unk630 <= 0xE) gPokedexView->unk630++; else gPokedexView->unk630 = 0; @@ -1362,24 +1362,24 @@ u16 sub_808E48C(u16 a, u16 b) u8 r3; u8 r5; u32 r10 = 0; - if(!(gMain.heldKeys & 0x40) || a == 0) + if (!(gMain.heldKeys & 0x40) || a == 0) { u8 i; u16 r6; //_0808E4B6 - if(gMain.heldKeys & 0x80) + if (gMain.heldKeys & 0x80) { - if(a < gPokedexView->unk60C - 1) + if (a < gPokedexView->unk60C - 1) goto _0808E5C4; } //_0808E4CE - if((gMain.newKeys & 0x20) && a != 0) + if ((gMain.newKeys & 0x20) && a != 0) { r6 = a; //_0808E4E0 - for(i = 0; i < 7; i++) + for (i = 0; i < 7; i++) { a = sub_8091818(1, a, 0, gPokedexView->unk60C - 1); } @@ -1391,11 +1391,11 @@ u16 sub_808E48C(u16 a, u16 b) goto _0808E5A2; } //_0808E53C - if(!(gMain.newKeys & 0x10) || a >= gPokedexView->unk60C - 1) + if (!(gMain.newKeys & 0x10) || a >= gPokedexView->unk60C - 1) goto _0808E5A2; r6 = a; - for(i = 0; i < 7; i++) + for (i = 0; i < 7; i++) { a = sub_8091818(0, a, 0, gPokedexView->unk60C - 1); } @@ -1407,7 +1407,7 @@ u16 sub_808E48C(u16 a, u16 b) goto _0808E5A2; _0808E5A2: - if(r10 != 0) + if (r10 != 0) goto _0808E628; gPokedexView->unk638 = r10; return a; @@ -1442,7 +1442,7 @@ u16 sub_808E48C(u16 a, u16 b) gPokedexView->unk62F = r10; gPokedexView->unk628 = r5; sub_808E208(gPokedexView->unk62F, gPokedexView->unk634, gPokedexView->unk636); - if(gPokedexView->unk638 <= 0xB) + if (gPokedexView->unk638 <= 0xB) gPokedexView->unk638++; return a; } @@ -1720,11 +1720,11 @@ void sub_808E6BC(void) { u16 i; - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { u16 spriteId = gPokedexView->unk61E[i]; - if(gSprites[spriteId].pos2.x == 0 && gSprites[spriteId].pos2.y == 0 && spriteId != 0xFFFF) + if (gSprites[spriteId].pos2.x == 0 && gSprites[spriteId].pos2.y == 0 && spriteId != 0xFFFF) gPokedexView->unk626 = spriteId; } } @@ -1734,21 +1734,21 @@ u8 sub_808E71C(void) u16 r2; u16 r4 = gPokedexView->selectedPokemon; - if((gMain.newKeys & DPAD_UP) && r4) + if ((gMain.newKeys & DPAD_UP) && r4) { r2 = r4; - while(r2 != 0) + while (r2 != 0) { r2 = sub_8091818(1, r2, 0, gPokedexView->unk60C - 1); - if(gPokedexView->unk0[r2].seen) + if (gPokedexView->unk0[r2].seen) { r4 = r2; break; } } - if(gPokedexView->selectedPokemon == r4) + if (gPokedexView->selectedPokemon == r4) return 0; else { @@ -1757,21 +1757,21 @@ u8 sub_808E71C(void) return 1; } } - else if((gMain.newKeys & DPAD_DOWN) && r4 < gPokedexView->unk60C - 1) + else if ((gMain.newKeys & DPAD_DOWN) && r4 < gPokedexView->unk60C - 1) { r2 = r4; - while(r2 < gPokedexView->unk60C - 1) + while (r2 < gPokedexView->unk60C - 1) { r2 = sub_8091818(0, r2, 0, gPokedexView->unk60C - 1); - if(gPokedexView->unk0[r2].seen) + if (gPokedexView->unk0[r2].seen) { r4 = r2; break; } } - if(gPokedexView->selectedPokemon == r4) + if (gPokedexView->selectedPokemon == r4) return 0; else { @@ -1787,9 +1787,9 @@ u8 sub_808E82C(void) { u16 i; - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { - if(gPokedexView->unk61E[i] != 0xFFFF) + if (gPokedexView->unk61E[i] != 0xFFFF) { DestroySprite(&gSprites[gPokedexView->unk61E[i]]); gPokedexView->unk61E[i] |= 0xFFFF; @@ -1800,9 +1800,9 @@ u8 sub_808E82C(void) u16 sub_808E888(u16 a1) { - if(a1 > 385 || gPokedexView->unk0[a1].dexNum == 0xFFFF) + if (a1 > 385 || gPokedexView->unk0[a1].dexNum == 0xFFFF) return 0xFFFF; - else if(gPokedexView->unk0[a1].seen) + else if (gPokedexView->unk0[a1].seen) return gPokedexView->unk0[a1].dexNum; else return 0; @@ -1812,9 +1812,9 @@ u32 sub_808E8C8(u16 a, u16 b, u16 c) { u8 i; - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { - if(gPokedexView->unk61E[i] == 0xFFFF) + if (gPokedexView->unk61E[i] == 0xFFFF) { u8 spriteId = sub_80918EC(a, (s16)b, (s16)c, i); @@ -1867,7 +1867,7 @@ void sub_808E978(u8 a) gSprites[spriteId].data0 = 0x1F; gSprites[spriteId].data1 = 0x80; - if(a == 0) + if (a == 0) { u32 _a; @@ -1880,14 +1880,14 @@ void sub_808E978(u8 a) spriteId = CreateSprite(&gSpriteTemplate_83A059C, 0x1C, 0x30, 1); r5 = gPokedexView->unk61A / 100; StartSpriteAnim(&gSprites[spriteId], r5); - if(r5 != 0) + if (r5 != 0) _a = 1; else gSprites[spriteId].invisible = 1; spriteId = CreateSprite(&gSpriteTemplate_83A059C, 0x22, 0x30, 1); r5 = (gPokedexView->unk61A % 100) / 10; - if(r5 != 0 || _a != 0) + if (r5 != 0 || _a != 0) StartSpriteAnim(&gSprites[spriteId], r5); else gSprites[spriteId].invisible = 1; @@ -1900,14 +1900,14 @@ void sub_808E978(u8 a) spriteId = CreateSprite(&gSpriteTemplate_83A059C, 0x1C, 0x50, 1); r5 = gPokedexView->unk61C / 100; StartSpriteAnim(&gSprites[spriteId], r5); - if(r5 != 0) + if (r5 != 0) _a = 1; else gSprites[spriteId].invisible = 1; spriteId = CreateSprite(&gSpriteTemplate_83A059C, 0x22, 0x50, 1); r5 = (gPokedexView->unk61C % 100) / 10; - if(r5 != 0 || _a != 0) + if (r5 != 0 || _a != 0) StartSpriteAnim(&gSprites[spriteId], r5); else gSprites[spriteId].invisible = 1; @@ -1932,7 +1932,7 @@ void nullsub_58(struct Sprite *sprite) void sub_808ED94(struct Sprite *sprite) { - if(gPokedexView->unk64A != 0) + if (gPokedexView->unk64A != 0) DestroySprite(sprite); } @@ -1943,15 +1943,15 @@ void sub_808EDB8(struct Sprite *sprite) sprite->oam.affineMode = 0; sprite->pos2.x = 0; sprite->pos2.y = 0; - if(sprite->pos1.x != 0x30 || sprite->pos1.y != 0x38) + if (sprite->pos1.x != 0x30 || sprite->pos1.y != 0x38) { - if(sprite->pos1.x > 0x30) + if (sprite->pos1.x > 0x30) sprite->pos1.x--; - if(sprite->pos1.x < 0x30) + if (sprite->pos1.x < 0x30) sprite->pos1.x++; - if(sprite->pos1.y > 0x38) + if (sprite->pos1.y > 0x38) sprite->pos1.y--; - if(sprite->pos1.y <0x38) + if (sprite->pos1.y <0x38) sprite->pos1.y++; } //_0808EE1C @@ -1963,7 +1963,7 @@ void sub_808EE28(struct Sprite *sprite) { u8 data1 = sprite->data1; - if(gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) + if (gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) { DestroySprite(sprite); gPokedexView->unk61E[data1] = 0xFFFF; @@ -1975,13 +1975,13 @@ void sub_808EE28(struct Sprite *sprite) sprite->pos2.y = gSineTable[(u8)sprite->data5] * 76 / 256; var = 0x10000 / gSineTable[sprite->data5 + 0x40]; - if((u32)var > 0xFFFF) + if ((u32)var > 0xFFFF) var = 0xFFFF; SetOamMatrix(sprite->data1 + 1, 0x100, 0, 0, var); sprite->oam.matrixNum = data1 + 1; //ToDo: clean up these inequalities - if((u16)(sprite->data5 + 0x3F) <= 0x7E) + if ((u16)(sprite->data5 + 0x3F) <= 0x7E) { sprite->invisible = 0; sprite->data0 = 1; @@ -1991,7 +1991,7 @@ void sub_808EE28(struct Sprite *sprite) sprite->invisible = 1; } //_0808EEF8 - if((u16)(sprite->data5 + 0x3F) > 0x7E && sprite->data0 != 0) + if ((u16)(sprite->data5 + 0x3F) > 0x7E && sprite->data0 != 0) { DestroySprite(sprite); gPokedexView->unk61E[data1] = 0xFFFF; @@ -2002,7 +2002,7 @@ void sub_808EE28(struct Sprite *sprite) void sub_808EF38(struct Sprite *sprite) { - if(gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) + if (gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) DestroySprite(sprite); else sprite->pos2.y = gPokedexView->selectedPokemon * 120 / (gPokedexView->unk60C - 1); @@ -2010,15 +2010,15 @@ void sub_808EF38(struct Sprite *sprite) void sub_808EF8C(struct Sprite *sprite) { - if(gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) + if (gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) DestroySprite(sprite); else { u8 r0; - if(sprite->data1 != 0) + if (sprite->data1 != 0) { - if(gPokedexView->selectedPokemon == gPokedexView->unk60C - 1) + if (gPokedexView->selectedPokemon == gPokedexView->unk60C - 1) sprite->invisible = 1; else sprite->invisible = 0; @@ -2026,7 +2026,7 @@ void sub_808EF8C(struct Sprite *sprite) } else { - if(gPokedexView->selectedPokemon == 0) + if (gPokedexView->selectedPokemon == 0) sprite->invisible = 1; else sprite->invisible = 0; @@ -2034,7 +2034,7 @@ void sub_808EF8C(struct Sprite *sprite) } sprite->pos2.y = gSineTable[r0] / 64; sprite->data2 = sprite->data2 + 8; - if(gPokedexView->menuIsOpen == 0 && gPokedexView->menuY == 0 && sprite->invisible == 0) + if (gPokedexView->menuIsOpen == 0 && gPokedexView->menuY == 0 && sprite->invisible == 0) sprite->invisible = 0; else sprite->invisible = 1; @@ -2043,14 +2043,14 @@ void sub_808EF8C(struct Sprite *sprite) void sub_808F08C(struct Sprite *sprite) { - if(gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) + if (gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) DestroySprite(sprite); } #ifdef NONMATCHING void sub_808F0B4(struct Sprite *sprite) { - if(gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) + if (gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) DestroySprite(sprite); else { @@ -2168,13 +2168,13 @@ _0808F164: .4byte gSineTable\n\ void sub_808F168(struct Sprite *sprite) { - if(gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) + if (gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) DestroySprite(sprite); else { u16 r1 = gPokedexView->unk64A == 0 ? 0x50 : 0x60; - if(gPokedexView->menuIsOpen != 0 && gPokedexView->menuY == r1) + if (gPokedexView->menuIsOpen != 0 && gPokedexView->menuY == r1) { sprite->invisible = 0; sprite->pos2.y = gPokedexView->menuCursorPos * 16; @@ -2202,7 +2202,7 @@ u8 sub_808F210(struct PokedexListItem *item, u8 b) bool8 sub_808F250(u8 taskId) { - if(gTasks[taskId].data[0] == 0 && gTasks[taskId].func == Task_PageScreenProcessInput) + if (gTasks[taskId].data[0] == 0 && gTasks[taskId].func == Task_PageScreenProcessInput) return 0; else return 1; @@ -2220,11 +2220,11 @@ u8 sub_808F284(struct PokedexListItem *item, u8 b) void Task_InitPageScreenMultistep(u8 taskId) { - switch(gMain.state) + switch (gMain.state) { case 0: default: - if(!gPaletteFade.active) + if (!gPaletteFade.active) { u16 r2; @@ -2233,9 +2233,9 @@ void Task_InitPageScreenMultistep(u8 taskId) gUnknown_03005CEC = gMain.vblankCallback; SetVBlankCallback(NULL); r2 = 0; - if(gTasks[taskId].data[1] != 0) + if (gTasks[taskId].data[1] != 0) r2 += 0x1000; - if(gTasks[taskId].data[2] != 0) + if (gTasks[taskId].data[2] != 0) r2 |= 0x200; sub_8091060(r2); gMain.state = 1; @@ -2259,7 +2259,7 @@ void Task_InitPageScreenMultistep(u8 taskId) gMain.state++; break; case 4: - if(gPokedexView->dexMode == DEX_MODE_HOENN) + if (gPokedexView->dexMode == DEX_MODE_HOENN) sub_8091154(NationalToHoennOrder(gUnknown_0202FFBC->dexNum), 0xD, 3); else sub_8091154(gUnknown_0202FFBC->dexNum, 0xD, 3); @@ -2268,7 +2268,7 @@ void Task_InitPageScreenMultistep(u8 taskId) MenuPrint(gDexText_UnknownPoke, 11, 5); MenuPrint(gDexText_UnknownHeight, 16, 7); MenuPrint(gDexText_UnknownWeight, 16, 9); - if(gUnknown_0202FFBC->owned) + if (gUnknown_0202FFBC->owned) { sub_8091304(gPokedexEntries[gUnknown_0202FFBC->dexNum].categoryName, 11, 5); sub_8091458(gPokedexEntries[gUnknown_0202FFBC->dexNum].height, 16, 7); @@ -2285,7 +2285,7 @@ void Task_InitPageScreenMultistep(u8 taskId) gMain.state++; break; case 5: - if(gTasks[taskId].data[1] == 0) + if (gTasks[taskId].data[1] == 0) { //_0808F540 gTasks[taskId].data[4] = (u16)sub_80918EC(gUnknown_0202FFBC->dexNum, 0x30, 0x38, 0); @@ -2297,9 +2297,9 @@ void Task_InitPageScreenMultistep(u8 taskId) { u32 r3 = 0; - if(gTasks[taskId].data[2] != 0) + if (gTasks[taskId].data[2] != 0) r3 = 0x14; - if(gTasks[taskId].data[1] != 0) + if (gTasks[taskId].data[1] != 0) { r3 |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 0x10)); } @@ -2318,10 +2318,10 @@ void Task_InitPageScreenMultistep(u8 taskId) gMain.state++; break; case 8: - if(!gPaletteFade.active) + if (!gPaletteFade.active) { gMain.state++; - if(gTasks[taskId].data[3] == 0) + if (gTasks[taskId].data[3] == 0) { StopCryAndClearCrySongs(); PlayCry2(NationalPokedexNumToSpecies(gUnknown_0202FFBC->dexNum), 0, 0x7D, 0xA); @@ -2331,7 +2331,7 @@ void Task_InitPageScreenMultistep(u8 taskId) } break; case 9: - if(!IsCryPlayingOrClearCrySongs()) + if (!IsCryPlayingOrClearCrySongs()) gMain.state++; break; case 10: @@ -2408,13 +2408,13 @@ void Task_PageScreenProcessInput(u8 taskId) void sub_808F888(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) gTasks[taskId].func = Task_InitPageScreenMultistep; } void Task_ClosePageScreen(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) DestroyTask(taskId); } @@ -2453,15 +2453,15 @@ void Task_InitAreaScreenMultistep(u8 taskId) void Task_AreaScreenProcessInput(u8 taskId) { - if(gPokedexView->unk64F != 0) + if (gPokedexView->unk64F != 0) gTasks[taskId].func = sub_808FA00; } void sub_808FA00(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { - switch(gPokedexView->unk64F) + switch (gPokedexView->unk64F) { case 1: default: @@ -2476,11 +2476,11 @@ void sub_808FA00(u8 taskId) void Task_InitCryScreenMultistep(u8 taskId) { - switch(gMain.state) + switch (gMain.state) { case 0: default: - if(!gPaletteFade.active) + if (!gPaletteFade.active) { m4aMPlayStop(&gMPlay_BGM); gPokedexView->unk64A = 6; @@ -2529,7 +2529,7 @@ void Task_InitCryScreenMultistep(u8 taskId) sp8.unk3 = 8; sp8.unk5 = 0x1E; sp8.unk4 = 0xC; - if(sub_8119E3C(&sp8, 0) != 0) + if (sub_8119E3C(&sp8, 0) != 0) { gMain.state++; gUnknown_03005E98 = 0; @@ -2545,7 +2545,7 @@ void Task_InitCryScreenMultistep(u8 taskId) sp10.unk3 = 9; sp10.unk4 = 0x12; sp10.unk5 = 3; - if(ShowPokedexCryScreen(&sp10, 1) != 0) + if (ShowPokedexCryScreen(&sp10, 1) != 0) { gMain.state++; } @@ -2627,10 +2627,10 @@ void Task_CryScreenProcessInput(u8 taskId) void sub_808FFBC(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { DestroyCryMeterNeedleSprite(); - switch(gPokedexView->unk64F) + switch (gPokedexView->unk64F) { default: case 1: @@ -2649,7 +2649,7 @@ void sub_8090040(u8 a) { u16 unk; - if(a != 0) + if (a != 0) unk = 0x392; else unk = 0x2AF; @@ -2660,11 +2660,11 @@ void Task_InitSizeScreenMultistep(u8 taskId) { u8 spriteId; - switch(gMain.state) + switch (gMain.state) { default: case 0: - if(!gPaletteFade.active) + if (!gPaletteFade.active) { gPokedexView->unk64A = 7; gUnknown_03005CEC = gMain.vblankCallback; @@ -2736,7 +2736,7 @@ void Task_InitSizeScreenMultistep(u8 taskId) gMain.state++; break; case 9: - if(!gPaletteFade.active) + if (!gPaletteFade.active) { gPokedexView->unk64F = 0; gMain.state = 0; @@ -2748,7 +2748,7 @@ void Task_InitSizeScreenMultistep(u8 taskId) void Task_SizeScreenProcessInput(u8 taskId) { - if(gMain.newKeys & B_BUTTON) + if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); gPokedexView->unk64F = 1; @@ -2756,7 +2756,7 @@ void Task_SizeScreenProcessInput(u8 taskId) PlaySE(SE_PC_OFF); } //_08090430 - else if((gMain.newKeys & DPAD_LEFT) + else if ((gMain.newKeys & DPAD_LEFT) || ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); @@ -2768,9 +2768,9 @@ void Task_SizeScreenProcessInput(u8 taskId) void sub_8090498(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { - switch(gPokedexView->unk64F) + switch (gPokedexView->unk64F) { default: case 1: @@ -2803,15 +2803,15 @@ void sub_8090584(u8 a, u16 b) u32 r6; register u8 r7; - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { r7 = i * 5 + 1; r6 = 0x4000; - if(i == a) + if (i == a) r6 = 0x2000; - for(j = 0; j < 5; j++) + for (j = 0; j < 5; j++) { u32 r0 = b * 0x800 + (r7 + j) * 2; u8 *ptr; @@ -2823,7 +2823,7 @@ void sub_8090584(u8 a, u16 b) } } r6 = 0x4000; - for(j = 0; j < 5; j++) + for (j = 0; j < 5; j++) { u32 r0 = b * 0x800 + j * 2; u8 *ptr; @@ -2947,17 +2947,17 @@ void sub_8090644(u8 a, u16 b) u8 i; u8 j; - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { u8 r8 = i * 5 + 1; u32 r5; - if(i == a || i == 0) + if (i == a || i == 0) r5 = 0x2000; - else if(a != 0) + else if (a != 0) r5 = 0x4000; - for(j = 0; j < 5; j++) + for (j = 0; j < 5; j++) { u16 (*vramData)[0x400]; @@ -2968,7 +2968,7 @@ void sub_8090644(u8 a, u16 b) } } - for(j = 0; j < 5; j++) + for (j = 0; j < 5; j++) { u16 (*vramData)[0x400]; @@ -3108,11 +3108,11 @@ void sub_8090750(u8 taskId) { u16 dexNum = gTasks[taskId].data[1]; - switch(gTasks[taskId].data[0]) + switch (gTasks[taskId].data[0]) { default: case 0: - if(!gPaletteFade.active) + if (!gPaletteFade.active) { gUnknown_03005CEC = gMain.vblankCallback; SetVBlankCallback(NULL); @@ -3126,7 +3126,7 @@ void sub_8090750(u8 taskId) LZ77UnCompVram(gPokedexMenu_Gfx, (void *)(VRAM + 0x4000)); LZ77UnCompVram(gUnknown_08E96BD4, (void *)(VRAM + 0x7800)); - for(i = 0; i < 0x280; i++) + for (i = 0; i < 0x280; i++) ((u16 *)(VRAM + 0x7800))[i] += 0x2000; sub_8091738(gTasks[taskId].data[1], 2, 0x3FC); ResetPaletteFade(); @@ -3142,7 +3142,7 @@ void sub_8090750(u8 taskId) break; case 3: sub_8072BD8(gDexText_RegisterComplete, 2, 0, 0xD0); - if(!IsNationalPokedexEnabled()) + if (!IsNationalPokedexEnabled()) sub_8091154(NationalToHoennOrder(dexNum), 13, 3); else sub_8091154(dexNum, 13, 3); @@ -3177,7 +3177,7 @@ void sub_8090750(u8 taskId) gTasks[taskId].data[0]++; break; case 6: - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayCry1(NationalPokedexNumToSpecies(dexNum), 0); gTasks[taskId].data[2] = 0; diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 69ae03767..87d95e1fa 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -133,7 +133,8 @@ u8 sub_803C434(u8 a1) } #else __attribute__((naked)) -u8 sub_803C434(u8 a1) { +u8 sub_803C434(u8 a1) +{ asm(".syntax unified\n\ push {r4-r6,lr}\n\ lsls r0, 24\n\ diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 1c6b6accb..92743b729 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -61,9 +61,9 @@ static u8 TranslateBigMonSizeTableIndex(u16 a) { u8 i; - for(i = 1; i < 15; i++) + for (i = 1; i < 15; i++) { - if(a < sBigMonSizeTable[i].unk4) + if (a < sBigMonSizeTable[i].unk4) return i - 1; } return i; @@ -99,7 +99,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size) static u8 CompareMonSize(u16 species, u16 *sizeRecord) { - if(gScriptResult == 0xFF) + if (gScriptResult == 0xFF) { return 0; } @@ -108,7 +108,7 @@ static u8 CompareMonSize(u16 species, u16 *sizeRecord) struct Pokemon *pkmn = &gPlayerParty[gScriptResult]; // UB: Too few arguments for function 'GetMonData' - if(GetMonData(pkmn, MON_DATA_IS_EGG) == TRUE || GetMonData(pkmn, MON_DATA_SPECIES) != species) + if (GetMonData(pkmn, MON_DATA_IS_EGG) == TRUE || GetMonData(pkmn, MON_DATA_SPECIES) != species) { return 1; } @@ -122,7 +122,7 @@ static u8 CompareMonSize(u16 species, u16 *sizeRecord) newSize = GetMonSize(species, sizeParams); oldSize = GetMonSize(species, *sizeRecord); FormatMonSizeRecord(gStringVar2, newSize); - if(newSize <= oldSize) + if (newSize <= oldSize) { return 2; } @@ -142,7 +142,7 @@ static void GetMonSizeRecordInfo(u16 species, u16 *sizeRecord) FormatMonSizeRecord(gStringVar3, size); StringCopy(gStringVar1, gSpeciesNames[species]); - if(*sizeRecord == 0x8100) + if (*sizeRecord == 0x8100) StringCopy(gStringVar2, gOtherText_Marco); else StringCopy(gStringVar2, gSaveBlock2.playerName); @@ -193,20 +193,20 @@ void GiveGiftRibbonToParty(u8 index, u8 ribbonId) u8 data = 1; u8 arr[] = { 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E }; - if(index < 11 && ribbonId < 65) + if (index < 11 && ribbonId < 65) { gSaveBlock1.giftRibbons[index] = ribbonId; - for(i = 0; i < 6; i++) + for (i = 0; i < 6; i++) { struct Pokemon *pkmn = &gPlayerParty[i]; - if(GetMonData(pkmn, MON_DATA_SPECIES) != 0 && GetMonData(pkmn, MON_DATA_SANITY_BIT3) == 0) + if (GetMonData(pkmn, MON_DATA_SPECIES) != 0 && GetMonData(pkmn, MON_DATA_SANITY_BIT3) == 0) { SetMonData(pkmn, arr[index], &data); gotRibbon = TRUE; } } - if(gotRibbon) + if (gotRibbon) FlagSet(SYS_RIBBON_GET); } } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 7bf9ef078..5f96512f0 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -90,7 +90,8 @@ void PokemonSummaryScreen_PrintEggTrainerMemo(struct Pokemon *mon, u8 left, u8 t MenuPrint(gOtherText_EggDayCare, left, top); } -void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *pokemon, u8 left, u8 top) { +void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *pokemon, u8 left, u8 top) +{ u8 locationMet; u8 gameMet; u8 *ptr = gStringVar4; @@ -98,16 +99,19 @@ void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *pokemon, u8 left, u8 ptr = sub_80A1E9C(ptr, gNatureNames[nature], 14); - if (nature != NATURE_BOLD && nature != NATURE_GENTLE) { + if (nature != NATURE_BOLD && nature != NATURE_GENTLE) + { ptr = StringCopy(ptr, gOtherText_Terminator4); } ptr = StringCopy(ptr, gOtherText_Nature); - if (PokemonSummaryScreen_CheckOT(pokemon) == TRUE) { + if (PokemonSummaryScreen_CheckOT(pokemon) == TRUE) + { locationMet = GetMonData(pokemon, MON_DATA_MET_LOCATION); - if (GetMonData(pokemon, MON_DATA_MET_LEVEL) == 0) { + if (GetMonData(pokemon, MON_DATA_MET_LEVEL) == 0) + { ptr = PokemonSummaryScreen_CopyPokemonLevel(ptr, 5); *ptr = CHAR_NEWLINE; ptr++; @@ -115,12 +119,16 @@ void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *pokemon, u8 left, u8 CopyLocationName(gStringVar1, locationMet); ptr = sub_80A1E9C(ptr, gStringVar1, 14); StringCopy(ptr, gOtherText_Egg2); - } else if (locationMet >= 88) { + } + else if (locationMet >= 88) + { *ptr = CHAR_NEWLINE; ptr++; StringCopy(ptr, gOtherText_ObtainedInTrade); - } else { + } + else + { u8 levelMet = GetMonData(pokemon, MON_DATA_MET_LEVEL); ptr = PokemonSummaryScreen_CopyPokemonLevel(ptr, levelMet); @@ -131,17 +139,23 @@ void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *pokemon, u8 left, u8 ptr = sub_80A1E9C(ptr, gStringVar1, 14); StringCopy(ptr, gOtherText_Met); } - } else { + } + else + { gameMet = GetMonData(pokemon, MON_DATA_MET_GAME); - if (!(gameMet == VERSION_RUBY || gameMet == VERSION_SAPPHIRE || gameMet == VERSION_EMERALD)) { + if (!(gameMet == VERSION_RUBY || gameMet == VERSION_SAPPHIRE || gameMet == VERSION_EMERALD)) + { *ptr = CHAR_NEWLINE; ptr++; StringCopy(ptr, gOtherText_ObtainedInTrade); - } else { + } + else + { locationMet = GetMonData(pokemon, MON_DATA_MET_LOCATION); - if (locationMet == 0xFF) { + if (locationMet == 0xFF) + { u8 levelMet = GetMonData(pokemon, MON_DATA_MET_LEVEL); ptr = PokemonSummaryScreen_CopyPokemonLevel(ptr, levelMet); @@ -149,12 +163,16 @@ void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *pokemon, u8 left, u8 ptr++; StringCopy(ptr, gOtherText_FatefulEncounter); - } else if (locationMet >= 88) { + } + else if (locationMet >= 88) + { *ptr = CHAR_NEWLINE; ptr++; StringCopy(ptr, gOtherText_ObtainedInTrade); - } else { + } + else + { u8 levelMet = GetMonData(pokemon, MON_DATA_MET_LEVEL); ptr = PokemonSummaryScreen_CopyPokemonLevel(ptr, levelMet); diff --git a/src/record_mixing.c b/src/record_mixing.c index 554f360fa..7263bd323 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -71,7 +71,7 @@ void sub_80B92AC(void) memcpy(unk_2018000.filler10AC, gUnknown_083D0280, 0x78); memcpy(unk_2018000.filler1124, gUnknown_083D0284, 0xA4); - if(GetMultiplayerId() == 0) + if (GetMultiplayerId() == 0) unk_2018000.filler11C8[0] = sub_8126338(); } #else @@ -199,7 +199,7 @@ void sub_80B93B0(u32 a) void sub_80B9450(u8 taskId) { gTasks[taskId].data[0]++; - if(gTasks[taskId].data[0] == 50) + if (gTasks[taskId].data[0] == 50) { PlaySE(SE_W213); gTasks[taskId].data[0] = 0; @@ -212,7 +212,7 @@ void sub_80B9484(u8 taskId) { s16 *taskData = gTasks[taskId].data; - switch(taskData[TD_STATE]) + switch (taskData[TD_STATE]) { case 0: sub_8007270(gSpecialVar_0x8005); @@ -225,7 +225,7 @@ void sub_80B9484(u8 taskId) taskData[15] = CreateTask(sub_80B9450, 0x51); break; case 1: - if(!gTasks[taskData[10]].isActive) + if (!gTasks[taskData[10]].isActive) { taskData[TD_STATE] = 2; FlagSet(SYS_MIX_RECORD); @@ -239,7 +239,7 @@ void sub_80B9484(u8 taskId) PlaySE(SE_W226); break; case 3: - if(!gTasks[taskData[10]].isActive) + if (!gTasks[taskData[10]].isActive) { taskData[TD_STATE] = 4; taskData[10] = sub_8083664(); @@ -250,11 +250,11 @@ void sub_80B9484(u8 taskId) break; case 4: taskData[8]++; - if(taskData[8] > 60) + if (taskData[8] > 60) taskData[TD_STATE] = 5; break; case 5: - if(!gTasks[taskData[10]].isActive) + if (!gTasks[taskData[10]].isActive) { sub_8055588(); MenuZeroFillScreen(); @@ -269,7 +269,7 @@ void sub_80B95F0(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch(task->data[TD_STATE]) + switch (task->data[TD_STATE]) { case 0: sub_80B9A78(); @@ -281,7 +281,7 @@ void sub_80B95F0(u8 taskId) break; case 100: task->data[12]++; - if(task->data[12] > 20) + if (task->data[12] > 20) { task->data[12] = 0; task->data[TD_STATE] = 101; @@ -291,9 +291,9 @@ void sub_80B95F0(u8 taskId) { u8 players = GetLinkPlayerCount_2(); - if(IsLinkMaster() == 1) + if (IsLinkMaster() == 1) { - if(players == sub_800820C()) + if (players == sub_800820C()) { PlaySE(0x15); task->data[TD_STATE] = 201; @@ -308,9 +308,9 @@ void sub_80B95F0(u8 taskId) break; } case 201: - if(sub_800820C() == GetLinkPlayerCount_2()) + if (sub_800820C() == GetLinkPlayerCount_2()) { - if(++task->data[12] > GetLinkPlayerCount_2() * 30) + if (++task->data[12] > GetLinkPlayerCount_2() * 30) { sub_8007F4C(); task->data[TD_STATE] = 1; @@ -318,19 +318,19 @@ void sub_80B95F0(u8 taskId) } break; case 301: - if(sub_800820C() == GetLinkPlayerCount_2()) + if (sub_800820C() == GetLinkPlayerCount_2()) task->data[TD_STATE] = 1; break; case 400: task->data[12]++; - if(task->data[12] > 20) + if (task->data[12] > 20) { task->data[TD_STATE] = 1; task->data[12] = 0; } break; case 1: - if(gReceivedRemoteLinkPlayers) + if (gReceivedRemoteLinkPlayers) { ConvertIntToDecimalStringN(gStringVar1, GetMultiplayerId_(), 2, 2); task->data[TD_STATE] = 5; @@ -354,7 +354,7 @@ void sub_80B95F0(u8 taskId) } case 5: task->data[10]++; - if(task->data[10] > 60) + if (task->data[10] > 60) { task->data[10] = 0; task->data[TD_STATE] = 2; @@ -367,7 +367,7 @@ void sub_80B97DC(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch(task->data[TD_STATE]) + switch (task->data[TD_STATE]) { case 0: //Copy record data to send buffer { @@ -378,7 +378,7 @@ void sub_80B97DC(u8 taskId) break; } case 1: - if(GetMultiplayerId() == 0) + if (GetMultiplayerId() == 0) sub_8007E9C(1); task->data[TD_STATE]++; break; @@ -386,13 +386,13 @@ void sub_80B97DC(u8 taskId) break; case 3: task->data[4]++; - if((u16)task->data[4] == 24) + if ((u16)task->data[4] == 24) task->data[TD_STATE]++; else task->data[TD_STATE] = 0; break; case 4: - if(!gTasks[task->data[10]].isActive) + if (!gTasks[task->data[10]].isActive) task->func = sub_80B9A1C; } } @@ -403,30 +403,30 @@ void Task_CopyRecvBuffer(u8 taskId) s32 recvStatus = GetBlockReceivedStatus(); u32 sp8 = 0; - if(recvStatus == sub_8008198()) + if (recvStatus == sub_8008198()) { u8 player; - for(player = 0; player < GetLinkPlayerCount(); player++) + for (player = 0; player < GetLinkPlayerCount(); player++) { //_080B98D4 u8 *ptr; void *src; u8 *dst; - if((recvStatus >> player) & 1) + if ((recvStatus >> player) & 1) { ptr = LoadPtrFromTaskData(&task->data[5]); dst = ptr + task->data[player + 1] * BUFFER_CHUNK_SIZE + player * sizeof(struct PlayerRecords); src = GetPlayerRecvBuffer(player); - if((u32)(task->data[player + 1] + 1) * BUFFER_CHUNK_SIZE > sizeof(struct PlayerRecords)) + if ((u32)(task->data[player + 1] + 1) * BUFFER_CHUNK_SIZE > sizeof(struct PlayerRecords)) memcpy(dst, src, sizeof(struct PlayerRecords) - task->data[player + 1] * BUFFER_CHUNK_SIZE); else memcpy(dst, src, BUFFER_CHUNK_SIZE); //_080B993C ResetBlockReceivedFlag(player); task->data[player + 1]++; - if((u16)task->data[player + 1] == 0x18) + if ((u16)task->data[player + 1] == 0x18) sp8 = (u8)(sp8 + 1); } } @@ -434,7 +434,7 @@ void Task_CopyRecvBuffer(u8 taskId) gTasks[task->data[0]].data[0]++; } //_080B998A - if(sp8 == GetLinkPlayerCount()) + if (sp8 == GetLinkPlayerCount()) DestroyTask(taskId); } @@ -442,7 +442,7 @@ void sub_80B99B4(u8 taskId) { struct Task *task = &gTasks[taskId]; - if(!gTasks[task->data[10]].isActive) + if (!gTasks[task->data[10]].isActive) DestroyTask(taskId); } @@ -451,7 +451,7 @@ void sub_80B99E8(u8 taskId) struct Task *task = &gTasks[taskId]; task->func = sub_80B99B4; - if(gUnknown_03000718 == 1) + if (gUnknown_03000718 == 1) sub_80B93B0(task->data[5]); } @@ -493,20 +493,20 @@ void sub_80B9A88(u8 *a) u32 id; u32 players = GetLinkPlayerCount(); - switch(players) + switch (players) { case 2: - for(i = 0; i < 2; i++) + for (i = 0; i < 2; i++) a[i] = gUnknown_083D0288[i]; break; case 3: id = GetLinkPlayerTrainerId(0) % 2; - for(i = 0; i < 3; i++) + for (i = 0; i < 3; i++) a[i] = gUnknown_083D028A[id][i]; break; case 4: id = GetLinkPlayerTrainerId(0) % 9; - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) a[i] = gUnknown_083D0290[id][i]; break; default: @@ -624,7 +624,7 @@ u8 sub_80B9C4C(u8 *a) int i; u8 r2 = 0; - for(i = 0; i < 0x100; i++) + for (i = 0; i < 0x100; i++) r2 += a[i]; return r2; } @@ -669,7 +669,7 @@ extern void sub_80B9C6C(void *a, u32 b, u8 c, void *d) s.unk4C = 12; - while(r3 < 4) + while (r3 < 4) { s.unk4[r3] |= 0xFF; @@ -684,18 +684,18 @@ extern void sub_80B9C6C(void *a, u32 b, u8 c, void *d) s.unk50 = r8 << 16; s.unk48 = s.unk30 * s.unk34; - if(s.unk3C < r8) + if (s.unk3C < r8) { do //_080B9D00 { u32 *r6 = (u32 *)(s.unk2C + s.unk30 * r3); - if(r6[0x1C] != 0 && r6[0x1C] > 0) + if (r6[0x1C] != 0 && r6[0x1C] > 0) { } //_080B9D3C } - while(r3 < r8); + while (r3 < r8); } //_080B9D46 } diff --git a/src/rom4.c b/src/rom4.c index fe5b7cb45..6946cec03 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -1572,12 +1572,12 @@ void sub_8054BA8(void) addr = (void *)VRAM; size = 0x18000; - while(1) + while (1) { DmaFill16(3, 0, addr, 0x1000); addr += 0x1000; size -= 0x1000; - if(size <= 0x1000) + if (size <= 0x1000) { DmaFill16(3, 0, addr, size); break; diff --git a/src/rom_800D42C.c b/src/rom_800D42C.c index e9c816818..f41aa560a 100644 --- a/src/rom_800D42C.c +++ b/src/rom_800D42C.c @@ -26,42 +26,50 @@ extern u8 BattleText_Tie[]; #define PRINT_MESSAGE_LEFT(text, tileDataStartOffset) PRINT_MESSAGE(text, tileDataStartOffset, LEFT_MESSAGE_X) #define PRINT_MESSAGE_RIGHT(text, tileDataStartOffset) PRINT_MESSAGE(text, tileDataStartOffset, RIGHT_MESSAGE_X) -void sub_800DC24(void) { +void sub_800DC24(void) +{ - if (gUnknown_02024D26 == 3) { + if (gUnknown_02024D26 == 3) + { PRINT_MESSAGE(BattleText_Tie, 160, CENTER_MESSAGE_X); return; } - if (gBattleTypeFlags & BATTLE_TYPE_40) { + if (gBattleTypeFlags & BATTLE_TYPE_40) + { // Double battle? - if (gUnknown_02024D26 == 1) { + if (gUnknown_02024D26 == 1) + { // lp_field_18 = player position? - switch (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18) { - case 0: - case 2: PRINT_MESSAGE_LEFT(BattleText_Win, 160); - PRINT_MESSAGE_RIGHT(BattleText_Loss, 168); - return; - - case 1: - case 3: PRINT_MESSAGE_RIGHT(BattleText_Win, 160) - PRINT_MESSAGE_LEFT(BattleText_Loss, 168) - return; + switch (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18) + { + case 0: + case 2: PRINT_MESSAGE_LEFT(BattleText_Win, 160); + PRINT_MESSAGE_RIGHT(BattleText_Loss, 168); + return; + + case 1: + case 3: PRINT_MESSAGE_RIGHT(BattleText_Win, 160) + PRINT_MESSAGE_LEFT(BattleText_Loss, 168) + return; } - } else { - - switch (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18) { - case 1: - case 3: PRINT_MESSAGE_LEFT(BattleText_Win, 160); - PRINT_MESSAGE_RIGHT(BattleText_Loss, 168); - return; - - case 0: - case 2: PRINT_MESSAGE_RIGHT(BattleText_Win, 160); - PRINT_MESSAGE_LEFT(BattleText_Loss, 168); - return; + } + else + { + + switch (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18) + { + case 1: + case 3: PRINT_MESSAGE_LEFT(BattleText_Win, 160); + PRINT_MESSAGE_RIGHT(BattleText_Loss, 168); + return; + + case 0: + case 2: PRINT_MESSAGE_RIGHT(BattleText_Win, 160); + PRINT_MESSAGE_LEFT(BattleText_Loss, 168); + return; } } @@ -69,19 +77,28 @@ void sub_800DC24(void) { } - if (gUnknown_02024D26 == 1) { - if (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18 != 0) { + if (gUnknown_02024D26 == 1) + { + if (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18 != 0) + { PRINT_MESSAGE_RIGHT(BattleText_Win, 160); PRINT_MESSAGE_LEFT(BattleText_Loss, 168); - } else { + } + else + { PRINT_MESSAGE_LEFT(BattleText_Win, 160); PRINT_MESSAGE_RIGHT(BattleText_Loss, 168); } - } else { - if (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18 != 0) { + } + else + { + if (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18 != 0) + { PRINT_MESSAGE_LEFT(BattleText_Win, 160); PRINT_MESSAGE_RIGHT(BattleText_Loss, 168); - } else { + } + else + { PRINT_MESSAGE_RIGHT(BattleText_Win, 160); PRINT_MESSAGE_LEFT(BattleText_Loss, 168); } diff --git a/src/rom_8080874.c b/src/rom_8080874.c index 29aeac97b..261ed46c9 100644 --- a/src/rom_8080874.c +++ b/src/rom_8080874.c @@ -21,65 +21,77 @@ extern void sub_8053E90(void); extern u8 sub_810CDB8(u8, u8); extern int sub_8080E70(void); -void palette_bg_fill_white (void) { - u32 source_color = 0x7fff7fff; - CpuFastSet(&source_color, gPlttBufferFaded, 0x100 | (1 << 24)); +void palette_bg_fill_white(void) +{ + u32 source_color = 0x7fff7fff; + CpuFastSet(&source_color, gPlttBufferFaded, 0x100 | (1 << 24)); } -void palette_bg_fill_black (void) { - u32 source_color = 0; - CpuFastSet(&source_color, gPlttBufferFaded, 0x100 | (1 << 24)); +void palette_bg_fill_black(void) +{ + u32 source_color = 0; + CpuFastSet(&source_color, gPlttBufferFaded, 0x100 | (1 << 24)); } -void pal_fill_for_map_transition (void) { - u8 map_light = get_map_light_from_warp0(); - switch (fade_type_for_given_maplight_pair(map_light, sav1_map_get_light_level())) { +void pal_fill_for_map_transition(void) +{ + u8 map_light = get_map_light_from_warp0(); + switch (fade_type_for_given_maplight_pair(map_light, sav1_map_get_light_level())) + { case 0: - fade_screen(0, 0); - palette_bg_fill_black(); - break; + fade_screen(0, 0); + palette_bg_fill_black(); + break; case 1: - fade_screen(2, 0); - palette_bg_fill_white(); - } + fade_screen(2, 0); + palette_bg_fill_white(); + } } -void pal_fill_black (void) { - fade_screen(0, 0); - palette_bg_fill_black(); +void pal_fill_black(void) +{ + fade_screen(0, 0); + palette_bg_fill_black(); } -void fade_8080918 (void) { - u8 light_level = sav1_map_get_light_level(); - switch (sub_810CDB8(light_level, warp1_get_mapheader() -> mapType)) { +void fade_8080918(void) +{ + u8 light_level = sav1_map_get_light_level(); + switch (sub_810CDB8(light_level, warp1_get_mapheader()->mapType)) + { case 0: - fade_screen(1, 0); - break; + fade_screen(1, 0); + break; case 1: - fade_screen(3, 0); - } + fade_screen(3, 0); + } } -void sub_8080958 (u8 arg) { - sub_8059B88(!arg); +void sub_8080958(u8 arg) +{ + sub_8059B88(!arg); } -void task0A_asap_script_env_2_enable_and_set_ctx_running (u8 taskID) { - if (sub_8080E70() == 1) { - DestroyTask(taskID); - EnableBothScriptContexts(); - } +void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID) +{ + if (sub_8080E70() == 1) + { + DestroyTask(taskID); + EnableBothScriptContexts(); + } } -void sub_8080990 (void) { - ScriptContext2_Enable(); - sub_8053E90(); - pal_fill_black(); - CreateTask(&task0A_asap_script_env_2_enable_and_set_ctx_running, 0x0a); +void sub_8080990(void) +{ + ScriptContext2_Enable(); + sub_8053E90(); + pal_fill_black(); + CreateTask(&task0A_asap_script_env_2_enable_and_set_ctx_running, 0x0a); } -void sub_80809B0 (void) { - ScriptContext2_Enable(); - pal_fill_black(); - CreateTask(&task0A_asap_script_env_2_enable_and_set_ctx_running, 0x0a); +void sub_80809B0(void) +{ + ScriptContext2_Enable(); + pal_fill_black(); + CreateTask(&task0A_asap_script_env_2_enable_and_set_ctx_running, 0x0a); } diff --git a/src/rom_8094928.c b/src/rom_8094928.c index 8cc1857eb..95847eda4 100644 --- a/src/rom_8094928.c +++ b/src/rom_8094928.c @@ -6,89 +6,126 @@ extern u8 IsLinkDoubleBattle(void); extern u8 IsDoubleBattle(void); extern u8 battle_get_side_with_given_state(u8); extern u8 battle_side_get_owner(u8); -void sub_8094998(u8 [3], u8); -void sub_8094A74(u8 [3], u8, u32); +void sub_8094998(u8[3], u8); +void sub_8094A74(u8[3], u8, u32); extern u8 gUnknown_02038470[3]; extern u8 sub_803FBBC(void); extern u16 gUnknown_02024A6A[]; -void unref_sub_8094928 (void * ptr) { - memcpy(ptr, &gPokemonStorage, 0x83d0); +void unref_sub_8094928(void *ptr) +{ + memcpy(ptr, &gPokemonStorage, 0x83d0); } -void unref_sub_8094940 (void * ptr) { - memcpy(&gPokemonStorage, ptr, 0x83d0); +void unref_sub_8094940(void *ptr) +{ + memcpy(&gPokemonStorage, ptr, 0x83d0); } -void sub_8094958 (void) { - sub_8094998(gUnknown_02038470, sub_803FBBC()); +void sub_8094958(void) +{ + sub_8094998(gUnknown_02038470, sub_803FBBC()); } -void sub_8094978 (u8 arg1, u8 arg2) { - sub_8094A74((((u8 (*) [3]) 0x0201606c))[arg1], arg2, arg1); +void sub_8094978(u8 arg1, u8 arg2) +{ + sub_8094A74((((u8(*)[3]) 0x0201606c))[arg1], arg2, arg1); } -void sub_8094998 (u8 arg[3], u8 player_number) { - int i; - u32 pos; - u8 temp[6]; - if (IsLinkDoubleBattle() == 1) - if (player_number) { - *arg = 0x30; - arg[1] = 0x45; - arg[2] = 0x12; - } else { - *arg = 0x03; - arg[1] = 0x12; - arg[2] = 0x45; +void sub_8094998(u8 arg[3], u8 player_number) +{ + int i; + u32 pos; + u8 temp[6]; + if (IsLinkDoubleBattle() == TRUE) + { + if (player_number) + { + *arg = 0x30; + arg[1] = 0x45; + arg[2] = 0x12; + } + else + { + *arg = 0x03; + arg[1] = 0x12; + arg[2] = 0x45; + } } - else { - if (!IsDoubleBattle()) { - pos = 1; - *temp = gUnknown_02024A6A[battle_get_side_with_given_state(0)]; - for (i = 0; i <= 5; i ++) if (i != *temp) temp[pos ++] = i; - } else { - pos = 2; - *temp = gUnknown_02024A6A[battle_get_side_with_given_state(0)]; - temp[1] = gUnknown_02024A6A[battle_get_side_with_given_state(2)]; - for (i = 0; i <= 5; i ++) if ((i != *temp) && (i != temp[1])) temp[pos ++] = i; + else + { + if (!IsDoubleBattle()) + { + pos = 1; + *temp = gUnknown_02024A6A[battle_get_side_with_given_state(0)]; + for (i = 0; i <= 5; i++) + if (i != *temp) + temp[pos++] = i; + } + else + { + pos = 2; + *temp = gUnknown_02024A6A[battle_get_side_with_given_state(0)]; + temp[1] = gUnknown_02024A6A[battle_get_side_with_given_state(2)]; + for (i = 0; i <= 5; i++) + if ((i != *temp) && (i != temp[1])) + temp[pos++] = i; + } + for (i = 0; i <= 2; i++) + arg[i] = (temp[i << 1] << 4) | temp[(i << 1) + 1]; } - for (i = 0; i <= 2; i ++) arg[i] = (temp[i << 1] << 4) | temp[(i << 1) + 1]; - } } -void sub_8094A74 (u8 arg[3], u8 player_number, u32 arg3) { - int i, j; - u8 temp[6]; - if (!battle_side_get_owner(arg3)) { - i = battle_get_side_with_given_state(0); - j = battle_get_side_with_given_state(2); - } else { - i = battle_get_side_with_given_state(1); - j = battle_get_side_with_given_state(3); - } - if (IsLinkDoubleBattle() == 1) - if (player_number) { - *arg = 0x30; - arg[1] = 0x45; - arg[2] = 0x12; - } else { - *arg = 0x03; - arg[1] = 0x12; - arg[2] = 0x45; +void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3) +{ + int i, j; + u8 temp[6]; + if (!battle_side_get_owner(arg3)) + { + i = battle_get_side_with_given_state(0); + j = battle_get_side_with_given_state(2); } - else { - if (!IsDoubleBattle()) { - int pos = 1; - *temp = gUnknown_02024A6A[i]; - for (i = 0; i <= 5; i ++) if (i != *temp) temp[pos ++] = i; - } else { - int pos = 2; - *temp = gUnknown_02024A6A[i]; - temp[1] = gUnknown_02024A6A[j]; - for (i = 0; i <= 5; i ++) if ((i != *temp) && (i != temp[1])) temp[pos ++] = i; + else + { + i = battle_get_side_with_given_state(1); + j = battle_get_side_with_given_state(3); + } + if (IsLinkDoubleBattle() == TRUE) + { + if (player_number) + { + *arg = 0x30; + arg[1] = 0x45; + arg[2] = 0x12; + } + else + { + *arg = 0x03; + arg[1] = 0x12; + arg[2] = 0x45; + } + } + else + { + if (!IsDoubleBattle()) + { + int pos = 1; + *temp = gUnknown_02024A6A[i]; + for (i = 0; i <= 5; i++) + if (i != *temp) + temp[pos++] = i; + } + else + { + int pos = 2; + *temp = gUnknown_02024A6A[i]; + temp[1] = gUnknown_02024A6A[j]; + for (i = 0; i <= 5; i++) + if ((i != *temp) && (i != temp[1])) + temp[pos++] = i; + } + for (i = 0; i <= 2; i++) + arg[i] = (temp[i << 1] << 4) | temp[(i << 1) + 1]; } - for (i = 0; i <= 2; i ++) arg[i] = (temp[i << 1] << 4) | temp[(i << 1) + 1]; - } } diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 962e8207b..1e2651aa6 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -107,7 +107,7 @@ static void CB2_SaveFailedScreen(void) { u16 ime; - switch(gMain.state) + switch (gMain.state) { case 0: default: diff --git a/src/script_menu.c b/src/script_menu.c index e1783208c..51230b66b 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -38,7 +38,7 @@ void CreatePCMenu(void); bool8 sub_80B5054(u8 left, u8 top, u8 var3, u8 var4) { - if(FuncIsActiveTask(sub_80B52B4) == 1) + if (FuncIsActiveTask(sub_80B52B4) == 1) return FALSE; else { @@ -50,7 +50,7 @@ bool8 sub_80B5054(u8 left, u8 top, u8 var3, u8 var4) bool8 sub_80B50B0(u8 left, u8 top, u8 var3, u8 var4, u8 var5) { - if(FuncIsActiveTask(sub_80B52B4) == 1) + if (FuncIsActiveTask(sub_80B52B4) == 1) return FALSE; else { @@ -74,17 +74,17 @@ void DrawMultichoiceMenu(u8 left, u8 top, u8 count, struct MenuAction *list, u8 u8 right; u8 bottom; - for(i = 1; i < count; i++) + for (i = 1; i < count; i++) { newWidth = GetStringWidthInTilesForScriptMenu(list[i].text); - if(width < newWidth) + if (width < newWidth) width = newWidth; } right = width; right = (right + left) + 1; - if(right > 29) + if (right > 29) { left = left + (29 - right); right = 29; @@ -108,7 +108,7 @@ void sub_80B5230(u8 left, u8 top, u8 right, u8 bottom, u8 unkVar, u8 count) gTasks[taskId].data[3] = bottom; gTasks[taskId].data[4] = unkVar; - if(count > 3) + if (count > 3) gTasks[taskId].data[5] = TRUE; else gTasks[taskId].data[5] = FALSE; @@ -118,18 +118,18 @@ void sub_80B52B4(u8 taskId) { s8 var; - if(!gPaletteFade.active) + if (!gPaletteFade.active) { - if(!gTasks[taskId].data[5]) + if (!gTasks[taskId].data[5]) var = ProcessMenuInputNoWrap(); else var = ProcessMenuInput(); - if(var != -2) + if (var != -2) { - if(var == -1) + if (var == -1) { - if(!gTasks[taskId].data[4]) + if (!gTasks[taskId].data[4]) { PlaySE(5); gScriptResult = 127; @@ -153,7 +153,7 @@ void sub_80B52B4(u8 taskId) bool8 Multichoice(u8 var1, u8 var2, u8 var3, u8 var4) { - if(FuncIsActiveTask(sub_80B52B4) == 1) + if (FuncIsActiveTask(sub_80B52B4) == 1) return FALSE; else { @@ -171,10 +171,10 @@ void sub_80B53B4(u8 left, u8 top, u8 count, struct MenuAction *list, u8 var4) u8 right; u8 bottom; - for(i = 1; i < count; i++) + for (i = 1; i < count; i++) { newWidth = GetStringWidthInTilesForScriptMenu(list[i].text); - if(width < newWidth) + if (width < newWidth) width = newWidth; } @@ -191,7 +191,7 @@ bool8 yes_no_box(u8 var1, u8 var2) { u8 taskId; - if(FuncIsActiveTask(task_yes_no_maybe) == 1) + if (FuncIsActiveTask(task_yes_no_maybe) == 1) return FALSE; else { @@ -207,7 +207,7 @@ bool8 yes_no_box(u8 var1, u8 var2) // unused bool8 IsScriptActive(void) { - if(gScriptResult == 0xFF) + if (gScriptResult == 0xFF) return FALSE; else return TRUE; @@ -315,7 +315,7 @@ void sub_80B5684(u8 taskId) bool8 TryCreatePCMenu(void) { - if(FuncIsActiveTask(sub_80B52B4) == 1) + if (FuncIsActiveTask(sub_80B52B4) == 1) return FALSE; else { @@ -331,12 +331,12 @@ void CreatePCMenu(void) u8 width; u8 numChoices; - if(playersPCWidth > GetStringWidthInTilesForScriptMenu(gPCText_SomeonesPC)) + if (playersPCWidth > GetStringWidthInTilesForScriptMenu(gPCText_SomeonesPC)) width = playersPCWidth; else width = 8; - if(FlagGet(SYS_GAME_CLEAR)) // player has cleared game? + if (FlagGet(SYS_GAME_CLEAR)) // player has cleared game? { numChoices = 4; MenuDrawTextWindow(0, 0, width + 2, 9); @@ -350,7 +350,7 @@ void CreatePCMenu(void) MenuPrint(gPCText_LogOff, 1, 5); } - if(FlagGet(SYS_PC_LANETTE)) // player met lanette? + if (FlagGet(SYS_PC_LANETTE)) // player met lanette? MenuPrint(gPCText_LanettesPC, 1, 1); else MenuPrint(gPCText_SomeonesPC, 1, 1); @@ -370,7 +370,7 @@ void task_picbox(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch(task->data[0]) + switch (task->data[0]) { case 0: task->data[0]++; @@ -393,7 +393,7 @@ bool8 sub_80B58C4(u16 var1, u8 var2, u8 var3) u8 taskId; u8 var; - if(FindTaskIdByFunc(task_picbox) != 0xFF) + if (FindTaskIdByFunc(task_picbox) != 0xFF) return FALSE; else { @@ -415,7 +415,7 @@ void *picbox_close(void) { u8 taskId = FindTaskIdByFunc(task_picbox); - if(taskId == 0xFF) + if (taskId == 0xFF) return NULL; gTasks[taskId].data[0]++; @@ -424,7 +424,7 @@ void *picbox_close(void) bool8 sub_80B59AC(void) { - if(FindTaskIdByFunc(task_picbox) == 0xFF) + if (FindTaskIdByFunc(task_picbox) == 0xFF) return TRUE; else return FALSE; diff --git a/src/start_menu.c b/src/start_menu.c index ee6582553..8a56b6c33 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -141,11 +141,11 @@ static void Task_8071B64(u8 taskId); static void BuildStartMenuActions(void) { sNumStartMenuActions = 0; - if(is_c1_link_related_active() == TRUE) + if (is_c1_link_related_active() == TRUE) BuildStartMenuActions_Link(); else { - if(GetSafariZoneFlag() == TRUE) + if (GetSafariZoneFlag() == TRUE) BuildStartMenuActions_SafariZone(); else BuildStartMenuActions_Normal(); @@ -159,12 +159,12 @@ static void AddStartMenuAction(u8 action) static void BuildStartMenuActions_Normal(void) { - if(FlagGet(SYS_POKEDEX_GET) == TRUE) + if (FlagGet(SYS_POKEDEX_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEDEX); - if(FlagGet(SYS_POKEMON_GET) == TRUE) + if (FlagGet(SYS_POKEMON_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_BAG); - if(FlagGet(SYS_POKENAV_GET) == TRUE) + if (FlagGet(SYS_POKENAV_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER); AddStartMenuAction(MENU_ACTION_SAVE); @@ -187,7 +187,7 @@ static void BuildStartMenuActions_Link(void) { AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_BAG); - if(FlagGet(SYS_POKENAV_GET) == TRUE) + if (FlagGet(SYS_POKENAV_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER_LINK); AddStartMenuAction(MENU_ACTION_OPTION); @@ -211,20 +211,20 @@ static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n) { MenuPrint(sStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2); _index++; - if(_index >= sNumStartMenuActions) + if (_index >= sNumStartMenuActions) { *index = _index; return TRUE; } } - while(--n != 0); + while (--n != 0); *index = _index; return FALSE; } static bool32 InitStartMenuMultistep(s16 *step, s16 *index) { - switch(*step) + switch (*step) { case 1: BuildStartMenuActions(); @@ -236,12 +236,12 @@ static bool32 InitStartMenuMultistep(s16 *step, s16 *index) (*step)++; break; case 3: - if(GetSafariZoneFlag()) + if (GetSafariZoneFlag()) DisplaySafariBallsWindow(); (*step)++; break; case 4: - if(PrintStartMenuItemsMultistep(index, 2)) + if (PrintStartMenuItemsMultistep(index, 2)) (*step)++; break; case 0: @@ -259,13 +259,13 @@ static void InitStartMenu(void) s16 step = 0; s16 index = 0; - while(InitStartMenuMultistep(&step, &index) == FALSE) + while (InitStartMenuMultistep(&step, &index) == FALSE) ; } static void Task_StartMenu(u8 taskId) { - if(InitStartMenuMultistep(gTasks[taskId].data, gTasks[taskId].data + 1) == TRUE) + if (InitStartMenuMultistep(gTasks[taskId].data, gTasks[taskId].data + 1) == TRUE) { *gTasks[taskId].data = 0; SwitchTaskToFollowupFunc(taskId); @@ -285,14 +285,14 @@ void sub_80712B4(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch(task->data[0]) + switch (task->data[0]) { case 0: gCallback_03004AE8 = StartMenu_InputProcessCallback; task->data[0]++; break; case 1: - if(gCallback_03004AE8() == 1) + if (gCallback_03004AE8() == 1) DestroyTask(taskId); break; } @@ -300,7 +300,7 @@ void sub_80712B4(u8 taskId) void sub_8071310(void) { - if(!is_c1_link_related_active()) + if (!is_c1_link_related_active()) { FreezeMapObjects(); sub_80594C0(); @@ -312,32 +312,32 @@ void sub_8071310(void) static u8 StartMenu_InputProcessCallback(void) { - if(gMain.newKeys & DPAD_UP) + if (gMain.newKeys & DPAD_UP) { PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(-1); } - if(gMain.newKeys & DPAD_DOWN) + if (gMain.newKeys & DPAD_DOWN) { PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(1); } - if(gMain.newKeys & A_BUTTON) + if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - if(sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func == StartMenu_PokedexCallback) + if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func == StartMenu_PokedexCallback) { - if(GetNationalPokedexCount(0) == 0) + if (GetNationalPokedexCount(0) == 0) return 0; } gCallback_03004AE8 = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func; - if(gCallback_03004AE8 != StartMenu_SaveCallback && + if (gCallback_03004AE8 != StartMenu_SaveCallback && gCallback_03004AE8 != StartMenu_ExitCallback && gCallback_03004AE8 != StartMenu_RetireCallback) fade_screen(1, 0); return 0; } - if(gMain.newKeys & (START_BUTTON | B_BUTTON)) + if (gMain.newKeys & (START_BUTTON | B_BUTTON)) { CloseMenu(); return 1; @@ -348,7 +348,7 @@ static u8 StartMenu_InputProcessCallback(void) //When player selects POKEDEX static u8 StartMenu_PokedexCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { IncrementGameStat(0x29); PlayRainSoundEffect(); @@ -361,7 +361,7 @@ static u8 StartMenu_PokedexCallback(void) //When player selects POKEMON static u8 StartMenu_PokemonCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); SetMainCallback2(sub_8089A70); @@ -373,7 +373,7 @@ static u8 StartMenu_PokemonCallback(void) //When player selects BAG static u8 StartMenu_BagCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); SetMainCallback2(sub_80A53F8); @@ -385,7 +385,7 @@ static u8 StartMenu_BagCallback(void) //When player selects POKENAV static u8 StartMenu_PokenavCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); SetMainCallback2(sub_80EBA5C); @@ -397,7 +397,7 @@ static u8 StartMenu_PokenavCallback(void) //When player selects his/her name static u8 StartMenu_PlayerCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); sub_8093110(sub_805469C); @@ -417,7 +417,7 @@ static u8 StartMenu_SaveCallback(void) //When player selects OPTION static u8 StartMenu_OptionCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); SetMainCallback2(CB2_InitOptionMenu); @@ -445,7 +445,7 @@ static u8 StartMenu_RetireCallback(void) //When player selects their name in multiplayer mode static u8 StartMenu_PlayerLinkCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); sub_8093130(gUnknown_03004860, sub_805469C); @@ -472,7 +472,7 @@ static u8 SaveCallback1(void) static u8 SaveCallback2(void) { - switch(RunSaveDialogCallback()) + switch (RunSaveDialogCallback()) { case SAVE_IN_PROGRESS: return FALSE; @@ -501,9 +501,9 @@ static void sub_807160C(void) static u8 RunSaveDialogCallback(void) { - if(savingComplete) + if (savingComplete) { - if(!MenuUpdateWindowText()) + if (!MenuUpdateWindowText()) return 0; } savingComplete = FALSE; @@ -529,7 +529,7 @@ static void Task_SaveDialog(u8 taskId) { u8 status = RunSaveDialogCallback(); - switch(status) + switch (status) { case SAVE_CANCELED: case SAVE_ERROR: @@ -563,21 +563,21 @@ static void SaveDialogStartTimeout(void) static bool8 SaveDialogCheckForTimeoutOrKeypress(void) { saveDialogTimer--; - if(gMain.heldKeys & A_BUTTON) + if (gMain.heldKeys & A_BUTTON) { PlaySE(SE_SELECT); return TRUE; } - else if(saveDialogTimer == 0) + else if (saveDialogTimer == 0) return TRUE; return FALSE; } static bool8 SaveDialogCheckForTimeoutAndKeypress(void) { - if(saveDialogTimer != 0) + if (saveDialogTimer != 0) saveDialogTimer--; - else if(gMain.heldKeys & A_BUTTON) + else if (gMain.heldKeys & A_BUTTON) return TRUE; return FALSE; } @@ -600,15 +600,15 @@ static u8 SaveDialogCB_DisplayConfirmYesNoMenu(void) static u8 SaveDialogCB_ProcessConfirmYesNoMenu(void) { - switch(ProcessMenuInputNoWrap_()) + switch (ProcessMenuInputNoWrap_()) { case 0: //YES HideSaveDialog(); - switch(gSaveFileStatus) + switch (gSaveFileStatus) { case 0: case 2: - if(gUnknown_020297EC == FALSE) + if (gUnknown_020297EC == FALSE) { saveDialogCallback = SaveDialogCB_SaveFileExists; return SAVE_IN_PROGRESS; @@ -646,7 +646,7 @@ static u8 SaveDialogCB_DisplayOverwriteYesNoMenu(void) static u8 SaveDialogCB_ProcessOverwriteYesNoMenu(void) { - switch(ProcessMenuInputNoWrap_()) + switch (ProcessMenuInputNoWrap_()) { case 0: //YES HideSaveDialog(); @@ -673,7 +673,7 @@ static u8 SaveDialogCB_DoSave(void) u8 a; IncrementGameStat(0); - if(gUnknown_020297EC == TRUE) + if (gUnknown_020297EC == TRUE) { a = sub_8125D44(4); gUnknown_020297EC = FALSE; @@ -683,7 +683,7 @@ static u8 SaveDialogCB_DoSave(void) a = sub_8125D44(0); } - if(a == 1) + if (a == 1) { //"(Player) saved the game." DisplaySaveMessageWithCallback(gSaveText_PlayerSavedTheGame, SaveDialogCB_SaveSuccess); @@ -700,7 +700,7 @@ static u8 SaveDialogCB_DoSave(void) static u8 SaveDialogCB_SaveSuccess(void) { - if(MenuUpdateWindowText()) + if (MenuUpdateWindowText()) { PlaySE(SE_SAVE); saveDialogCallback = SaveDialogCB_ReturnSuccess; @@ -710,7 +710,7 @@ static u8 SaveDialogCB_SaveSuccess(void) static u8 SaveDialogCB_ReturnSuccess(void) { - if(!IsSEPlaying() && SaveDialogCheckForTimeoutOrKeypress()) + if (!IsSEPlaying() && SaveDialogCheckForTimeoutOrKeypress()) { sub_8071700(); return SAVE_SUCCESS; @@ -721,7 +721,7 @@ static u8 SaveDialogCB_ReturnSuccess(void) static u8 SaveDialogCB_SaveError(void) { - if(MenuUpdateWindowText()) + if (MenuUpdateWindowText()) { PlaySE(SE_BOO); saveDialogCallback = SaveDialogCB_ReturnError; @@ -731,7 +731,7 @@ static u8 SaveDialogCB_SaveError(void) static u8 SaveDialogCB_ReturnError(void) { - if(!SaveDialogCheckForTimeoutAndKeypress()) + if (!SaveDialogCheckForTimeoutAndKeypress()) return SAVE_IN_PROGRESS; else { @@ -747,7 +747,7 @@ static void sub_80719F0(void) static bool32 sub_80719FC(u8 *step) { - switch(*step) + switch (*step) { case 0: { @@ -760,12 +760,12 @@ static bool32 sub_80719FC(u8 *step) DmaClear16(3, PLTT, PLTT_SIZE); addr = (void *)VRAM; size = 0x18000; - while(1) + while (1) { DmaFill16(3, 0, addr, 0x1000); addr += 0x1000; size -= 0x1000; - if(size <= 0x1000) + if (size <= 0x1000) { DmaFill16(3, 0, addr, size); break; @@ -805,7 +805,7 @@ static bool32 sub_80719FC(u8 *step) void sub_8071B28(void) { - if(sub_80719FC(&gMain.state)) + if (sub_80719FC(&gMain.state)) { CreateTask(Task_8071B64, 0x50); SetMainCallback2(sub_8071B54); @@ -822,9 +822,9 @@ static void Task_8071B64(u8 taskId) { s16 *step = gTasks[taskId].data; - if(!gPaletteFade.active) + if (!gPaletteFade.active) { - switch(*step) + switch (*step) { case 0: MenuDisplayMessageBox(); @@ -838,7 +838,7 @@ static void Task_8071B64(u8 taskId) (*step)++; break; case 2: - if(!sub_8125E6C()) + if (!sub_8125E6C()) break; ClearSecretBase2Field_9_2(); (*step)++; diff --git a/src/starter_choose.c b/src/starter_choose.c index 28dd6a820..4a6fb11eb 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -70,7 +70,7 @@ enum { //Retrieves one of the available starter Pokemon u16 GetStarterPokemon(u16 n) { - if(n > 3) + if (n > 3) n = 0; return gStarterMons[n]; } @@ -190,7 +190,7 @@ static void Task_StarterChoose2(u8 taskId) { u8 selection = gTasks[taskId].data[TD_STARTERSELECTION]; - if(gMain.newKeys & A_BUTTON) + if (gMain.newKeys & A_BUTTON) { u8 spriteId; @@ -224,12 +224,12 @@ static void Task_StarterChoose2(u8 taskId) } else { - if((gMain.newKeys & DPAD_LEFT) && selection > 0) + if ((gMain.newKeys & DPAD_LEFT) && selection > 0) { gTasks[taskId].data[TD_STARTERSELECTION]--; CreateStarterPokemonLabel(selection, gTasks[taskId].data[TD_STARTERSELECTION]); } - else if((gMain.newKeys & DPAD_RIGHT) && selection < 2) + else if ((gMain.newKeys & DPAD_RIGHT) && selection < 2) { gTasks[taskId].data[TD_STARTERSELECTION]++; CreateStarterPokemonLabel(selection, gTasks[taskId].data[TD_STARTERSELECTION]); @@ -239,7 +239,7 @@ static void Task_StarterChoose2(u8 taskId) static void Task_StarterChoose3(u8 taskId) { - if(gSprites[gTasks[taskId].data[TD_CIRCLE_SPRITE_ID]].affineAnimEnded && + if (gSprites[gTasks[taskId].data[TD_CIRCLE_SPRITE_ID]].affineAnimEnded && gSprites[gTasks[taskId].data[TD_CIRCLE_SPRITE_ID]].pos1.x == STARTER_PKMN_POS_X && gSprites[gTasks[taskId].data[TD_CIRCLE_SPRITE_ID]].pos1.y == STARTER_PKMN_POS_Y) { @@ -261,7 +261,7 @@ static void Task_StarterChoose5(u8 taskId) { u8 spriteId; - switch(ProcessMenuInputNoWrap_()) + switch (ProcessMenuInputNoWrap_()) { case 0: //YES //Return the starter choice and exit. @@ -319,7 +319,7 @@ static void CreateStarterPokemonLabel(u8 prevSelection, u8 selection) u8 labelTop; u8 labelBottom; - if(prevSelection != 0xFF) + if (prevSelection != 0xFF) { //Remove the old Pokemon label MenuZeroFillWindowRect( @@ -341,7 +341,7 @@ static void CreateStarterPokemonLabel(u8 prevSelection, u8 selection) //Copy category string to label dstIndex = 8; srcIndex = 0; - while(category[srcIndex] != EOS && srcIndex <= 10) + while (category[srcIndex] != EOS && srcIndex <= 10) { labelText[dstIndex] = category[srcIndex]; srcIndex++; @@ -406,7 +406,7 @@ void sub_810A62C(struct Sprite *sprite) //Sprite callback void sub_810A68C(struct Sprite *sprite) { - if(gTasks[sprite->data0].data[TD_STARTERSELECTION] == sprite->data1) + if (gTasks[sprite->data0].data[TD_STARTERSELECTION] == sprite->data1) StartSpriteAnimIfDifferent(sprite, 1); else StartSpriteAnimIfDifferent(sprite, 0); @@ -416,12 +416,12 @@ void sub_810A68C(struct Sprite *sprite) void StarterPokemonSpriteAnimCallback(struct Sprite *sprite) { //Move sprite to upper center of screen - if(sprite->pos1.x > STARTER_PKMN_POS_X) + if (sprite->pos1.x > STARTER_PKMN_POS_X) sprite->pos1.x -= 4; - if(sprite->pos1.x < STARTER_PKMN_POS_X) + if (sprite->pos1.x < STARTER_PKMN_POS_X) sprite->pos1.x += 4; - if(sprite->pos1.y > STARTER_PKMN_POS_Y) + if (sprite->pos1.y > STARTER_PKMN_POS_Y) sprite->pos1.y -= 2; - if(sprite->pos1.y < STARTER_PKMN_POS_Y) + if (sprite->pos1.y < STARTER_PKMN_POS_Y) sprite->pos1.y += 2; } diff --git a/src/tileset_anim.c b/src/tileset_anim.c index 415b69cfe..34685381d 100644 --- a/src/tileset_anim.c +++ b/src/tileset_anim.c @@ -30,10 +30,11 @@ extern u8 *gTilesetAnimTable_EliteFour_1[]; extern u8 *gTilesetAnimTable_MauvilleGym[]; extern u8 *gTilesetAnimTable_BikeShop[]; -struct Dma { - u8 *src; - u8 *dest; - u16 size; +struct Dma +{ + u8 *src; + u8 *dest; + u16 size; }; EWRAM_DATA static struct Dma gTilesetAnimDmas[20] = {0}; @@ -88,510 +89,542 @@ static void sub_807399C(u16); static void sub_8073974(u16); static void sub_80739EC(u16); -static void ClearTilesetAnimDmas(void) { - gNumTilesetAnimDmas = 0; - CpuFill32(0, &gTilesetAnimDmas, sizeof(gTilesetAnimDmas)); -} - -static void QueueTilesetAnimDma(u8 *src, u8 *dest, u16 size) { - if (gNumTilesetAnimDmas < 20) { - gTilesetAnimDmas[gNumTilesetAnimDmas].src = src; - gTilesetAnimDmas[gNumTilesetAnimDmas].dest = dest; - gTilesetAnimDmas[gNumTilesetAnimDmas].size = size; - gNumTilesetAnimDmas++; - } -} - -void sub_8072E74(void) { - int i; - for (i = 0; i < gNumTilesetAnimDmas; i++) { - DmaCopy16(3, - gTilesetAnimDmas[i].src, - gTilesetAnimDmas[i].dest, - gTilesetAnimDmas[i].size); - } - gNumTilesetAnimDmas = 0; -} - -void cur_mapheader_run_tileset_funcs_after_some_cpuset(void) { - ClearTilesetAnimDmas(); - StartTileset1Animation(); - StartTileset2Animation(); -} - -void sub_8072ED0(void) { - StartTileset2Animation(); -} - -void sub_8072EDC(void) { - ClearTilesetAnimDmas(); - if (++gTileset1AnimFrame >= gTileset1AnimLength) { - gTileset1AnimFrame = 0; - } - if (++gTileset2AnimFrame >= gTileset2AnimLength) { - gTileset2AnimFrame = 0; - } - if (gTileset1AnimCallback) { - gTileset1AnimCallback(gTileset1AnimFrame); - } - if (gTileset2AnimCallback) { - gTileset2AnimCallback(gTileset2AnimFrame); - } -} - -static void StartTileset1Animation(void) { - gTileset1AnimFrame = 0; - gTileset1AnimLength = 0; - gTileset1AnimCallback = 0; - if (gMapHeader.mapData->primaryTileset) { - if (gMapHeader.mapData->primaryTileset->callback) { - gMapHeader.mapData->primaryTileset->callback(); - } - } -} - -static void StartTileset2Animation(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = 0; - gTileset2AnimCallback = 0; - if (gMapHeader.mapData->secondaryTileset) { - if (gMapHeader.mapData->secondaryTileset->callback) { - gMapHeader.mapData->secondaryTileset->callback(); - } - } +static void ClearTilesetAnimDmas(void) +{ + gNumTilesetAnimDmas = 0; + CpuFill32(0, &gTilesetAnimDmas, sizeof(gTilesetAnimDmas)); +} + +static void QueueTilesetAnimDma(u8 *src, u8 *dest, u16 size) +{ + if (gNumTilesetAnimDmas < 20) + { + gTilesetAnimDmas[gNumTilesetAnimDmas].src = src; + gTilesetAnimDmas[gNumTilesetAnimDmas].dest = dest; + gTilesetAnimDmas[gNumTilesetAnimDmas].size = size; + gNumTilesetAnimDmas++; + } +} + +void sub_8072E74(void) +{ + int i; + for (i = 0; i < gNumTilesetAnimDmas; i++) + { + DmaCopy16(3, + gTilesetAnimDmas[i].src, + gTilesetAnimDmas[i].dest, + gTilesetAnimDmas[i].size); + } + gNumTilesetAnimDmas = 0; +} + +void cur_mapheader_run_tileset_funcs_after_some_cpuset(void) +{ + ClearTilesetAnimDmas(); + StartTileset1Animation(); + StartTileset2Animation(); +} + +void sub_8072ED0(void) +{ + StartTileset2Animation(); +} + +void sub_8072EDC(void) +{ + ClearTilesetAnimDmas(); + if (++gTileset1AnimFrame >= gTileset1AnimLength) + { + gTileset1AnimFrame = 0; + } + if (++gTileset2AnimFrame >= gTileset2AnimLength) + { + gTileset2AnimFrame = 0; + } + if (gTileset1AnimCallback) + { + gTileset1AnimCallback(gTileset1AnimFrame); + } + if (gTileset2AnimCallback) + { + gTileset2AnimCallback(gTileset2AnimFrame); + } +} + +static void StartTileset1Animation(void) +{ + gTileset1AnimFrame = 0; + gTileset1AnimLength = 0; + gTileset1AnimCallback = 0; + if (gMapHeader.mapData->primaryTileset) + { + if (gMapHeader.mapData->primaryTileset->callback) + { + gMapHeader.mapData->primaryTileset->callback(); + } + } +} + +static void StartTileset2Animation(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = 0; + gTileset2AnimCallback = 0; + if (gMapHeader.mapData->secondaryTileset) + { + if (gMapHeader.mapData->secondaryTileset->callback) + { + gMapHeader.mapData->secondaryTileset->callback(); + } + } +} + +void TilesetCB_General(void) +{ + gTileset1AnimFrame = 0; + gTileset1AnimLength = 0x100; + gTileset1AnimCallback = sub_8073014; +} + +void TilesetCB_Building(void) +{ + gTileset1AnimFrame = 0; + gTileset1AnimLength = 0x100; + gTileset1AnimCallback = sub_8073058; +} + +static void sub_8073014(u16 a1) +{ + int v1; + v1 = a1 % 0x10; + if (v1 == 0) sub_8073070(a1 / 0x10); + if (v1 == 1) sub_8073098(a1 / 0x10); + if (v1 == 2) sub_80730C0(a1 / 0x10); + if (v1 == 3) sub_80730E8(a1 / 0x10); + if (v1 == 4) sub_807361C(a1 / 0x10); +} + +static void sub_8073058(u16 a1) +{ + if (a1 % 8 == 0) + { + sub_8073904(a1 / 8); + } +} + +static void sub_8073070(u16 a1) +{ + int v1; + v1 = a1 % 4; + QueueTilesetAnimDma(gTilesetAnimTable_General_0[v1], (u8 *)(BG_VRAM + 0x3f80), 0x80); +} + +static void sub_8073098(u16 a1) +{ + u8 v1; + v1 = a1 % 8; + QueueTilesetAnimDma(gTilesetAnimTable_General_1[v1], (u8 *)(BG_VRAM + 0x3600), 0x3c0); +} + +static void sub_80730C0(u16 a1) +{ + int v1; + v1 = a1 % 8; + QueueTilesetAnimDma(gTilesetAnimTable_General_2[v1], (u8 *)(BG_VRAM + 0x3a00), 0x140); +} + +static void sub_80730E8(u16 a1) +{ + int v1; + v1 = a1 % 4; + QueueTilesetAnimDma(gTilesetAnimTable_General_3[v1], (u8 *)(BG_VRAM + 0x3e00), 0xc0); } -void TilesetCB_General(void) { - gTileset1AnimFrame = 0; - gTileset1AnimLength = 0x100; - gTileset1AnimCallback = sub_8073014; +void TilesetCB_Petalburg(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = 0; } -void TilesetCB_Building(void) { - gTileset1AnimFrame = 0; - gTileset1AnimLength = 0x100; - gTileset1AnimCallback = sub_8073058; +void TilesetCB_Rustboro(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = sub_8073424; } -static void sub_8073014(u16 a1) { - int v1; - v1 = a1 % 0x10; - if (v1 == 0) sub_8073070(a1 / 0x10); - if (v1 == 1) sub_8073098(a1 / 0x10); - if (v1 == 2) sub_80730C0(a1 / 0x10); - if (v1 == 3) sub_80730E8(a1 / 0x10); - if (v1 == 4) sub_807361C(a1 / 0x10); +void TilesetCB_Dewford(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = 0; } -static void sub_8073058(u16 a1) { - if (a1 % 8 == 0) { - sub_8073904(a1 / 8); - } +void TilesetCB_Slateport(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = 0; } -static void sub_8073070(u16 a1) { - int v1; - v1 = a1 % 4; - QueueTilesetAnimDma(gTilesetAnimTable_General_0[v1], - (u8 *)(BG_VRAM + 0x3f80), - 0x80); +void TilesetCB_Mauville(void) +{ + gTileset2AnimFrame = gTileset1AnimFrame; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = sub_80734A0; } -static void sub_8073098(u16 a1) { - u8 v1; - v1 = a1 % 8; - QueueTilesetAnimDma(gTilesetAnimTable_General_1[v1], - (u8 *)(BG_VRAM + 0x3600), - 0x3c0); +void TilesetCB_Lavaridge(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = sub_8073514; } -static void sub_80730C0(u16 a1) { - int v1; - v1 = a1 % 8; - QueueTilesetAnimDma(gTilesetAnimTable_General_2[v1], - (u8 *)(BG_VRAM + 0x3a00), - 0x140); +void TilesetCB_Fallarbor(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = 0; } -static void sub_80730E8(u16 a1) { - int v1; - v1 = a1 % 4; - QueueTilesetAnimDma(gTilesetAnimTable_General_3[v1], - (u8 *)(BG_VRAM + 0x3e00), - 0xc0); +void TilesetCB_Fortree(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = 0; } -void TilesetCB_Petalburg(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = 0; +void TilesetCB_Lilycove(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = 0; } -void TilesetCB_Rustboro(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = sub_8073424; +void TilesetCB_Mossdeep(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = 0; } -void TilesetCB_Dewford(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = 0; +void TilesetCB_EverGrande(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = sub_8073540; } -void TilesetCB_Slateport(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = 0; +void TilesetCB_Pacifidlog(void) +{ + gTileset2AnimFrame = gTileset1AnimFrame; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = sub_80735B4; } -void TilesetCB_Mauville(void) { - gTileset2AnimFrame = gTileset1AnimFrame; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = sub_80734A0; +void TilesetCB_Sootopolis(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = 0; } -void TilesetCB_Lavaridge(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = sub_8073514; +void TilesetCB_Underwater(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = 0x80; + gTileset2AnimCallback = sub_80735E4; } -void TilesetCB_Fallarbor(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = 0; +void TilesetCB_SootopolisGym(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = 0xf0; + gTileset2AnimCallback = sub_80738A8; } -void TilesetCB_Fortree(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = 0; +void TilesetCB_Cave(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = sub_8073600; } -void TilesetCB_Lilycove(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = 0; +void TilesetCB_EliteFour(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = 0x80; + gTileset2AnimCallback = sub_80738C0; } -void TilesetCB_Mossdeep(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = 0; +void TilesetCB_MauvilleGym(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = sub_8073890; } -void TilesetCB_EverGrande(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = sub_8073540; +void TilesetCB_BikeShop(void) +{ + gTileset2AnimFrame = 0; + gTileset2AnimLength = gTileset1AnimLength; + gTileset2AnimCallback = sub_80738EC; } -void TilesetCB_Pacifidlog(void) { - gTileset2AnimFrame = gTileset1AnimFrame; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = sub_80735B4; -} - -void TilesetCB_Sootopolis(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = 0; -} - -void TilesetCB_Underwater(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = 0x80; - gTileset2AnimCallback = sub_80735E4; -} +static void sub_8073424(u16 a1) +{ + int v1; + v1 = a1 % 8; + if (v1 == 0) + { + sub_80737A4(a1 / 8, 0); + sub_80737E0(a1 / 8); + } + if (v1 == 1) sub_80737A4(a1 / 8, 1); + if (v1 == 2) sub_80737A4(a1 / 8, 2); + if (v1 == 3) sub_80737A4(a1 / 8, 3); + if (v1 == 4) sub_80737A4(a1 / 8, 4); + if (v1 == 5) sub_80737A4(a1 / 8, 5); + if (v1 == 6) sub_80737A4(a1 / 8, 6); + if (v1 == 7) sub_80737A4(a1 / 8, 7); +} + +static void sub_80734A0(u16 a1) +{ + int v1; + v1 = a1 % 8; + if (v1 == 0) sub_8073704(a1 / 8, 0); + if (v1 == 1) sub_8073704(a1 / 8, 1); + if (v1 == 2) sub_8073704(a1 / 8, 2); + if (v1 == 3) sub_8073704(a1 / 8, 3); + if (v1 == 4) sub_8073704(a1 / 8, 4); + if (v1 == 5) sub_8073704(a1 / 8, 5); + if (v1 == 6) sub_8073704(a1 / 8, 6); + if (v1 == 7) sub_8073704(a1 / 8, 7); +} + +static void sub_8073514(u16 a1) +{ + int v1; + v1 = a1 % 0x10; + if (v1 == 0) sub_8073644(a1 / 0x10); + if (v1 == 1) sub_8073808(a1 / 0x10); +} + +static void sub_8073540(u16 a1) +{ + int v1; + v1 = a1 % 8; + if (v1 == 0) sub_8073830(a1 / 8, 0); + if (v1 == 1) sub_8073830(a1 / 8, 1); + if (v1 == 2) sub_8073830(a1 / 8, 2); + if (v1 == 3) sub_8073830(a1 / 8, 3); + if (v1 == 4) sub_8073830(a1 / 8, 4); + if (v1 == 5) sub_8073830(a1 / 8, 5); + if (v1 == 6) sub_8073830(a1 / 8, 6); + if (v1 == 7) sub_8073830(a1 / 8, 7); +} + +static void sub_80735B4(u16 a1) +{ + int v1; + v1 = a1 % 0x10; + if (v1 == 0) sub_807368C(a1 / 0x10); + if (v1 == 1) sub_80736DC(a1 / 0x10); +} + +static void sub_80735E4(u16 a1) +{ + int v1; + v1 = a1 % 0x10; + if (v1 == 0) sub_80736B4(a1 / 0x10); +} + +static void sub_8073600(u16 a1) +{ + int v1; + v1 = a1 % 0x10; + if (v1 == 1) sub_8073868(a1 / 0x10); +} + +static void sub_807361C(u16 a1) +{ + int v1; + v1 = a1 % 4; + QueueTilesetAnimDma(gTilesetAnimTable_General_4[v1], (u8 *)(BG_VRAM + 0x3c00), 0x140); +} + +static void sub_8073644(u8 a1) +{ + u8 v1; + v1 = a1 % 4; + QueueTilesetAnimDma(gTilesetAnimTable_Lavaridge[v1], (u8 *)(BG_VRAM + 0x6400), 0x80); + v1 = (a1 + 2) % 4; + QueueTilesetAnimDma(gTilesetAnimTable_Lavaridge[v1], (u8 *)(BG_VRAM + 0x6480), 0x80); +} + +static void sub_807368C(u8 a1) +{ + int v1; + v1 = a1 % 4; + QueueTilesetAnimDma(gTilesetAnimTable_Pacifidlog_0[v1], (u8 *)(BG_VRAM + 0x7a00), 0x3c0); +} + +static void sub_80736B4(u8 a1) +{ + int v1; + v1 = a1 % 4; + QueueTilesetAnimDma(gTilesetAnimTable_Underwater[v1], (u8 *)(BG_VRAM + 0x7e00), 0x80); +} + +static void sub_80736DC(u8 a1) +{ + int v1; + v1 = a1 % 8; + QueueTilesetAnimDma(gTilesetAnimTable_Pacifidlog_1[v1], (u8 *)(BG_VRAM + 0x7e00), 0x100); +} + +static void sub_8073704(u16 a1, u8 a2) +{ + int v1; + a1 -= a2; + if (a1 < 12) + { + v1 = a1 % 12; + QueueTilesetAnimDma(gTilesetAnimTable_Mauville_0A[v1], gUnknown_0837BAE4[a2], 0x80); + QueueTilesetAnimDma(gTilesetAnimTable_Mauville_1A[v1], gUnknown_0837BB04[a2], 0x80); + } + else + { + v1 = a1 % 4; + QueueTilesetAnimDma(gTilesetAnimTable_Mauville_0B[v1], gUnknown_0837BAE4[a2], 0x80); + QueueTilesetAnimDma(gTilesetAnimTable_Mauville_1B[v1], gUnknown_0837BB04[a2], 0x80); + } +} + +static void sub_80737A4(u16 a1, u8 a2) +{ + int v1; + a1 -= a2; + + v1 = a1 % 8; + if (gTilesetAnimTable_Rustboro_0[v1]) + { + QueueTilesetAnimDma(gTilesetAnimTable_Rustboro_0[v1], gUnknown_0837BFA4[a2], 0x80); + } +} + +static void sub_80737E0(u16 a1) +{ + int v1; + v1 = a1 % 2; + QueueTilesetAnimDma(gTilesetAnimTable_Rustboro_1[v1], (u8 *)(BG_VRAM + 0x7800), 0x80); +} + +static void sub_8073808(u16 a1) +{ + int v1; + v1 = a1 % 4; + QueueTilesetAnimDma(gTilesetAnimTable_Cave[v1], (u8 *)(BG_VRAM + 0x5400), 0x80); +} + +static void sub_8073830(u16 a1, u8 a2) +{ + int v1; + a1 -= a2; + v1 = a1 % 8; + QueueTilesetAnimDma(gTilesetAnimTable_EverGrande[v1], gUnknown_0837C93C[a2], 0x80); +} + +static void sub_8073868(u16 a1) +{ + int v1; + v1 = a1 % 4; + QueueTilesetAnimDma(gTilesetAnimTable_Cave[v1], (u8 *)(BG_VRAM + 0x7400), 0x80); +} + +static void sub_8073890(u16 a1) +{ + int v1; + v1 = a1 % 2; + if (!v1) + { + sub_80739C4(a1 / 2); + } +} + +static void sub_80738A8(u16 a1) +{ + int v1; + v1 = a1 % 8; + if (!v1) + { + sub_807392C(a1 / 8); + } +} + +static void sub_80738C0(u16 a1) +{ + if (a1 % 0x40 == 0) + { + sub_807399C(a1 / 0x40); + } + if (a1 % 8 == 1) + { + sub_8073974(a1 / 8); + } +} + +static void sub_80738EC(u16 a1) +{ + if (a1 % 4 == 0) + { + sub_80739EC(a1 / 4); + } +} + +static void sub_8073904(u16 a1) +{ + int v1; + v1 = a1 % 2; + QueueTilesetAnimDma(gTilesetAnimTable_Building[v1], (u8 *)(BG_VRAM + 0x3e00), 0x80); +} + +static void sub_807392C(u16 a1) +{ + int v1; + v1 = a1 % 3; + QueueTilesetAnimDma(gTilesetAnimTable_SootopolisGym_0[v1], (u8 *)(BG_VRAM + 0x7e00), 0x180); + QueueTilesetAnimDma(gTilesetAnimTable_SootopolisGym_1[v1], (u8 *)(BG_VRAM + 0x7a00), 0x280); +} -void TilesetCB_SootopolisGym(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = 0xf0; - gTileset2AnimCallback = sub_80738A8; +static void sub_8073974(u16 a1) +{ + int v1; + v1 = a1 % 4; + QueueTilesetAnimDma(gTilesetAnimTable_EliteFour_0[v1], (u8 *)(BG_VRAM + 0x7f00), 0x20); +} + +static void sub_807399C(u16 a1) +{ + int v1; + v1 = a1 % 2; + QueueTilesetAnimDma(gTilesetAnimTable_EliteFour_1[v1], (u8 *)(BG_VRAM + 0x7c00), 0x80); } -void TilesetCB_Cave(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = sub_8073600; -} - -void TilesetCB_EliteFour(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = 0x80; - gTileset2AnimCallback = sub_80738C0; -} - -void TilesetCB_MauvilleGym(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = sub_8073890; -} - -void TilesetCB_BikeShop(void) { - gTileset2AnimFrame = 0; - gTileset2AnimLength = gTileset1AnimLength; - gTileset2AnimCallback = sub_80738EC; -} - -static void sub_8073424(u16 a1) { - int v1; - v1 = a1 % 8; - if (v1 == 0) { - sub_80737A4(a1 / 8, 0); - sub_80737E0(a1 / 8); - } - if (v1 == 1) sub_80737A4(a1 / 8, 1); - if (v1 == 2) sub_80737A4(a1 / 8, 2); - if (v1 == 3) sub_80737A4(a1 / 8, 3); - if (v1 == 4) sub_80737A4(a1 / 8, 4); - if (v1 == 5) sub_80737A4(a1 / 8, 5); - if (v1 == 6) sub_80737A4(a1 / 8, 6); - if (v1 == 7) sub_80737A4(a1 / 8, 7); -} - -static void sub_80734A0(u16 a1) { - int v1; - v1 = a1 % 8; - if (v1 == 0) sub_8073704(a1 / 8, 0); - if (v1 == 1) sub_8073704(a1 / 8, 1); - if (v1 == 2) sub_8073704(a1 / 8, 2); - if (v1 == 3) sub_8073704(a1 / 8, 3); - if (v1 == 4) sub_8073704(a1 / 8, 4); - if (v1 == 5) sub_8073704(a1 / 8, 5); - if (v1 == 6) sub_8073704(a1 / 8, 6); - if (v1 == 7) sub_8073704(a1 / 8, 7); -} - -static void sub_8073514(u16 a1) { - int v1; - v1 = a1 % 0x10; - if (v1 == 0) sub_8073644(a1 / 0x10); - if (v1 == 1) sub_8073808(a1 / 0x10); -} - -static void sub_8073540(u16 a1) { - int v1; - v1 = a1 % 8; - if (v1 == 0) sub_8073830(a1 / 8, 0); - if (v1 == 1) sub_8073830(a1 / 8, 1); - if (v1 == 2) sub_8073830(a1 / 8, 2); - if (v1 == 3) sub_8073830(a1 / 8, 3); - if (v1 == 4) sub_8073830(a1 / 8, 4); - if (v1 == 5) sub_8073830(a1 / 8, 5); - if (v1 == 6) sub_8073830(a1 / 8, 6); - if (v1 == 7) sub_8073830(a1 / 8, 7); -} - -static void sub_80735B4(u16 a1) { - int v1; - v1 = a1 % 0x10; - if (v1 == 0) sub_807368C(a1 / 0x10); - if (v1 == 1) sub_80736DC(a1 / 0x10); -} - -static void sub_80735E4(u16 a1) { - int v1; - v1 = a1 % 0x10; - if (v1 == 0) sub_80736B4(a1 / 0x10); -} - -static void sub_8073600(u16 a1) { - int v1; - v1 = a1 % 0x10; - if (v1 == 1) sub_8073868(a1 / 0x10); -} - -static void sub_807361C(u16 a1) { - int v1; - v1 = a1 % 4; - QueueTilesetAnimDma(gTilesetAnimTable_General_4[v1], - (u8 *)(BG_VRAM + 0x3c00), - 0x140); -} - -static void sub_8073644(u8 a1) { - u8 v1; - v1 = a1 % 4; - QueueTilesetAnimDma(gTilesetAnimTable_Lavaridge[v1], - (u8 *)(BG_VRAM + 0x6400), - 0x80); - v1 = (a1 + 2) % 4; - QueueTilesetAnimDma(gTilesetAnimTable_Lavaridge[v1], - (u8 *)(BG_VRAM + 0x6480), - 0x80); -} - -static void sub_807368C(u8 a1) { - int v1; - v1 = a1 % 4; - QueueTilesetAnimDma(gTilesetAnimTable_Pacifidlog_0[v1], - (u8 *)(BG_VRAM + 0x7a00), - 0x3c0); -} - -static void sub_80736B4(u8 a1) { - int v1; - v1 = a1 % 4; - QueueTilesetAnimDma(gTilesetAnimTable_Underwater[v1], - (u8 *)(BG_VRAM + 0x7e00), - 0x80); -} - -static void sub_80736DC(u8 a1) { - int v1; - v1 = a1 % 8; - QueueTilesetAnimDma(gTilesetAnimTable_Pacifidlog_1[v1], - (u8 *)(BG_VRAM + 0x7e00), - 0x100); -} - -static void sub_8073704(u16 a1, u8 a2) { - int v1; - a1 -= a2; - if (a1 < 12) { - v1 = a1 % 12; - QueueTilesetAnimDma(gTilesetAnimTable_Mauville_0A[v1], - gUnknown_0837BAE4[a2], - 0x80); - QueueTilesetAnimDma(gTilesetAnimTable_Mauville_1A[v1], - gUnknown_0837BB04[a2], - 0x80); - } else { - v1 = a1 % 4; - QueueTilesetAnimDma(gTilesetAnimTable_Mauville_0B[v1], - gUnknown_0837BAE4[a2], - 0x80); - QueueTilesetAnimDma(gTilesetAnimTable_Mauville_1B[v1], - gUnknown_0837BB04[a2], - 0x80); - } -} - -static void sub_80737A4(u16 a1, u8 a2) { - int v1; - a1 -= a2; - - v1 = a1 % 8; - if (gTilesetAnimTable_Rustboro_0[v1]) { - QueueTilesetAnimDma(gTilesetAnimTable_Rustboro_0[v1], - gUnknown_0837BFA4[a2], - 0x80); - } -} - -static void sub_80737E0(u16 a1) { - int v1; - v1 = a1 % 2; - QueueTilesetAnimDma(gTilesetAnimTable_Rustboro_1[v1], - (u8 *)(BG_VRAM + 0x7800), - 0x80); -} - -static void sub_8073808(u16 a1) { - int v1; - v1 = a1 % 4; - QueueTilesetAnimDma(gTilesetAnimTable_Cave[v1], - (u8 *)(BG_VRAM + 0x5400), - 0x80); -} - -static void sub_8073830(u16 a1, u8 a2) { - int v1; - a1 -= a2; - v1 = a1 % 8; - QueueTilesetAnimDma(gTilesetAnimTable_EverGrande[v1], - gUnknown_0837C93C[a2], - 0x80); -} - -static void sub_8073868(u16 a1) { - int v1; - v1 = a1 % 4; - QueueTilesetAnimDma(gTilesetAnimTable_Cave[v1], - (u8 *)(BG_VRAM + 0x7400), - 0x80); -} - -static void sub_8073890(u16 a1) { - int v1; - v1 = a1 % 2; - if (!v1) { - sub_80739C4(a1 / 2); - } -} - -static void sub_80738A8(u16 a1) { - int v1; - v1 = a1 % 8; - if (!v1) { - sub_807392C(a1 / 8); - } -} - -static void sub_80738C0(u16 a1) { - if (a1 % 0x40 == 0) { - sub_807399C(a1 / 0x40); - } - if (a1 % 8 == 1) { - sub_8073974(a1 / 8); - } -} - -static void sub_80738EC(u16 a1) { - if (a1 % 4 == 0) { - sub_80739EC(a1 / 4); - } -} - -static void sub_8073904(u16 a1) { - int v1; - v1 = a1 % 2; - QueueTilesetAnimDma(gTilesetAnimTable_Building[v1], - (u8 *)(BG_VRAM + 0x3e00), - 0x80); -} - -static void sub_807392C(u16 a1) { - int v1; - v1 = a1 % 3; - QueueTilesetAnimDma(gTilesetAnimTable_SootopolisGym_0[v1], - (u8 *)(BG_VRAM + 0x7e00), - 0x180); - QueueTilesetAnimDma(gTilesetAnimTable_SootopolisGym_1[v1], - (u8 *)(BG_VRAM + 0x7a00), - 0x280); -} - -static void sub_8073974(u16 a1) { - int v1; - v1 = a1 % 4; - QueueTilesetAnimDma(gTilesetAnimTable_EliteFour_0[v1], - (u8 *)(BG_VRAM + 0x7f00), - 0x20); -} - -static void sub_807399C(u16 a1) { - int v1; - v1 = a1 % 2; - QueueTilesetAnimDma(gTilesetAnimTable_EliteFour_1[v1], - (u8 *)(BG_VRAM + 0x7c00), - 0x80); -} - -static void sub_80739C4(u16 a1) { - int v1; - v1 = a1 % 2; - QueueTilesetAnimDma(gTilesetAnimTable_MauvilleGym[v1], - (u8 *)(BG_VRAM + 0x5200), - 0x200); +static void sub_80739C4(u16 a1) +{ + int v1; + v1 = a1 % 2; + QueueTilesetAnimDma(gTilesetAnimTable_MauvilleGym[v1], (u8 *)(BG_VRAM + 0x5200), 0x200); } -static void sub_80739EC(u16 a1) { - int v1; - v1 = a1 % 2; - QueueTilesetAnimDma(gTilesetAnimTable_BikeShop[v1], - (u8 *)(BG_VRAM + 0x7e00), - 0x120); +static void sub_80739EC(u16 a1) +{ + int v1; + v1 = a1 % 2; + QueueTilesetAnimDma(gTilesetAnimTable_BikeShop[v1], (u8 *)(BG_VRAM + 0x7e00), 0x120); } diff --git a/src/trainer_card.c b/src/trainer_card.c index d4e8c5e9f..3b40fa6e7 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -17,7 +17,8 @@ typedef void (*Callback)(void); -struct Struct2000000 { +struct Struct2000000 +{ /*0x00*/ u8 var_0; /*0x01*/ bool8 var_1; /*0x02*/ u8 var_2; @@ -70,7 +71,8 @@ void FormatPlayTime(u8 *playtime, u16 hours, u16 minutes, s16 colon); u16 GetPokedexSeenCount(void); -enum { +enum +{ TD_0, TD_1, TD_CALLBACK, @@ -144,13 +146,15 @@ static void TrainerCard_Back_PrintPokemonTrades_Label(void); static void TrainerCard_Back_PrintPokemonTrades(void); void unref_sub_8094588(u16 left, u16 top); -void sub_8093110(Callback arg1) { +void sub_8093110(Callback arg1) +{ sub_80932AC(arg1); SetMainCallback2(sub_8093174); unk_2000000.language = GAME_LANGUAGE; } -void sub_8093130(u8 playerIndex, Callback arg2) { +void sub_8093130(u8 playerIndex, Callback arg2) +{ struct Struct2000000* r2; struct LinkPlayer* r3; struct LinkPlayerMapObject* r4; @@ -169,53 +173,57 @@ void sub_8093130(u8 playerIndex, Callback arg2) { } -static void sub_8093174(void) { - switch (gMain.state) { - case 0: - sub_8093534(); - sub_8093688(); - gMain.state += 1; - break; - case 1: - sub_8093598(); - gMain.state += 1; - break; - case 2: - sub_80935EC(); - gMain.state += 1; - break; - case 3: - sub_8093610(); - sub_80937A4(); - gMain.state += 1; - break; - case 4: - sub_80937BC(); - gMain.state += 1; - case 5: - if (MultistepInitMenuWindowContinue() == FALSE) { - return; - } - gMain.state += 1; - break; - case 6: - sub_80937F0(); - gMain.state += 1; - break; - case 7: - sub_80937D8(); - gMain.state += 1; - break; - case 8: - nullsub_15(); - sub_8093800(); - sub_8093550(); - SetMainCallback2(sub_809323C); - break; +static void sub_8093174(void) +{ + switch (gMain.state) + { + case 0: + sub_8093534(); + sub_8093688(); + gMain.state += 1; + break; + case 1: + sub_8093598(); + gMain.state += 1; + break; + case 2: + sub_80935EC(); + gMain.state += 1; + break; + case 3: + sub_8093610(); + sub_80937A4(); + gMain.state += 1; + break; + case 4: + sub_80937BC(); + gMain.state += 1; + case 5: + if (MultistepInitMenuWindowContinue() == FALSE) + { + return; + } + gMain.state += 1; + break; + case 6: + sub_80937F0(); + gMain.state += 1; + break; + case 7: + sub_80937D8(); + gMain.state += 1; + break; + case 8: + nullsub_15(); + sub_8093800(); + sub_8093550(); + SetMainCallback2(sub_809323C); + break; } } -static void sub_809323C(void) { +static void sub_809323C(void) +{ RunTasks(); AnimateSprites(); BuildOamBuffer(); @@ -237,43 +245,51 @@ static void sub_8093254(void) DmaCopy16(3, gUnknown_03004DE0, gUnknown_03004DE0 + 0x780, 320); } -static void sub_80932AC(Callback callBack) { +static void sub_80932AC(Callback callBack) +{ u8 taskId = CreateTask(nullsub_60, 0xFF); struct Task *task = &gTasks[taskId]; task->data[TD_0] = FALSE; - StoreWordInTwoHalfwords(&task->data[TD_CALLBACK], (u32) callBack); + StoreWordInTwoHalfwords(&task->data[TD_CALLBACK], (u32)callBack); } -static void sub_80932E4(u8 arg1, Callback callBack) { +static void sub_80932E4(u8 arg1, Callback callBack) +{ u8 taskId = CreateTask(nullsub_60, 0xFF); struct Task *task = &gTasks[taskId]; task->data[TD_0] = TRUE; task->data[TD_1] = arg1; - StoreWordInTwoHalfwords(&task->data[TD_CALLBACK], (u32) callBack); + StoreWordInTwoHalfwords(&task->data[TD_CALLBACK], (u32)callBack); } -void sub_8093324(void) { +void sub_8093324(void) +{ u8 taskId = FindTaskIdByFunc(nullsub_60); struct Task *task = &gTasks[taskId]; unk_2000000.var_1 = task->data[TD_0]; - LoadWordFromTwoHalfwords((u16 *) &task->data[TD_CALLBACK], (u32 *) &unk_2000000.var_60); + LoadWordFromTwoHalfwords((u16 *)&task->data[TD_CALLBACK], (u32 *)&unk_2000000.var_60); - if (unk_2000000.var_1) { - struct TrainerCard (*trainerCards)[4] = &gTrainerCards; + if (unk_2000000.var_1) + { + struct TrainerCard(*trainerCards)[4] = &gTrainerCards; s16 var = task->data[TD_1]; struct TrainerCard *dest = &(*trainerCards)[var]; memcpy(&unk_2000000.var_64, dest, sizeof(struct TrainerCard)); - } else { + } + else + { sub_8093390(&unk_2000000.var_64); } } -static void nullsub_60(u8 taskid) { +static void nullsub_60(u8 taskid) +{ } -void sub_8093390(struct TrainerCard *arg1) { +void sub_8093390(struct TrainerCard *arg1) +{ u32 playTime; bool32 enteredHallOfFame; bool8 r4; @@ -285,7 +301,8 @@ void sub_8093390(struct TrainerCard *arg1) { playTime = GetGameStat(GAME_STAT_FIRST_HOF_PLAY_TIME); enteredHallOfFame = GetGameStat(GAME_STAT_ENTERED_HOF); - if (!enteredHallOfFame) { + if (!enteredHallOfFame) + { playTime = 0; } arg1->firstHallOfFameA = playTime >> 16; @@ -314,82 +331,97 @@ void sub_8093390(struct TrainerCard *arg1) { // Battle tower? arg1->battleTowerWins = gSaveBlock2.filler_A8.var_4C8; arg1->battleTowerLosses = gSaveBlock2.filler_A8.var_4CA; - if (arg1->battleTowerWins > 9999) { + if (arg1->battleTowerWins > 9999) + { arg1->battleTowerWins = 9999; } - if (arg1->battleTowerLosses > 9999) { + if (arg1->battleTowerLosses > 9999) + { arg1->battleTowerLosses = 9999; } r4 = FALSE; - if (sub_80C4D50() > 4) { + if (sub_80C4D50() > 4) + { r4 = TRUE; } arg1->var_4 = r4; arg1->money = gSaveBlock1.money; - for (i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) + { arg1->var_28[i] = gSaveBlock1.unk2B1C[i]; } - for (i = 0; i < 8; i++) { + for (i = 0; i < 8; i++) + { arg1->playerName[i] = gSaveBlock2.playerName[i]; } arg1->stars = sub_80934F4(arg1); } -u8 sub_80934C4(u8 id) { +u8 sub_80934C4(u8 id) +{ return gTrainerCards[id].stars; } -static u32 sav12_xor_get_clamped_above(u8 index, u32 maxVal) { +static u32 sav12_xor_get_clamped_above(u8 index, u32 maxVal) +{ u32 value = GetGameStat(index); - if (value > maxVal) { + if (value > maxVal) + { value = maxVal; } return value; } -static u8 sub_80934F4(struct TrainerCard *trainerCard) { +static u8 sub_80934F4(struct TrainerCard *trainerCard) +{ u8 value = 0; - if (trainerCard->firstHallOfFameA != 0 || trainerCard->firstHallOfFameB != 0 || trainerCard->firstHallOfFameC != 0) { + if (trainerCard->firstHallOfFameA != 0 || trainerCard->firstHallOfFameB != 0 || trainerCard->firstHallOfFameC != 0) + { value += 1; } - if (trainerCard->var_3) { + if (trainerCard->var_3) + { value += 1; } - if (trainerCard->battleTowerLosses > 49) { + if (trainerCard->battleTowerLosses > 49) + { value += 1; } - if (trainerCard->var_4) { + if (trainerCard->var_4) + { value += 1; } return value; } -static void sub_8093534(void) { +static void sub_8093534(void) +{ SetVBlankCallback(NULL); SetHBlankCallback(NULL); REG_DISPCNT = 0; } -static void sub_8093550(void) { +static void sub_8093550(void) +{ u16 backup; SetVBlankCallback(sub_8093254); backup = REG_IME; REG_IME = 0; - REG_IE |= INTR_FLAG_VBLANK| INTR_FLAG_HBLANK; + REG_IE |= INTR_FLAG_VBLANK | INTR_FLAG_HBLANK; REG_IME = backup; REG_DISPSTAT |= DISPSTAT_VBLANK_INTR | DISPSTAT_HBLANK_INTR; @@ -397,7 +429,8 @@ static void sub_8093550(void) { } __attribute__((naked)) -void sub_8093598() { +void sub_8093598() +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ sub sp, 0x4\n\ @@ -445,7 +478,8 @@ _080935E8: .4byte 0x81000800\n\ } __attribute__((naked)) -void sub_80935EC() { +void sub_80935EC() +{ asm(".syntax unified\n\ sub sp, 0x4\n\ movs r2, 0xE0\n\ @@ -468,7 +502,8 @@ _0809360C: .4byte 0x81000200\n\ } __attribute__((naked)) -void sub_8093610() { +void sub_8093610() +{ asm(".syntax unified\n\ push {r4,r5,lr}\n\ ldr r5, _08093664 @ =REG_BG0CNT\n\ @@ -525,7 +560,8 @@ _08093684: .4byte 0x00000a03\n\ } #ifdef NONMATCHING -static void sub_8093688(void) { +static void sub_8093688(void) +{ int i; asm_comment("WIP"); @@ -540,7 +576,8 @@ static void sub_8093688(void) { unk_2000000.var_5 = FALSE; unk_2000000.var_6 = FALSE; - for (i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) + { sub_80EB3FC(unk_2000000.var_20[i], unk_2000000.var_64.var_28[i]); } @@ -549,7 +586,8 @@ static void sub_8093688(void) { #else __attribute__((naked)) -static void sub_8093688(void) { +static void sub_8093688(void) +{ asm(".syntax unified\n\ push {r4-r6,lr}\n\ bl sub_8093324\n\ @@ -592,7 +630,8 @@ _080936D0: .4byte 0x02000000\n\ #endif -void sub_80936D4(void) { +void sub_80936D4(void) +{ unk_2000000.var_7 = FALSE; unk_2000000.var_8 = FALSE; unk_2000000.var_9 = FALSE; @@ -603,86 +642,104 @@ void sub_80936D4(void) { memset(unk_2000000.var_e, 0, sizeof(unk_2000000.var_e)); - if (unk_2000000.var_64.hasPokedex) { + if (unk_2000000.var_64.hasPokedex) + { unk_2000000.var_7 += TRUE; } if (unk_2000000.var_64.firstHallOfFameA != 0 || unk_2000000.var_64.firstHallOfFameB != 0 || - unk_2000000.var_64.firstHallOfFameC != 0) { + unk_2000000.var_64.firstHallOfFameC != 0) + { unk_2000000.var_8 += TRUE; } - if (unk_2000000.var_64.linkBattleWins != 0 || unk_2000000.var_64.linkBattleLosses != 0) { + if (unk_2000000.var_64.linkBattleWins != 0 || unk_2000000.var_64.linkBattleLosses != 0) + { unk_2000000.var_9 += TRUE; } - if (unk_2000000.var_64.battleTowerWins != 0 || unk_2000000.var_64.battleTowerLosses != 0) { + if (unk_2000000.var_64.battleTowerWins != 0 || unk_2000000.var_64.battleTowerLosses != 0) + { unk_2000000.var_a += TRUE; } - if (unk_2000000.var_64.contestsWithFriends != 0) { + if (unk_2000000.var_64.contestsWithFriends != 0) + { unk_2000000.var_b += TRUE; } - if (unk_2000000.var_64.pokeblocksWithFriends != 0) { + if (unk_2000000.var_64.pokeblocksWithFriends != 0) + { unk_2000000.var_c += TRUE; } - if (unk_2000000.var_64.pokemonTrades != 0) { + if (unk_2000000.var_64.pokemonTrades != 0) + { unk_2000000.var_d += TRUE; } - if (!unk_2000000.var_1) { + if (!unk_2000000.var_1) + { u32 badgeFlag; int i; i = 0; badgeFlag = BADGE01_GET; - while (TRUE) { - if (FlagGet(badgeFlag)) { + while (TRUE) + { + if (FlagGet(badgeFlag)) + { unk_2000000.var_e[i] += TRUE; } badgeFlag += 1; i += 1; - if (badgeFlag > BADGE08_GET) { + if (badgeFlag > BADGE08_GET) + { break; } } } } -void sub_80937A4() { +void sub_80937A4() +{ ResetPaletteFade(); ResetSpriteData(); FreeAllSpritePalettes(); ResetTasks(); } -void sub_80937BC() { +void sub_80937BC() +{ SetUpWindowConfig(&WindowConfig_TrainerCard_Back_Values); MultistepInitMenuWindowBegin(&WindowConfig_TrainerCard_Back_Values); } -static void sub_80937D8() { +static void sub_80937D8() +{ sub_8093E04(); sub_8093E28(); sub_8093F64(); sub_8093DAC(); } -static void sub_80937F0() { +static void sub_80937F0() +{ sub_8093EF8(); } -static void nullsub_15(void) { +static void nullsub_15(void) +{ } -static void sub_8093800() { +static void sub_8093800() +{ sub_809380C(); } -static void sub_809380C() { +static void sub_809380C() +{ u8 taskId; taskId = CreateTask(sub_809382C, 0); @@ -690,7 +747,8 @@ static void sub_809380C() { } __attribute__((naked)) -static void sub_809382C(u8 taskId) { +static void sub_809382C(u8 taskId) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ lsls r0, 24\n\ @@ -722,7 +780,8 @@ _08093860: .4byte gTasks\n\ } __attribute__((naked)) -bool8 sub_8093864() { +bool8 sub_8093864() +{ asm(".syntax unified\n\ push {r4,r5,lr}\n\ sub sp, 0x4\n\ @@ -758,7 +817,8 @@ _080938A4: .4byte gSaveBlock2\n\ } __attribute__((naked)) -bool8 sub_80938A8() { +bool8 sub_80938A8() +{ asm(".syntax unified\n\ push {lr}\n\ ldr r0, _080938C4 @ =gPaletteFade\n\ @@ -782,7 +842,8 @@ _080938C8: .4byte 0x02000000\n\ } __attribute__((naked)) -bool8 sub_80938CC() { +bool8 sub_80938CC() +{ asm(".syntax unified\n\ push {lr}\n\ ldr r0, _080938E4 @ =gMain\n\ @@ -829,7 +890,8 @@ _08093914:\n\ .syntax divided\n"); } -bool8 sub_8093918() { +bool8 sub_8093918() +{ sub_8093A28(); PlaySE(SE_CARD); @@ -838,8 +900,10 @@ bool8 sub_8093918() { return FALSE; } -bool8 sub_8093938() { - if (sub_8093A48()) { +bool8 sub_8093938() +{ + if (sub_8093A48()) + { unk_2000000.var_0 = 2; } @@ -847,7 +911,8 @@ bool8 sub_8093938() { } __attribute__((naked)) -bool8 sub_8093954() { +bool8 sub_8093954() +{ asm(".syntax unified\n\ push {lr}\n\ sub sp, 0x4\n\ @@ -872,35 +937,42 @@ _0809397C: .4byte 0x02000000\n\ .syntax divided\n"); } -bool8 sub_8093980() { - if (!gPaletteFade.active) { - SetMainCallback2((MainCallback) unk_2000000.var_60); +bool8 sub_8093980() +{ + if (!gPaletteFade.active) + { + SetMainCallback2((MainCallback)unk_2000000.var_60); } return FALSE; } -static void sub_80939A4(void) { +static void sub_80939A4(void) +{ CreateTask(sub_80939DC, 0); BasicInitMenuWindow(&WindowConfig_TrainerCard_Back_Values); } -static void sub_80939C0(void) { +static void sub_80939C0(void) +{ u8 taskId; taskId = FindTaskIdByFunc(sub_80939DC); - if (taskId != 0xFF) { + if (taskId != 0xFF) + { DestroyTask(taskId); } } -static void sub_80939DC(u8 taskId) { +static void sub_80939DC(u8 taskId) +{ u8 buffer[32]; struct Task *task; task = &gTasks[taskId]; - if (unk_2000000.var_5 != task->data[TD_1]) { + if (unk_2000000.var_5 != task->data[TD_1]) + { task->data[TD_1] = unk_2000000.var_5; task->data[TD_0] ^= TRUE; } @@ -909,7 +981,8 @@ static void sub_80939DC(u8 taskId) { MenuPrint(buffer, 10, 12); } -static void sub_8093A28(void) { +static void sub_8093A28(void) +{ u8 taskId; taskId = CreateTask(sub_8093A68, 0); @@ -917,7 +990,8 @@ static void sub_8093A28(void) { } __attribute__((naked)) -static u8 sub_8093A48() { +static u8 sub_8093A48() +{ asm(".syntax unified\n\ push {lr}\n\ ldr r0, _08093A5C @ =sub_8093A68\n\ @@ -939,7 +1013,8 @@ _08093A62:\n\ } __attribute__((naked)) -static void sub_8093A68(u8 taskId) { +static void sub_8093A68(u8 taskId) +{ asm(".syntax unified\n\ push {r4,r5,lr}\n\ lsls r0, 24\n\ @@ -971,7 +1046,8 @@ _08093A9C: .4byte gTasks\n\ } __attribute__((naked)) -bool8 sub_8093AA0() { +bool8 sub_8093AA0() +{ asm(".syntax unified\n\ push {r4,lr}\n\ adds r4, r0, 0\n\ @@ -1012,7 +1088,8 @@ _08093AEC: .4byte sub_8093D7C\n\ } __attribute__((naked)) -bool8 sub_8093AF0() { +bool8 sub_8093AF0() +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r10\n\ @@ -1162,11 +1239,13 @@ _08093C08: .4byte 0x0000fffc\n\ .syntax divided\n"); } -bool8 sub_8093C0C(struct TrainerCard *trainerCard) { +bool8 sub_8093C0C(struct TrainerCard *trainerCard) +{ sub_80939C0(); sub_8093DAC(); - if (!unk_2000000.var_3) { + if (!unk_2000000.var_3) + { sub_80939A4(); } @@ -1176,7 +1255,8 @@ bool8 sub_8093C0C(struct TrainerCard *trainerCard) { } __attribute__((naked)) -bool8 sub_8093C38() { +bool8 sub_8093C38() +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r10\n\ @@ -1324,7 +1404,8 @@ _08093D4C: .4byte 0x0000fffc\n\ .syntax divided\n"); } -bool8 sub_8093D50(void) { +bool8 sub_8093D50(void) +{ u8 taskId; unk_2000000.var_4 = FALSE; @@ -1338,7 +1419,8 @@ bool8 sub_8093D50(void) { } __attribute__((naked)) -void sub_8093D7C(void) { +void sub_8093D7C(void) +{ asm(".syntax unified\n\ ldr r1, _08093DA0 @ =gUnknown_03004DE0\n\ ldr r0, _08093DA4 @ =REG_VCOUNT\n\ @@ -1365,15 +1447,20 @@ _08093DA8: .4byte 0x4000012 @ REG_BG0VOFS\n\ .syntax divided\n"); } -static void sub_8093DAC(void) { - if (unk_2000000.var_3) { +static void sub_8093DAC(void) +{ + if (unk_2000000.var_3) + { sub_8093DEC(); - } else { + } + else + { sub_8093DC8(); } } -static void sub_8093DC8(void) { +static void sub_8093DC8(void) +{ MenuZeroFillScreen(); sub_80940E4(); sub_8093F14(); @@ -1383,7 +1470,8 @@ static void sub_8093DC8(void) { sub_8094140(); } -static void sub_8093DEC(void) { +static void sub_8093DEC(void) +{ MenuZeroFillScreen(); sub_80940E4(); sub_8093F48(); @@ -1391,7 +1479,8 @@ static void sub_8093DEC(void) { } __attribute__((naked)) -static void sub_8093E04() { +static void sub_8093E04() +{ asm(".syntax unified\n\ ldr r0, _08093E20 @ =REG_BG0VOFS\n\ ldr r2, _08093E24 @ =0x0000fffc\n\ @@ -1414,7 +1503,8 @@ _08093E24: .4byte 0x0000fffc\n\ } __attribute__((naked)) -static void sub_8093E28(void) { +static void sub_8093E28(void) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ bl sub_8093EA0\n\ @@ -1471,22 +1561,26 @@ _08093E9C: .4byte 0x80000200\n\ .syntax divided\n"); } -void sub_8093EA0(void) { +void sub_8093EA0(void) +{ LoadPalette(gUnknown_083B5EF8[unk_2000000.var_2], 0, 48 * 2); LoadPalette(gBadgesPalette, 48, 16 * 2); LoadPalette(gUnknown_083B5F4C, 64, 16 * 2); - if (unk_2000000.var_64.gender != MALE) { + if (unk_2000000.var_64.gender != MALE) + { LoadPalette(gUnknown_083B5F0C, 16, 16 * 2); } } -static void sub_8093EF8(void) { - LoadTrainerGfx_TrainerCard(unk_2000000.var_64.gender, 80, (void *) (VRAM + 0x1880)); +static void sub_8093EF8(void) +{ + LoadTrainerGfx_TrainerCard(unk_2000000.var_64.gender, 80, (void *)(VRAM + 0x1880)); } __attribute__((naked)) -static void sub_8093F14(void) { +static void sub_8093F14(void) +{ asm(".syntax unified\n\ push {lr}\n\ sub sp, 0x8\n\ @@ -1514,16 +1608,19 @@ _08093F44: .4byte 0x06004800\n\ .syntax divided\n"); } -static void sub_8093F48(void) { - CpuFastSet(gUnknown_08E8CFC0, (void *) (VRAM + 0x4800), 320); +static void sub_8093F48(void) +{ + CpuFastSet(gUnknown_08E8CFC0, (void *)(VRAM + 0x4800), 320); } -static void sub_8093F64(void) { - CpuFastSet(gUnknown_08E8D9C0, (void *) (VRAM + 0x5000), 320); +static void sub_8093F64(void) +{ + CpuFastSet(gUnknown_08E8D9C0, (void *)(VRAM + 0x5000), 320); } __attribute__((naked)) -static void sub_8093F80(void) { +static void sub_8093F80(void) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ movs r5, 0xC4\n\ @@ -1570,7 +1667,8 @@ _08093FCC: .4byte 0x06004000\n\ } __attribute__((naked)) -static void sub_8093FD0(void) { +static void sub_8093FD0(void) +{ asm(".syntax unified\n\ push {r4-r6,lr}\n\ ldr r4, _0809402C @ =0x06004000\n\ @@ -1629,7 +1727,8 @@ _08094034: .4byte 0x0000408f\n\ } __attribute__((naked)) -static void sub_8094038(void) { +static void sub_8094038(void) +{ asm(".syntax unified\n\ push {r4-r7,lr}\n\ mov r7, r9\n\ @@ -1719,7 +1818,8 @@ _080940E0: .4byte 0x00000402\n\ } __attribute__((naked)) -static void sub_80940E4() { +static void sub_80940E4() +{ asm(".syntax unified\n\ push {r4,lr}\n\ movs r2, 0\n\ @@ -1747,7 +1847,8 @@ _0809410C: .4byte 0x000003ff\n\ } __attribute__((naked)) -static void sub_8094110() { +static void sub_8094110() +{ asm(".syntax unified\n\ push {r4-r6,lr}\n\ ldr r6, _0809413C @ =0x06004800\n\ @@ -1778,7 +1879,8 @@ _0809413C: .4byte 0x06004800\n\ } -static void sub_8094140(void) { +static void sub_8094140(void) +{ u8 *buffer; BasicInitMenuWindow(&WindowConfig_TrainerCard_Back_Values); @@ -1794,7 +1896,8 @@ static void sub_8094140(void) { sub_809429C(); } -static void sub_8094188(void) { +static void sub_8094188(void) +{ BasicInitMenuWindow(&WindowConfig_TrainerCard_Back_Values); TrainerCard_Back_PrintName(); TrainerCard_Back_PrintHallOfFameTime_Label(); @@ -1813,21 +1916,25 @@ static void sub_8094188(void) { TrainerCard_Back_PrintPokemonTrades(); } -static void TrainerCard_Front_PrintTrainerID(void) { +static void TrainerCard_Front_PrintTrainerID(void) +{ u8 buffer[8]; ConvertIntToDecimalStringN(buffer, unk_2000000.var_64.trainerId, STR_CONV_MODE_LEADING_ZEROS, 5); MenuPrint(buffer, 20, 2); } -static void TrainerCard_Front_PrintMoney(void) { +static void TrainerCard_Front_PrintMoney(void) +{ sub_80B7AEC(unk_2000000.var_64.money, 16, 8); } -static void TrainerCard_Front_PrintPokedexCount(void) { +static void TrainerCard_Front_PrintPokedexCount(void) +{ u8 buffer[16]; - if (unk_2000000.var_7 == FALSE) { + if (unk_2000000.var_7 == FALSE) + { sub_8094110(); return; } @@ -1836,7 +1943,8 @@ static void TrainerCard_Front_PrintPokedexCount(void) { MenuPrint_RightAligned(buffer, 16, 10); } -static void TrainerCard_Front_PrintPlayTime(u8 *arg1, s16 colon) { +static void TrainerCard_Front_PrintPlayTime(u8 *arg1, s16 colon) +{ u8 buffer[16]; u16 playTimeHours; u16 playTimeMinutes; @@ -1844,7 +1952,8 @@ static void TrainerCard_Front_PrintPlayTime(u8 *arg1, s16 colon) { playTimeHours = gSaveBlock2.playTimeHours; playTimeMinutes = gSaveBlock2.playTimeMinutes; - if (unk_2000000.var_1 != 0) { + if (unk_2000000.var_1 != 0) + { playTimeHours = unk_2000000.var_64.playTimeHours; playTimeMinutes = unk_2000000.var_64.playTimeMinutes; } @@ -1853,80 +1962,88 @@ static void TrainerCard_Front_PrintPlayTime(u8 *arg1, s16 colon) { sub_8072C74(arg1, buffer, 48, 1); } -static void sub_809429C(void) { - u8 *bufferPtr; +static void sub_809429C(void) +{ + u8 *str; - if (unk_2000000.var_1 == FALSE) { + if (unk_2000000.var_1 == FALSE) + { return; } - bufferPtr = gStringVar1; - bufferPtr = StringCopy(bufferPtr, unk_2000000.var_20[0]); - bufferPtr[0] = 00; - bufferPtr++; - bufferPtr = StringCopy(bufferPtr, unk_2000000.var_20[1]); + str = gStringVar1; + str = StringCopy(str, unk_2000000.var_20[0]); + str[0] = 00; + str++; + str = StringCopy(str, unk_2000000.var_20[1]); MenuPrint(gStringVar1, 2, 14); - bufferPtr = gStringVar1; - bufferPtr = StringCopy(bufferPtr, unk_2000000.var_20[2]); - bufferPtr[0] = 00; - bufferPtr++; - bufferPtr = StringCopy(bufferPtr, unk_2000000.var_20[3]); + str = gStringVar1; + str = StringCopy(str, unk_2000000.var_20[2]); + str[0] = 00; + str++; + str = StringCopy(str, unk_2000000.var_20[3]); MenuPrint(gStringVar1, 2, 16); } -static void TrainerCard_Back_PrintName(void) { - u8 *bufferPtr; +static void TrainerCard_Back_PrintName(void) +{ + u8 *str; - bufferPtr = gStringVar1; - StringCopy(bufferPtr, unk_2000000.var_64.playerName); - ConvertInternationalString(bufferPtr, unk_2000000.language); + str = gStringVar1; + StringCopy(str, unk_2000000.var_64.playerName); + ConvertInternationalString(str, unk_2000000.language); - StringAppend(bufferPtr, gOtherText_TrainersTrainerCard); + StringAppend(str, gOtherText_TrainersTrainerCard); MenuPrint_RightAligned(gStringVar1, 28, 2); } -static void TrainerCard_Back_PrintHallOfFameTime_Label(void) { - if (unk_2000000.var_8 == FALSE) { +static void TrainerCard_Back_PrintHallOfFameTime_Label(void) +{ + if (unk_2000000.var_8 == FALSE) + { return; } MenuPrint(gOtherText_FirstHOF, 3, 5); } -static void TrainerCard_Back_PrintHallOfFameTime(void) { - u8 *bufferPtr; +static void TrainerCard_Back_PrintHallOfFameTime(void) +{ + u8 *str; - if (unk_2000000.var_8 == FALSE) { + if (unk_2000000.var_8 == FALSE) + { return; } - bufferPtr = gStringVar1; - bufferPtr = ConvertIntToDecimalStringN(bufferPtr, unk_2000000.var_64.firstHallOfFameA, STR_CONV_MODE_RIGHT_ALIGN, - 3); - bufferPtr = StringCopy(bufferPtr, gUnknown_083B5EF4); - bufferPtr = ConvertIntToDecimalStringN(bufferPtr, unk_2000000.var_64.firstHallOfFameB, STR_CONV_MODE_LEADING_ZEROS, - 2); - bufferPtr = StringCopy(bufferPtr, gUnknown_083B5EF4); - bufferPtr = ConvertIntToDecimalStringN(bufferPtr, unk_2000000.var_64.firstHallOfFameC, STR_CONV_MODE_LEADING_ZEROS, - 2); + str = gStringVar1; + str = ConvertIntToDecimalStringN(str, unk_2000000.var_64.firstHallOfFameA, STR_CONV_MODE_RIGHT_ALIGN, 3); + str = StringCopy(str, gUnknown_083B5EF4); + str = ConvertIntToDecimalStringN(str, unk_2000000.var_64.firstHallOfFameB, STR_CONV_MODE_LEADING_ZEROS, 2); + str = StringCopy(str, gUnknown_083B5EF4); + str = ConvertIntToDecimalStringN(str, unk_2000000.var_64.firstHallOfFameC, STR_CONV_MODE_LEADING_ZEROS, 2); MenuPrint_RightAligned(gStringVar1, 28, 5); } -static void TrainerCard_Back_PrintLinkBattlesLabel(void) { - if (unk_2000000.var_9 == FALSE) { +static void TrainerCard_Back_PrintLinkBattlesLabel(void) +{ + if (unk_2000000.var_9 == FALSE) + { return; } MenuPrint(gOtherText_LinkCableBattles, 3, 7); } -static void TrainerCard_Back_PrintLinkBattles(void) { +static void TrainerCard_Back_PrintLinkBattles(void) +{ u8 buffer[16]; - if (unk_2000000.var_9 == FALSE) { + if (unk_2000000.var_9 == FALSE) + { return; } @@ -1937,18 +2054,22 @@ static void TrainerCard_Back_PrintLinkBattles(void) { MenuPrint_RightAligned(buffer, 28, 7); } -static void TrainerCard_Back_PrintBattleTower_Label(void) { - if (unk_2000000.var_a == FALSE) { +static void TrainerCard_Back_PrintBattleTower_Label(void) +{ + if (unk_2000000.var_a == FALSE) + { return; } MenuPrint(gOtherText_BattleTowerWinRecord, 3, 15); } -static void TrainerCard_Back_PrintBattleTower(void) { +static void TrainerCard_Back_PrintBattleTower(void) +{ u8 buffer[16]; - if (unk_2000000.var_a == FALSE) { + if (unk_2000000.var_a == FALSE) + { return; } @@ -1959,18 +2080,22 @@ static void TrainerCard_Back_PrintBattleTower(void) { MenuPrint_PixelCoords(buffer, 149, 120, 0); } -static void TrainerCard_Back_PrintLinkContests_Label(void) { - if (unk_2000000.var_b == FALSE) { +static void TrainerCard_Back_PrintLinkContests_Label(void) +{ + if (unk_2000000.var_b == FALSE) + { return; } MenuPrint(gOtherText_ContestRecord, 3, 13); } -static void TrainerCard_Back_PrintLinkContests(void) { +static void TrainerCard_Back_PrintLinkContests(void) +{ u8 buffer[8]; - if (unk_2000000.var_b == FALSE) { + if (unk_2000000.var_b == FALSE) + { return; } @@ -1978,18 +2103,22 @@ static void TrainerCard_Back_PrintLinkContests(void) { MenuPrint_RightAligned(buffer, 28, 13); } -static void TrainerCard_Back_PrintLinkPokeblocks_Label(void) { - if (unk_2000000.var_c == FALSE) { +static void TrainerCard_Back_PrintLinkPokeblocks_Label(void) +{ + if (unk_2000000.var_c == FALSE) + { return; } MenuPrint(gOtherText_MixingRecord, 3, 11); } -static void TrainerCard_Back_PrintLinkPokeblocks(void) { +static void TrainerCard_Back_PrintLinkPokeblocks(void) +{ u8 buffer[8]; - if (unk_2000000.var_c == FALSE) { + if (unk_2000000.var_c == FALSE) + { return; } @@ -1997,18 +2126,22 @@ static void TrainerCard_Back_PrintLinkPokeblocks(void) { MenuPrint_RightAligned(buffer, 28, 11); } -static void TrainerCard_Back_PrintPokemonTrades_Label(void) { - if (unk_2000000.var_d == FALSE) { +static void TrainerCard_Back_PrintPokemonTrades_Label(void) +{ + if (unk_2000000.var_d == FALSE) + { return; } MenuPrint(gOtherText_TradeRecord, 3, 9); } -static void TrainerCard_Back_PrintPokemonTrades(void) { +static void TrainerCard_Back_PrintPokemonTrades(void) +{ u8 buffer[8]; - if (unk_2000000.var_d == FALSE) { + if (unk_2000000.var_d == FALSE) + { return; } @@ -2016,12 +2149,14 @@ static void TrainerCard_Back_PrintPokemonTrades(void) { MenuPrint_RightAligned(buffer, 28, 9); } -void unref_sub_8094588(u16 left, u16 top) { +void unref_sub_8094588(u16 left, u16 top) +{ u8 *text = gOtherText_Boy; - if (gSaveBlock2.playerGender == FEMALE) { + if (gSaveBlock2.playerGender == FEMALE) + { text = gOtherText_Girl; } - MenuPrint(text, (u8) left, (u8) top); + MenuPrint(text, (u8)left, (u8)top); } diff --git a/src/trainer_see.c b/src/trainer_see.c index 28904d04d..9d58faab8 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -23,7 +23,7 @@ bool8 CheckTrainers(void) { u8 i; - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) { if ( gMapObjects[i].active ) if ( gMapObjects[i].trainerType == 1 || gMapObjects[i].trainerType == 3 ) @@ -37,14 +37,14 @@ bool8 CheckTrainer(u8 trainer) { u8 *scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(trainer); - if(GetTrainerFlagFromScriptPointer(scriptPtr)) + if (GetTrainerFlagFromScriptPointer(scriptPtr)) return FALSE; else { struct MapObject *trainerObj = &gMapObjects[trainer]; u8 canApproach = TrainerCanApproachPlayer(trainerObj); - if(canApproach != 0) + if (canApproach != 0) { TrainerWantsBattle(trainer, scriptPtr); sub_80842C8(trainerObj, (canApproach - 1)); @@ -71,7 +71,7 @@ bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj) } else // spinners { - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { playerCoord = gIsTrainerInRange[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y); if ( CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, playerCoord, i + 1) ) // directions are 1-4 instead of 0-3. south north west east @@ -233,7 +233,7 @@ s8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj) { if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) { - if(task->data[3]) + if (task->data[3]) { FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18)); task->data[3]--; @@ -282,7 +282,7 @@ s8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainerObj) // te s8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj) { - if(!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) + if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) { FieldObjectSetSpecialAnim(trainerObj, 0x59); @@ -301,7 +301,7 @@ s8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj) s8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj) { - if(!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) + if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) { FieldObjectSetSpecialAnim(trainerObj, 0x3E); @@ -312,7 +312,7 @@ s8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj) s8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj) { - if(FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj)) + if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj)) { gUnknown_0202FF84[0] = trainerObj->coords2.x; gUnknown_0202FF84[1] = trainerObj->coords2.y; @@ -328,7 +328,7 @@ s8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj) { struct Sprite *sprite; - if(gSprites[task->data[4]].animCmdIndex == 2) + if (gSprites[task->data[4]].animCmdIndex == 2) { trainerObj->mapobj_bit_26 = 0; trainerObj->mapobj_bit_2 = 1; @@ -344,7 +344,7 @@ s8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj) s8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj) { - if(!FieldEffectActiveListContains(49)) + if (!FieldEffectActiveListContains(49)) task->data[0] = 3; return 0; @@ -357,13 +357,13 @@ void sub_80846E4(u8 taskId) // another mapObj loaded into by loadword? LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&mapObj); - if(!task->data[7]) + if (!task->data[7]) { FieldObjectClearAnim(mapObj); task->data[7]++; } gTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj); - if(task->data[0] == 3 && !FieldEffectActiveListContains(49)) + if (task->data[0] == 3 && !FieldEffectActiveListContains(49)) { npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18)); sub_805C774(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18)); @@ -7,7 +7,8 @@ #include "string_util.h" #include "text.h" -enum { +enum +{ TVSHOW_FAN_CLUB_LETTER = 1, TVSHOW_RECENT_HAPPENINGS = 2, TVSHOW_PKMN_FAN_CLUB_OPINIONS = 3, @@ -15,15 +16,17 @@ enum { TVSHOW_MASS_OUTBREAK = 41, }; -struct UnkTvStruct { +struct UnkTvStruct +{ s8 var0; }; -struct OutbreakPokemon { - /* 0x00 */ u16 species; - /* 0x02 */ u16 moves[4]; - /* 0x0A */ u8 level; - /* 0x0B */ u8 location; +struct OutbreakPokemon +{ + /*0x00*/ u16 species; + /*0x02*/ u16 moves[4]; + /*0x0A*/ u8 level; + /*0x0B*/ u8 location; }; extern u16 gSpecialVar_0x8004; @@ -37,26 +40,30 @@ extern u8 gSpeciesNames[][11]; extern u8 *gTVPokemonOutbreakTextGroup[]; extern struct OutbreakPokemon gPokeOutbreakSpeciesList[5]; -void sub_80BE478(void) { +void sub_80BE478(void) +{ u16 playerNameLength; u16 pokemonNicknameLength; TVShow *tvShow; sub_80BF478(); - if (gScriptResult == 1) { + if (gScriptResult == 1) + { return; } GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1); playerNameLength = StringLength(gSaveBlock2.playerName); - if (playerNameLength <= 1) { + if (playerNameLength <= 1) + { return; } pokemonNicknameLength = StringLength(gStringVar1); - if (pokemonNicknameLength <= 1) { + if (pokemonNicknameLength <= 1) + { return; } @@ -83,7 +90,8 @@ void sub_80BE478(void) { StripExtCtrlCodes(tvShow->nameRaterShow.pokemonName); } -void StartMassOutbreak(void) { +void StartMassOutbreak(void) +{ TVShow *tvShow; tvShow = &gSaveBlock1.tvShows[gSpecialVar_0x8004]; @@ -103,7 +111,8 @@ void StartMassOutbreak(void) { gSaveBlock1.outbreakUnk5 = 2; } -void sub_80BE5FC(void) { +void sub_80BE5FC(void) +{ TVShow *tvShow; u16 species; @@ -119,7 +128,8 @@ void sub_80BE5FC(void) { tvShow->fanclubLetter.var18 = GAME_LANGUAGE; } -void sub_80BE65C(void) { +void sub_80BE65C(void) +{ TVShow *tvShow; tvShow = &gSaveBlock1.tvShows[gUnknown_03005D38.var0]; @@ -133,7 +143,8 @@ void sub_80BE65C(void) { tvShow->recentHappenings.var18 = GAME_LANGUAGE; } -void sub_80BE6A0(void) { +void sub_80BE6A0(void) +{ TVShow *tvShow; u8 monIndex; @@ -159,30 +170,36 @@ void sub_80BE6A0(void) { StripExtCtrlCodes(tvShow->fanclubOpinions.var10); } -void nullsub_21(void) { - +void nullsub_21(void) +{ } -void sub_80BE778(void) { +void sub_80BE778(void) +{ u8 i; - if (!FlagGet(SYS_GAME_CLEAR)) { + if (!FlagGet(SYS_GAME_CLEAR)) + { return; } - for (i = 0; i < 24; i++) { - if (gSaveBlock1.tvShows[i].massOutbreak.var00 == TVSHOW_MASS_OUTBREAK) { + for (i = 0; i < 24; i++) + { + if (gSaveBlock1.tvShows[i].massOutbreak.var00 == TVSHOW_MASS_OUTBREAK) + { return; } } - if (sub_80BF77C(0x147)) { + if (sub_80BF77C(0x147)) + { return; } gUnknown_03005D38.var0 = sub_80BF720(gSaveBlock1.tvShows); - if (gUnknown_03005D38.var0 == -1) { + if (gUnknown_03005D38.var0 == -1) + { return; } { @@ -222,7 +239,8 @@ void sub_80BE778(void) { } } -void EndMassOutbreak(void) { +void EndMassOutbreak(void) +{ gSaveBlock1.outbreakPokemonSpecies = 0; gSaveBlock1.outbreakLocationMapNum = 0; gSaveBlock1.outbreakLocationMapGroup = 0; @@ -238,7 +256,8 @@ void EndMassOutbreak(void) { gSaveBlock1.outbreakUnk5 = 0; } -void sub_80BE8C4(u16 arg0) { +void sub_80BE8C4(u16 arg0) +{ sub_80BE8EC(arg0); UpdateMassOutbreakTimeLeft(arg0); sub_80BEE84(arg0); @@ -247,14 +266,16 @@ void sub_80BE8C4(u16 arg0) { asm(".section .text_b"); -u8 sub_80BF4F4(u8 arg0) { +u8 sub_80BF4F4(u8 arg0) +{ u32 species; GetMonData(&gPlayerParty[arg0], MON_DATA_NICKNAME, &gStringVar1); species = GetMonData(&gPlayerParty[arg0], MON_DATA_SPECIES, NULL); - if (StringCompareWithoutExtCtrlCodes(gSpeciesNames[species], gStringVar1) == FALSE) { + if (StringCompareWithoutExtCtrlCodes(gSpeciesNames[species], gStringVar1) == FALSE) + { return FALSE; } @@ -263,7 +284,8 @@ u8 sub_80BF4F4(u8 arg0) { asm(".section .text_c"); -void DoTVShowPokemonNewsMassOutbreak(void) { +void DoTVShowPokemonNewsMassOutbreak(void) +{ TVShow *tvShow; tvShow = &gSaveBlock1.tvShows[gSpecialVar_0x8004]; @@ -280,13 +302,15 @@ void DoTVShowPokemonNewsMassOutbreak(void) { asm(".section .text_d"); -void TVShowDone(void) { +void TVShowDone(void) +{ gScriptResult = 1; gUnknown_020387E8 = 0; gSaveBlock1.tvShows[gSpecialVar_0x8004].common.var01 = 0; } -void sub_80C2014(void) { +void sub_80C2014(void) +{ gUnknown_020387E8 = 0; } diff --git a/src/wallclock.c b/src/wallclock.c index 2c4a78956..dc9d871e7 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -98,12 +98,12 @@ static void LoadWallClockGraphics(void) addr = (void *)VRAM; size = 0x18000; - while(1) + while (1) { DmaFill16(3, 0, addr, 0x1000); addr += 0x1000; size -= 0x1000; - if(size <= 0x1000) + if (size <= 0x1000) { DmaFill16(3, 0, addr, size); break; @@ -113,7 +113,7 @@ static void LoadWallClockGraphics(void) DmaClear16(3, PLTT, PLTT_SIZE); LZ77UnCompVram(gMiscClock_Gfx, (void *)VRAM); - if(gSpecialVar_0x8004 == MALE) + if (gSpecialVar_0x8004 == MALE) LoadPalette(gMiscClockMale_Pal, 0, 32); else LoadPalette(gMiscClockFemale_Pal, 0, 32); @@ -201,7 +201,7 @@ void CB2_ViewWallClock(void) taskId = CreateTask(Task_ViewClock1, 0); InitClockWithRtc(taskId); - if(gTasks[taskId].data[TD_PERIOD] == 0) + if (gTasks[taskId].data[TD_PERIOD] == 0) { angle1 = 45; angle2 = 90; @@ -243,14 +243,14 @@ static void WallClockMainCallback(void) static void Task_SetClock1(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) gTasks[taskId].func = Task_SetClock2; } //Handle keypresses when setting clock static void Task_SetClock2(u8 taskId) { - if(gTasks[taskId].data[TD_MHAND_ANGLE] % 6) + if (gTasks[taskId].data[TD_MHAND_ANGLE] % 6) { gTasks[taskId].data[TD_MHAND_ANGLE] = CalcNewMinHandAngle( gTasks[taskId].data[TD_MHAND_ANGLE], @@ -261,7 +261,7 @@ static void Task_SetClock2(u8 taskId) { gTasks[taskId].data[TD_MHAND_ANGLE] = gTasks[taskId].data[TD_MINUTES] * 6; gTasks[taskId].data[TD_HHAND_ANGLE] = (gTasks[taskId].data[TD_HOURS] % 12) * 30 + (gTasks[taskId].data[TD_MINUTES] / 10) * 5; - if(gMain.newKeys & A_BUTTON) + if (gMain.newKeys & A_BUTTON) { gTasks[taskId].func = Task_SetClock3; return; @@ -269,13 +269,13 @@ static void Task_SetClock2(u8 taskId) else { gTasks[taskId].data[TD_SETDIRECTION] = gMain.newKeys & A_BUTTON; - if(gMain.heldKeys & DPAD_LEFT) + if (gMain.heldKeys & DPAD_LEFT) gTasks[taskId].data[TD_SETDIRECTION] = BACKWARD; - if(gMain.heldKeys & DPAD_RIGHT) + if (gMain.heldKeys & DPAD_RIGHT) gTasks[taskId].data[TD_SETDIRECTION] = FORWARD; - if(gTasks[taskId].data[TD_SETDIRECTION]) + if (gTasks[taskId].data[TD_SETDIRECTION]) { - if(gTasks[taskId].data[TD_SETSPEED] <= 0xFE) + if (gTasks[taskId].data[TD_SETSPEED] <= 0xFE) gTasks[taskId].data[TD_SETSPEED]++; gTasks[taskId].data[TD_MHAND_ANGLE] = CalcNewMinHandAngle( gTasks[taskId].data[TD_MHAND_ANGLE], @@ -305,7 +305,7 @@ static void Task_SetClock3(u8 taskId) //Get menu selection static void Task_SetClock4(u8 taskId) { - switch(ProcessMenuInputNoWrap_()) + switch (ProcessMenuInputNoWrap_()) { case 0: //YES PlaySE(SE_SELECT); @@ -331,13 +331,13 @@ static void Task_SetClock5(u8 taskId) static void Task_SetClock6(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) SetMainCallback2((MainCallback)gMain.savedCallback); } static void Task_ViewClock1(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) gTasks[taskId].func = Task_ViewClock2; } @@ -345,7 +345,7 @@ static void Task_ViewClock1(u8 taskId) static void Task_ViewClock2(u8 taskId) { InitClockWithRtc(taskId); - if(gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) gTasks[taskId].func = Task_ViewClock3; } @@ -357,17 +357,17 @@ static void Task_ViewClock3(u8 taskId) static void Task_ViewClock4(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) SetMainCallback2((MainCallback)gMain.savedCallback); } static u8 CalcMinHandDelta(u16 speed) { - if(speed > 60) + if (speed > 60) return 6; - else if(speed > 30) + else if (speed > 30) return 3; - else if(speed > 10) + else if (speed > 10) return 2; else return 1; @@ -378,16 +378,16 @@ static u16 CalcNewMinHandAngle(u16 angle, u8 direction, u8 speed) { u8 delta = CalcMinHandDelta(speed); - switch(direction) + switch (direction) { case BACKWARD: - if(angle) + if (angle) angle = angle - delta; else angle = 360 - delta; break; case FORWARD: - if(angle < 360 - delta) + if (angle < 360 - delta) angle = angle + delta; else angle = 0; @@ -399,15 +399,15 @@ static u16 CalcNewMinHandAngle(u16 angle, u8 direction, u8 speed) //Advances clock forward or backward by 1 minute static u8 AdvanceClock(u8 taskId, u8 direction) { - switch(direction) + switch (direction) { case BACKWARD: - if(gTasks[taskId].data[TD_MINUTES] > 0) + if (gTasks[taskId].data[TD_MINUTES] > 0) gTasks[taskId].data[TD_MINUTES]--; else { gTasks[taskId].data[TD_MINUTES] = 59; - if(gTasks[taskId].data[TD_HOURS] > 0) + if (gTasks[taskId].data[TD_HOURS] > 0) gTasks[taskId].data[TD_HOURS]--; else gTasks[taskId].data[TD_HOURS] = 23; @@ -415,12 +415,12 @@ static u8 AdvanceClock(u8 taskId, u8 direction) } break; case FORWARD: - if(gTasks[taskId].data[TD_MINUTES] <= 58) + if (gTasks[taskId].data[TD_MINUTES] <= 58) gTasks[taskId].data[TD_MINUTES]++; else { gTasks[taskId].data[TD_MINUTES] = 0; - if(gTasks[taskId].data[TD_HOURS] <= 22) + if (gTasks[taskId].data[TD_HOURS] <= 22) gTasks[taskId].data[TD_HOURS]++; else gTasks[taskId].data[TD_HOURS] = 0; @@ -436,10 +436,10 @@ static void UpdateClockPeriod(u8 taskId, u8 direction) { u8 hours = gTasks[taskId].data[TD_HOURS]; - switch(direction) + switch (direction) { case BACKWARD: - switch(hours) + switch (hours) { case 11: gTasks[taskId].data[TD_PERIOD] = AM; @@ -450,7 +450,7 @@ static void UpdateClockPeriod(u8 taskId, u8 direction) } break; case FORWARD: - switch(hours) + switch (hours) { case 0: gTasks[taskId].data[TD_PERIOD] = AM; @@ -470,7 +470,7 @@ static void InitClockWithRtc(u8 taskId) gTasks[taskId].data[TD_MINUTES] = gLocalTime.minutes; gTasks[taskId].data[TD_MHAND_ANGLE] = gTasks[taskId].data[TD_MINUTES] * 6; gTasks[taskId].data[TD_HHAND_ANGLE] = (gTasks[taskId].data[TD_HOURS] % 12) * 30 + (gTasks[taskId].data[TD_MINUTES] / 10) * 5; - if(gLocalTime.hours <= 11) + if (gLocalTime.hours <= 11) gTasks[taskId].data[TD_PERIOD] = AM; else gTasks[taskId].data[TD_PERIOD] = PM; @@ -492,9 +492,9 @@ void sub_810B05C(struct Sprite *sprite) y = gClockHandCoords[angle][1]; //Manual sign extension - if(x > 0x80) + if (x > 0x80) x |= 0xFF00; - if(y > 0x80) + if (y > 0x80) y |= 0xFF00; sprite->pos2.x = x; @@ -517,9 +517,9 @@ void sub_810B0F4(struct Sprite *sprite) y = gClockHandCoords[angle][1]; //Manual sign extension - if(x > 0x80) + if (x > 0x80) x |= 0xFF00; - if(y > 0x80) + if (y > 0x80) y |= 0xFF00; sprite->pos2.x = x; @@ -531,18 +531,18 @@ void sub_810B18C(struct Sprite *sprite) s16 sin; s16 cos; - if(gTasks[sprite->data0].data[TD_PERIOD] != AM) + if (gTasks[sprite->data0].data[TD_PERIOD] != AM) { - if((u16)(sprite->data1 - 60) <= 29) + if ((u16)(sprite->data1 - 60) <= 29) sprite->data1 += 5; - if(sprite->data1 <= 59) + if (sprite->data1 <= 59) sprite->data1++; } else { - if((u16)(sprite->data1 - 46) <= 29) + if ((u16)(sprite->data1 - 46) <= 29) sprite->data1 -= 5; - if(sprite->data1 > 75) + if (sprite->data1 > 75) sprite->data1--; } cos = Cos2((u16)sprite->data1); @@ -556,18 +556,18 @@ void sub_810B230(struct Sprite *sprite) s16 sin; s16 cos; - if(gTasks[sprite->data0].data[TD_PERIOD] != AM) + if (gTasks[sprite->data0].data[TD_PERIOD] != AM) { - if(sprite->data1 >= 105 && sprite->data1 < 135) + if (sprite->data1 >= 105 && sprite->data1 < 135) sprite->data1 += 5; - if(sprite->data1 < 105) + if (sprite->data1 < 105) sprite->data1++; } else { - if(sprite->data1 > 90 && sprite->data1 <= 120) + if (sprite->data1 > 90 && sprite->data1 <= 120) sprite->data1 -= 5; - if(sprite->data1 > 120) + if (sprite->data1 > 120) sprite->data1--; } cos = Cos2((u16)sprite->data1); diff --git a/src/weather.c b/src/weather.c index f3c79b42c..5d9553836 100644 --- a/src/weather.c +++ b/src/weather.c @@ -5,49 +5,50 @@ #include "sprite.h" #include "task.h" -struct Weather { - u8 filler_000[0x200]; - u8 unknown_200[2][32]; - u8 filler_240[0x480]; - s8 unknown_6C0; - s8 unknown_6C1; - u8 unknown_6C2; - u8 unknown_6C3; - u16 unknown_6C4; - u8 unknown_6C6; - u8 unknown_6C7; - u8 unknown_6C8; - u8 unknown_6C9; - u8 unknown_6CA; - u8 unknown_6CB; - u8 filler_6CC[2]; - u16 unknown_6CE; - u8 unknown_6D0; - u8 unknown_6D1; - u8 filler_6D2[1]; - u8 unknown_6D3; - u8 unknown_6D4; - u8 unknown_6D5; - u8 filler_6D6[2]; - u8 unknown_6D8; - u8 filler_6D9[1]; - u8 unknown_6DA; - u8 filler_6DB[3]; - u8 unknown_6DE; - u8 filler_6DF[5]; - u8 unknown_6E4; - u8 filler_6E5[0x15]; - u8 unknown_6FA; - u8 unknown_6FB; - u8 filler_6FC[4]; - u8 unknown_700; - u8 filler_701[0x15]; - u8 unknown_716; - u8 unknown_717; - u8 filler_718[0xc]; - u8 unknown_724; - u8 filler_725[9]; - u8 unknown_72E; +struct Weather +{ + u8 filler_000[0x200]; + u8 unknown_200[2][32]; + u8 filler_240[0x480]; + s8 unknown_6C0; + s8 unknown_6C1; + u8 unknown_6C2; + u8 unknown_6C3; + u16 unknown_6C4; + u8 unknown_6C6; + u8 unknown_6C7; + u8 unknown_6C8; + u8 unknown_6C9; + u8 unknown_6CA; + u8 unknown_6CB; + u8 filler_6CC[2]; + u16 unknown_6CE; + u8 unknown_6D0; + u8 unknown_6D1; + u8 filler_6D2[1]; + u8 unknown_6D3; + u8 unknown_6D4; + u8 unknown_6D5; + u8 filler_6D6[2]; + u8 unknown_6D8; + u8 filler_6D9[1]; + u8 unknown_6DA; + u8 filler_6DB[3]; + u8 unknown_6DE; + u8 filler_6DF[5]; + u8 unknown_6E4; + u8 filler_6E5[0x15]; + u8 unknown_6FA; + u8 unknown_6FB; + u8 filler_6FC[4]; + u8 unknown_700; + u8 filler_701[0x15]; + u8 unknown_716; + u8 unknown_717; + u8 filler_718[0xc]; + u8 unknown_724; + u8 filler_725[9]; + u8 unknown_72E; }; #define gWeather gUnknown_0202F7E8 @@ -61,247 +62,307 @@ extern u8 (*gUnknown_0202FC48)[32]; extern u8 gUnknown_0202F9E8[32]; -void sub_807C828(void) { - u8 index; - if (!FuncIsActiveTask(&sub_807CA34)) { - index = AllocSpritePalette(0x1200); - CpuCopy32(&gUnknown_083970E8, &gPlttBufferUnfaded[0x100 + index * 16], 32); - sub_807CB10(); - gWeather.unknown_6D5 = index; - gWeather.unknown_6D4 = AllocSpritePalette(0x1201); - gWeather.unknown_6DA = 0; - gWeather.unknown_6D8 = 0; - gWeather.unknown_6DE = 0; - gWeather.unknown_6E4 = 0; - gWeather.unknown_700 = 0; - gWeather.unknown_6FB = 0; - gWeather.unknown_724 = 0; - gWeather.unknown_716 = 0; - gWeather.unknown_717 = 0; - gWeather.unknown_72E = 0; - gWeather.unknown_6FA = 0; - sub_807DB64(16, 0); - gWeather.unknown_6D0 = 0; - gWeather.unknown_6C6 = 3; - gWeather.unknown_6C8 = 0; - gWeather.unknown_6D3 = 1; - gWeather.unknown_6C9 = CreateTask(&sub_807C9E4, 80); - } +void sub_807C828(void) +{ + u8 index; + if (!FuncIsActiveTask(&sub_807CA34)) + { + index = AllocSpritePalette(0x1200); + CpuCopy32(&gUnknown_083970E8, &gPlttBufferUnfaded[0x100 + index * 16], 32); + sub_807CB10(); + gWeather.unknown_6D5 = index; + gWeather.unknown_6D4 = AllocSpritePalette(0x1201); + gWeather.unknown_6DA = 0; + gWeather.unknown_6D8 = 0; + gWeather.unknown_6DE = 0; + gWeather.unknown_6E4 = 0; + gWeather.unknown_700 = 0; + gWeather.unknown_6FB = 0; + gWeather.unknown_724 = 0; + gWeather.unknown_716 = 0; + gWeather.unknown_717 = 0; + gWeather.unknown_72E = 0; + gWeather.unknown_6FA = 0; + sub_807DB64(16, 0); + gWeather.unknown_6D0 = 0; + gWeather.unknown_6C6 = 3; + gWeather.unknown_6C8 = 0; + gWeather.unknown_6D3 = 1; + gWeather.unknown_6C9 = CreateTask(&sub_807C9E4, 80); + } } -void DoWeatherEffect(u8 effect) { - if (effect != 3 && effect != 5 && effect != 13) { - PlayRainSoundEffect(); - } - if (gWeather.unknown_6D1 != effect && gWeather.unknown_6D0 == effect) { - gUnknown_08396FC8[effect][0](); - } - gWeather.unknown_6D3 = 0; - gWeather.unknown_6D1 = effect; - gWeather.unknown_6CE = 0; +void DoWeatherEffect(u8 effect) +{ + if (effect != 3 && effect != 5 && effect != 13) + { + PlayRainSoundEffect(); + } + if (gWeather.unknown_6D1 != effect && gWeather.unknown_6D0 == effect) + { + gUnknown_08396FC8[effect][0](); + } + gWeather.unknown_6D3 = 0; + gWeather.unknown_6D1 = effect; + gWeather.unknown_6CE = 0; } -void sub_807C988(u8 effect) { - PlayRainSoundEffect(); - gWeather.unknown_6D0 = effect; - gWeather.unknown_6D1 = effect; +void sub_807C988(u8 effect) +{ + PlayRainSoundEffect(); + gWeather.unknown_6D0 = effect; + gWeather.unknown_6D1 = effect; } -void sub_807C9B4(u8 effect) { - PlayRainSoundEffect(); - gWeather.unknown_6D0 = effect; - gWeather.unknown_6D1 = effect; - gWeather.unknown_6C8 = 1; +void sub_807C9B4(u8 effect) +{ + PlayRainSoundEffect(); + gWeather.unknown_6D0 = effect; + gWeather.unknown_6D1 = effect; + gWeather.unknown_6C8 = 1; } -void sub_807C9E4(u8 task) { - if (gWeather.unknown_6C8) { - gUnknown_08396FC8[gWeather.unknown_6D0][2](); - gTasks[task].func = &sub_807CA34; - } +void sub_807C9E4(u8 task) +{ + if (gWeather.unknown_6C8) + { + gUnknown_08396FC8[gWeather.unknown_6D0][2](); + gTasks[task].func = &sub_807CA34; + } } -void sub_807CA34(u8 task) { - u8 v1; - if (gWeather.unknown_6D0 != gWeather.unknown_6D1) { - v1 = gUnknown_08396FC8[gWeather.unknown_6D0][3](); - if (!v1) { - gUnknown_08396FC8[gWeather.unknown_6D1][0](); - gWeather.unknown_6C3 = 0; // compiler reuses v1 - gWeather.unknown_6C6 = 0; // compiler reuses v1 - gWeather.unknown_6D0 = gWeather.unknown_6D1; - gWeather.unknown_6D3 = 1; - } - } else { - gUnknown_08396FC8[gWeather.unknown_6D0][1](); - } - gUnknown_083970B8[gWeather.unknown_6C6](); +void sub_807CA34(u8 task) +{ + u8 v1; + if (gWeather.unknown_6D0 != gWeather.unknown_6D1) + { + v1 = gUnknown_08396FC8[gWeather.unknown_6D0][3](); + if (!v1) + { + gUnknown_08396FC8[gWeather.unknown_6D1][0](); + gWeather.unknown_6C3 = 0; // compiler reuses v1 + gWeather.unknown_6C6 = 0; // compiler reuses v1 + gWeather.unknown_6D0 = gWeather.unknown_6D1; + gWeather.unknown_6D3 = 1; + } + } + else + { + gUnknown_08396FC8[gWeather.unknown_6D0][1](); + } + gUnknown_083970B8[gWeather.unknown_6C6](); } -void sub_807CAE8(void) { - gWeather.unknown_6C1 = 0; - gWeather.unknown_6C2 = 0; +void sub_807CAE8(void) +{ + gWeather.unknown_6C1 = 0; + gWeather.unknown_6C2 = 0; } -void nullsub_38(void) { +void nullsub_38(void) +{ } -u32 sub_807CB0C(void) { - return 0; +u32 sub_807CB0C(void) +{ + return 0; } -void sub_807CB10(void) { - u16 v0; - u8 (*v1)[32]; - u16 v2; - u16 v4; - u16 v5; - u16 v6; - u16 v9; - u32 v10; - u16 v11; - s16 dunno; +void sub_807CB10(void) +{ + u16 v0; + u8(*v1)[32]; + u16 v2; + u16 v4; + u16 v5; + u16 v6; + u16 v9; + u32 v10; + u16 v11; + s16 dunno; - gUnknown_030006DC = &gUnknown_083970C8; - for (v0 = 0; v0 <= 1; v0++) { - if (v0 == 0) { - v1 = &gUnknown_0202F9E8; - } else { - v1 = &gUnknown_0202F9E8 + 19; - } - for (v2 = 0; (u16)v2 <= 0x1f; v2++) { - v4 = v2 << 8; - if (v0 == 0) { - v5 = (v2 << 8) / 16; - } else { - v5 = 0; - } - v6 = 0; - for (; v6 <= 2; v6++) { - v4 = (v4 - v5); - v1[v6][v2] = v4 >> 8; - } - v9 = v4; - v10 = 0x1f00 - v4; - if ((0x1f00 - v4) < 0) { - v10 += 0xf; - } - v11 = v10 >> 4; - if (v2 <= 0xb) { - for (; v6 <= 0x12; v6++) { - v4 += v11; - dunno = v4 - v9; - if (dunno > 0) { - v4 -= (dunno + ((u16)dunno >> 15)) >> 1; - } - v1[v6][v2] = v4 >> 8; - if (v1[v6][v2] > 0x1f) { - v1[v6][v2] = 0x1f; - } - } - } else { - for (; v6 <= 0x12; v6++) { - v4 += v11; - v1[v6][v2] = v4 >> 8; - if (v1[v6][v2] > 0x1f) { - v1[v6][v2] = 0x1f; - } - } - } - } - } + gUnknown_030006DC = &gUnknown_083970C8; + for (v0 = 0; v0 <= 1; v0++) + { + if (v0 == 0) + { + v1 = &gUnknown_0202F9E8; + } + else + { + v1 = &gUnknown_0202F9E8 + 19; + } + for (v2 = 0; (u16)v2 <= 0x1f; v2++) + { + v4 = v2 << 8; + if (v0 == 0) + { + v5 = (v2 << 8) / 16; + } + else + { + v5 = 0; + } + v6 = 0; + for (; v6 <= 2; v6++) + { + v4 = (v4 - v5); + v1[v6][v2] = v4 >> 8; + } + v9 = v4; + v10 = 0x1f00 - v4; + if ((0x1f00 - v4) < 0) + { + v10 += 0xf; + } + v11 = v10 >> 4; + if (v2 <= 0xb) + { + for (; v6 <= 0x12; v6++) + { + v4 += v11; + dunno = v4 - v9; + if (dunno > 0) + { + v4 -= (dunno + ((u16)dunno >> 15)) >> 1; + } + v1[v6][v2] = v4 >> 8; + if (v1[v6][v2] > 0x1f) + { + v1[v6][v2] = 0x1f; + } + } + } + else + { + for (; v6 <= 0x12; v6++) + { + v4 += v11; + v1[v6][v2] = v4 >> 8; + if (v1[v6][v2] > 0x1f) + { + v1[v6][v2] = 0x1f; + } + } + } + } + } } -void sub_807CC24(void) { - if (gWeather.unknown_6C0 == gWeather.unknown_6C1) { - gWeather.unknown_6C6 = 3; - } else { - if (++gWeather.unknown_6C3 >= gWeather.unknown_6C2) { - gWeather.unknown_6C3 = 0; - if (gWeather.unknown_6C0 < gWeather.unknown_6C1) { - gWeather.unknown_6C0++; - } else { - gWeather.unknown_6C0--; - } - sub_807CEBC(0, 0x20, gWeather.unknown_6C0); - } - } +void sub_807CC24(void) +{ + if (gWeather.unknown_6C0 == gWeather.unknown_6C1) + { + gWeather.unknown_6C6 = 3; + } + else + { + if (++gWeather.unknown_6C3 >= gWeather.unknown_6C2) + { + gWeather.unknown_6C3 = 0; + if (gWeather.unknown_6C0 < gWeather.unknown_6C1) + { + gWeather.unknown_6C0++; + } + else + { + gWeather.unknown_6C0--; + } + sub_807CEBC(0, 0x20, gWeather.unknown_6C0); + } + } } -void sub_807CCAC(void) { - if (++gWeather.unknown_6CB > 1) { - gWeather.unknown_6CA = 0; - } - switch (gWeather.unknown_6D0) { - case 3: - case 4: - case 5: - case 11: - case 13: - if (sub_807CDC4() == 0) { - gWeather.unknown_6C0 = 3; - gWeather.unknown_6C6 = 3; - } - break; - case 12: - if (sub_807CE24() == 0) { - gWeather.unknown_6C0 = -6; - gWeather.unknown_6C6 = 3; - } - break; - case 6: - if (sub_807CE7C() == 0) { - gWeather.unknown_6C0 = 0; - gWeather.unknown_6C6 = 3; - } - break; - case 7: - case 8: - case 9: - case 10: - default: - if (!gPaletteFade.active) { - gWeather.unknown_6C0 = gWeather.unknown_6C1; - gWeather.unknown_6C6 = 3; - } - break; - } +void sub_807CCAC(void) +{ + if (++gWeather.unknown_6CB > 1) + { + gWeather.unknown_6CA = 0; + } + switch (gWeather.unknown_6D0) + { + case 3: + case 4: + case 5: + case 11: + case 13: + if (sub_807CDC4() == 0) + { + gWeather.unknown_6C0 = 3; + gWeather.unknown_6C6 = 3; + } + break; + case 12: + if (sub_807CE24() == 0) + { + gWeather.unknown_6C0 = -6; + gWeather.unknown_6C6 = 3; + } + break; + case 6: + if (sub_807CE7C() == 0) + { + gWeather.unknown_6C0 = 0; + gWeather.unknown_6C6 = 3; + } + break; + case 7: + case 8: + case 9: + case 10: + default: + if (!gPaletteFade.active) + { + gWeather.unknown_6C0 = gWeather.unknown_6C1; + gWeather.unknown_6C6 = 3; + } + break; + } } -u8 sub_807CDC4(void) { - if (gWeather.unknown_6C7 == 0x10) { - return 0; - } - if (++gWeather.unknown_6C7 >= 0x10) { - sub_807CEBC(0, 0x20, 3); - gWeather.unknown_6C7 = 0x10; - return 0; - } - sub_807D1BC(0, 0x20, 3, 0x10 - gWeather.unknown_6C7, gWeather.unknown_6C4); - return 1; +u8 sub_807CDC4(void) +{ + if (gWeather.unknown_6C7 == 0x10) + { + return 0; + } + if (++gWeather.unknown_6C7 >= 0x10) + { + sub_807CEBC(0, 0x20, 3); + gWeather.unknown_6C7 = 0x10; + return 0; + } + sub_807D1BC(0, 0x20, 3, 0x10 - gWeather.unknown_6C7, gWeather.unknown_6C4); + return 1; } -u8 sub_807CE24(void) { - if (gWeather.unknown_6C7 == 0x10) { - return 0; - } - if (++gWeather.unknown_6C7 >= 0x10) { - sub_807CEBC(0, 0x20, -6); - gWeather.unknown_6C7 = 0x10; - return 0; - } - sub_807D304(-6, 0x10 - gWeather.unknown_6C7, gWeather.unknown_6C4); - return 1; +u8 sub_807CE24(void) +{ + if (gWeather.unknown_6C7 == 0x10) + { + return 0; + } + if (++gWeather.unknown_6C7 >= 0x10) + { + sub_807CEBC(0, 0x20, -6); + gWeather.unknown_6C7 = 0x10; + return 0; + } + sub_807D304(-6, 0x10 - gWeather.unknown_6C7, gWeather.unknown_6C4); + return 1; } -u8 sub_807CE7C(void) { - if (gWeather.unknown_6C7 == 0x10) { - return 0; - } - ++gWeather.unknown_6C7; - sub_807D424(0x10 - gWeather.unknown_6C7, gWeather.unknown_6C4); - return 1; +u8 sub_807CE7C(void) +{ + if (gWeather.unknown_6C7 == 0x10) + { + return 0; + } + ++gWeather.unknown_6C7; + sub_807D424(0x10 - gWeather.unknown_6C7, gWeather.unknown_6C4); + return 1; } -void nullsub_39(void) { +void nullsub_39(void) +{ } |