diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
| commit | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch) | |
| tree | 153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /asm/decoration.s | |
| parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into decompile_rom3
Diffstat (limited to 'asm/decoration.s')
| -rw-r--r-- | asm/decoration.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/decoration.s b/asm/decoration.s index 89bfbe3bf..0798e3165 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -2094,7 +2094,7 @@ sub_8127B04: @ 8127B04 lsls r4, 24 asrs r4, 24 str r4, [sp] - bl warp1_set + bl Overworld_SetWarpDestination bl warp_in add sp, 0x4 pop {r4,r5} @@ -2490,7 +2490,7 @@ _08127E34: cmp r0, 0x1 bne _08127F1C adds r0, r4, 0 - bl FlagReset + bl FlagClear movs r2, 0 ldr r0, [r7, 0x4] ldrb r4, [r0] |