dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
PikalaxALT
2019-10-14 10:02:00 -04:00
parent 8fd0bc4245
commit 5a20fefab1
5 changed files with 836 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/strings.s
+794 -243
View File
File diff suppressed because it is too large Load Diff
src/quest_log.c
+22 -22
View File
@@ -92,30 +92,30 @@ struct UnkStruct_203AE98 * gUnknown_3005E94;
static struct UnkStruct_300201C * gUnknown_300201C; static struct UnkStruct_300201C * gUnknown_300201C;
static u16 gUnknown_3002020; static u16 gUnknown_3002020;
EWRAM_DATA u8 gUnknown_203ADF8 = 0; static EWRAM_DATA u8 gUnknown_203ADF8 = 0;
static EWRAM_DATA u8 sNumScenes = 0; static EWRAM_DATA u8 sNumScenes = 0;
EWRAM_DATA u8 gUnknown_203ADFA = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0;
EWRAM_DATA u16 gUnknown_203ADFC = 0; static EWRAM_DATA u16 gUnknown_203ADFC = 0;
EWRAM_DATA u8 gUnknown_203ADFE[3] = {0}; static EWRAM_DATA u8 gUnknown_203ADFE[3] = {0};
EWRAM_DATA u16 * gUnknown_203AE04 = NULL; static EWRAM_DATA u16 * gUnknown_203AE04 = NULL;
EWRAM_DATA u16 * gUnknown_203AE08 = NULL; static EWRAM_DATA u16 * gUnknown_203AE08 = NULL;
EWRAM_DATA u16 * gUnknown_203AE0C[32] = {NULL}; static EWRAM_DATA u16 * gUnknown_203AE0C[32] = {NULL};
EWRAM_DATA void (* gUnknown_203AE8C)(void) = NULL; static EWRAM_DATA void (* gUnknown_203AE8C)(void) = NULL;
EWRAM_DATA u16 *gUnknown_203AE90 = NULL; static EWRAM_DATA u16 *gUnknown_203AE90 = NULL;
EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; static EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0};
EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; static EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0};
EWRAM_DATA u16 gUnknown_203AF98 = 0; static EWRAM_DATA u16 gUnknown_203AF98 = 0;
EWRAM_DATA u8 gUnknown_203AF9A[64][2] = {{0}}; static EWRAM_DATA u8 gUnknown_203AF9A[64][2] = {{0}};
EWRAM_DATA u16 gUnknown_203B01A = 0; static EWRAM_DATA u16 gUnknown_203B01A = 0;
EWRAM_DATA u16 gUnknown_203B01C = 0; static EWRAM_DATA u16 gUnknown_203B01C = 0;
EWRAM_DATA u16 gUnknown_203B01E = 0; static EWRAM_DATA u16 gUnknown_203B01E = 0;
EWRAM_DATA u8 sHelpMessageWindowId = 0; static EWRAM_DATA u8 sHelpMessageWindowId = 0;
EWRAM_DATA struct UnkStruct_203B024 gUnknown_203B024 = {0}; static EWRAM_DATA struct UnkStruct_203B024 gUnknown_203B024 = {0};
EWRAM_DATA struct UnkStruct_203B044 gUnknown_203B044 = {0}; static EWRAM_DATA struct UnkStruct_203B044 gUnknown_203B044 = {0};
EWRAM_DATA u8 gUnknown_203B048 = 0; static EWRAM_DATA u8 gUnknown_203B048 = 0;
EWRAM_DATA u8 gUnknown_203B049 = 0; static EWRAM_DATA u8 gUnknown_203B049 = 0;
EWRAM_DATA u8 gUnknown_203B04A = 0; static EWRAM_DATA u8 gUnknown_203B04A = 0;
EWRAM_DATA u8 gUnknown_203B04B = 0; static EWRAM_DATA u8 gUnknown_203B04B = 0;
void sub_8110A00(void); void sub_8110A00(void);
void sub_8110A3C(void); void sub_8110A3C(void);
src/start_menu.c
+6 -6
View File
@@ -72,7 +72,7 @@ static ALIGNED(4) EWRAM_DATA u8 sSaveStatsWindowId = 0;
static u8 (*sSaveDialogCB)(void); static u8 (*sSaveDialogCB)(void);
static u8 sSaveDialogDelay; static u8 sSaveDialogDelay;
static u8 sSaveDialogIsPrinting; static bool8 sSaveDialogIsPrinting;
static void SetUpStartMenu_Link(void); static void SetUpStartMenu_Link(void);
static void SetUpStartMenu_UnionRoom(void); static void SetUpStartMenu_UnionRoom(void);
@@ -601,14 +601,14 @@ static void StartMenu_PrepareForSave(void)
{ {
save_serialize_map(); save_serialize_map();
sSaveDialogCB = SaveDialogCB_PrintAskSaveText; sSaveDialogCB = SaveDialogCB_PrintAskSaveText;
sSaveDialogIsPrinting = 0; sSaveDialogIsPrinting = FALSE;
} }
static u8 RunSaveDialogCB(void) static u8 RunSaveDialogCB(void)
{ {
if (RunTextPrinters_CheckPrinter0Active() == TRUE) if (RunTextPrinters_CheckPrinter0Active() == TRUE)
return 0; return 0;
sSaveDialogIsPrinting = 0; sSaveDialogIsPrinting = FALSE;
return sSaveDialogCB(); return sSaveDialogCB();
} }
@@ -620,13 +620,13 @@ void Field_AskSaveTheGame(void)
CreateTask(task50_save_game, 80); CreateTask(task50_save_game, 80);
} }
void PrintSaveTextWithFollowupFunc(const u8 *str, bool8 (*savecb)(void)) void PrintSaveTextWithFollowupFunc(const u8 *str, bool8 (*saveDialogCB)(void))
{ {
StringExpandPlaceholders(gStringVar4, str); StringExpandPlaceholders(gStringVar4, str);
sub_80F7768(0, TRUE); sub_80F7768(0, TRUE);
AddTextPrinterForMessage(TRUE); AddTextPrinterForMessage(TRUE);
sSaveDialogIsPrinting = 1; sSaveDialogIsPrinting = TRUE;
sSaveDialogCB = savecb; sSaveDialogCB = saveDialogCB;
} }
void task50_save_game(u8 taskId) void task50_save_game(u8 taskId)
sym_bss.txt
+4 -4
View File
@@ -53,11 +53,11 @@ gUnknown_3000E9C: @ 3000E9C
gUnknown_3000EA0: @ 3000EA0 gUnknown_3000EA0: @ 3000EA0
.space 0x8 .space 0x8
.align 2 .align 2
.include "src/script.o" .include "src/script.o"
.align 2 .align 2
.include "src/start_menu.o" .include "src/start_menu.o"
.align 2 .align 2
.include "src/tileset_anims.o" .include "src/tileset_anims.o"
.align 2 .align 2
.include "src/sound.o" .include "src/sound.o"
@@ -105,9 +105,9 @@ gUnknown_3002008: @ 3002008
gUnknown_3002018: @ 3002018 gUnknown_3002018: @ 3002018
.space 0x4 .space 0x4
.include "src/quest_log.o" .include "src/quest_log.o"
.align 2 .align 2
gUnknown_3002024: @ 3002024 gUnknown_3002024: @ 3002024
.space 0x4 .space 0x4
sym_ewram.txt
+10 -10
View File
@@ -12,7 +12,7 @@
.align 2 .align 2
.include "src/sprite.o" .include "src/sprite.o"
.align 2 .align 2
.include "src/string_util.o" .include "src/string_util.o"
.align 2 .align 2
.include "src/link.o" .include "src/link.o"
.space 8 .space 8
@@ -510,9 +510,9 @@ gUnknown_203709C: @ 203709C
.space 0x4 .space 0x4
.include "src/script.o" .include "src/script.o"
.include "src/scrcmd.o" .include "src/scrcmd.o"
.align 2 .align 2
gSpecialVar_0x8000: @ 20370B8 gSpecialVar_0x8000: @ 20370B8
.space 0x2 .space 0x2
@@ -576,13 +576,13 @@ gUnknown_20370DE: @ 20370DE
gUnknown_20370E0: @ 20370E0 gUnknown_20370E0: @ 20370E0
.space 0x10 .space 0x10
.align 2 .align 2
.include "src/start_menu.o" .include "src/start_menu.o"
.align 2 .align 2
.include "src/tileset_anims.o" .include "src/tileset_anims.o"
.align 2 .align 2
.include "src/palette.o" .include "src/palette.o"
.align 2 .align 2
.include "src/sound.o" .include "src/sound.o"
.align 2 .align 2
@@ -958,9 +958,9 @@ gUnknown_203AAB4: @ 203AAB4
gUnknown_203AAB8: @ 203AAB8 gUnknown_203AAB8: @ 203AAB8
.space 0x4 .space 0x4
.align 2 .align 2
.include "src/player_pc.o" .include "src/player_pc.o"
.align 2 .align 2
.include "src/intro.o" .include "src/intro.o"
.align 2 .align 2