apprentice and factory screen common symbols

This commit is contained in:
DizzyEggg 2018-11-19 18:06:15 +01:00
parent 37d49b34e0
commit 9f8bcadad5
5 changed files with 16 additions and 16 deletions

View File

@ -0,0 +1,3 @@
gUnknown_030062EC
gUnknown_030062F0
gUnknown_030062F4

View File

@ -0,0 +1 @@
gUnknown_030062E8

View File

@ -340,9 +340,10 @@ extern const u8 gText_082B7185[];
extern const u8 gText_082B71C1[]; extern const u8 gText_082B71C1[];
extern const u8 gText_082B71F9[]; extern const u8 gText_082B71F9[];
extern struct Unk030062ECStruct *gUnknown_030062EC; // IWRAM common
extern struct Unk030062F0Struct *gUnknown_030062F0; struct Unk030062ECStruct *gUnknown_030062EC;
extern void (*gUnknown_030062F4)(void); struct Unk030062F0Struct *gUnknown_030062F0;
void (*gUnknown_030062F4)(void);
// This file's functions. // This file's functions.
static u16 sub_819FF98(u8 arg0); static u16 sub_819FF98(u8 arg0);

View File

@ -131,7 +131,6 @@ struct FactorySwapMonsStruct
bool8 unk30; bool8 unk30;
}; };
extern u8 (*gUnknown_030062E8)(void);
extern u8 gUnknown_0203CF20; extern u8 gUnknown_0203CF20;
extern const u16 gBattleFrontierHeldItems[]; 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 void (*sSwap_CurrentTableFunc)(u8 taskId);
static IWRAM_DATA struct FactorySwapMonsStruct *sFactorySwapScreen; static IWRAM_DATA struct FactorySwapMonsStruct *sFactorySwapScreen;
// IWRAM common
u8 (*gUnknown_030062E8)(void);
// Const rom data. // Const rom data.
static const u16 gUnknown_0860F13C[] = INCBIN_U16("graphics/unknown/unknown_60F13C.gbapal"); static const u16 gUnknown_0860F13C[] = INCBIN_U16("graphics/unknown/unknown_60F13C.gbapal");
static const u16 gUnknown_0860F15C[] = INCBIN_U16("graphics/unknown/unknown_60F15C.gbapal"); static const u16 gUnknown_0860F15C[] = INCBIN_U16("graphics/unknown/unknown_60F15C.gbapal");

View File

@ -87,18 +87,11 @@ gUnknown_030062E0: @ 30062E0
gUnknown_030062E4: @ 30062E4 gUnknown_030062E4: @ 30062E4
.space 0x4 .space 0x4
gUnknown_030062E8: @ 30062E8 .include "battle_factory_screen.o"
.space 0x4 .include "apprentice.o"
gUnknown_030062EC: @ 30062EC .space 0x8
.space 0x4
gUnknown_030062F0: @ 30062F0
.space 0x4
gUnknown_030062F4: @ 30062F4
.space 0xC
.include "list_menu.o" .include "list_menu.o"
gUnknown_03006328: @ 3006328 gUnknown_03006328: @ 3006328