diff options
| -rw-r--r-- | include/battle.h | 12 | ||||
| -rw-r--r-- | src/battle_main.c | 2 | ||||
| -rw-r--r-- | src/party_menu.c | 8 | ||||
| -rw-r--r-- | src/pokemon.c | 2 | ||||
| -rw-r--r-- | src/union_room.c | 2 |
5 files changed, 12 insertions, 14 deletions
diff --git a/include/battle.h b/include/battle.h index 424cade00..1a10b7c1c 100644 --- a/include/battle.h +++ b/include/battle.h @@ -196,14 +196,13 @@ struct ProtectStruct u32 flag_x20 : 1; // 0x20 u32 flag_x40 : 1; // 0x40 u32 flag_x80 : 1; // 0x80 - /* field_3 */ u32 field3 : 8; - /* field_4 */ u32 physicalDmg; - /* soundTimer */ u32 specialDmg; - /* field_C */ u8 physicalBattlerId; - /* field_D */ u8 specialBattlerId; - /* field_E */ u16 fieldE; + u32 physicalDmg; + u32 specialDmg; + u8 physicalBattlerId; + u8 specialBattlerId; + u16 fieldE; }; extern struct ProtectStruct gProtectStructs[MAX_BATTLERS_COUNT]; @@ -719,7 +718,6 @@ extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT]; extern u8 gBattleTerrain; extern struct MultiBattlePokemonTx gMultiPartnerParty[3]; -extern u16 *sUnknownDebugSpriteDataBuffer; extern u16 gRandomTurnNumber; #endif // GUARD_BATTLE_H diff --git a/src/battle_main.c b/src/battle_main.c index af2a02c52..d7f43ce75 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -132,7 +132,7 @@ EWRAM_DATA u32 gUnknown_2022B54 = 0; EWRAM_DATA struct MultiBattlePokemonTx gMultiPartnerParty[3] = {0}; EWRAM_DATA u8 *gBattleAnimMons_BgTilesBuffer = NULL; EWRAM_DATA u8 *gBattleAnimMons_BgTilemapBuffer = NULL; -EWRAM_DATA u16 *sUnknownDebugSpriteDataBuffer = NULL; +static EWRAM_DATA u16 *sUnknownDebugSpriteDataBuffer = NULL; EWRAM_DATA u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200] = {0}; EWRAM_DATA u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200] = {0}; EWRAM_DATA u8 gActiveBattler = 0; diff --git a/src/party_menu.c b/src/party_menu.c index e521484e0..1acbc04ea 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -367,7 +367,7 @@ static void Task_PartyMenu_PokedudeStep(u8 taskId); static void Task_PartyMenuFromBag_PokedudeStep(u8 taskId); static bool8 PartyMenuPokedudeIsCancelled(u8 taskId); static void PartyMenuHandlePokedudeCancel(void); -static void PartyMenu_OakOldMan_PrintText(u8 windowId, const u8 *str); +static void PartyMenu_Oak_PrintText(u8 windowId, const u8 *str); static u8 FirstBattleEnterParty_CreateWindowAndMsg1Printer(void); static void FirstBattleEnterParty_DestroyVoiceoverWindow(u8 windowId); static void SetSwitchedPartyOrderQuestLogEvent(void); @@ -2005,7 +2005,7 @@ static void Task_FirstBattleEnterParty_StartPrintMsg2(u8 taskId) { s16 *data = gTasks[taskId].data; - PartyMenu_OakOldMan_PrintText(data[0], gText_OakThisIsListOfPokemon); + PartyMenu_Oak_PrintText(data[0], gText_OakThisIsListOfPokemon); gTasks[taskId].func = Task_FirstBattleEnterParty_RunPrinterMsg2; } @@ -2616,7 +2616,7 @@ static void RemoveLevelUpStatsWindow(void) PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]); } -static void PartyMenu_OakOldMan_PrintText(u8 windowId, const u8 *str) +static void PartyMenu_Oak_PrintText(u8 windowId, const u8 *str) { StringExpandPlaceholders(gStringVar4, str); gTextFlags.canABSpeedUpPrint = TRUE; @@ -2629,7 +2629,7 @@ static bool8 FirstBattleEnterParty_CreateWindowAndMsg1Printer(void) TextWindow_LoadResourcesStdFrame0(windowId, 0x4F, 0xE0); DrawDialogFrameWithCustomTileAndPalette(windowId, 1, 0x4F, 0xE); - PartyMenu_OakOldMan_PrintText(windowId, gText_OakImportantToGetToKnowPokemonThroughly); + PartyMenu_Oak_PrintText(windowId, gText_OakImportantToGetToKnowPokemonThroughly); return windowId; } diff --git a/src/pokemon.c b/src/pokemon.c index b5f683ab4..f8c03ea02 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4900,7 +4900,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) else holdEffect = ItemId_GetHoldEffect(heldItem); - if (holdEffect == HOLD_EFFECT_PREVENT_EVOLVE && type != 3) + if (holdEffect == HOLD_EFFECT_PREVENT_EVOLVE && type != EVO_MODE_ITEM_CHECK) return 0; switch (type) diff --git a/src/union_room.c b/src/union_room.c index 36619dd13..24b8a4d3e 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -3563,7 +3563,7 @@ static u8 HandlePlayerListUpdate(void) struct UnkStruct_URoom * structPtr = sUnionRoomMain.uRoom; s32 r7 = 0; - // If someone new joined, register them in soundTimer + // If someone new joined, register them in field_8 for (i = 0; i < RFU_CHILD_MAX; i++) { if (AreGnameUnameDifferent(&structPtr->field_C->arr[i].gname_uname, &sUnionGnameUnamePair_Dummy) == TRUE) |