Game-Decompilation/fireemblem8u
1
0
Fork 0
mirror of https://github.com/FireEmblemUniverse/fireemblem8u.git synced 2024-11-23 13:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix and clean up ROM padding and split out more end ROM objects

Browse Source
This commit is contained in:
ProjectRevoTPP 2019-05-05 13:00:22 -04:00
parent bcd0e39951
commit bfe5f604e1
6 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -10,14 +10,10 @@ CC1 := tools/agbcc/bin/agbcc$(EXE)
CC1_OLD := tools/agbcc/bin/old_agbcc$(EXE)
#include $(DEVKITARM)
PREFIX = arm-none-eabi-
export CPP := cpp
export AS := $(PREFIX)as$(EXE)
export LD := $(PREFIX)ld$(EXE)
export OBJCOPY := $(PREFIX)objcopy$(EXE)
#CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp
#AS := $(DEVKITARM)/bin/arm-none-eabi-as
#LD := $(DEVKITARM)/bin/arm-none-eabi-ld
#OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
CPP := cpp
AS := tools/binutils/bin/arm-none-eabi-as
LD := tools/binutils/bin/arm-none-eabi-ld
OBJCOPY := tools/binutils/bin/arm-none-eabi-objcopy
BIN2C := tools/bin2c/bin2c$(EXE)
GBAGFX := tools/gbagfx/gbagfx$(EXE)
SCANINC := tools/scaninc/scaninc$(EXE)
@ -63,10 +59,8 @@ compare: $(ROM)
clean:
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.fk' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
$(RM) $(ROM) $(ELF) $(MAP) $(ALL_OBJECTS) src/*.s graphics/*.h -r $(DEPS_DIR)
# Delete all .o files otherwise some object files won't be deleted if you rename the source files
find . -name '*.o' -type f -exec rm -rf {} \;
# Remove battle animation binaries
$(RM) data/banim/*.bin data/banim/*.bak
$(RM) data/banim/*.bin data/banim/*.o data/banim/*.lz data/banim/*.bak
# Graphics Recipes
@ -115,7 +109,7 @@ $(ELF): $(ALL_OBJECTS) $(LDSCRIPT) $(SYM_FILES)
$(LD) -T $(LDSCRIPT) -Map $(MAP) $(ALL_OBJECTS) tools/agbcc/lib/libgcc.a tools/agbcc/lib/libc.a -o $@
%.gba: %.elf
$(OBJCOPY) -O binary --pad-to 0x9000000 $< $@
$(OBJCOPY) -O binary --pad-to 0x9000000 --gap-fill=0xff $< $@
$(C_OBJECTS): %.o: %.c $(DEPS_DIR)/%.d
@$(MAKEDEP)

2
data/data_B1FE7C.s
View File

@ -2,4 +2,4 @@
.global gUnknown_08B1FE7C
gUnknown_08B1FE7C: @ 0x08B1FE7C
.incbin "baserom.gba", 0xB1FE7C, 0xC00000 - 0xB1FE7C
.incbin "baserom.gba", 0xB1FE7C, 0xA788

8
data/data_E47180.s
View File

@ -1,10 +1,6 @@
.section .data
@ TODO remove padding FF
.global gUnknown_08E47180
gUnknown_08E47180: @ 0x08E47180
.incbin "baserom.gba", 0xE47180, 0x98E88
.incbin "baserom.gba", 0xEE0000, 0x8
.global gUnknown_08EE0008
gUnknown_08EE0008: @ 0x08EE0008
@ -12,4 +8,4 @@ gUnknown_08EE0008: @ 0x08EE0008
.global gUnknown_08EF8008
gUnknown_08EF8008: @ 0x08EF8008
.incbin "baserom.gba", 0xEF8008
.incbin "baserom.gba", 0xEF8008, 0x32D8

5
data/data_FE0000.s Normal file
View File

@ -0,0 +1,5 @@
.section .data
.global gUnknown_08FE0000
gUnknown_08FE0000: @ 0x08FE0000
.incbin "baserom.gba", 0xFE0000, 0x4000

5
data/data_FFF000.s Normal file
View File

@ -0,0 +1,5 @@
.section .data
.global gUnknown_08FFF000
gUnknown_08FFF000: @ 0x08FFF000
.incbin "baserom.gba", 0xFFF000, 0xF00

7
ldscript.txt
View File

@ -252,10 +252,15 @@ SECTIONS
. = ALIGN(4); tools/agbcc/lib/libc.a:locale.o(.data);
. = ALIGN(4); tools/agbcc/lib/libc.a:mallocr.o(.data);
. = ALIGN(4); data/data_B1FE7C.o(.data);
FILL(0xFF);
. = 0xC00000; src/banim_data.o(.data.banim_array_len);
. = 0xC00008; src/banim_data.o(.data.banim_array);
FILL(0x00); /* TODO: This padding is handled by banim linking process itself? */
. = 0xC02000; data/banim/data_banim.o(.data);
. = ALIGN(4); data/data_E47180.o(.data);
FILL(0xFF);
. = 0xEE0000; data/data_E47180.o(.data);
. = 0xFE0000; data/data_FE0000.o(.data);
. = 0xFFF000; data/data_FFF000.o(.data);
} = 0
/* Discard everything not specifically mentioned above. */