From 40a44a8508fb728e2bc528586c6fba717222751f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 17 Nov 2018 22:55:39 +0100 Subject: more battle pytamid --- src/start_menu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 173d0a79f..976cbe2a6 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -460,18 +460,18 @@ static bool32 InitStartMenuStep(void) sUnknown_02037619[0]++; break; case 3: - if (GetSafariZoneFlag() != FALSE) + if (GetSafariZoneFlag()) { ShowSafariBallsWindow(); } - if (InBattlePyramid() != FALSE) + if (InBattlePyramid()) { ShowPyramidFloorWindow(); } sUnknown_02037619[0]++; break; case 4: - if (PrintStartMenuActions(&sUnknown_02037619[1], 2) == FALSE) + if (!PrintStartMenuActions(&sUnknown_02037619[1], 2)) { break; } -- cgit v1.2.3 From 95d3c180cc13b228dc10e6503b4a30c60f164f48 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 19 Nov 2018 01:03:14 +0100 Subject: clean up variables in files --- src/start_menu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 976cbe2a6..455d26509 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -35,6 +35,7 @@ #include "field_player_avatar.h" #include "battle_pyramid_bag.h" #include "battle_pike.h" +#include "new_game.h" // Menu actions enum @@ -63,6 +64,10 @@ enum SAVE_ERROR }; +// IWRAM common +bool8 (*gMenuCallback)(void); + +// EWRAM EWRAM_DATA static u8 sSafariBallsWindowId = 0; EWRAM_DATA static u8 sBattlePyramidFloorWindowId = 0; EWRAM_DATA static u8 sStartMenuCursorPos = 0; @@ -76,7 +81,6 @@ EWRAM_DATA static bool8 sSavingComplete = FALSE; EWRAM_DATA static u8 sSaveInfoWindowId = 0; // Extern variables. -extern u8 gDifferentSaveFile; extern u8 gUnknown_03005DB4; // Extern functions in not decompiled files. -- cgit v1.2.3