From bd56bb073f87eeca6e71b14ab1ec0a11ea1ee3a4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 5 Nov 2017 12:05:07 +0100 Subject: start working on hall of fame --- asm/start_menu.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 4f8544eea..e5e91bac8 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1683,7 +1683,7 @@ _080A05AC: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_082C8959 + ldr r2, =gText_SavingDontTurnOffPower movs r4, 0 str r4, [sp] movs r0, 0x2 -- cgit v1.2.3 From e6ef86e4b0a66440c3339c8d63c13dcd11521984 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 8 Nov 2017 15:20:10 -0600 Subject: Update variable and flag names --- asm/start_menu.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 4f8544eea..752f2c810 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -974,13 +974,13 @@ task50_save_game: @ 809FFD0 _0809FFEC: cmp r1, 0x3 bgt _080A0000 - ldr r1, =gScriptResult + ldr r1, =gSpecialVar_ScriptResult movs r0, 0 strh r0, [r1] b _080A0000 .pool _0809FFFC: - ldr r0, =gScriptResult + ldr r0, =gSpecialVar_ScriptResult strh r1, [r0] _080A0000: adds r0, r4, 0 -- cgit v1.2.3 From de8a05871462eca6474d3961cf3fe855cd402fd4 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 10 Nov 2017 02:24:21 -0600 Subject: Extract more baseroms from maps --- asm/start_menu.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 752f2c810..dd12ea2dc 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -868,7 +868,7 @@ _0809FF00: bl sub_8197DF8 bl sub_80984F4 bl ScriptContext2_Disable - ldr r0, =gUnknown_08252C88 + ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88 bl ScriptContext1_SetupScript movs r0, 0x1 b _0809FF22 @@ -1089,7 +1089,7 @@ sub_80A00A0: @ 80A00A0 lsls r0, 24 cmp r0, 0 beq _080A00D4 - ldr r0, =gUnknown_08252CA7 + ldr r0, =BattleFrontier_BattlePyramidEmptySquare_Text_252CA7 ldr r1, =sub_80A00EC bl sub_809FF98 b _080A00DC -- cgit v1.2.3 From a81deec3b3e48de7b1a8bfdb3a5d68a29e660232 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 10 Nov 2017 11:40:46 -0600 Subject: Extract unused maps --- asm/start_menu.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index dd12ea2dc..7a366f461 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1415,7 +1415,7 @@ sub_80A035C: @ 80A035C movs r1, 0 bl sub_819746C bl remove_start_menu_window_maybe - ldr r0, =gUnknown_08252CFB + ldr r0, =BattleFrontier_BattlePyramidEmptySquare_Text_252CFB ldr r1, =sub_80A0388 bl sub_809FF98 movs r0, 0 -- cgit v1.2.3 From 2e40384fa22725de06a5293454b8962ab4de8f4d Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 10 Nov 2017 18:12:18 -0600 Subject: Extract baseroms from event_scripts --- asm/start_menu.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 7a366f461..74aa0fc5f 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -974,13 +974,13 @@ task50_save_game: @ 809FFD0 _0809FFEC: cmp r1, 0x3 bgt _080A0000 - ldr r1, =gSpecialVar_ScriptResult + ldr r1, =gSpecialVar_Result movs r0, 0 strh r0, [r1] b _080A0000 .pool _0809FFFC: - ldr r0, =gSpecialVar_ScriptResult + ldr r0, =gSpecialVar_Result strh r1, [r0] _080A0000: adds r0, r4, 0 -- cgit v1.2.3