dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix faulty search&replace

Browse Source
This commit is contained in:
PikalaxALT
2021-03-18 15:00:06 -04:00
parent 18f1080882
commit c5aa5d3722
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle.h
+5 -7
View File
@@ -196,14 +196,13 @@ struct ProtectStruct
u32 flag_x20 : 1; // 0x20 u32 flag_x20 : 1; // 0x20
u32 flag_x40 : 1; // 0x40 u32 flag_x40 : 1; // 0x40
u32 flag_x80 : 1; // 0x80 u32 flag_x80 : 1; // 0x80
/* field_3 */
u32 field3 : 8; u32 field3 : 8;
/* field_4 */ u32 physicalDmg; u32 physicalDmg;
/* soundTimer */ u32 specialDmg; u32 specialDmg;
/* field_C */ u8 physicalBattlerId; u8 physicalBattlerId;
/* field_D */ u8 specialBattlerId; u8 specialBattlerId;
/* field_E */ u16 fieldE; u16 fieldE;
}; };
extern struct ProtectStruct gProtectStructs[MAX_BATTLERS_COUNT]; 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 gChosenActionByBattler[MAX_BATTLERS_COUNT];
extern u8 gBattleTerrain; extern u8 gBattleTerrain;
extern struct MultiBattlePokemonTx gMultiPartnerParty[3]; extern struct MultiBattlePokemonTx gMultiPartnerParty[3];
extern u16 *sUnknownDebugSpriteDataBuffer;
extern u16 gRandomTurnNumber; extern u16 gRandomTurnNumber;
#endif // GUARD_BATTLE_H #endif // GUARD_BATTLE_H
src/battle_main.c
+1 -1
View File
@@ -132,7 +132,7 @@ EWRAM_DATA u32 gUnknown_2022B54 = 0;
EWRAM_DATA struct MultiBattlePokemonTx gMultiPartnerParty[3] = {0}; EWRAM_DATA struct MultiBattlePokemonTx gMultiPartnerParty[3] = {0};
EWRAM_DATA u8 *gBattleAnimMons_BgTilesBuffer = NULL; EWRAM_DATA u8 *gBattleAnimMons_BgTilesBuffer = NULL;
EWRAM_DATA u8 *gBattleAnimMons_BgTilemapBuffer = 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 gBattleBufferA[MAX_BATTLERS_COUNT][0x200] = {0};
EWRAM_DATA u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200] = {0}; EWRAM_DATA u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200] = {0};
EWRAM_DATA u8 gActiveBattler = 0; EWRAM_DATA u8 gActiveBattler = 0;
src/party_menu.c
+4 -4
View File
@@ -367,7 +367,7 @@ static void Task_PartyMenu_PokedudeStep(u8 taskId);
static void Task_PartyMenuFromBag_PokedudeStep(u8 taskId); static void Task_PartyMenuFromBag_PokedudeStep(u8 taskId);
static bool8 PartyMenuPokedudeIsCancelled(u8 taskId); static bool8 PartyMenuPokedudeIsCancelled(u8 taskId);
static void PartyMenuHandlePokedudeCancel(void); 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 u8 FirstBattleEnterParty_CreateWindowAndMsg1Printer(void);
static void FirstBattleEnterParty_DestroyVoiceoverWindow(u8 windowId); static void FirstBattleEnterParty_DestroyVoiceoverWindow(u8 windowId);
static void SetSwitchedPartyOrderQuestLogEvent(void); static void SetSwitchedPartyOrderQuestLogEvent(void);
@@ -2005,7 +2005,7 @@ static void Task_FirstBattleEnterParty_StartPrintMsg2(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; 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; gTasks[taskId].func = Task_FirstBattleEnterParty_RunPrinterMsg2;
} }
@@ -2616,7 +2616,7 @@ static void RemoveLevelUpStatsWindow(void)
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]); 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); StringExpandPlaceholders(gStringVar4, str);
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
@@ -2629,7 +2629,7 @@ static bool8 FirstBattleEnterParty_CreateWindowAndMsg1Printer(void)
TextWindow_LoadResourcesStdFrame0(windowId, 0x4F, 0xE0); TextWindow_LoadResourcesStdFrame0(windowId, 0x4F, 0xE0);
DrawDialogFrameWithCustomTileAndPalette(windowId, 1, 0x4F, 0xE); DrawDialogFrameWithCustomTileAndPalette(windowId, 1, 0x4F, 0xE);
PartyMenu_OakOldMan_PrintText(windowId, gText_OakImportantToGetToKnowPokemonThroughly); PartyMenu_Oak_PrintText(windowId, gText_OakImportantToGetToKnowPokemonThroughly);
return windowId; return windowId;
} }
src/pokemon.c
+1 -1
View File
@@ -4900,7 +4900,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem)
else else
holdEffect = ItemId_GetHoldEffect(heldItem); 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; return 0;
switch (type) switch (type)
src/union_room.c
+1 -1
View File
@@ -3563,7 +3563,7 @@ static u8 HandlePlayerListUpdate(void)
struct UnkStruct_URoom * structPtr = sUnionRoomMain.uRoom; struct UnkStruct_URoom * structPtr = sUnionRoomMain.uRoom;
s32 r7 = 0; 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++) for (i = 0; i < RFU_CHILD_MAX; i++)
{ {
if (AreGnameUnameDifferent(&structPtr->field_C->arr[i].gname_uname, &sUnionGnameUnamePair_Dummy) == TRUE) if (AreGnameUnameDifferent(&structPtr->field_C->arr[i].gname_uname, &sUnionGnameUnamePair_Dummy) == TRUE)