summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/field_camera.s2
-rw-r--r--asm/field_door.s8
-rw-r--r--asm/field_map_obj.s4
-rw-r--r--asm/field_tasks.s4
-rw-r--r--asm/fieldmap.s248
-rw-r--r--asm/fldeff_cut.s2
-rw-r--r--asm/item_use.s2
-rw-r--r--asm/overworld.s2
-rw-r--r--asm/shop.s6
9 files changed, 16 insertions, 262 deletions
diff --git a/asm/field_camera.s b/asm/field_camera.s
index 3d4ca0025..3d0ed4ba7 100644
--- a/asm/field_camera.s
+++ b/asm/field_camera.s
@@ -528,7 +528,7 @@ sub_805A948: @ 805A948
mov r8, r1
adds r0, r6, 0
adds r1, r7, 0
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x80
diff --git a/asm/field_door.s b/asm/field_door.s
index 4384531d0..bcb8a6082 100644
--- a/asm/field_door.s
+++ b/asm/field_door.s
@@ -337,7 +337,7 @@ sub_805B158: @ 805B158
adds r6, r2, 0
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -392,7 +392,7 @@ sub_805B1B8: @ 805B1B8
adds r6, r2, 0
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -439,7 +439,7 @@ sub_805B210: @ 805B210
adds r6, r2, 0
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -643,7 +643,7 @@ sub_805B388: @ 805B388
adds r4, r0, 0
adds r0, r1, 0
adds r1, r2, 0
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 2c57aa70c..04770435e 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -12332,7 +12332,7 @@ npc_block_way: @ 80636AC
_080636E2:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8058DC4
+ bl MapGridIsImpassableAt
lsls r0, 24
cmp r0, 0
bne _08063724
@@ -12432,7 +12432,7 @@ sub_8063770: @ 8063770
lsrs r4, r1, 31
adds r0, r6, 0
adds r1, r5, 0
- bl sub_8058DC4
+ bl MapGridIsImpassableAt
lsls r0, 24
cmp r0, 0
bne _080637E8
diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 306b52940..b4106c021 100644
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -490,7 +490,7 @@ _0806EB8E:
ldrsh r0, [r0, r3]
movs r2, 0
ldrsh r1, [r4, r2]
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
ldr r1, _0806EBDC @ =0x0000020a
cmp r0, r1
bne _0806EBE4
@@ -534,7 +534,7 @@ sub_806EC04: @ 806EC04
asrs r4, r1, 16
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
ldr r1, _0806EC38 @ =0x0000022f
ldr r2, _0806EC3C @ =0x00000237
cmp r0, r1
diff --git a/asm/fieldmap.s b/asm/fieldmap.s
index 15a18b775..035a601dd 100644
--- a/asm/fieldmap.s
+++ b/asm/fieldmap.s
@@ -5,252 +5,6 @@
.text
- thumb_func_start MapGridGetZCoordAt
-MapGridGetZCoordAt: @ 8058D44
- push {r4-r7,lr}
- adds r2, r0, 0
- adds r7, r1, 0
- cmp r2, 0
- blt _08058D74
- ldr r1, _08058D70 @ =VMap
- ldr r3, [r1]
- cmp r2, r3
- bge _08058D74
- cmp r7, 0
- blt _08058D74
- ldr r0, [r1, 0x4]
- cmp r7, r0
- bge _08058D74
- adds r0, r3, 0
- muls r0, r7
- adds r0, r2, r0
- ldr r1, [r1, 0x8]
- lsls r0, 1
- adds r0, r1
- ldrh r1, [r0]
- b _08058DA8
- .align 2, 0
-_08058D70: .4byte VMap
-_08058D74:
- ldr r0, _08058DB4 @ =gMapHeader
- ldr r6, [r0]
- subs r0, r2, 0x7
- ldrb r5, [r6, 0x18]
- lsls r1, r5, 3
- adds r0, r1
- adds r1, r5, 0
- bl __modsi3
- adds r4, r0, 0
- subs r0, r7, 0x7
- ldrb r1, [r6, 0x19]
- lsls r2, r1, 3
- adds r0, r2
- bl __modsi3
- muls r0, r5
- adds r4, r0
- ldr r0, [r6, 0x8]
- lsls r4, 1
- adds r4, r0
- ldrh r1, [r4]
- movs r2, 0xC0
- lsls r2, 4
- adds r0, r2, 0
- orrs r1, r0
-_08058DA8:
- ldr r0, _08058DB8 @ =0x000003ff
- cmp r1, r0
- beq _08058DBC
- lsrs r0, r1, 12
- b _08058DBE
- .align 2, 0
-_08058DB4: .4byte gMapHeader
-_08058DB8: .4byte 0x000003ff
-_08058DBC:
- movs r0, 0
-_08058DBE:
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end MapGridGetZCoordAt
-
- thumb_func_start sub_8058DC4
-sub_8058DC4: @ 8058DC4
- push {r4-r7,lr}
- adds r2, r0, 0
- adds r7, r1, 0
- cmp r2, 0
- blt _08058DF4
- ldr r1, _08058DF0 @ =VMap
- ldr r3, [r1]
- cmp r2, r3
- bge _08058DF4
- cmp r7, 0
- blt _08058DF4
- ldr r0, [r1, 0x4]
- cmp r7, r0
- bge _08058DF4
- adds r0, r3, 0
- muls r0, r7
- adds r0, r2, r0
- ldr r1, [r1, 0x8]
- lsls r0, 1
- adds r0, r1
- ldrh r1, [r0]
- b _08058E28
- .align 2, 0
-_08058DF0: .4byte VMap
-_08058DF4:
- ldr r0, _08058E38 @ =gMapHeader
- ldr r6, [r0]
- subs r0, r2, 0x7
- ldrb r5, [r6, 0x18]
- lsls r1, r5, 3
- adds r0, r1
- adds r1, r5, 0
- bl __modsi3
- adds r4, r0, 0
- subs r0, r7, 0x7
- ldrb r1, [r6, 0x19]
- lsls r2, r1, 3
- adds r0, r2
- bl __modsi3
- muls r0, r5
- adds r4, r0
- ldr r0, [r6, 0x8]
- lsls r4, 1
- adds r4, r0
- ldrh r1, [r4]
- movs r2, 0xC0
- lsls r2, 4
- adds r0, r2, 0
- orrs r1, r0
-_08058E28:
- ldr r0, _08058E3C @ =0x000003ff
- cmp r1, r0
- beq _08058E40
- movs r0, 0xC0
- lsls r0, 4
- ands r1, r0
- lsrs r0, r1, 10
- b _08058E42
- .align 2, 0
-_08058E38: .4byte gMapHeader
-_08058E3C: .4byte 0x000003ff
-_08058E40:
- movs r0, 0x1
-_08058E42:
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_8058DC4
-
- thumb_func_start sub_8058E48
-sub_8058E48: @ 8058E48
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- mov r8, r0
- mov r9, r1
- cmp r0, 0
- blt _08058E80
- ldr r1, _08058E7C @ =VMap
- ldr r2, [r1]
- cmp r8, r2
- bge _08058E80
- mov r0, r9
- cmp r0, 0
- blt _08058E80
- ldr r0, [r1, 0x4]
- cmp r9, r0
- bge _08058E80
- mov r0, r9
- muls r0, r2
- add r0, r8
- ldr r1, [r1, 0x8]
- lsls r0, 1
- adds r0, r1
- ldrh r7, [r0]
- b _08058EBA
- .align 2, 0
-_08058E7C: .4byte VMap
-_08058E80:
- ldr r0, _08058EC8 @ =gMapHeader
- ldr r6, [r0]
- mov r0, r8
- subs r0, 0x7
- ldrb r5, [r6, 0x18]
- lsls r1, r5, 3
- adds r0, r1
- adds r1, r5, 0
- bl __modsi3
- adds r4, r0, 0
- mov r0, r9
- subs r0, 0x7
- ldrb r1, [r6, 0x19]
- lsls r2, r1, 3
- adds r0, r2
- bl __modsi3
- muls r0, r5
- adds r4, r0
- ldr r0, [r6, 0x8]
- lsls r4, 1
- adds r4, r0
- ldrh r1, [r4]
- movs r2, 0xC0
- lsls r2, 4
- adds r0, r2, 0
- adds r7, r0, 0
- orrs r7, r1
-_08058EBA:
- ldr r0, _08058ECC @ =0x000003ff
- cmp r7, r0
- beq _08058ED0
- ands r7, r0
- adds r0, r7, 0
- b _08058F0A
- .align 2, 0
-_08058EC8: .4byte gMapHeader
-_08058ECC: .4byte 0x000003ff
-_08058ED0:
- ldr r0, _08058F18 @ =gMapHeader
- ldr r6, [r0]
- mov r0, r8
- subs r0, 0x7
- ldrb r5, [r6, 0x18]
- lsls r1, r5, 3
- adds r0, r1
- adds r1, r5, 0
- bl __modsi3
- adds r4, r0, 0
- mov r0, r9
- subs r0, 0x7
- ldrb r1, [r6, 0x19]
- lsls r2, r1, 3
- adds r0, r2
- bl __modsi3
- muls r0, r5
- adds r4, r0
- ldr r0, [r6, 0x8]
- lsls r4, 1
- adds r4, r0
- ldrh r0, [r4]
- movs r2, 0xC0
- lsls r2, 4
- adds r1, r2, 0
- orrs r0, r1
- ands r0, r7
-_08058F0A:
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r1}
- bx r1
- .align 2, 0
-_08058F18: .4byte gMapHeader
- thumb_func_end sub_8058E48
-
thumb_func_start sub_8058F1C
sub_8058F1C: @ 8058F1C
push {lr}
@@ -287,7 +41,7 @@ sub_8058F48: @ 8058F48
asrs r0, 16
lsls r1, 16
asrs r1, 16
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s
index 2497c695d..ac5ab0a72 100644
--- a/asm/fldeff_cut.s
+++ b/asm/fldeff_cut.s
@@ -380,7 +380,7 @@ sub_8097B50: @ 8097B50
asrs r0, 16
lsrs r7, r1, 16
asrs r1, 16
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
lsls r0, 16
lsrs r2, r0, 16
ldr r1, _08097B84 @ =gUnknown_83D4100
diff --git a/asm/item_use.s b/asm/item_use.s
index 0b6dacdd4..fce57bc88 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -544,7 +544,7 @@ _080A13D4:
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
- bl sub_8058DC4
+ bl MapGridIsImpassableAt
lsls r0, 24
cmp r0, 0
beq _080A13D0
diff --git a/asm/overworld.s b/asm/overworld.s
index 071cca7e6..a24fe7740 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -7829,7 +7829,7 @@ _08058854:
bls _08058810
asrs r0, r3, 16
asrs r1, r5, 16
- bl sub_8058DC4
+ bl MapGridIsImpassableAt
lsls r0, 24
lsrs r0, 24
_0805886A:
diff --git a/asm/shop.s b/asm/shop.s
index 25a2311ce..91bbf195c 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -1632,7 +1632,7 @@ _0809B7B2:
movs r3, 0
ldrsh r1, [r2, r3]
adds r1, r7
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
lsls r0, 16
lsrs r5, r0, 16
mov r0, sp
@@ -2940,7 +2940,7 @@ _0809C238:
adds r5, r1, r0
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
movs r2, 0
ldrsh r1, [r7, r2]
lsls r0, 16
@@ -3006,7 +3006,7 @@ _0809C2B8:
adds r5, r1, r0
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8058E48
+ bl MapGridGetMetatileIdAt
movs r1, 0x2
subs r1, r7
lsls r1, 1
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 18:26:33 +0000