dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Update header files to match source files (#2143)

Browse Source
This commit is contained in:
Bassoonian
2025-05-19 10:18:04 +02:00
committed by GitHub
parent e1e7d1cf35
commit 59d315734d
94 changed files with 704 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/battle_controllers.c
View File

@@ -1128,15 +1128,15 @@ void BtlController_EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 m
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 16 + sizeof(struct DisableStruct));
}
void BtlController_EmitPrintString(u8 bufferId, u16 stringID)
void BtlController_EmitPrintString(u8 bufferId, u16 stringId)
{
s32 i;
struct BattleMsgData *stringInfo;
sBattleBuffersTransferData[0] = CONTROLLER_PRINTSTRING;
sBattleBuffersTransferData[1] = gBattleOutcome;
sBattleBuffersTransferData[2] = stringID;
sBattleBuffersTransferData[3] = (stringID & 0xFF00) >> 8;
sBattleBuffersTransferData[2] = stringId;
sBattleBuffersTransferData[3] = (stringId & 0xFF00) >> 8;
stringInfo = (struct BattleMsgData *)(&sBattleBuffersTransferData[4]);
stringInfo->currentMove = gCurrentMove;
@@ -1160,15 +1160,15 @@ void BtlController_EmitPrintString(u8 bufferId, u16 stringID)
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct BattleMsgData) + 4);
}
void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringID)
void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringId)
{
s32 i;
struct BattleMsgData *stringInfo;
sBattleBuffersTransferData[0] = CONTROLLER_PRINTSTRINGPLAYERONLY;
sBattleBuffersTransferData[1] = CONTROLLER_PRINTSTRINGPLAYERONLY;
sBattleBuffersTransferData[2] = stringID;
sBattleBuffersTransferData[3] = (stringID & 0xFF00) >> 8;
sBattleBuffersTransferData[2] = stringId;
sBattleBuffersTransferData[3] = (stringId & 0xFF00) >> 8;
stringInfo = (struct BattleMsgData *)(&sBattleBuffersTransferData[4]);
stringInfo->currentMove = gCurrentMove;

2
src/main.c
View File

@@ -86,7 +86,7 @@ void EnableVCountIntrAtLine150(void);
#define B_START_SELECT (B_BUTTON | START_BUTTON | SELECT_BUTTON)
void AgbMain()
void AgbMain(void)
{
// Modern compilers are liberal with the stack on entry to this function,
// so RegisterRamReset may crash if it resets IWRAM.

2
src/metatile_behavior.c
View File

@@ -320,7 +320,7 @@ bool8 MetatileBehavior_IsSouthArrowWarp(u8 metatileBehavior)
return FALSE;
}
bool8 Unref_MetatileBehavior_IsArrowWarp(u8 metatileBehavior)
bool8 UNUSED Unref_MetatileBehavior_IsArrowWarp(u8 metatileBehavior)
{
u8 isArrowWarp = FALSE;

2
src/save.c
View File

@@ -826,7 +826,7 @@ bool8 LinkFullSave_SetLastSectorSignature(void)
return FALSE;
}
u8 WriteSaveBlock2(void)
bool8 WriteSaveBlock2(void)
{
if (gFlashMemoryPresent != TRUE)
return TRUE;