ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-14 07:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1373 from PikalaxALT/fix_nonmatchings

Browse Source 
Nonmatching resoltuion
This commit is contained in:
GriffinR 2021-03-12 14:03:39 -05:00 committed by GitHub
commit 665dffe048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/battle_ai_script_commands.c
View File

@ -2089,12 +2089,7 @@ static void Cmd_get_used_held_item(void)
else else
battlerId = gBattlerTarget; battlerId = gBattlerTarget;
// This is likely a leftover from Ruby's code and its ugly ewram access. AI_THINKING_STRUCT->funcResult = *(u8 *)&gBattleStruct->usedHeldItems[battlerId];
#ifdef NONMATCHING
AI_THINKING_STRUCT->funcResult = gBattleStruct->usedHeldItems[battlerId];
#else
AI_THINKING_STRUCT->funcResult = *(u8*)((u8*)(gBattleStruct) + offsetof(struct BattleStruct, usedHeldItems) + (battlerId * 2));
#endif // NONMATCHING
gAIScriptPtr += 2; gAIScriptPtr += 2;
} }

3
src/battle_main.c
View File

@ -68,9 +68,6 @@ extern const struct BgTemplate gBattleBgTemplates[];
extern const struct WindowTemplate *const gBattleWindowTemplates[]; extern const struct WindowTemplate *const gBattleWindowTemplates[];
// this file's functions // this file's functions
#if !defined(NONMATCHING) && MODERN
#define static
#endif
static void CB2_InitBattleInternal(void); static void CB2_InitBattleInternal(void);
static void CB2_PreInitMultiBattle(void); static void CB2_PreInitMultiBattle(void);
static void CB2_PreInitIngamePlayerPartnerBattle(void); static void CB2_PreInitIngamePlayerPartnerBattle(void);

3
src/item.c
View File

@ -19,9 +19,6 @@
extern u16 gUnknown_0203CF30[]; extern u16 gUnknown_0203CF30[];
// this file's functions // this file's functions
#if !defined(NONMATCHING) && MODERN
#define static
#endif
static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count); static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count);
static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count); static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count);

3
src/trade.c
View File

@ -165,9 +165,6 @@ static EWRAM_DATA struct {
/*0xFE*/ u8 wirelessWinBottom; /*0xFE*/ u8 wirelessWinBottom;
} *sTradeData = {NULL}; } *sTradeData = {NULL};
#if !defined(NONMATCHING) && MODERN
#define static
#endif
static bool32 IsWirelessTrade(void); static bool32 IsWirelessTrade(void);
static void CB2_CreateTradeMenu(void); static void CB2_CreateTradeMenu(void);
static void VBlankCB_TradeMenu(void); static void VBlankCB_TradeMenu(void);

3
src/tv.c
View File

@ -75,9 +75,6 @@ EWRAM_DATA ALIGNED(4) u8 sTVShowState = 0;
EWRAM_DATA u8 sTVSecretBaseSecretsRandomValues[3] = {}; EWRAM_DATA u8 sTVSecretBaseSecretsRandomValues[3] = {};
// Static ROM declarations // Static ROM declarations
#if !defined(NONMATCHING) && MODERN
#define static
#endif
void ClearPokemonNews(void); void ClearPokemonNews(void);
u8 GetTVChannelByShowType(u8 kind); u8 GetTVChannelByShowType(u8 kind);
u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void); u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void);