ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add entry in sym_ewram.txt and organize a bit

Browse Source
This commit is contained in:
Diegoisawesome 2018-01-23 21:34:15 -06:00
parent 5a57485ece
commit cc307730a1
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/naming_screen.c
View File

@ -27,14 +27,10 @@
#include "text_window.h"
#include "overworld.h"
extern EWRAM_DATA struct NamingScreenData *gNamingScreenData;
EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL;
extern u16 gKeyRepeatStartDelay;
// graphics
static const u8 gSpriteImage_858BBF8[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp");
static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_icon/1.4bpp");
const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal");
// extern graphics
extern const u16 gNamingScreenMenu_Pal[];
extern const u8 gNamingScreenMenu_Gfx[];
extern const u8 gUnknown_08DD4544[];
@ -48,7 +44,7 @@ extern const u8 gNamingScreenCursor_Gfx[];
extern const u8 gNamingScreenRightPointingTriangleTiles[];
extern const u8 gNamingScreenUnderscoreTiles[];
// text
// extern text
extern const u8 gExpandedPlaceholder_Empty[];
extern const u8 gText_PkmnTransferredSomeonesPC[];
extern const u8 gText_PkmnTransferredLanettesPC[];
@ -61,6 +57,11 @@ extern const u8 gText_PkmnsNickname[];
extern const u8 gText_TellHimTheWords[];
// start of .rodata
static const u8 gSpriteImage_858BBF8[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp");
static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_icon/1.4bpp");
static const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal");
static const u8 *const gUnknown_0858BDB8[] =
{
gText_PkmnTransferredSomeonesPC,

4
sym_ewram.txt
View File

@ -945,9 +945,7 @@ gUnknown_02039F8C: @ 2039F8C
gUnknown_02039F90: @ 2039F90
.space 0x4
gNamingScreenData: @ 2039F94
.space 0x4
.include "src/naming_screen.o"
.include "src/money.o"
.align 2