mirror of
https://github.com/pret/pmd-red.git
synced 2026-09-30 12:58:10 -05:00
Merge kecleon_items and kecleon_items_1
This commit is contained in:
3
Makefile
3
Makefile
@@ -124,7 +124,8 @@ $(C_BUILDDIR)/agb_flash_mx.o: CC1FLAGS := -O -mthumb-interwork
|
||||
|
||||
$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc
|
||||
|
||||
$(C_BUILDDIR)/kecleon_items_1.o: CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
|
||||
# Stack size in sub_801A9E0 is funky with an unused var
|
||||
$(C_BUILDDIR)/kecleon_items.o: CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
|
||||
|
||||
|
||||
#### Main Rules ####
|
||||
|
||||
@@ -98,7 +98,6 @@ SECTIONS {
|
||||
src/felicity_bank.o(.text);
|
||||
src/kangaskhan_storage.o(.text);
|
||||
src/kecleon_items.o(.text);
|
||||
src/kecleon_items_1.o(.text);
|
||||
src/code_801AFA4.o(.text);
|
||||
src/code_801B3C0.o(.text);
|
||||
src/code_801C620.o(.text);
|
||||
|
||||
@@ -139,7 +139,7 @@ extern char gUnknown_80DBE30[]; // {ARG_POKEMON_0}
|
||||
extern u8 gUnknown_80DBDC8[];
|
||||
extern u8 *gUnknown_80D4970[];
|
||||
|
||||
void sub_8007B7C(s32, s32, s32, s32, s32);
|
||||
extern void sub_8007B7C(s32, s32, s32, s32, s32);
|
||||
extern bool8 sub_801CF14(s32);
|
||||
extern u32 sub_801CE58(void);
|
||||
extern void sub_801CC38(void);
|
||||
|
||||
1368
src/kecleon_items.c
1368
src/kecleon_items.c
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user