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

More changes for modern gcc compat

Browse Source
This commit is contained in:
PikalaxALT
2018-11-10 18:28:24 -05:00
parent d6233c5b3b
commit a6b5d09ddf
8 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dma3_manager.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "dma3.h"
IWRAM_DATA struct {
static /*IWRAM_DATA*/ struct {
/* 0x00 */ const u8 *src;
/* 0x04 */ u8 *dest;
/* 0x08 */ u16 size;
src/quest_log.c
+2 -2
View File
@@ -88,8 +88,8 @@ u16 gUnknown_3005E8C;
struct UnkStruct_3005E90 gUnknown_3005E90;
struct UnkStruct_203AE98 * gUnknown_3005E94;
IWRAM_DATA struct UnkStruct_300201C * gUnknown_300201C;
IWRAM_DATA u16 gUnknown_3002020;
static struct UnkStruct_300201C * gUnknown_300201C;
static u16 gUnknown_3002020;
EWRAM_DATA u8 gUnknown_203ADF8 = 0;
EWRAM_DATA u8 gUnknown_203ADF9 = 0;
src/script.c
+11 -11
View File
@@ -22,17 +22,17 @@ EWRAM_DATA u8 gUnknown_20370A0 = 0;
EWRAM_DATA u8 *gUnknown_20370A4 = NULL;
// ewram bss
IWRAM_DATA static u8 sScriptContext1Status;
IWRAM_DATA static u32 sUnusedVariable1;
IWRAM_DATA static struct ScriptContext sScriptContext1;
IWRAM_DATA static u32 sUnusedVariable2;
IWRAM_DATA static struct ScriptContext sScriptContext2;
IWRAM_DATA static bool8 sScriptContext2Enabled;
IWRAM_DATA static u8 gUnknown_3000F9D;
IWRAM_DATA static u8 gUnknown_3000F9E;
IWRAM_DATA static u8 gUnknown_3000F9F;
IWRAM_DATA static u8 gUnknown_3000FA0;
IWRAM_DATA static u8 gUnknown_3000FA1;
/*IWRAM_DATA*/ static u8 sScriptContext1Status;
/*IWRAM_DATA*/ static u32 sUnusedVariable1;
/*IWRAM_DATA*/ static struct ScriptContext sScriptContext1;
/*IWRAM_DATA*/ static u32 sUnusedVariable2;
/*IWRAM_DATA*/ static struct ScriptContext sScriptContext2;
/*IWRAM_DATA*/ static bool8 sScriptContext2Enabled;
/*IWRAM_DATA*/ static u8 gUnknown_3000F9D;
/*IWRAM_DATA*/ static u8 gUnknown_3000F9E;
/*IWRAM_DATA*/ static u8 gUnknown_3000F9F;
/*IWRAM_DATA*/ static u8 gUnknown_3000FA0;
/*IWRAM_DATA*/ static u8 gUnknown_3000FA1;
extern ScrCmdFunc gScriptCmdTable[];
extern ScrCmdFunc gScriptCmdTableEnd[];
src/sound.c
+5 -5
View File
@@ -24,11 +24,11 @@ EWRAM_DATA struct MusicPlayerInfo* gMPlay_PokemonCry = NULL;
EWRAM_DATA u8 gPokemonCryBGMDuckingCounter = 0;
// iwram bss
IWRAM_DATA static u16 sCurrentMapMusic;
IWRAM_DATA static u16 sNextMapMusic;
IWRAM_DATA static u8 sMapMusicState;
IWRAM_DATA static u8 sMapMusicFadeInSpeed;
IWRAM_DATA static u16 sFanfareCounter;
/*IWRAM_DATA*/ static u16 sCurrentMapMusic;
/*IWRAM_DATA*/ static u16 sNextMapMusic;
/*IWRAM_DATA*/ static u8 sMapMusicState;
/*IWRAM_DATA*/ static u8 sMapMusicFadeInSpeed;
/*IWRAM_DATA*/ static u16 sFanfareCounter;
// iwram common
bool8 gDisableMusic;