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
Makefile
-5
View File
@@ -108,11 +108,6 @@ sound/%.bin: sound/%.aif ; $(AIF) $< $@
sound/songs/%.s: sound/songs/%.mid sound/songs/%.s: sound/songs/%.mid
cd $(@D) && ../../$(MID) $(<F) cd $(@D) && ../../$(MID) $(<F)
$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_BUILDDIR)/libc.o: CFLAGS := -O2
$(C_BUILDDIR)/siirtc.o: CFLAGS := -mthumb-interwork
$(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork $(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork $(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
ld_script.txt
+2
View File
@@ -358,6 +358,7 @@ SECTIONS {
src/main.o(.rodata); src/main.o(.rodata);
src/bg.o(.rodata); src/bg.o(.rodata);
src/malloc.o(.rodata); src/malloc.o(.rodata);
src/malloc.o(.rodata.str1.4);
src/text_printer.o(.rodata); src/text_printer.o(.rodata);
src/window.o(.rodata); src/window.o(.rodata);
src/text.o(.rodata); src/text.o(.rodata);
@@ -373,6 +374,7 @@ SECTIONS {
data/quest_log.o(.rodata); data/quest_log.o(.rodata);
data/data_83FECCC.o(.rodata.8456C74); data/data_83FECCC.o(.rodata.8456C74);
src/menews_jisan.o(.rodata); src/menews_jisan.o(.rodata);
src/menews_jisan.o(.rodata.str1.4);
data/data_8468C98.o(.rodata); data/data_8468C98.o(.rodata);
src/m4a_tables.o(.rodata); src/m4a_tables.o(.rodata);
data/sound_data.o(.rodata); data/sound_data.o(.rodata);
src/dma3_manager.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "dma3.h" #include "dma3.h"
IWRAM_DATA struct { static /*IWRAM_DATA*/ struct {
/* 0x00 */ const u8 *src; /* 0x00 */ const u8 *src;
/* 0x04 */ u8 *dest; /* 0x04 */ u8 *dest;
/* 0x08 */ u16 size; /* 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_3005E90 gUnknown_3005E90;
struct UnkStruct_203AE98 * gUnknown_3005E94; struct UnkStruct_203AE98 * gUnknown_3005E94;
IWRAM_DATA struct UnkStruct_300201C * gUnknown_300201C; static struct UnkStruct_300201C * gUnknown_300201C;
IWRAM_DATA u16 gUnknown_3002020; static u16 gUnknown_3002020;
EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADF8 = 0;
EWRAM_DATA u8 gUnknown_203ADF9 = 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_DATA u8 *gUnknown_20370A4 = NULL;
// ewram bss // ewram bss
IWRAM_DATA static u8 sScriptContext1Status; /*IWRAM_DATA*/ static u8 sScriptContext1Status;
IWRAM_DATA static u32 sUnusedVariable1; /*IWRAM_DATA*/ static u32 sUnusedVariable1;
IWRAM_DATA static struct ScriptContext sScriptContext1; /*IWRAM_DATA*/ static struct ScriptContext sScriptContext1;
IWRAM_DATA static u32 sUnusedVariable2; /*IWRAM_DATA*/ static u32 sUnusedVariable2;
IWRAM_DATA static struct ScriptContext sScriptContext2; /*IWRAM_DATA*/ static struct ScriptContext sScriptContext2;
IWRAM_DATA static bool8 sScriptContext2Enabled; /*IWRAM_DATA*/ static bool8 sScriptContext2Enabled;
IWRAM_DATA static u8 gUnknown_3000F9D; /*IWRAM_DATA*/ static u8 gUnknown_3000F9D;
IWRAM_DATA static u8 gUnknown_3000F9E; /*IWRAM_DATA*/ static u8 gUnknown_3000F9E;
IWRAM_DATA static u8 gUnknown_3000F9F; /*IWRAM_DATA*/ static u8 gUnknown_3000F9F;
IWRAM_DATA static u8 gUnknown_3000FA0; /*IWRAM_DATA*/ static u8 gUnknown_3000FA0;
IWRAM_DATA static u8 gUnknown_3000FA1; /*IWRAM_DATA*/ static u8 gUnknown_3000FA1;
extern ScrCmdFunc gScriptCmdTable[]; extern ScrCmdFunc gScriptCmdTable[];
extern ScrCmdFunc gScriptCmdTableEnd[]; 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; EWRAM_DATA u8 gPokemonCryBGMDuckingCounter = 0;
// iwram bss // iwram bss
IWRAM_DATA static u16 sCurrentMapMusic; /*IWRAM_DATA*/ static u16 sCurrentMapMusic;
IWRAM_DATA static u16 sNextMapMusic; /*IWRAM_DATA*/ static u16 sNextMapMusic;
IWRAM_DATA static u8 sMapMusicState; /*IWRAM_DATA*/ static u8 sMapMusicState;
IWRAM_DATA static u8 sMapMusicFadeInSpeed; /*IWRAM_DATA*/ static u8 sMapMusicFadeInSpeed;
IWRAM_DATA static u16 sFanfareCounter; /*IWRAM_DATA*/ static u16 sFanfareCounter;
// iwram common // iwram common
bool8 gDisableMusic; bool8 gDisableMusic;
sym_bss.txt
+2 -5
View File
@@ -174,12 +174,9 @@ gUnknown_3002008: @ 3002008
gUnknown_3002018: @ 3002018 gUnknown_3002018: @ 3002018
.space 0x4 .space 0x4
gUnknown_300201C: @ 300201C .include "src/quest_log.o"
.space 0x4
gUnknown_3002020: @ 3002020
.space 0x4
.align 2
gUnknown_3002024: @ 3002024 gUnknown_3002024: @ 3002024
.space 0x4 .space 0x4
sym_ewram.txt
+1 -2
View File
@@ -47,8 +47,7 @@ gStringVar3: @ 2021D04
gStringVar4: @ 2021D18 gStringVar4: @ 2021D18
.space 0x3E8 .space 0x3E8
gUnknownStringVar: @ 2022100 .include "src/string_util.o"
.space 0x10
gUnknown_2022110: @ 2022110 gUnknown_2022110: @ 2022110
.space 0x1 .space 0x1