summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom4.s58
-rw-r--r--asm/rom5.s26
-rw-r--r--src/main_menu.c4
3 files changed, 44 insertions, 44 deletions
diff --git a/asm/rom4.s b/asm/rom4.s
index c87dfef9e..aa8f661af 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -3130,10 +3130,10 @@ _08054400:
_0805440C: .4byte 0x0300485c
thumb_func_end sub_80543E8
- thumb_func_start c2_load_new_map_2
-c2_load_new_map_2: @ 8054410
+ thumb_func_start CB2_NewGame
+CB2_NewGame: @ 8054410
push {lr}
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
bl sub_8074D08
bl ResetSafariZoneFlag_
bl NewGameInitData
@@ -3159,7 +3159,7 @@ _08054458: .4byte sub_80C76A0
_0805445C: .4byte 0x03001bac
_08054460: .4byte c1_overworld
_08054464: .4byte c2_overworld
- thumb_func_end c2_load_new_map_2
+ thumb_func_end CB2_NewGame
thumb_func_start c2_whiteout
c2_whiteout: @ 8054468
@@ -3175,7 +3175,7 @@ c2_whiteout: @ 8054468
lsrs r0, 24
cmp r0, 0x77
bls _080544BE
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
bl sub_8074D08
bl ResetSafariZoneFlag_
bl sub_8052F5C
@@ -3208,10 +3208,10 @@ _080544D4: .4byte c1_overworld
_080544D8: .4byte c2_overworld
thumb_func_end c2_whiteout
- thumb_func_start c2_load_new_map
-c2_load_new_map: @ 80544DC
+ thumb_func_start CB2_LoadMap
+CB2_LoadMap: @ 80544DC
push {lr}
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
bl script_env_1_init
bl script_env_2_disable
movs r0, 0
@@ -3226,11 +3226,11 @@ c2_load_new_map: @ 80544DC
.align 2, 0
_08054500: .4byte sub_810CC80
_08054504: .4byte 0x03001770
-_08054508: .4byte CB2_NewGame
- thumb_func_end c2_load_new_map
+_08054508: .4byte CB2_LoadMap2
+ thumb_func_end CB2_LoadMap
- thumb_func_start CB2_NewGame
-CB2_NewGame: @ 805450C
+ thumb_func_start CB2_LoadMap2
+CB2_LoadMap2: @ 805450C
push {lr}
ldr r0, _08054528
bl do_load_map_stuff_loop
@@ -3245,7 +3245,7 @@ CB2_NewGame: @ 805450C
_08054528: .4byte 0x03001bac
_0805452C: .4byte c1_overworld
_08054530: .4byte c2_overworld
- thumb_func_end CB2_NewGame
+ thumb_func_end CB2_LoadMap2
thumb_func_start sub_8054534
sub_8054534: @ 8054534
@@ -3256,7 +3256,7 @@ sub_8054534: @ 8054534
ldrb r0, [r4]
cmp r0, 0
bne _08054554
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
bl script_env_1_init
bl script_env_2_disable
movs r0, 0
@@ -3286,7 +3286,7 @@ _08054584: .4byte c2_overworld
thumb_func_start sub_8054588
sub_8054588: @ 8054588
push {lr}
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
ldr r0, _080545A0
ldr r1, _080545A4
str r1, [r0]
@@ -3336,7 +3336,7 @@ c2_exit_to_overworld_2_switch: @ 80545E4
.align 2, 0
_080545F8: .4byte c2_exit_to_overworld_2_link
_080545FC:
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
ldr r0, _0805460C
bl SetMainCallback2
_08054606:
@@ -3387,7 +3387,7 @@ _08054658: .4byte c2_overworld
thumb_func_start sub_805465C
sub_805465C: @ 805465C
push {lr}
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
bl sub_8074D08
bl sub_8054F70
ldr r0, _0805468C
@@ -3412,7 +3412,7 @@ _08054698: .4byte sub_8080A3C
thumb_func_start sub_805469C
sub_805469C: @ 805469C
push {lr}
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
ldr r1, _080546B0
ldr r0, _080546B4
str r0, [r1]
@@ -3427,7 +3427,7 @@ _080546B4: .4byte atk17_seteffectuser
thumb_func_start sub_80546B8
sub_80546B8: @ 80546B8
push {lr}
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
ldr r1, _080546CC
ldr r0, _080546D0
str r0, [r1]
@@ -3442,7 +3442,7 @@ _080546D0: .4byte sub_80809B0
thumb_func_start c2_exit_to_overworld_1_continue_scripts_restart_music
c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80546D4
push {lr}
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
ldr r1, _080546E8
ldr r0, _080546EC
str r0, [r1]
@@ -3457,7 +3457,7 @@ _080546EC: .4byte sub_8080990
thumb_func_start sub_80546F0
sub_80546F0: @ 80546F0
push {lr}
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
ldr r1, _08054704
ldr r0, _08054708
str r0, [r1]
@@ -3493,7 +3493,7 @@ _08054730: .4byte 0x0202e828
thumb_func_start CB2_ContinueSavedGame
CB2_ContinueSavedGame: @ 8054734
push {lr}
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
bl sub_8074D08
bl ResetSafariZoneFlag_
bl sub_805338C
@@ -3515,7 +3515,7 @@ CB2_ContinueSavedGame: @ 8054734
bl SetMainCallback2
b _08054798
.align 2, 0
-_08054784: .4byte c2_load_new_map
+_08054784: .4byte CB2_LoadMap
_08054788:
ldr r0, _0805479C
ldr r1, _080547A0
@@ -3532,8 +3532,8 @@ _080547A0: .4byte sub_805470C
_080547A4: .4byte c1_overworld
thumb_func_end CB2_ContinueSavedGame
- thumb_func_start sub_80547A8
-sub_80547A8: @ 80547A8
+ thumb_func_start FieldClearVBlankHBlankCallbacks
+FieldClearVBlankHBlankCallbacks: @ 80547A8
push {r4,lr}
ldr r4, _080547D8
ldrh r3, [r4]
@@ -3560,7 +3560,7 @@ sub_80547A8: @ 80547A8
_080547D8: .4byte 0x04000208
_080547DC: .4byte 0x04000200
_080547E0: .4byte 0x0000fffd
- thumb_func_end sub_80547A8
+ thumb_func_end FieldClearVBlankHBlankCallbacks
thumb_func_start SetFieldVBlankCallback
SetFieldVBlankCallback: @ 80547E4
@@ -3638,7 +3638,7 @@ _08054854:
.4byte _08054924
.4byte _08054930
_0805488C:
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
bl script_env_1_init
bl script_env_2_disable
bl sub_8054F70
@@ -3751,7 +3751,7 @@ _08054958:
.4byte _08054A34
.4byte _08054A40
_08054990:
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
adds r0, r5, 0
bl sub_8053994
b _08054A38
@@ -3916,7 +3916,7 @@ _08054AB4:
.4byte _08054B6C
.4byte _08054B78
_08054AEC:
- bl sub_80547A8
+ bl FieldClearVBlankHBlankCallbacks
bl sub_8054BA8
b _08054B70
_08054AF6:
diff --git a/asm/rom5.s b/asm/rom5.s
index d70b329a1..2135ab199 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -12793,7 +12793,7 @@ _080810CC:
bx r0
.align 2, 0
_080810D4: .4byte 0x03002fa4
-_080810D8: .4byte c2_load_new_map
+_080810D8: .4byte CB2_LoadMap
thumb_func_end sub_8081050
thumb_func_start sub_80810DC
@@ -12861,7 +12861,7 @@ _08081152:
pop {r0}
bx r0
.align 2, 0
-_08081158: .4byte c2_load_new_map
+_08081158: .4byte CB2_LoadMap
thumb_func_end task0A_fade_n_map_maybe
thumb_func_start sub_808115C
@@ -24069,7 +24069,7 @@ _08086666:
_0808666C: .4byte 0x03004b20
_08086670: .4byte 0x0202ff84
_08086674: .4byte 0x03005ce0
-_08086678: .4byte c2_load_new_map
+_08086678: .4byte CB2_LoadMap
_0808667C: .4byte 0x0300485c
_08086680: .4byte mapldr_08084390
thumb_func_end task00_8084310
@@ -24860,7 +24860,7 @@ _08086C7C:
_08086C80: .4byte 0x0202f388
_08086C84: .4byte 0x0300485c
_08086C88: .4byte sub_8086C94
-_08086C8C: .4byte c2_load_new_map
+_08086C8C: .4byte CB2_LoadMap
_08086C90: .4byte sub_8086A68
thumb_func_end sub_8086C40
@@ -25879,7 +25879,7 @@ _0808742C:
_08087434: .4byte 0x0202f388
_08087438: .4byte 0x0300485c
_0808743C: .4byte mapldr_080851BC
-_08087440: .4byte c2_load_new_map
+_08087440: .4byte CB2_LoadMap
_08087444: .4byte sub_80871D0
thumb_func_end sub_80873F4
@@ -26383,7 +26383,7 @@ _0808780C:
_08087814: .4byte 0x0202f388
_08087818: .4byte 0x0300485c
_0808781C: .4byte sub_8086748
-_08087820: .4byte c2_load_new_map
+_08087820: .4byte CB2_LoadMap
_08087824: .4byte sub_808766C
thumb_func_end sub_80877D4
@@ -26591,7 +26591,7 @@ _080879C0: .4byte 0x030048a0
_080879C4: .4byte 0x0202f388
_080879C8: .4byte 0x0300485c
_080879CC: .4byte mapldr_080859D4
-_080879D0: .4byte c2_load_new_map
+_080879D0: .4byte CB2_LoadMap
_080879D4: .4byte sub_80878C4
_080879D8:
ldrh r1, [r4, 0xA]
@@ -27091,7 +27091,7 @@ _08087DB4:
bx r0
.align 2, 0
_08087DB8: .4byte 0x0202f388
-_08087DBC: .4byte c2_load_new_map
+_08087DBC: .4byte CB2_LoadMap
_08087DC0: .4byte 0x0300485c
_08087DC4: .4byte mapldr_08085D88
_08087DC8: .4byte sub_8087BBC
@@ -132931,7 +132931,7 @@ _080BBADC: .4byte 0x02025734
_080BBAE0: .4byte 0x00001a18
_080BBAE4: .4byte 0x0300485c
_080BBAE8: .4byte sub_8080990
-_080BBAEC: .4byte c2_load_new_map
+_080BBAEC: .4byte CB2_LoadMap
thumb_func_end sub_80BBA48
thumb_func_start sub_80BBAF0
@@ -133117,7 +133117,7 @@ _080BBC64: .4byte 0x02025734
_080BBC68: .4byte gUnknown_083D1374
_080BBC6C: .4byte 0x0300485c
_080BBC70: .4byte sub_80BBB90
-_080BBC74: .4byte c2_load_new_map
+_080BBC74: .4byte CB2_LoadMap
thumb_func_end sub_80BBBEC
thumb_func_start sub_80BBC78
@@ -133690,7 +133690,7 @@ _080BC0E4:
.align 2, 0
_080BC0EC: .4byte 0x0300485c
_080BC0F0: .4byte mapldr_default
-_080BC0F4: .4byte c2_load_new_map
+_080BC0F4: .4byte CB2_LoadMap
thumb_func_end sub_80BC074
thumb_func_start sub_80BC0F8
@@ -158273,7 +158273,7 @@ _080C8288: .4byte 0x02024d26
_080C828C: .4byte gUnknown_081C340A
_080C8290: .4byte 0x0300485c
_080C8294: .4byte sub_8080E44
-_080C8298: .4byte c2_load_new_map
+_080C8298: .4byte CB2_LoadMap
_080C829C:
cmp r0, 0x7
bne _080C82B0
@@ -346107,7 +346107,7 @@ _08123864: .4byte 0x85000400
_08123868: .4byte 0x02039274
_0812386C: .4byte 0x81000800
_08123870: .4byte 0x0300485c
-_08123874: .4byte c2_load_new_map
+_08123874: .4byte CB2_LoadMap
thumb_func_end sub_8123740
thumb_func_start sub_8123878
diff --git a/src/main_menu.c b/src/main_menu.c
index 17010c418..18e1a42bc 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -35,7 +35,7 @@ u8 GetMenuCursorPos(void);
void DoNamingScreen(u8 r0, struct SaveBlock2 *r1, u16 r2, u16 r3, u8 s0, MainCallback s4);
void DisplayYesNoMenu(u8 r0, u8 r1, u32 r2);
s8 ProcessMenuInputNoWrap_(void);
-void c2_load_new_map_2(void);
+void CB2_NewGame(void);
void LZ77UnCompVram(const void *src, void *dest);
void InitMenuWindow(const struct WindowConfig *);
void CB2_MainMenu(void);
@@ -1315,7 +1315,7 @@ void sub_800B034(u8 taskId)
{
if (!gPaletteFade.active)
{
- SetMainCallback2(c2_load_new_map_2);
+ SetMainCallback2(CB2_NewGame);
DestroyTask(taskId);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-16 01:16:50 +0000