summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/cable_car.s2
-rw-r--r--asm/field_control_avatar.s20
-rw-r--r--asm/field_effect_helpers.s16
-rw-r--r--asm/field_screen.s24
4 files changed, 31 insertions, 31 deletions
diff --git a/asm/cable_car.s b/asm/cable_car.s
index 59245a1b2..276b878e2 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -774,7 +774,7 @@ _08150340:
orrs r3, r0
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
- bl warp_in
+ bl WarpIntoMap
ldr r0, =gFieldCallback
str r4, [r0]
ldr r0, =CB2_LoadMap
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index c2b13e2bf..666e440a6 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -530,7 +530,7 @@ sub_809C2C8: @ 809C2C8
ldrh r1, [r4, 0x2]
b _0809C30E
_0809C2F0:
- ldr r1, =gUnknown_08339D64
+ ldr r1, =gDirectionToVectors
lsls r2, r6, 3
adds r0, r2, r1
ldr r3, [r0]
@@ -631,7 +631,7 @@ _0809C3B4:
lsrs r0, 24
cmp r0, 0x1
bne _0809C400
- ldr r1, =gUnknown_08339D64
+ ldr r1, =gDirectionToVectors
lsls r2, r7, 3
adds r0, r2, r1
ldr r3, [r0]
@@ -1658,7 +1658,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38
negs r0, r0
cmp r4, r0
beq _0809CC90
- bl walkrun_find_lowest_active_bit_in_bitfield
+ bl StoreInitialPlayerAvatarState
mov r0, r8
adds r1, r4, 0
adds r2, r7, 0
@@ -1699,7 +1699,7 @@ sub_809CC9C: @ 809CC9C
lsrs r0, 24
cmp r0, 0x1
bne _0809CD8A
- bl walkrun_find_lowest_active_bit_in_bitfield
+ bl StoreInitialPlayerAvatarState
adds r0, r7, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -2083,7 +2083,7 @@ _0809CFB0:
lsrs r0, 24
cmp r0, 0x1
bne _0809CFFC
- bl walkrun_find_lowest_active_bit_in_bitfield
+ bl StoreInitialPlayerAvatarState
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
@@ -2334,7 +2334,7 @@ dive_warp: @ 809D16C
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
- bl sub_8085058
+ bl SetDiveWarpEmerge
b _0809D1C8
.pool
_0809D1A4:
@@ -2353,12 +2353,12 @@ _0809D1A4:
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
- bl sub_8085078
+ bl SetDiveWarpDive
_0809D1C8:
lsls r0, 24
cmp r0, 0
beq _0809D1E0
- bl walkrun_find_lowest_active_bit_in_bitfield
+ bl StoreInitialPlayerAvatarState
bl sp13E_warp_to_last_warp
movs r0, 0xE9
bl PlaySE
@@ -2407,7 +2407,7 @@ sub_809D1E8: @ 809D1E8
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
- bl sub_8085058
+ bl SetDiveWarpEmerge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2431,7 +2431,7 @@ _0809D244:
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
- bl sub_8085078
+ bl SetDiveWarpDive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 6cf62ba8b..9a019f60c 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -20,7 +20,7 @@ SetUpReflection: @ 8153ED4
ldrsh r2, [r4, r0]
adds r0, r4, 0
movs r3, 0x98
- bl obj_unfreeze
+ bl CreateCopySpriteAt
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -34,7 +34,7 @@ SetUpReflection: @ 8153ED4
movs r0, 0xC
orrs r1, r0
strb r1, [r7, 0x5]
- ldr r2, =gUnknown_084975C4
+ ldr r2, =gReflectionEffectPaletteMap
lsrs r0, r1, 4
adds r0, r2
ldrb r0, [r0]
@@ -185,7 +185,7 @@ npc_pal_op_B: @ 815401C
bne _0815404C
ldrh r0, [r2, 0x2]
adds r1, r4, 0
- bl npc_load_two_palettes__no_record
+ bl LoadPlayerObjectReflectionPalette
b _0815406A
.pool
_0815404C:
@@ -193,15 +193,15 @@ _0815404C:
bne _0815405A
ldrh r0, [r2, 0x2]
adds r1, r4, 0
- bl npc_load_two_palettes__and_record
+ bl LoadSpecialObjectReflectionPalette
b _0815406A
_0815405A:
adds r0, r4, 0
- bl npc_paltag_by_palslot
+ bl GetObjectPaletteTag
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
- bl pal_patch_for_npc
+ bl PatchObjectPalette
_0815406A:
adds r0, r4, 0
bl UpdateSpritePaletteWithWeather
@@ -225,7 +225,7 @@ npc_pal_op_A: @ 8154078
beq _0815409C
adds r0, r1, 0
adds r1, r4, 0
- bl pal_patch_for_npc
+ bl PatchObjectPalette
adds r0, r4, 0
bl UpdateSpritePaletteWithWeather
_0815409C:
@@ -277,7 +277,7 @@ _081540E0:
b _08154214
.pool
_081540FC:
- ldr r1, =gUnknown_084975C4
+ ldr r1, =gReflectionEffectPaletteMap
ldrb r0, [r5, 0x5]
lsrs r0, 4
adds r0, r1
diff --git a/asm/field_screen.s b/asm/field_screen.s
index 27627ac58..c11aef1b4 100644
--- a/asm/field_screen.s
+++ b/asm/field_screen.s
@@ -7914,7 +7914,7 @@ sub_80AF0B4: @ 80AF0B4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl warp1_get_mapheader
+ bl GetDestinationWarpMapHeader
ldrb r1, [r0, 0x17]
adds r0, r4, 0
bl sub_8137360
@@ -8924,7 +8924,7 @@ _080AF914:
bl sub_80AF710
cmp r0, 0
bne _080AF93E
- bl sub_80859A0
+ bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AF93E
@@ -8934,7 +8934,7 @@ _080AF926:
strh r0, [r4, 0x8]
b _080AF93E
_080AF92E:
- bl warp_in
+ bl WarpIntoMap
ldr r0, =sub_8086074
bl SetMainCallback2
adds r0, r5, 0
@@ -8999,7 +8999,7 @@ _080AF9B2:
bl sub_80AF710
cmp r0, 0
bne _080AF9E8
- bl sub_80859A0
+ bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AF9E8
@@ -9014,7 +9014,7 @@ _080AF9D0:
ldrb r0, [r0]
cmp r0, 0
bne _080AF9E8
- bl warp_in
+ bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
@@ -9076,7 +9076,7 @@ _080AFA44:
bl sub_81BE72C
strh r5, [r4, 0xA]
_080AFA5A:
- bl sub_80859A0
+ bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AFA7C
@@ -9086,7 +9086,7 @@ _080AFA64:
strh r0, [r4, 0x8]
b _080AFA7C
_080AFA6C:
- bl warp_in
+ bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r6, 0
@@ -9297,7 +9297,7 @@ _080AFC2C:
bl sub_80AF710
cmp r0, 0
bne _080AFC56
- bl sub_80859A0
+ bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AFC56
@@ -9307,7 +9307,7 @@ _080AFC3E:
strh r0, [r4, 0x8]
b _080AFC56
_080AFC46:
- bl warp_in
+ bl WarpIntoMap
ldr r0, =sub_8086024
bl SetMainCallback2
adds r0, r5, 0
@@ -10049,7 +10049,7 @@ _080B0210:
bl sub_80AF710
cmp r0, 0
bne _080B023A
- bl sub_80859A0
+ bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080B023A
@@ -10059,7 +10059,7 @@ _080B0222:
strh r0, [r4, 0x8]
b _080B023A
_080B022A:
- bl warp_in
+ bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
@@ -10492,7 +10492,7 @@ task50_0807F0C8: @ 80B05CC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_80859A0
+ bl BGMusicStopped
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 08:08:56 +0000