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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Paul Sander
2018-12-18 23:13:33 +01:00
parent 478c7b5421 74137d7448
commit f04f8baa5b
5 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
INSTALL.md
+4 -11
View File
@@ -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**): 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/pokefirered
git clone https://github.com/pret/agbcc git clone https://github.com/pikalaxalt/agbcc -b new_layout_with_libs
cd agbcc cd agbcc
./build.sh make
./install.sh ../pokefirered make install prefix=../pokefirered
cd ../pokefirered cd ../pokefirered
@@ -49,7 +42,7 @@ If the command for building pokefirered.gba does not work, run `nproc` and use t
## Windows 10 ## 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 ## Important note for all users
Makefile
+5 -4
View File
@@ -1,6 +1,7 @@
include $(DEVKITARM)/base_tools AS := tools/binutils/bin/arm-none-eabi-as
export CPP := $(PREFIX)cpp CPP := $(CC) -E
export LD := $(PREFIX)ld LD := tools/binutils/bin/arm-none-eabi-ld
OBJCOPY := tools/binutils/bin/arm-none-eabi-objcopy
TITLE := POKEMON FIRE TITLE := POKEMON FIRE
GAME_CODE := BPRE 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 cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld
$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(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) $(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@ $(OBJCOPY) -O binary $< $@
berry_fix/Makefile
+5 -4
View File
@@ -1,6 +1,7 @@
include $(DEVKITARM)/base_tools AS := ../tools/binutils/bin/arm-none-eabi-as
export CPP := $(PREFIX)cpp CPP := $(CC) -E
export LD := $(PREFIX)ld LD := ../tools/binutils/bin/arm-none-eabi-ld
OBJCOPY := ../tools/binutils/bin/arm-none-eabi-objcopy
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
EXE := .exe EXE := .exe
@@ -152,7 +153,7 @@ $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
$(AS) $(ASFLAGS) -I sound -o $@ $< $(AS) $(ASFLAGS) -I sound -o $@ $<
$(ELF): ld_script.txt $(OBJS) $(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) $(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@ $(OBJCOPY) -O binary $< $@
berry_fix/payload/Makefile
+5 -4
View File
@@ -1,6 +1,7 @@
include $(DEVKITARM)/base_tools AS := ../../tools/binutils/bin/arm-none-eabi-as
export CPP := $(PREFIX)cpp CPP := $(CC) -E
export LD := $(PREFIX)ld LD := ../../tools/binutils/bin/arm-none-eabi-ld
OBJCOPY := ../../tools/binutils/bin/arm-none-eabi-objcopy
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
EXE := .exe 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 cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../$< | sed "s#tools/#../tools/#g" > ld_script.ld
$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(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) $(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@ $(OBJCOPY) -O binary $< $@
include/global.h
+1 -1
View File
@@ -705,7 +705,7 @@ struct SaveBlock1
/*0x30D0*/ struct Roamer roamer; /*0x30D0*/ struct Roamer roamer;
/*0x30EC*/ struct EnigmaBerry enigmaBerry; /*0x30EC*/ struct EnigmaBerry enigmaBerry;
/*0x3120*/ struct MEventBuffers unk_3120; /*0x3120*/ struct MEventBuffers unk_3120;
/*0x348C*/ u8 filler_348C[0x190]; /*0x348C*/ u8 filler_348C[400];
/*0x361C*/ struct RamScript ramScript; /*0x361C*/ struct RamScript ramScript;
/*0x3A08*/ u8 filler3A08[12]; /*0x3A08*/ u8 filler3A08[12];
/*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; /*0x3A14*/ u8 seen2[DEX_FLAGS_NO];