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

Rename start menu functions

Browse Source
This commit is contained in:
Anders Løvig 2018-03-28 21:09:27 +02:00
parent 5bc8ee6465
commit 57775a946d
8 changed files with 261 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/cable_club.s
View File

@ -1729,7 +1729,7 @@ _080B3248:
thumb_func_start sub_80B3254 thumb_func_start sub_80B3254
sub_80B3254: @ 80B3254 sub_80B3254: @ 80B3254
push {lr} push {lr}
bl sub_809FF80 bl SaveGame
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80B3254 thumb_func_end sub_80B3254

2
asm/field_control_avatar.s
View File

@ -326,7 +326,7 @@ _0809C13A:
beq _0809C15C beq _0809C15C
movs r0, 0x6 movs r0, 0x6
bl PlaySE bl PlaySE
bl sub_809FA9C bl ShowStartMenu
_0809C14E: _0809C14E:
movs r0, 0x1 movs r0, 0x1
b _0809C172 b _0809C172

2
asm/map_name_popup.s
View File

@ -8,7 +8,7 @@
thumb_func_start sub_80D47D4 thumb_func_start sub_80D47D4
sub_80D47D4: @ 80D47D4 sub_80D47D4: @ 80D47D4
push {lr} push {lr}
bl sub_80A0934 bl HideStartMenu
bl ShowMapNamePopup bl ShowMapNamePopup
movs r0, 0x1 movs r0, 0x1
pop {r1} pop {r1}

2
data/event_scripts.s
View File

@ -835,7 +835,7 @@ SlateportCity_BattleTentLobby_EventScript_27134F:: @ 827134F
SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F:: @ 827134F SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F:: @ 827134F
TrainerHill_Entrance_EventScript_27134F:: @ 827134F TrainerHill_Entrance_EventScript_27134F:: @ 827134F
VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F
special sub_809FF80 special SaveGame
waitstate waitstate
return return

2
data/specials.inc
View File

@ -104,7 +104,7 @@ gSpecials:: @ 81DBA64
def_special sub_80F8D24 def_special sub_80F8D24
def_special sub_80F8C7C def_special sub_80F8C7C
def_special sub_80B3000 def_special sub_80B3000
def_special sub_809FF80 def_special SaveGame
def_special sub_80FAFF8 def_special sub_80FAFF8
def_special easy_chat_input_maybe def_special easy_chat_input_maybe
def_special sub_811EECC def_special sub_811EECC

6
include/start_menu.h
View File

@ -5,12 +5,12 @@ extern bool8 (*gMenuCallback)(void); // Defined in sym_common.txt
void sub_809FA18(void); void sub_809FA18(void);
void sub_809FA34(u8 taskId); void sub_809FA34(u8 taskId);
void sub_809FA9C(void); void ShowStartMenu(void);
void sub_809FDD4(void); void sub_809FDD4(void);
void sub_809FF80(void); void SaveGame(void);
void sub_80A0514(void); void sub_80A0514(void);
void sub_80A08CC(void); void sub_80A08CC(void);
void sub_80A0934(void); void HideStartMenu(void);
void AppendToList(u8* list, u8* pos, u8 newEntry); void AppendToList(u8* list, u8* pos, u8 newEntry);
#endif // GUARD_START_MENU_H #endif // GUARD_START_MENU_H

4
src/overworld.c
View File

@ -161,7 +161,7 @@ extern void FieldEffectActiveListClear(void);
extern void SetUpFieldTasks(void); extern void SetUpFieldTasks(void);
extern void sub_81BE6B8(void); extern void sub_81BE6B8(void);
extern void sub_80AAFA4(void); extern void sub_80AAFA4(void);
extern void sub_809FA9C(void); extern void ShowStartMenu(void);
extern void sub_80AEE84(void); extern void sub_80AEE84(void);
extern void mapldr_default(void); extern void mapldr_default(void);
extern void npc_paltag_set_load(u8); extern void npc_paltag_set_load(u8);
@ -2795,7 +2795,7 @@ static void sub_8087510(void)
static void sub_808751C(void) static void sub_808751C(void)
{ {
PlaySE(SE_WIN_OPEN); PlaySE(SE_WIN_OPEN);
sub_809FA9C(); ShowStartMenu();
ScriptContext2_Enable(); ScriptContext2_Enable();
} }

468
src/start_menu.c
View File

File diff suppressed because it is too large Load Diff