more overworld work
This commit is contained in:
@@ -2156,7 +2156,7 @@ sub_80B360C: @ 80B360C
|
||||
negs r1, r1
|
||||
ands r0, r1
|
||||
str r0, [r2]
|
||||
bl call_ResetMapMusic
|
||||
bl Overworld_ResetMapMusic
|
||||
bl copy_player_party_from_sav1
|
||||
bl copy_bags_and_unk_data_to_save_blocks
|
||||
bl sub_813BF10
|
||||
|
||||
@@ -1884,8 +1884,8 @@ _080ABEF4:
|
||||
.pool
|
||||
thumb_func_end sub_80ABE18
|
||||
|
||||
thumb_func_start sub_80ABF00
|
||||
sub_80ABF00: @ 80ABF00
|
||||
thumb_func_start ApplyWeatherGammaShiftToPal
|
||||
ApplyWeatherGammaShiftToPal: @ 80ABF00
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -1900,7 +1900,7 @@ sub_80ABF00: @ 80ABF00
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80ABF00
|
||||
thumb_func_end ApplyWeatherGammaShiftToPal
|
||||
|
||||
thumb_func_start sub_80ABF20
|
||||
sub_80ABF20: @ 80ABF20
|
||||
@@ -10478,7 +10478,7 @@ sub_80B058C: @ 80B058C
|
||||
thumb_func_start sub_80B05B4
|
||||
sub_80B05B4: @ 80B05B4
|
||||
push {lr}
|
||||
bl sub_80859B0
|
||||
bl Overworld_FadeOutMapMusic
|
||||
ldr r0, =task50_0807F0C8
|
||||
movs r1, 0x50
|
||||
bl CreateTask
|
||||
|
||||
@@ -182,8 +182,8 @@ _0809D9EA:
|
||||
bx r0
|
||||
thumb_func_end ActivatePerStepCallback
|
||||
|
||||
thumb_func_start wild_encounter_reset_coro_args
|
||||
wild_encounter_reset_coro_args: @ 809D9F0
|
||||
thumb_func_start ResetFieldTasksArgs
|
||||
ResetFieldTasksArgs: @ 809D9F0
|
||||
push {lr}
|
||||
ldr r0, =task_per_step_callback_manager
|
||||
bl FindTaskIdByFunc
|
||||
@@ -207,7 +207,7 @@ _0809DA1A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end wild_encounter_reset_coro_args
|
||||
thumb_func_end ResetFieldTasksArgs
|
||||
|
||||
thumb_func_start nullsub_34
|
||||
nullsub_34: @ 809DA2C
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
sub_80D47D4: @ 80D47D4
|
||||
push {lr}
|
||||
bl sub_80A0934
|
||||
bl AddMapNamePopUpWindowTask
|
||||
bl ShowMapNamePopup
|
||||
movs r0, 0x1
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80D47D4
|
||||
|
||||
thumb_func_start AddMapNamePopUpWindowTask
|
||||
AddMapNamePopUpWindowTask: @ 80D47E4
|
||||
thumb_func_start ShowMapNamePopup
|
||||
ShowMapNamePopup: @ 80D47E4
|
||||
push {r4,lr}
|
||||
movs r0, 0x80
|
||||
lsls r0, 7
|
||||
@@ -83,7 +83,7 @@ _080D486C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end AddMapNamePopUpWindowTask
|
||||
thumb_func_end ShowMapNamePopup
|
||||
|
||||
thumb_func_start Task_MapNamePopUpWindow
|
||||
Task_MapNamePopUpWindow: @ 80D487C
|
||||
|
||||
1496
asm/overworld.s
1496
asm/overworld.s
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user