diff options
| author | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-08 16:44:04 -0400 |
|---|---|---|
| committer | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-08 18:54:51 -0400 |
| commit | e84da39d8ad7228e731a55b2d6eaf58aa8acc96f (patch) | |
| tree | 0e6838cb69cac5b14ff152104a8ec99c3a913610 /berry_fix | |
| parent | 4d31980359af92c407a15358d3c73ba47d6f00b7 (diff) | |
Match BattleIntroOpponent1SendsOutMonAnimation
Diffstat (limited to 'berry_fix')
| -rw-r--r-- | berry_fix/Makefile | 4 | ||||
| -rw-r--r-- | berry_fix/payload/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/berry_fix/Makefile b/berry_fix/Makefile index 0ead3804f..f14179176 100644 --- a/berry_fix/Makefile +++ b/berry_fix/Makefile @@ -42,7 +42,7 @@ CPPFLAGS := -I ../tools/agbcc/include -I ../tools/agbcc -iquote include -nostdin ROM := berry_fix.gba OBJ_DIR := build CC1 := ../tools/agbcc/bin/agbcc$(EXE) -override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm +override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm -nostdlib ELF = $(ROM:.gba=.elf) @@ -56,7 +56,7 @@ C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR) ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR) DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR) -ASFLAGS := -mcpu=arm7tdmi +ASFLAGS := -mcpu=arm7tdmi -mthumb-interwork LDFLAGS = -Map ../$(MAP) diff --git a/berry_fix/payload/Makefile b/berry_fix/payload/Makefile index a121fda93..ca8b952dd 100644 --- a/berry_fix/payload/Makefile +++ b/berry_fix/payload/Makefile @@ -38,7 +38,7 @@ CPPFLAGS := -I ../../tools/agbcc/include -I ../../tools/agbcc -iquote include -n ROM := payload.gba OBJ_DIR := build CC1 := ../../tools/agbcc/bin/agbcc$(EXE) -override CC1FLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm +override CC1FLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm -nostdlib ELF = $(ROM:.gba=.elf) @@ -52,7 +52,7 @@ C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR) ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR) DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR) -ASFLAGS := -mcpu=arm7tdmi +ASFLAGS := -mcpu=arm7tdmi -mthumb-interwork LDFLAGS = -Map ../$(MAP) |