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

Move start_menu EWRAM symbols into C file

Browse Source
This commit is contained in:
Diegoisawesome 2018-02-05 23:12:34 -06:00
parent eb6aed50e5
commit 06e1aca2ac
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/start_menu.s
View File

@ -170,7 +170,7 @@ _0809F926:
b _0809F940 b _0809F940
.pool .pool
_0809F930: _0809F930:
ldr r4, =gUnknown_0203761A ldr r4, =gUnknown_02037619+1
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2 movs r1, 0x2
bl PrintStartMenuActions bl PrintStartMenuActions

5
src/start_menu.c
View File

@ -62,6 +62,11 @@ EWRAM_DATA u8 sBattlePyramidFloorWindowId = 0;
EWRAM_DATA u8 sStartMenuCursorPos = 0; EWRAM_DATA u8 sStartMenuCursorPos = 0;
EWRAM_DATA u8 sNumStartMenuActions = 0; EWRAM_DATA u8 sNumStartMenuActions = 0;
EWRAM_DATA u8 sCurrentStartMenuActions[9] = {0}; EWRAM_DATA u8 sCurrentStartMenuActions[9] = {0};
EWRAM_DATA u8 gUnknown_02037619[2] = {0};
EWRAM_DATA bool8 (*gUnknown_0203761C)(void) = NULL;
EWRAM_DATA u8 gUnknown_02037620 = 0;
EWRAM_DATA u8 gUnknown_02037621 = 0;
EWRAM_DATA u8 gUnknown_02037622 = 0;
// const rom data // const rom data
static const struct WindowTemplate gSafariBallsWindowTemplate = {0, 1, 1, 9, 4, 0xF, 8}; static const struct WindowTemplate gSafariBallsWindowTemplate = {0, 1, 1, 9, 4, 0xF, 8};

19
sym_ewram.txt
View File

@ -659,25 +659,6 @@ gUnknown_020375D6: @ 20375D6
.include "src/event_data.o" .include "src/event_data.o"
.include "src/start_menu.o" .include "src/start_menu.o"
gUnknown_02037619: @ 2037619
.space 0x1
gUnknown_0203761A: @ 203761A
.space 0x2
gUnknown_0203761C: @ 203761C
.space 0x4
gUnknown_02037620: @ 2037620
.space 0x1
gUnknown_02037621: @ 2037621
.space 0x1
gUnknown_02037622: @ 2037622
.space 0x2
.include "src/tileset_anims.o" .include "src/tileset_anims.o"
.include "src/palette.o" .include "src/palette.o"
.include "src/sound.o" .include "src/sound.o"