diff options
| -rw-r--r-- | common_syms/apprentice.txt | 3 | ||||
| -rw-r--r-- | common_syms/battle_factory_screen.txt | 1 | ||||
| -rw-r--r-- | src/apprentice.c | 7 | ||||
| -rw-r--r-- | src/battle_factory_screen.c | 4 | ||||
| -rw-r--r-- | sym_common.txt | 17 |
5 files changed, 16 insertions, 16 deletions
diff --git a/common_syms/apprentice.txt b/common_syms/apprentice.txt new file mode 100644 index 000000000..e35133ecc --- /dev/null +++ b/common_syms/apprentice.txt @@ -0,0 +1,3 @@ +gUnknown_030062EC +gUnknown_030062F0 +gUnknown_030062F4 diff --git a/common_syms/battle_factory_screen.txt b/common_syms/battle_factory_screen.txt new file mode 100644 index 000000000..9f6868139 --- /dev/null +++ b/common_syms/battle_factory_screen.txt @@ -0,0 +1 @@ +gUnknown_030062E8 diff --git a/src/apprentice.c b/src/apprentice.c index fa4e08385..499f85094 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -340,9 +340,10 @@ extern const u8 gText_082B7185[]; extern const u8 gText_082B71C1[]; extern const u8 gText_082B71F9[]; -extern struct Unk030062ECStruct *gUnknown_030062EC; -extern struct Unk030062F0Struct *gUnknown_030062F0; -extern void (*gUnknown_030062F4)(void); +// IWRAM common +struct Unk030062ECStruct *gUnknown_030062EC; +struct Unk030062F0Struct *gUnknown_030062F0; +void (*gUnknown_030062F4)(void); // This file's functions. static u16 sub_819FF98(u8 arg0); diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 255cf5aa1..42a9b579c 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -131,7 +131,6 @@ struct FactorySwapMonsStruct bool8 unk30; }; -extern u8 (*gUnknown_030062E8)(void); extern u8 gUnknown_0203CF20; extern const u16 gBattleFrontierHeldItems[]; @@ -237,6 +236,9 @@ static IWRAM_DATA struct FactorySelectMonsStruct *sFactorySelectScreen; static IWRAM_DATA void (*sSwap_CurrentTableFunc)(u8 taskId); static IWRAM_DATA struct FactorySwapMonsStruct *sFactorySwapScreen; +// IWRAM common +u8 (*gUnknown_030062E8)(void); + // Const rom data. static const u16 gUnknown_0860F13C[] = INCBIN_U16("graphics/unknown/unknown_60F13C.gbapal"); static const u16 gUnknown_0860F15C[] = INCBIN_U16("graphics/unknown/unknown_60F15C.gbapal"); diff --git a/sym_common.txt b/sym_common.txt index 0c742d925..346591222 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -87,18 +87,11 @@ gUnknown_030062E0: @ 30062E0 gUnknown_030062E4: @ 30062E4 .space 0x4 -gUnknown_030062E8: @ 30062E8 - .space 0x4 - -gUnknown_030062EC: @ 30062EC - .space 0x4 - -gUnknown_030062F0: @ 30062F0 - .space 0x4 - -gUnknown_030062F4: @ 30062F4 - .space 0xC - + .include "battle_factory_screen.o" + .include "apprentice.o" + + .space 0x8 + .include "list_menu.o" gUnknown_03006328: @ 3006328 |