summaryrefslogtreecommitdiff
path: root/asm/field_region_map.s
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-03-05 07:35:03 +0000
committerDiegoisawesome <diego@domoreaweso.me>2017-03-05 13:27:22 -0600
commitb2ec63d69e19b274fa5f8d56fb0a35cc0c9bd524 (patch)
tree9aa447ec447d4c777a5c3c0679e573ac73774ff0 /asm/field_region_map.s
parentd12fd5c5ce574dd920a968794591afe7d42659fb (diff)
resolve implicit declarations and enforce warnings as errors
Diffstat (limited to 'asm/field_region_map.s')
-rw-r--r--asm/field_region_map.s10
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/field_region_map.s b/asm/field_region_map.s
index 67fc08a2b..12411dbf5 100644
--- a/asm/field_region_map.s
+++ b/asm/field_region_map.s
@@ -89,7 +89,7 @@ sub_8170260: @ 8170260
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
- bl copy_pal_bg_faded_to_pal_ram
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8170260
@@ -100,7 +100,7 @@ sub_8170274: @ 8170274
bl sub_8170290
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl fade_and_return_progress_probably
+ bl UpdatePaletteFade
bl do_scheduled_bg_tilemap_copies_to_vram
pop {r0}
bx r0
@@ -205,7 +205,7 @@ _08170358:
b _081703D8
.pool
_08170380:
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -241,7 +241,7 @@ _081703C0:
movs r2, 0
movs r3, 0x10
_081703CC:
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =gUnknown_0203BCD0
ldr r1, [r0]
_081703D4:
@@ -254,7 +254,7 @@ _081703D8:
b _08170416
.pool
_081703E8:
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1