diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
| commit | e130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch) | |
| tree | e128e502a2229f5d934f0436a0eb31dc86350bbb /asm/new_game.s | |
| parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'asm/new_game.s')
| -rw-r--r-- | asm/new_game.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/new_game.s b/asm/new_game.s index 63bfd9523..e2b9c876f 100644 --- a/asm/new_game.s +++ b/asm/new_game.s @@ -159,7 +159,7 @@ sub_80549F8: @ 80549F8 movs r1, 0x1 movs r3, 0x6 bl Overworld_SetWarpDestination - bl warp_in + bl WarpIntoMap add sp, 0x4 pop {r0} bx r0 @@ -174,8 +174,8 @@ Sav2_ClearSetDefault: @ 8054A18 bx r0 thumb_func_end Sav2_ClearSetDefault - thumb_func_start sub_8054A28 -sub_8054A28: @ 8054A28 + thumb_func_start ResetMenuAndMonGlobals +ResetMenuAndMonGlobals: @ 8054A28 push {lr} ldr r1, _08054A5C @ =gUnknown_2031DB0 movs r0, 0 @@ -195,7 +195,7 @@ sub_8054A28: @ 8054A28 bx r0 .align 2, 0 _08054A5C: .4byte gUnknown_2031DB0 - thumb_func_end sub_8054A28 + thumb_func_end ResetMenuAndMonGlobals thumb_func_start sub_8054A60 sub_8054A60: @ 8054A60 @@ -262,7 +262,7 @@ sub_8054A60: @ 8054A60 ldr r1, _08054B68 @ =0x00000296 adds r0, r1 strh r5, [r0] - bl sub_809A2DC + bl ClearItemSlotsInAllBagPockets bl sub_80EB658 bl sub_809C794 bl sub_80BDD34 |