diff options
| -rw-r--r-- | INSTALL.md | 15 | ||||
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | berry_fix/Makefile | 9 | ||||
| -rw-r--r-- | berry_fix/payload/Makefile | 9 | ||||
| -rw-r--r-- | include/global.h | 2 |
5 files changed, 20 insertions, 24 deletions
diff --git a/INSTALL.md b/INSTALL.md index 5ba0ee484..745f70007 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,18 +1,11 @@ -Install [devkitARM](https://devkitpro.org/wiki/Getting_Started) (if you are on **Windows 10**, [do this instead](#windows-10)). - Run the following commands (first, see [this](#macos) if you are on **macOS** or [this](#old-windows) if you are on **old Windows**): - export DEVKITPRO=/opt/devkitpro - echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc - export DEVKITARM=$DEVKITPRO/devkitARM - echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc - git clone https://github.com/pret/pokefirered - git clone https://github.com/pret/agbcc + git clone https://github.com/pikalaxalt/agbcc -b new_layout_with_libs cd agbcc - ./build.sh - ./install.sh ../pokefirered + make + make install prefix=../pokefirered cd ../pokefirered @@ -49,7 +42,7 @@ If the command for building pokefirered.gba does not work, run `nproc` and use t ## Windows 10 -Install the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/install-win10), then install [devkitARM](https://devkitpro.org/wiki/Getting_Started) inside the subsystem, and run the commands. +Install the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/install-win10), and run the commands. ## Important note for all users @@ -1,6 +1,7 @@ -include $(DEVKITARM)/base_tools -export CPP := $(PREFIX)cpp -export LD := $(PREFIX)ld +AS := tools/binutils/bin/arm-none-eabi-as +CPP := $(CC) -E +LD := tools/binutils/bin/arm-none-eabi-ld +OBJCOPY := tools/binutils/bin/arm-none-eabi-objcopy TITLE := POKEMON FIRE GAME_CODE := BPRE @@ -166,7 +167,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB) + cd $(OBJ_DIR) && ../../$(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ diff --git a/berry_fix/Makefile b/berry_fix/Makefile index ffe0cf251..d449fdbef 100644 --- a/berry_fix/Makefile +++ b/berry_fix/Makefile @@ -1,6 +1,7 @@ -include $(DEVKITARM)/base_tools -export CPP := $(PREFIX)cpp -export LD := $(PREFIX)ld +AS := ../tools/binutils/bin/arm-none-eabi-as +CPP := $(CC) -E +LD := ../tools/binutils/bin/arm-none-eabi-ld +OBJCOPY := ../tools/binutils/bin/arm-none-eabi-objcopy ifeq ($(OS),Windows_NT) EXE := .exe @@ -152,7 +153,7 @@ $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s $(AS) $(ASFLAGS) -I sound -o $@ $< $(ELF): ld_script.txt $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../ld_script.txt -o ../$@ + cd $(OBJ_DIR) && ../$(LD) $(LDFLAGS) -T ../ld_script.txt -o ../$@ $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ diff --git a/berry_fix/payload/Makefile b/berry_fix/payload/Makefile index e63d74234..b97556774 100644 --- a/berry_fix/payload/Makefile +++ b/berry_fix/payload/Makefile @@ -1,6 +1,7 @@ -include $(DEVKITARM)/base_tools -export CPP := $(PREFIX)cpp -export LD := $(PREFIX)ld +AS := ../../tools/binutils/bin/arm-none-eabi-as +CPP := $(CC) -E +LD := ../../tools/binutils/bin/arm-none-eabi-ld +OBJCOPY := ../../tools/binutils/bin/arm-none-eabi-objcopy ifeq ($(OS),Windows_NT) EXE := .exe @@ -152,7 +153,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../$< | sed "s#tools/#../tools/#g" > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../$@ $(LIB) + cd $(OBJ_DIR) && ../$(LD) $(LDFLAGS) -T ld_script.ld -o ../$@ $(LIB) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ diff --git a/include/global.h b/include/global.h index 775b3115e..1d2152af7 100644 --- a/include/global.h +++ b/include/global.h @@ -705,7 +705,7 @@ struct SaveBlock1 /*0x30D0*/ struct Roamer roamer; /*0x30EC*/ struct EnigmaBerry enigmaBerry; /*0x3120*/ struct MEventBuffers unk_3120; - /*0x348C*/ u8 filler_348C[0x190]; + /*0x348C*/ u8 filler_348C[400]; /*0x361C*/ struct RamScript ramScript; /*0x3A08*/ u8 filler3A08[12]; /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; |