mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-17 23:10:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename gSinCosTable

Browse Source
This commit is contained in:
Aetias
2024-05-23 19:52:34 +02:00
parent c806d36e26
commit 552101cc26
119 changed files with 1857 additions and 1854 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/itcm.inc
+1 -1
View File
@@ -1,5 +1,5 @@
#pragma once
.extern data_02050f54
.extern gSinCosTable
.extern data_02054f54
.extern data_02055058
.extern data_0205ada4
asm/itcm.s
+2 -2
View File
@@ -4364,7 +4364,7 @@ func_01ffb7ec: ; 0x01ffb7ec
sub sp, sp, #0x30
ldrh r4, [sp, #0x58]
mov r10, r0
ldr lr, _01ffbbc8 ; =data_02050f54
ldr lr, _01ffbbc8 ; =gSinCosTable
mov r0, r4, asr #0x4
mov ip, r0, lsl #0x1
add r0, ip, #1
@@ -4619,7 +4619,7 @@ _01ffbb98:
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_01ffbbc8: .word data_02050f54
_01ffbbc8: .word gSinCosTable
arm_func_end func_01ffb7ec
.global func_01ffbbcc
asm/main/main_02000000.s
+42 -42
View File
@@ -22712,7 +22712,7 @@ func_02010714: ; 0x02010714
b _020107cc
_02010740:
ldrh r1, [r0]
ldr r3, _020107e4 ; =data_02050f54
ldr r3, _020107e4 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -22725,7 +22725,7 @@ _02010740:
b _020107cc
_02010770:
ldrh r1, [r0]
ldr r3, _020107e4 ; =data_02050f54
ldr r3, _020107e4 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -22738,7 +22738,7 @@ _02010770:
b _020107cc
_020107a0:
ldrh r1, [r0]
ldr r3, _020107e4 ; =data_02050f54
ldr r3, _020107e4 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -22756,7 +22756,7 @@ _020107cc:
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020107e4: .word data_02050f54
_020107e4: .word gSinCosTable
arm_func_end func_02010714
.global func_020107e8
@@ -23147,7 +23147,7 @@ func_02010d64: ; 0x02010d64
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
add r4, r0, #1
ldr r3, _02010e28 ; =data_02050f54
ldr r3, _02010e28 ; =gSinCosTable
mov r0, r0, lsl #0x1
mov r4, r4, lsl #0x1
ldrsh r0, [r3, r0]
@@ -23193,7 +23193,7 @@ func_02010d64: ; 0x02010d64
str r0, [r1, #8]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02010e28: .word data_02050f54
_02010e28: .word gSinCosTable
arm_func_end func_02010d64
.global func_02010e2c
@@ -23371,7 +23371,7 @@ _02011094:
add r1, r1, #0x10000
mov r2, r0, lsl #0x1
str r1, [sp, #4]
ldr r0, _02011d10 ; =data_02050f54
ldr r0, _02011d10 ; =gSinCosTable
mov r1, r2, lsl #0x1
ldrsh r1, [r0, r1]
ldr r3, [r9, #0x5c]
@@ -24184,7 +24184,7 @@ _02011d00: .word data_027e0370
_02011d04: .word 0x5eedf715
_02011d08: .word 0x1b0cb173
_02011d0c: .word 0x00000fff
_02011d10: .word data_02050f54
_02011d10: .word gSinCosTable
_02011d14: .word 0xaaaaaaab
_02011d18:
ldrh r0, [r7, #0x26]
@@ -25734,7 +25734,7 @@ _02012e08:
str r3, [sp, #0x38]
bl func_01ff9158
ldrh r0, [r8, #0x20]
ldr r2, _020130fc ; =data_02050f54
ldr r2, _020130fc ; =gSinCosTable
mov r3, #0
mov r0, r0, asr #0x4
mov r8, r0, lsl #0x1
@@ -25812,7 +25812,7 @@ _02012f30:
str r3, [sp, #0x38]
bl func_01ff9158
ldrh r0, [r8, #0x20]
ldr r1, _020130fc ; =data_02050f54
ldr r1, _020130fc ; =gSinCosTable
mov lr, #0
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
@@ -25903,7 +25903,7 @@ _02013084:
.align 2, 0
_020130f4: .word 0x040004a4
_020130f8: .word 0x00007fff
_020130fc: .word data_02050f54
_020130fc: .word gSinCosTable
_02013100: .word 0x04000454
_02013104: .word 0x04000480
arm_func_end func_02012c88
@@ -26027,7 +26027,7 @@ _02013270:
str r3, [sp, #0x38]
bl func_01ff9158
ldrh r0, [r6, #0x20]
ldr r2, _02013564 ; =data_02050f54
ldr r2, _02013564 ; =gSinCosTable
mov r3, #0
mov r0, r0, asr #0x4
mov r8, r0, lsl #0x1
@@ -26107,7 +26107,7 @@ _0201338c:
str r3, [sp, #0x38]
bl func_01ff9158
ldrh r0, [r6, #0x20]
ldr r1, _02013564 ; =data_02050f54
ldr r1, _02013564 ; =gSinCosTable
mov r3, #0
mov r0, r0, asr #0x4
mov r8, r0, lsl #0x1
@@ -26199,7 +26199,7 @@ _020134e8:
.align 2, 0
_0201355c: .word 0x040004a4
_02013560: .word 0x00007fff
_02013564: .word data_02050f54
_02013564: .word gSinCosTable
_02013568: .word 0x04000454
_0201356c: .word 0x04000480
arm_func_end func_02013108
@@ -27233,7 +27233,7 @@ func_02014474: ; 0x02014474
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldrh r2, [r5, #0x20]
ldrsh r0, [r5, #0x22]
ldr r1, _020147dc ; =data_02050f54
ldr r1, _020147dc ; =gSinCosTable
mov r2, r2, asr #0x4
str r0, [sp, #0x30]
ldr r0, [r6, #0x40]
@@ -27431,7 +27431,7 @@ _02014748:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_020147d8: .word 0x040004a4
_020147dc: .word data_02050f54
_020147dc: .word gSinCosTable
_020147e0: .word data_020572f0
_020147e4: .word 0x00007fff
_020147e8: .word 0x04000454
@@ -27471,7 +27471,7 @@ func_020147f4: ; 0x020147f4
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldrh r2, [r5, #0x20]
ldrsh r0, [r5, #0x22]
ldr r1, _02014b5c ; =data_02050f54
ldr r1, _02014b5c ; =gSinCosTable
mov r2, r2, asr #0x4
str r0, [sp, #0x30]
ldr r0, [r6, #0x40]
@@ -27669,7 +27669,7 @@ _02014ac8:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02014b58: .word 0x040004a4
_02014b5c: .word data_02050f54
_02014b5c: .word gSinCosTable
_02014b60: .word data_020572f0
_02014b64: .word 0x00007fff
_02014b68: .word 0x04000454
@@ -27710,7 +27710,7 @@ func_02014b74: ; 0x02014b74
ldr r0, [r6, #0x40]
ldrh r2, [r5, #0x20]
ldr r0, [r0, #0x20]
ldr r1, _02015058 ; =data_02050f54
ldr r1, _02015058 ; =gSinCosTable
ldr r0, [r0]
mov r2, r2, asr #0x4
mov r3, r2, lsl #0x1
@@ -28008,7 +28008,7 @@ _02014fc4:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02015054: .word 0x040004a4
_02015058: .word data_02050f54
_02015058: .word gSinCosTable
_0201505c: .word data_020572f0
_02015060: .word 0x00000ccd
_02015064: .word 0x00007fff
@@ -28050,7 +28050,7 @@ func_02015074: ; 0x02015074
ldr r0, [r6, #0x40]
ldrh r2, [r5, #0x20]
ldr r0, [r0, #0x20]
ldr r1, _0201555c ; =data_02050f54
ldr r1, _0201555c ; =gSinCosTable
ldr r0, [r0, #0x14]
mov r2, r2, asr #0x4
ldrh r0, [r0]
@@ -28349,7 +28349,7 @@ _020154c8:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02015558: .word 0x040004a4
_0201555c: .word data_02050f54
_0201555c: .word gSinCosTable
_02015560: .word data_020572f0
_02015564: .word 0x00000ccd
_02015568: .word 0x00007fff
@@ -28366,7 +28366,7 @@ func_02015578: ; 0x02015578
ldr r2, _02015614 ; =0x5eedf715
ldr r4, [ip]
ldr r3, _02015618 ; =0x1b0cb173
ldr r1, _0201561c ; =data_02050f54
ldr r1, _0201561c ; =gSinCosTable
mla r5, r4, r2, r3
mla r2, r5, r2, r3
mov r3, r5, lsr #0x10
@@ -28403,7 +28403,7 @@ func_02015578: ; 0x02015578
_02015610: .word data_027e0370
_02015614: .word 0x5eedf715
_02015618: .word 0x1b0cb173
_0201561c: .word data_02050f54
_0201561c: .word gSinCosTable
arm_func_end func_02015578
.global func_02015620
@@ -28414,7 +28414,7 @@ func_02015620: ; 0x02015620
ldr r1, _02015680 ; =0x5eedf715
ldr ip, [r3]
ldr r2, _02015684 ; =0x1b0cb173
ldr lr, _02015688 ; =data_02050f54
ldr lr, _02015688 ; =gSinCosTable
mla r4, ip, r1, r2
mov r1, r4, lsr #0x10
mov r1, r1, lsl #0x10
@@ -28436,7 +28436,7 @@ func_02015620: ; 0x02015620
_0201567c: .word data_027e0370
_02015680: .word 0x5eedf715
_02015684: .word 0x1b0cb173
_02015688: .word data_02050f54
_02015688: .word gSinCosTable
arm_func_end func_02015620
.global func_0201568c
@@ -57208,7 +57208,7 @@ func_0202aeb0: ; 0x0202aeb0
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
add r0, r3, #1
ldr r2, _0202af48 ; =data_02050f54
ldr r2, _0202af48 ; =gSinCosTable
mov r0, r0, lsl #0x1
ldrsh r0, [r2, r0]
ldmib r1, {r6, ip}
@@ -57241,7 +57241,7 @@ func_0202aeb0: ; 0x0202aeb0
str r0, [r1, #8]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0202af48: .word data_02050f54
_0202af48: .word gSinCosTable
arm_func_end func_0202aeb0
.global func_0202af4c
@@ -57253,7 +57253,7 @@ func_0202af4c: ; 0x0202af4c
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
add r0, r3, #1
ldr r2, _0202afec ; =data_02050f54
ldr r2, _0202afec ; =gSinCosTable
mov r4, r3, lsl #0x1
mov r0, r0, lsl #0x1
ldr r3, [r1]
@@ -57288,7 +57288,7 @@ func_0202af4c: ; 0x0202af4c
str r0, [r1, #8]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0202afec: .word data_02050f54
_0202afec: .word gSinCosTable
arm_func_end func_0202af4c
.global func_0202aff0
@@ -57803,7 +57803,7 @@ func_0202b66c: ; 0x0202b66c
mov r3, r3, asr #0x4
mov r6, r3, lsl #0x1
add r4, r6, #1
ldr r3, _0202b730 ; =data_02050f54
ldr r3, _0202b730 ; =gSinCosTable
mov r4, r4, lsl #0x1
ldrsh r5, [r3, r4]
ldrh ip, [sp, #0x18]
@@ -57847,7 +57847,7 @@ func_0202b66c: ; 0x0202b66c
str r0, [r1, #8]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0202b730: .word data_02050f54
_0202b730: .word gSinCosTable
arm_func_end func_0202b66c
.global func_0202b734
@@ -58359,7 +58359,7 @@ _0202bd0c:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0202bf30 ; =data_02050f54
ldr r2, _0202bf30 ; =gSinCosTable
mov r3, r1, lsl #0x1
mov r1, r0, lsl #0x1
ldrsh r0, [r2, r3]
@@ -58475,7 +58475,7 @@ _0202bf20: .word data_027e0d44
_0202bf24: .word 0x040004ac
_0202bf28: .word 0x04000444
_0202bf2c: .word data_027e0f64
_0202bf30: .word data_02050f54
_0202bf30: .word gSinCosTable
_0202bf34: .word 0x0400046c
_0202bf38: .word data_020561dc
_0202bf3c: .word 0x04000500
@@ -61264,7 +61264,7 @@ func_0202d95c: ; 0x0202d95c
cmpeq r0, #0
bne _0202da20
ldr r3, _0202da84 ; =data_027e0764
ldr lr, _0202da88 ; =data_02050f54
ldr lr, _0202da88 ; =gSinCosTable
ldr r1, [r3]
ldmib r3, {r0, r2}
umull ip, r6, r2, r1
@@ -61330,7 +61330,7 @@ _0202da20:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0202da84: .word data_027e0764
_0202da88: .word data_02050f54
_0202da88: .word gSinCosTable
arm_func_end func_0202d95c
.global func_0202da8c
@@ -63029,7 +63029,7 @@ _0202edb8:
mov r1, r1, lsl #0x10
mov r1, r1, lsr #0x10
mov r2, r1, asr #0x4
ldr r1, _0202eeac ; =data_02050f54
ldr r1, _0202eeac ; =gSinCosTable
mov r2, r2, lsl #0x2
ldrsh r2, [r1, r2]
mov r1, #0xc0
@@ -63086,7 +63086,7 @@ _0202ee7c:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0202eea8: .word 0x00000222
_0202eeac: .word data_02050f54
_0202eeac: .word gSinCosTable
_0202eeb0: .word data_027e0d3c
_0202eeb4: .word data_027e0c38
_0202eeb8: .word 0x2aaaaaab
@@ -67791,7 +67791,7 @@ func_02031ad8: ; 0x02031ad8
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02031bc8 ; =data_02050f54
ldr r2, _02031bc8 ; =gSinCosTable
mov r0, r0, lsl #0x1
mov r1, r1, lsl #0x1
ldrsh r0, [r2, r0]
@@ -67816,7 +67816,7 @@ _02031ba8:
add sp, sp, #0x10
bx lr
.align 2, 0
_02031bc8: .word data_02050f54
_02031bc8: .word gSinCosTable
arm_func_end func_02031ad8
.global func_02031bcc
@@ -85544,8 +85544,8 @@ _02050f50: .word data_02075ebc
arm_func_end func_02050f40
.rodata
.global data_02050f54
data_02050f54: ; 0x02050f54
.global gSinCosTable
gSinCosTable: ; 0x02050f54
.byte 0x00, 0x00
.global data_02050f56
data_02050f56: ; 0x02050f56
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -18,7 +18,7 @@
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN9SysObjectdlEPv
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02063e4c
.extern data_027e077c
asm/ov00/Actor/Actor.s
+6 -6
View File
@@ -1356,7 +1356,7 @@ _ZN5Actor18func_ov00_020c243cEPjPi: ; 0x020c243c
bne _020c2508
ldrh r0, [r5, #0x78]
mov r1, #0
ldr r3, _020c2700 ; =data_02050f54
ldr r3, _020c2700 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
@@ -1517,7 +1517,7 @@ _020c26f0: .word gAdventureFlags
_020c26f4: .word gActorManager
_020c26f8: .word 0x41525257
_020c26fc: .word 0x5342454d
_020c2700: .word data_02050f54
_020c2700: .word gSinCosTable
_020c2704: .word 0x43424c53
_020c2708: .word 0x424c5354
_020c270c: .word 0x42494752
@@ -1798,7 +1798,7 @@ _ZN5Actor18func_ov00_020c29ecEi: ; 0x020c29ec
_ZN5Actor9GetHitboxEP8Cylinder: ; 0x020c2a0c
stmdb sp!, {r3, r4, r5, lr}
ldr r2, [r0, #0x88]
ldr r3, _020c2afc ; =data_02050f54
ldr r3, _020c2afc ; =gSinCosTable
str r2, [r1, #0xc]
ldrh r4, [r0, #0x78]
ldr r2, [r0, #0x48]
@@ -1857,7 +1857,7 @@ _ZN5Actor9GetHitboxEP8Cylinder: ; 0x020c2a0c
str r0, [r1, #8]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020c2afc: .word data_02050f54
_020c2afc: .word gSinCosTable
arm_func_end _ZN5Actor9GetHitboxEP8Cylinder
.global _ZN5Actor10GetUnk_08cEP8Cylinder
@@ -1865,7 +1865,7 @@ _020c2afc: .word data_02050f54
_ZN5Actor10GetUnk_08cEP8Cylinder: ; 0x020c2b00
stmdb sp!, {r3, r4, r5, lr}
ldr r2, [r0, #0x98]
ldr r3, _020c2bf0 ; =data_02050f54
ldr r3, _020c2bf0 ; =gSinCosTable
str r2, [r1, #0xc]
ldrh r4, [r0, #0x78]
ldr r2, [r0, #0x48]
@@ -1924,7 +1924,7 @@ _ZN5Actor10GetUnk_08cEP8Cylinder: ; 0x020c2b00
str r0, [r1, #8]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020c2bf0: .word data_02050f54
_020c2bf0: .word gSinCosTable
arm_func_end _ZN5Actor10GetUnk_08cEP8Cylinder
.global _ZN5Actor20IncreaseActiveFramesEv
asm/ov00/Player/LinkStateBase.inc
+1 -1
View File
@@ -6,7 +6,7 @@
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
.extern _ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv
.extern _ZN13PlayerControl18func_ov00_020af4a4Ev
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0618
.extern data_027e0c68
.extern data_027e0d0c
asm/ov00/Player/LinkStateBase.s
+4 -4
View File
@@ -355,7 +355,7 @@ _ZN13LinkStateBase12ApplyImpulseEii: ; 0x020a82c4
mov r1, r1, asr #0x4
mov r4, r1, lsl #0x1
ldr r3, _020a8358 ; =data_027e0d0c
ldr lr, _020a835c ; =data_02050f54
ldr lr, _020a835c ; =gSinCosTable
mov r1, r4, lsl #0x1
ldrsh ip, [lr, r1]
add r1, r4, #1
@@ -388,7 +388,7 @@ _ZN13LinkStateBase12ApplyImpulseEii: ; 0x020a82c4
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020a8358: .word data_027e0d0c
_020a835c: .word data_02050f54
_020a835c: .word gSinCosTable
arm_func_end _ZN13LinkStateBase12ApplyImpulseEii
.global _ZN13LinkStateBase18func_ov00_020a8360Ei
@@ -763,7 +763,7 @@ _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi: ; 0x020a8774
ldr r0, [r0, #0x2c]
mov r2, r1, lsl #0x1
rsb lr, r0, #0
ldr r3, _020a8840 ; =data_02050f54
ldr r3, _020a8840 ; =gSinCosTable
add r1, r2, #1
mov r0, r2, lsl #0x1
ldrsh r2, [r3, r0]
@@ -797,7 +797,7 @@ _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi: ; 0x020a8774
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020a8840: .word data_02050f54
_020a8840: .word gSinCosTable
arm_func_end _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi
.global _ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb
asm/ov00/Player/LinkStateInteract.inc
+1 -1
View File
@@ -41,7 +41,7 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0d0c
.extern gMapManager
.extern data_027e0fb8
asm/ov00/Player/LinkStateInteract.s
+8 -8
View File
@@ -503,7 +503,7 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
mov r0, r1, asr #0x4
mov r0, r0, lsl #0x1
add r0, r0, #1
ldr r3, _020aabd0 ; =data_02050f54
ldr r3, _020aabd0 ; =gSinCosTable
mov r1, r0, lsl #0x1
ldrsh r1, [r3, r1]
ldrsh r9, [r3, r2]
@@ -714,7 +714,7 @@ _020aab34:
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020aabd0: .word data_02050f54
_020aabd0: .word gSinCosTable
_020aabd4: .word 0x00000155
arm_func_end _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
@@ -761,7 +761,7 @@ _020aac14:
str r1, [r4, #0x20]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r1, [r0]
ldr r2, _020ab3c4 ; =data_02050f54
ldr r2, _020ab3c4 ; =gSinCosTable
ldr r0, _020ab3c8 ; =0x000004cd
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -1264,7 +1264,7 @@ _020ab3b0:
.align 2, 0
_020ab3bc: .word gItemManager
_020ab3c0: .word data_027e0d0c
_020ab3c4: .word data_02050f54
_020ab3c4: .word gSinCosTable
_020ab3c8: .word 0x000004cd
_020ab3cc: .word data_027e0fb8
_020ab3d0: .word gActorManager
@@ -1379,7 +1379,7 @@ _020ab4ec:
mov r1, r1, asr #0x4
mov r5, r1, lsl #0x1
add r1, r5, #1
ldr ip, _020ab60c ; =data_02050f54
ldr ip, _020ab60c ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r3, [ip, r1]
ldr r6, _020ab610 ; =0x00000b33
@@ -1439,7 +1439,7 @@ _020ab604:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020ab60c: .word data_02050f54
_020ab60c: .word gSinCosTable
_020ab610: .word 0x00000b33
arm_func_end _ZN17LinkStateInteract8vfunc_34EP5Vec3p
@@ -1812,7 +1812,7 @@ _020aba70:
mla r0, r3, r2, r0
adds r1, r1, #0x800
add r5, ip, #1
ldr r6, _020abb70 ; =data_02050f54
ldr r6, _020abb70 ; =gSinCosTable
mov r3, ip, lsl #0x1
mov r2, r5, lsl #0x1
ldrsh r3, [r6, r3]
@@ -1859,7 +1859,7 @@ _020abb30:
_020abb64: .word 0x424b4559
_020abb68: .word 0x464f5243
_020abb6c: .word 0x0000028f
_020abb70: .word data_02050f54
_020abb70: .word gSinCosTable
_020abb74: .word data_ov00_020eec9c
arm_func_end _ZN17LinkStateInteract18func_ov00_020ab9b8Ejb
asm/ov00/Player/LinkStateRoll.inc
+1 -1
View File
@@ -24,7 +24,7 @@
.extern _ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv
.extern _ZN13PlayerControl18func_ov00_020b034cEv
.extern _ZN13PlayerControl18func_ov00_020b12d0EPs
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0618
.extern data_027e0e58
.extern data_027e0fb8
asm/ov00/Player/LinkStateRoll.s
+2 -2
View File
@@ -69,7 +69,7 @@ _020ae7e8:
mov r1, r5, asr #0x4
mov r2, r1, lsl #0x1
mov r6, r2, lsl #0x1
ldr r5, _020aeb10 ; =data_02050f54
ldr r5, _020aeb10 ; =gSinCosTable
add r2, r2, #1
mov r2, r2, lsl #0x1
ldrsh lr, [r5, r2]
@@ -262,7 +262,7 @@ _020aeb08:
add sp, sp, #0x14
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_020aeb10: .word data_02050f54
_020aeb10: .word gSinCosTable
_020aeb14: .word 0x0000019a
_020aeb18: .word data_027e0fb8
_020aeb1c: .word data_ov00_020e6078
asm/ov00/Player/PlayerControl.inc
+1 -1
View File
@@ -18,7 +18,7 @@
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager9HasPotionEj
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_027e05f8
.extern data_027e077c
asm/ov00/Player/PlayerControl.s
+6 -6
View File
@@ -1742,7 +1742,7 @@ _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb: ; 0x020b049c
ldr r1, _020b05dc ; =data_027e0d0c
ldr r0, _020b05e0 ; =gPlayerAngle
ldr r2, [r1]
ldr ip, _020b05e4 ; =data_02050f54
ldr ip, _020b05e4 ; =gSinCosTable
str r2, [r4]
ldr r3, [r1, #4]
mov r2, #0
@@ -1795,7 +1795,7 @@ _020b05d0:
_020b05d8: .word gPlayerPos
_020b05dc: .word data_027e0d0c
_020b05e0: .word gPlayerAngle
_020b05e4: .word data_02050f54
_020b05e4: .word gSinCosTable
arm_func_end _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb
.global _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p
@@ -1833,7 +1833,7 @@ _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p: ; 0x020b05e8
ldr r1, _020b076c ; =gPlayerAngle
ldr r0, [r4, #4]
ldrh r2, [r1]
ldr r3, _020b0770 ; =data_02050f54
ldr r3, _020b0770 ; =gSinCosTable
mov r1, #0x800
mov r2, r2, asr #0x4
mov r6, r2, lsl #0x1
@@ -1902,7 +1902,7 @@ _020b0758:
_020b0764: .word 0x00000333
_020b0768: .word gPlayerPos
_020b076c: .word gPlayerAngle
_020b0770: .word data_02050f54
_020b0770: .word gSinCosTable
_020b0774: .word gMapManager
arm_func_end _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p
@@ -1943,7 +1943,7 @@ _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r3, _020b0ab0 ; =data_02050f54
ldr r3, _020b0ab0 ; =gSinCosTable
mov r2, r1, lsl #0x1
mov r1, r0, lsl #0x1
ldrsh r2, [r3, r2]
@@ -2130,7 +2130,7 @@ _020b0aa0:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020b0aac: .word data_027e0f64
_020b0ab0: .word data_02050f54
_020b0ab0: .word gSinCosTable
arm_func_end _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
.global _ZN13PlayerControl16CheckNotTouchingEv
asm/ov00/ov00_02086cd0.inc
+1 -1
View File
@@ -105,7 +105,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02063e4c
.extern data_027e071c
asm/ov00/ov00_02086cd0.s
+18 -18
View File
@@ -324,7 +324,7 @@ func_ov00_020870d0: ; 0x020870d0
mov r0, #0x1000
bl Divide
ldrh r1, [r9, #4]
ldr r2, _02087268 ; =data_02050f54
ldr r2, _02087268 ; =gSinCosTable
mov r7, r0
mov r0, r1, asr #0x4
mov r3, r0, lsl #0x1
@@ -421,7 +421,7 @@ _02087120:
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02087268: .word data_02050f54
_02087268: .word gSinCosTable
arm_func_end func_ov00_020870d0
.global func_ov00_0208726c
@@ -3503,7 +3503,7 @@ func_ov00_02089b94: ; 0x02089b94
add r2, r0, #0x200
ldrh r3, [r2, #0x26]
mov r2, r1
ldr r4, _02089c4c ; =data_02050f54
ldr r4, _02089c4c ; =gSinCosTable
mov r1, r3, asr #0x4
mov r3, r1, lsl #0x1
mov r5, r3, lsl #0x1
@@ -3545,7 +3545,7 @@ func_ov00_02089b94: ; 0x02089b94
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02089c4c: .word data_02050f54
_02089c4c: .word gSinCosTable
arm_func_end func_ov00_02089b94
.global func_ov00_02089c50
@@ -3558,7 +3558,7 @@ func_ov00_02089c50: ; 0x02089c50
mov r2, r2, asr #0x4
mov r3, r2, lsl #0x1
add r2, r3, #1
ldr r4, _02089d08 ; =data_02050f54
ldr r4, _02089d08 ; =gSinCosTable
mov r3, r3, lsl #0x1
mov r2, r2, lsl #0x1
ldrsh r8, [r4, r3]
@@ -3598,7 +3598,7 @@ func_ov00_02089c50: ; 0x02089c50
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02089d08: .word data_02050f54
_02089d08: .word gSinCosTable
arm_func_end func_ov00_02089c50
.global func_ov00_02089d0c
@@ -6020,7 +6020,7 @@ _0208bbb8:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0208bef4 ; =data_02050f54
ldr r2, _0208bef4 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -6231,7 +6231,7 @@ _0208bee4: .word data_ov00_020ec9d4
_0208bee8: .word 0x040004c0
_0208beec: .word 0x001f0081
_0208bef0: .word data_027e0f64
_0208bef4: .word data_02050f54
_0208bef4: .word gSinCosTable
_0208bef8: .word 0x0400046c
_0208befc: .word 0x04000500
_0208bf00: .word 0x1ff00000
@@ -6393,7 +6393,7 @@ _0208c114:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0208c208 ; =data_02050f54
ldr r2, _0208c208 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -6449,7 +6449,7 @@ _0208c114:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0208c204: .word 0x0000ffff
_0208c208: .word data_02050f54
_0208c208: .word gSinCosTable
_0208c20c: .word data_027e0d3c
_0208c210: .word data_02063e4c
arm_func_end func_ov00_0208c0dc
@@ -9128,7 +9128,7 @@ func_ov00_0208e420: ; 0x0208e420
add r0, r3, #1
str r1, [sp, #4]
mov r1, r0, lsl #0x1
ldr r2, _0208e4f0 ; =data_02050f54
ldr r2, _0208e4f0 ; =gSinCosTable
mov r3, r3, lsl #0x1
str ip, [sp, #8]
add r0, r4, #0x8c
@@ -9151,7 +9151,7 @@ func_ov00_0208e420: ; 0x0208e420
str r1, [sp, #8]
add r1, r4, #0x4c
str r1, [sp, #0xc]
ldr r2, _0208e4f0 ; =data_02050f54
ldr r2, _0208e4f0 ; =gSinCosTable
mov r1, r0, lsl #0x1
mov r3, r3, lsl #0x1
ldrsh r0, [r2, r3]
@@ -9168,7 +9168,7 @@ func_ov00_0208e420: ; 0x0208e420
add sp, sp, #0x14
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0208e4f0: .word data_02050f54
_0208e4f0: .word gSinCosTable
arm_func_end func_ov00_0208e420
.global func_ov00_0208e4f4
@@ -10738,7 +10738,7 @@ func_ov00_0208fa0c: ; 0x0208fa0c
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _0208fa64 ; =data_02050f54
ldr r3, _0208fa64 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -10757,7 +10757,7 @@ func_ov00_0208fa0c: ; 0x0208fa0c
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0208fa64: .word data_02050f54
_0208fa64: .word gSinCosTable
arm_func_end func_ov00_0208fa0c
.global func_ov00_0208fa68
@@ -16520,7 +16520,7 @@ _02094288:
mov r2, #3
bl func_01ffa9fc
ldrh r1, [r4, #0xc]
ldr r3, _020947f8 ; =data_02050f54
ldr r3, _020947f8 ; =gSinCosTable
add r0, sp, #0xa0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -16558,7 +16558,7 @@ _0209437c:
mov r2, #3
bl func_01ffa9fc
ldrh r1, [r4, #0xc]
ldr r3, _020947f8 ; =data_02050f54
ldr r3, _020947f8 ; =gSinCosTable
add r0, sp, #0x64
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -16840,7 +16840,7 @@ _020947e8: .word data_ov00_020ec9d6
_020947ec: .word data_ov00_020ec9d4
_020947f0: .word 0x00004210
_020947f4: .word 0xffffeccd
_020947f8: .word data_02050f54
_020947f8: .word gSinCosTable
_020947fc: .word 0x00002666
_02094800: .word data_027e0d44
_02094804: .word 0x001f0081
asm/ov00/ov00_020980f4.inc
+1 -1
View File
@@ -78,7 +78,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02052f54
.extern data_02057840
.extern data_0205785c
asm/ov00/ov00_020980f4.s
+18 -18
View File
@@ -5528,7 +5528,7 @@ func_ov00_0209c788: ; 0x0209c788
add r2, r0, #1
mov r1, r1, lsl #0x1
mov r3, r2, lsl #0x1
ldr r4, _0209c8d8 ; =data_02050f54
ldr r4, _0209c8d8 ; =gSinCosTable
mov r2, r1, lsl #0x1
ldrsh r3, [r4, r3]
ldrsh r4, [r4, r2]
@@ -5548,7 +5548,7 @@ func_ov00_0209c788: ; 0x0209c788
cmp r5, ip
movlt r5, ip
_0209c828:
ldr r4, _0209c8d8 ; =data_02050f54
ldr r4, _0209c8d8 ; =gSinCosTable
mov r0, r0, lsl #0x1
ldrsh r4, [r4, r0]
ldr r0, _0209c8dc ; =0x00000fff
@@ -5563,7 +5563,7 @@ _0209c828:
movlt r4, r0
_0209c85c:
add r1, r1, #1
ldr r0, _0209c8d8 ; =data_02050f54
ldr r0, _0209c8d8 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh ip, [r0, r1]
strh r4, [sp, #2]
@@ -5595,7 +5595,7 @@ _0209c8b4:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0209c8d4: .word data_027e0d38
_0209c8d8: .word data_02050f54
_0209c8d8: .word gSinCosTable
_0209c8dc: .word 0x00000fff
_0209c8e0: .word data_027e0f88
arm_func_end func_ov00_0209c788
@@ -11551,7 +11551,7 @@ func_ov00_020a132c: ; 0x020a132c
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _020a1384 ; =data_02050f54
ldr r3, _020a1384 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -11570,7 +11570,7 @@ func_ov00_020a132c: ; 0x020a132c
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020a1384: .word data_02050f54
_020a1384: .word gSinCosTable
arm_func_end func_ov00_020a132c
.global func_ov00_020a1388
@@ -11697,7 +11697,7 @@ func_ov00_020a142c: ; 0x020a142c
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
add r3, r2, #1
ldr r2, _020a1538 ; =data_02050f54
ldr r2, _020a1538 ; =gSinCosTable
mov r3, r3, lsl #0x1
ldrsh r2, [r2, r3]
orr r1, r1, r0, lsl #20
@@ -11717,7 +11717,7 @@ _020a152c:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020a1534: .word 0x02710000
_020a1538: .word data_02050f54
_020a1538: .word gSinCosTable
arm_func_end func_ov00_020a142c
.global func_ov00_020a153c
@@ -12294,7 +12294,7 @@ func_ov00_020a1b54: ; 0x020a1b54
add r3, r1, #1
mov r2, r2, lsl #0x1
mov r5, r3, lsl #0x1
ldr r4, _020a1c60 ; =data_02050f54
ldr r4, _020a1c60 ; =gSinCosTable
mov r3, r2, lsl #0x1
ldrsh ip, [r4, r5]
ldrsh r4, [r4, r3]
@@ -12314,7 +12314,7 @@ func_ov00_020a1b54: ; 0x020a1b54
cmp r5, lr
movlt r5, lr
_020a1bcc:
ldr r4, _020a1c60 ; =data_02050f54
ldr r4, _020a1c60 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r4, [r4, r1]
strh r5, [r0, #8]
@@ -12329,7 +12329,7 @@ _020a1bcc:
movlt r5, r1
_020a1c00:
add r2, r2, #1
ldr r1, _020a1c60 ; =data_02050f54
ldr r1, _020a1c60 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r4, [r1, r2]
strh r5, [r0, #0xa]
@@ -12354,7 +12354,7 @@ _020a1c58:
strh r3, [r0, #0xc]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020a1c60: .word data_02050f54
_020a1c60: .word gSinCosTable
_020a1c64: .word 0x00000fff
arm_func_end func_ov00_020a1b54
@@ -17773,7 +17773,7 @@ func_ov00_020a6110: ; 0x020a6110
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
add r1, r3, #1
ldr r2, _020a61a8 ; =data_02050f54
ldr r2, _020a61a8 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r2, r1]
ldmib r0, {r6, ip}
@@ -17806,7 +17806,7 @@ func_ov00_020a6110: ; 0x020a6110
str r1, [r0, #8]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020a61a8: .word data_02050f54
_020a61a8: .word gSinCosTable
arm_func_end func_ov00_020a6110
.global func_ov00_020a61ac
@@ -17818,7 +17818,7 @@ func_ov00_020a61ac: ; 0x020a61ac
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
add r1, r3, #1
ldr r2, _020a624c ; =data_02050f54
ldr r2, _020a624c ; =gSinCosTable
mov r4, r3, lsl #0x1
mov r1, r1, lsl #0x1
ldr r3, [r0]
@@ -17853,7 +17853,7 @@ func_ov00_020a61ac: ; 0x020a61ac
str r1, [r0, #8]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020a624c: .word data_02050f54
_020a624c: .word gSinCosTable
arm_func_end func_ov00_020a61ac
.global func_ov00_020a6250
@@ -17865,7 +17865,7 @@ func_ov00_020a6250: ; 0x020a6250
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
add r1, r3, #1
ldr r2, _020a62e8 ; =data_02050f54
ldr r2, _020a62e8 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r2, r1]
ldmia r0, {r6, ip}
@@ -17898,7 +17898,7 @@ func_ov00_020a6250: ; 0x020a6250
str r1, [r0, #4]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020a62e8: .word data_02050f54
_020a62e8: .word gSinCosTable
arm_func_end func_ov00_020a6250
.global func_ov00_020a62ec
asm/ov00/ov00_020a8e04.inc
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
.extern _ZN9SysObjectdlEPv
.extern data_02050f54
.extern gSinCosTable
.extern data_027e016c
.extern data_027e0194
.extern data_027e037c
asm/ov00/ov00_020a8e04.s
+5 -5
View File
@@ -858,7 +858,7 @@ _020a9c94:
bne _020a9d48
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _020a9dbc ; =data_02050f54
ldr r1, _020a9dbc ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r3, [r1, r0]
@@ -873,7 +873,7 @@ _020a9c94:
mov r0, r8, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _020a9dbc ; =data_02050f54
ldr r1, _020a9dbc ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r3, [r1, r0]
@@ -890,7 +890,7 @@ _020a9c94:
_020a9d48:
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _020a9dbc ; =data_02050f54
ldr r2, _020a9dbc ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -904,7 +904,7 @@ _020a9d48:
mov r0, r8, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _020a9dbc ; =data_02050f54
ldr r2, _020a9dbc ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -918,7 +918,7 @@ _020a9d48:
add sp, sp, #0x94
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_020a9dbc: .word data_02050f54
_020a9dbc: .word gSinCosTable
arm_func_end func_ov00_020a9c14
.global func_ov00_020a9dc0
asm/ov00/ov00_020b1498.inc
+1 -1
View File
@@ -159,7 +159,7 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051f54
.extern data_02052f54
.extern data_02053f54
asm/ov00/ov00_020b1498.s
+68 -68
View File
@@ -24,7 +24,7 @@ func_ov00_020b1498: ; 0x020b1498
str r0, [sp]
mov r0, #9
ldr r1, _020b1520 ; =data_ov00_020dc6ec
ldr r3, _020b1524 ; =data_02050f54
ldr r3, _020b1524 ; =gSinCosTable
add r1, r1, lr, lsl #1
ldrb r1, [r4, r1]
ldrsh r4, [r3, ip]
@@ -42,7 +42,7 @@ func_ov00_020b1498: ; 0x020b1498
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020b1520: .word data_ov00_020dc6ec
_020b1524: .word data_02050f54
_020b1524: .word gSinCosTable
arm_func_end func_ov00_020b1498
.global func_ov00_020b1528
@@ -314,7 +314,7 @@ func_ov00_020b17ec: ; 0x020b17ec
sub sp, sp, #0x6c
ldrh r1, [sp, #0x88]
mov r4, r0
ldr r2, _020b18d4 ; =data_02050f54
ldr r2, _020b18d4 ; =gSinCosTable
mov r0, r1, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -325,7 +325,7 @@ func_ov00_020b17ec: ; 0x020b17ec
add r0, sp, #0x48
blx func_01ff81f8
ldrh r1, [sp, #0x8c]
ldr r3, _020b18d4 ; =data_02050f54
ldr r3, _020b18d4 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -340,7 +340,7 @@ func_ov00_020b17ec: ; 0x020b17ec
mov r2, r0
bl func_01ff8690
ldrh r1, [sp, #0x90]
ldr r3, _020b18d4 ; =data_02050f54
ldr r3, _020b18d4 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -368,7 +368,7 @@ func_ov00_020b17ec: ; 0x020b17ec
add sp, sp, #0x10
bx lr
.align 2, 0
_020b18d4: .word data_02050f54
_020b18d4: .word gSinCosTable
arm_func_end func_ov00_020b17ec
.global func_ov00_020b18d8
@@ -1155,7 +1155,7 @@ _020b2200:
str r1, [r4, #0x48]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r1, [r0]
ldr r5, _020b247c ; =data_02050f54
ldr r5, _020b247c ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1317,7 +1317,7 @@ _020b246c:
.align 2, 0
_020b2474: .word data_ov00_020ee698
_020b2478: .word data_027e0d0c
_020b247c: .word data_02050f54
_020b247c: .word gSinCosTable
_020b2480: .word 0x00000ccd
_020b2484: .word 0x000004cd
_020b2488: .word data_ov00_020eec68
@@ -1656,7 +1656,7 @@ _020b28f4:
mov r0, r4
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r1, [r0]
ldr r5, _020b2ba0 ; =data_02050f54
ldr r5, _020b2ba0 ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1728,7 +1728,7 @@ _020b29d0:
str r1, [r4, #0x48]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r1, [r0]
ldr r5, _020b2ba0 ; =data_02050f54
ldr r5, _020b2ba0 ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1776,7 +1776,7 @@ _020b2a8c:
str r1, [r4, #0x48]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r1, [r0]
ldr r5, _020b2ba0 ; =data_02050f54
ldr r5, _020b2ba0 ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1833,7 +1833,7 @@ _020b2b90: .word gMapManager
_020b2b94: .word data_027e0d38
_020b2b98: .word data_02052f54
_020b2b9c: .word data_02051f54
_020b2ba0: .word data_02050f54
_020b2ba0: .word gSinCosTable
arm_func_end func_ov00_020b2598
.global func_ov00_020b2ba4
@@ -2474,7 +2474,7 @@ _020b33a4:
ldr r2, [r0, #4]
ldr r1, [r0, #8]
ldr r0, [r0]
ldr r3, _020b35cc ; =data_02050f54
ldr r3, _020b35cc ; =gSinCosTable
str r0, [r5, #0x40]
str r2, [r5, #0x44]
str r1, [r5, #0x48]
@@ -2527,7 +2527,7 @@ _020b3470:
ldr r2, [r0, #4]
ldr r1, [r0, #8]
ldr r0, [r0]
ldr r3, _020b35cc ; =data_02050f54
ldr r3, _020b35cc ; =gSinCosTable
str r0, [r5, #0x40]
str r2, [r5, #0x44]
str r1, [r5, #0x48]
@@ -2614,7 +2614,7 @@ _020b35c0:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020b35cc: .word data_02050f54
_020b35cc: .word gSinCosTable
_020b35d0: .word 0x00000ccd
_020b35d4: .word 0x000009c3
arm_func_end func_ov00_020b3278
@@ -2675,7 +2675,7 @@ _020b3690:
b _020b38c4
_020b369c:
ldrh r1, [r5, #0x10]
ldr r4, _020b38d0 ; =data_02050f54
ldr r4, _020b38d0 ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -2707,7 +2707,7 @@ _020b369c:
b _020b38c4
_020b3718:
ldrh r1, [r5, #0x10]
ldr r3, _020b38d0 ; =data_02050f54
ldr r3, _020b38d0 ; =gSinCosTable
ldr r0, _020b38d4 ; =0x00000ccd
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -2743,7 +2743,7 @@ _020b3718:
_020b37a0:
ldrh r1, [r5, #0x10]
ldr r0, _020b38d8 ; =data_ov00_020e6194
ldr r2, _020b38d0 ; =data_02050f54
ldr r2, _020b38d0 ; =gSinCosTable
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
mov r1, r3, lsl #0x1
@@ -2787,7 +2787,7 @@ _020b3818:
b _020b38c4
_020b384c:
ldrh r1, [r5, #0x10]
ldr r4, _020b38d0 ; =data_02050f54
ldr r4, _020b38d0 ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -2821,7 +2821,7 @@ _020b38c4:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020b38d0: .word data_02050f54
_020b38d0: .word gSinCosTable
_020b38d4: .word 0x00000ccd
_020b38d8: .word data_ov00_020e6194
arm_func_end func_ov00_020b35d8
@@ -2943,7 +2943,7 @@ _020b3a64:
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
add r2, r1, #1
ldr r3, _020b3d50 ; =data_02050f54
ldr r3, _020b3d50 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r7, [r3, r1]
ldr r1, _020b3d54 ; =0xffffee66
@@ -2990,7 +2990,7 @@ _020b3b14:
mov r1, r1, lsl #0x1
mvn ip, #0
add r2, r1, #1
ldr r7, _020b3d50 ; =data_02050f54
ldr r7, _020b3d50 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r7, r1]
mov r5, ip, lsl #0xc
@@ -3029,7 +3029,7 @@ _020b3bb0:
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
add r2, r1, #1
ldr r3, _020b3d50 ; =data_02050f54
ldr r3, _020b3d50 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh ip, [r3, r1]
ldr r1, _020b3d60 ; =0xffffe4cd
@@ -3070,7 +3070,7 @@ _020b3c44:
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
add r1, r2, #1
ldr r3, _020b3d50 ; =data_02050f54
ldr r3, _020b3d50 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r2, [r3, r2]
mov r1, r1, lsl #0x1
@@ -3130,7 +3130,7 @@ _020b3ce4:
.align 2, 0
_020b3d48: .word data_027e0d38
_020b3d4c: .word gAdventureFlags
_020b3d50: .word data_02050f54
_020b3d50: .word gSinCosTable
_020b3d54: .word 0xffffee66
_020b3d58: .word data_027e0618
_020b3d5c: .word data_ov00_020eec9c
@@ -3472,7 +3472,7 @@ func_ov00_020b413c: ; 0x020b413c
mov ip, r1, lsl #0x1
add r1, ip, #1
mov r5, r0
ldr r3, _020b419c ; =data_02050f54
ldr r3, _020b419c ; =gSinCosTable
mov ip, ip, lsl #0x1
mov r0, r1, lsl #0x1
mov r4, r2
@@ -3489,7 +3489,7 @@ func_ov00_020b413c: ; 0x020b413c
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020b419c: .word data_02050f54
_020b419c: .word gSinCosTable
arm_func_end func_ov00_020b413c
.global func_ov00_020b41a0
@@ -4229,7 +4229,7 @@ func_ov00_020b4944: ; 0x020b4944
add r2, r4, #1
mov r5, r0
mov r0, r4, lsl #0x1
ldr ip, _020b49fc ; =data_02050f54
ldr ip, _020b49fc ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r4, r1
ldrsh r1, [ip, r0]
@@ -4247,7 +4247,7 @@ func_ov00_020b4944: ; 0x020b4944
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _020b49fc ; =data_02050f54
ldr r2, _020b49fc ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -4268,7 +4268,7 @@ _020b49dc:
add sp, sp, #0x48
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020b49fc: .word data_02050f54
_020b49fc: .word gSinCosTable
arm_func_end func_ov00_020b4944
.global func_ov00_020b4a00
@@ -5282,7 +5282,7 @@ _020b5540:
str r0, [r5]
str r0, [r5, #8]
ldrh r1, [sp, #2]
ldr r3, _020b5c88 ; =data_02050f54
ldr r3, _020b5c88 ; =gSinCosTable
ldr r0, [r5]
mov r1, r1, asr #0x4
mov r8, r1, lsl #0x1
@@ -5737,7 +5737,7 @@ _020b5c68:
.align 2, 0
_020b5c80: .word data_027e0fb8
_020b5c84: .word 0x0000071c
_020b5c88: .word data_02050f54
_020b5c88: .word gSinCosTable
_020b5c8c: .word gAdventureFlags
_020b5c90: .word 0x00000ccd
_020b5c94: .word gPlayerLink
@@ -7078,7 +7078,7 @@ _020b7000:
str r0, [sp, #0x28]
ldrh r1, [r4, #0xa0]
mov r0, #0x800
ldr r3, _020b7330 ; =data_02050f54
ldr r3, _020b7330 ; =gSinCosTable
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
add r1, r2, #1
@@ -7284,7 +7284,7 @@ _020b7318:
_020b7324: .word data_027e0f6c
_020b7328: .word _ZN7MapBase18func_ov00_0207e968Ev
_020b732c: .word _ZN7MapBase18func_ov00_0207e96cEv
_020b7330: .word data_02050f54
_020b7330: .word gSinCosTable
_020b7334: .word gMapManager
_020b7338: .word 0x00000e66
arm_func_end func_ov00_020b6ea0
@@ -8225,7 +8225,7 @@ func_ov00_020b7f28: ; 0x020b7f28
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _020b7fc8 ; =data_02050f54
ldr r2, _020b7fc8 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -8243,7 +8243,7 @@ _020b7fb4:
ldmia sp!, {r4, pc}
.align 2, 0
_020b7fc4: .word data_027e03c8
_020b7fc8: .word data_02050f54
_020b7fc8: .word gSinCosTable
arm_func_end func_ov00_020b7f28
.global func_ov00_020b7fcc
@@ -9657,11 +9657,11 @@ _020b8e80:
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
ldr r2, _020b915c ; =data_02050f54
ldr r2, _020b915c ; =gSinCosTable
b _020b8ef0
_020b8ecc:
ldr r0, _020b9160 ; =0xffffeaab
ldr r2, _020b915c ; =data_02050f54
ldr r2, _020b915c ; =gSinCosTable
add r0, r5, r0
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
@@ -9721,7 +9721,7 @@ _020b8f7c:
_020b8fa8:
ldr r2, [r4, #0x138]
ldr r0, _020b9168 ; =0x00001555
ldr r1, _020b915c ; =data_02050f54
ldr r1, _020b915c ; =gSinCosTable
mul r0, r2, r0
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
@@ -9769,7 +9769,7 @@ _020b9018:
_020b9060:
ldr r2, [r4, #0x138]
ldr r0, _020b9174 ; =0x00000aab
ldr r1, _020b915c ; =data_02050f54
ldr r1, _020b915c ; =gSinCosTable
mul r0, r2, r0
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
@@ -9837,7 +9837,7 @@ _020b9138:
_020b9150: .word 0x0000019a
_020b9154: .word 0x00000333
_020b9158: .word data_027e0764
_020b915c: .word data_02050f54
_020b915c: .word gSinCosTable
_020b9160: .word 0xffffeaab
_020b9164: .word 0x000004cd
_020b9168: .word 0x00001555
@@ -10381,7 +10381,7 @@ _020b98b0:
_020b98bc:
ldr r2, [r4, #0x138]
ldr r0, _020b9958 ; =0x00000aab
ldr r1, _020b995c ; =data_02050f54
ldr r1, _020b995c ; =gSinCosTable
mul r0, r2, r0
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
@@ -10424,7 +10424,7 @@ _020b994c:
ldmia sp!, {r4, pc}
.align 2, 0
_020b9958: .word 0x00000aab
_020b995c: .word data_02050f54
_020b995c: .word gSinCosTable
_020b9960: .word 0x00000b33
arm_func_end func_ov00_020b97e0
@@ -11626,7 +11626,7 @@ _020ba958:
ldr r1, _020bac68 ; =data_027e0f64
ldr r0, _020bac6c ; =gMapManager
ldr r1, [r1]
ldr r2, _020bac70 ; =data_02050f54
ldr r2, _020bac70 ; =gSinCosTable
ldr r1, [r1, #4]
mov r7, #0x800
add r1, r1, #0x200
@@ -11680,7 +11680,7 @@ _020ba958:
mov r0, r4, lsl #0x10
mov r0, r0, lsr #0x10
mov r1, r0, asr #0x4
ldr r0, _020bac70 ; =data_02050f54
ldr r0, _020bac70 ; =gSinCosTable
mov r1, r1, lsl #0x2
ldrsh r2, [r0, r1]
mov r0, #0x800
@@ -11698,7 +11698,7 @@ _020ba958:
_020baab8:
ldrsh r0, [r6, #0x78]
ldr r3, [sp, #0x1c]
ldr r2, _020bac70 ; =data_02050f54
ldr r2, _020bac70 ; =gSinCosTable
add r0, r0, #0x2000
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
@@ -11747,7 +11747,7 @@ _020baab8:
cmp r0, #0
beq _020babcc
ldrsh r0, [r6, #0x78]
ldr r2, _020bac70 ; =data_02050f54
ldr r2, _020bac70 ; =gSinCosTable
mov r1, #0x800
add r0, r0, #0x2000
mov r0, r0, lsl #0x10
@@ -11810,7 +11810,7 @@ _020bac60: .word gPlayerPos
_020bac64: .word data_027e0d38
_020bac68: .word data_027e0f64
_020bac6c: .word gMapManager
_020bac70: .word data_02050f54
_020bac70: .word gSinCosTable
arm_func_end func_ov00_020ba874
.global func_ov00_020bac74
@@ -14099,7 +14099,7 @@ _020bc600:
mov r0, r0, lsl #0x4
sub r0, r6, r0, lsr #16
mov r1, r0, asr #0x4
ldr r0, _020bc6d0 ; =data_02050f54
ldr r0, _020bc6d0 ; =gSinCosTable
mov r1, r1, lsl #0x2
ldrsh r0, [r0, r1]
smull r1, r0, r5, r0
@@ -14123,7 +14123,7 @@ _020bc6c0: .word gPlayerPos
_020bc6c4: .word gPlayerAngle
_020bc6c8: .word 0x66666667
_020bc6cc: .word 0x0b60b60b
_020bc6d0: .word data_02050f54
_020bc6d0: .word gSinCosTable
arm_func_end func_ov00_020bc520
.global func_ov00_020bc6d4
@@ -15910,12 +15910,12 @@ _020bdb70:
ldr r0, [sp, #0x30]
mov r2, r2, asr #0x4
mov r8, r2, lsl #0x1
ldr r2, _020bde44 ; =data_02050f54
ldr r2, _020bde44 ; =gSinCosTable
mov r3, r8, lsl #0x1
add r2, r2, r8, lsl #1
ldrsh lr, [r2, #2]
ldr r8, [sp, #0x10]
ldr r2, _020bde44 ; =data_02050f54
ldr r2, _020bde44 ; =gSinCosTable
umull r9, r8, lr, r8
mla r8, lr, r10, r8
ldrsh r3, [r2, r3]
@@ -16092,7 +16092,7 @@ _020bde34: .word 0x001f20c0
_020bde38: .word data_027e0f64
_020bde3c: .word 0x2aaaaaab
_020bde40: .word 0x04000444
_020bde44: .word data_02050f54
_020bde44: .word gSinCosTable
_020bde48: .word 0x000fffe0
_020bde4c: .word 0x0400048c
_020bde50: .word 0x04000504
@@ -17053,7 +17053,7 @@ func_ov00_020be9e4: ; 0x020be9e4
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
add r2, r0, #1
ldr r0, _020beb28 ; =data_02050f54
ldr r0, _020beb28 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh ip, [r0, r2]
ldr r0, _020beb2c ; =0x00000266
@@ -17116,7 +17116,7 @@ func_ov00_020be9e4: ; 0x020be9e4
.align 2, 0
_020beb20: .word 0x00000aab
_020beb24: .word data_027e0f64
_020beb28: .word data_02050f54
_020beb28: .word gSinCosTable
_020beb2c: .word 0x00000266
arm_func_end func_ov00_020be9e4
@@ -18373,7 +18373,7 @@ _020bfb20:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, [sp, #0x94]
ldr r5, _020bff4c ; =data_02050f54
ldr r5, _020bff4c ; =gSinCosTable
add r0, r0, #0x800
str r0, [sp, #0x94]
ldrh r0, [r4, #4]
@@ -18640,7 +18640,7 @@ _020bff3c: .word gMapManager
_020bff40: .word 0x0000099a
_020bff44: .word data_ov00_020dd268
_020bff48: .word gActorManager
_020bff4c: .word data_02050f54
_020bff4c: .word gSinCosTable
_020bff50: .word 0x00000666
_020bff54: .word data_027e0fe8
_020bff58: .word 0x5342454d
@@ -18896,7 +18896,7 @@ func_ov00_020c024c: ; 0x020c024c
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr ip, _020c0314 ; =data_02050f54
ldr ip, _020c0314 ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r2, [ip, r2]
@@ -18923,7 +18923,7 @@ func_ov00_020c024c: ; 0x020c024c
_020c0308: .word data_ov00_020dd2a0
_020c030c: .word data_ov00_020dd29c
_020c0310: .word data_ov00_020dd28c
_020c0314: .word data_02050f54
_020c0314: .word gSinCosTable
arm_func_end func_ov00_020c024c
.global func_ov00_020c0318
@@ -18966,7 +18966,7 @@ _020c035c:
add r2, r2, #1
ldrh ip, [r0, #4]
ldr r0, [r3, r1]
ldr r5, _020c0544 ; =data_02050f54
ldr r5, _020c0544 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r2, [r5, r2]
mov r1, ip, asr #0x4
@@ -19036,7 +19036,7 @@ _020c0484:
add r1, r3, #0x66
_020c04a8:
ldrh r2, [r0, #4]
ldr ip, _020c0544 ; =data_02050f54
ldr ip, _020c0544 ; =gSinCosTable
add r1, r1, #0x200
mov r2, r2, asr #0x4
mov r5, r2, lsl #0x1
@@ -19076,7 +19076,7 @@ _020c0524:
.align 2, 0
_020c053c: .word data_ov00_020dd2a0
_020c0540: .word data_ov00_020dd28c
_020c0544: .word data_02050f54
_020c0544: .word gSinCosTable
_020c0548: .word 0x00000b33
_020c054c: .word 0x5b6f58d9
arm_func_end func_ov00_020c0318
@@ -19107,7 +19107,7 @@ func_ov00_020c0550: ; 0x020c0550
mov r1, r3, lsl #0x10
mov r1, r1, lsr #0x10
mov r3, r1, asr #0x4
ldr r1, _020c05e8 ; =data_02050f54
ldr r1, _020c05e8 ; =gSinCosTable
mov r3, r3, lsl #0x2
ldrsh r1, [r1, r3]
ldr r0, [r2, r0]
@@ -19123,7 +19123,7 @@ func_ov00_020c0550: ; 0x020c0550
.align 2, 0
_020c05e0: .word data_ov00_020dd2a0
_020c05e4: .word data_ov00_020dd28c
_020c05e8: .word data_02050f54
_020c05e8: .word gSinCosTable
arm_func_end func_ov00_020c0550
.global func_ov00_020c05ec
@@ -19460,7 +19460,7 @@ _020c09c0:
cmp r0, #0
beq _020c0a60
ldrh r1, [r4, #4]
ldr r2, _020c0a80 ; =data_02050f54
ldr r2, _020c0a80 ; =gSinCosTable
ldr r0, _020c0a84 ; =0x00000333
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -19506,7 +19506,7 @@ _020c0a70: .word gItemManager
_020c0a74: .word data_02053f54
_020c0a78: .word data_ov00_020dd364
_020c0a7c: .word data_027e03c8
_020c0a80: .word data_02050f54
_020c0a80: .word gSinCosTable
_020c0a84: .word 0x00000333
arm_func_end func_ov00_020c086c
@@ -19525,7 +19525,7 @@ func_ov00_020c0a88: ; 0x020c0a88
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, pc}
ldrh r0, [r5, #4]
ldr r2, _020c0b5c ; =data_02050f54
ldr r2, _020c0b5c ; =gSinCosTable
ldr r3, _020c0b60 ; =0x0000019a
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
@@ -19567,7 +19567,7 @@ func_ov00_020c0a88: ; 0x020c0a88
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020c0b5c: .word data_02050f54
_020c0b5c: .word gSinCosTable
_020c0b60: .word 0x0000019a
arm_func_end func_ov00_020c0a88
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -115,7 +115,7 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_020561f4
.extern data_02056be4
.extern data_02057840
asm/ov00/ov00_020c3e54.s
+48 -48
View File
@@ -2605,7 +2605,7 @@ func_ov00_020c5ec0: ; 0x020c5ec0
mov ip, r1, lsl #0x1
add r1, ip, #1
mov r5, r0
ldr r3, _020c5f18 ; =data_02050f54
ldr r3, _020c5f18 ; =gSinCosTable
mov ip, ip, lsl #0x1
mov r0, r1, lsl #0x1
mov r4, r2
@@ -2620,7 +2620,7 @@ func_ov00_020c5ec0: ; 0x020c5ec0
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020c5f18: .word data_02050f54
_020c5f18: .word gSinCosTable
arm_func_end func_ov00_020c5ec0
.global func_ov00_020c5f1c
@@ -2689,7 +2689,7 @@ func_ov00_020c5fc0: ; 0x020c5fc0
ldr r0, [r5, #0x1c]
mov r4, r1
ldrh r2, [r0, #0x78]
ldr r3, _020c6020 ; =data_02050f54
ldr r3, _020c6020 ; =gSinCosTable
add r0, sp, #0
mov r1, r2, asr #0x4
mov r2, r1, lsl #0x1
@@ -2708,7 +2708,7 @@ func_ov00_020c5fc0: ; 0x020c5fc0
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020c6020: .word data_02050f54
_020c6020: .word gSinCosTable
arm_func_end func_ov00_020c5fc0
.global func_ov00_020c6024
@@ -2871,7 +2871,7 @@ _020c61d0:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _020c62ec ; =data_02050f54
ldr r1, _020c62ec ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r2, [r1, r2]
mov r0, r0, lsl #0x1
@@ -2897,7 +2897,7 @@ _020c6288:
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
add r1, r2, #1
ldr r3, _020c62ec ; =data_02050f54
ldr r3, _020c62ec ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r1, r1, lsl #0x1
ldrsh r2, [r3, r2]
@@ -2918,7 +2918,7 @@ _020c6288:
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020c62ec: .word data_02050f54
_020c62ec: .word gSinCosTable
arm_func_end func_ov00_020c6164
.global func_ov00_020c62f0
@@ -2997,14 +2997,14 @@ _020c6368:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _020c64d4 ; =data_02050f54
ldr r2, _020c64d4 ; =gSinCosTable
b _020c642c
_020c6414:
mov r0, r7, lsl #0x10
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
ldr r2, _020c64d4 ; =data_02050f54
ldr r2, _020c64d4 ; =gSinCosTable
add r0, r1, #1
_020c642c:
mov r1, r1, lsl #0x1
@@ -3031,7 +3031,7 @@ _020c6474:
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
add r1, r2, #1
ldr r3, _020c64d4 ; =data_02050f54
ldr r3, _020c64d4 ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r1, r1, lsl #0x1
ldrsh r2, [r3, r2]
@@ -3051,7 +3051,7 @@ _020c6474:
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_020c64d4: .word data_02050f54
_020c64d4: .word gSinCosTable
arm_func_end func_ov00_020c62f0
.global func_ov00_020c64d8
@@ -3146,7 +3146,7 @@ _020c65a4:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _020c66b8 ; =data_02050f54
ldr r1, _020c66b8 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r2, [r1, r2]
mov r0, r0, lsl #0x1
@@ -3170,7 +3170,7 @@ _020c665c:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _020c66b8 ; =data_02050f54
ldr r1, _020c66b8 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r2, [r1, r2]
mov r0, r0, lsl #0x1
@@ -3191,7 +3191,7 @@ _020c665c:
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020c66b8: .word data_02050f54
_020c66b8: .word gSinCosTable
arm_func_end func_ov00_020c6538
.global func_ov00_020c66bc
@@ -9380,7 +9380,7 @@ _020cb47c:
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r3, [sp, #0xc]
ldr r2, _020cb53c ; =data_02050f54
ldr r2, _020cb53c ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -9412,7 +9412,7 @@ _020cb47c:
_020cb530: .word data_027e0ffc
_020cb534: .word 0x00000191
_020cb538: .word data_027e0e5c
_020cb53c: .word data_02050f54
_020cb53c: .word gSinCosTable
arm_func_end func_ov00_020cb348
.global func_ov00_020cb540
@@ -11751,7 +11751,7 @@ _020cd204:
mov r1, r0, lsl #0x1
add r0, r1, #1
mov r3, r1, lsl #0x1
ldr r2, _020cd278 ; =data_02050f54
ldr r2, _020cd278 ; =gSinCosTable
mov r0, r0, lsl #0x1
str r5, [r6, #0x10]
ldrsh r5, [r2, r0]
@@ -11775,7 +11775,7 @@ _020cd204:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020cd274: .word gPlayerPos
_020cd278: .word data_02050f54
_020cd278: .word gSinCosTable
arm_func_end func_ov00_020cd174
.global func_ov00_020cd27c
@@ -11925,7 +11925,7 @@ _020cd430:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _020cd4e4 ; =data_02050f54
ldr r1, _020cd4e4 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r6, [r1, r2]
mov r0, r0, lsl #0x1
@@ -11966,7 +11966,7 @@ _020cd430:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020cd4e0: .word gPlayerPos
_020cd4e4: .word data_02050f54
_020cd4e4: .word gSinCosTable
arm_func_end func_ov00_020cd384
.global func_ov00_020cd4e8
@@ -12003,7 +12003,7 @@ func_ov00_020cd52c: ; 0x020cd52c
ldr ip, _020cd624 ; =data_027e0764
str r0, [r4, #0x18]
ldr r1, [r2, #4]
ldr r0, _020cd628 ; =data_02050f54
ldr r0, _020cd628 ; =gSinCosTable
str r1, [r4, #0x1c]
ldr r1, [r2, #8]
mov lr, #0
@@ -12059,7 +12059,7 @@ func_ov00_020cd52c: ; 0x020cd52c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020cd624: .word data_027e0764
_020cd628: .word data_02050f54
_020cd628: .word gSinCosTable
arm_func_end func_ov00_020cd52c
.global func_ov00_020cd62c
@@ -12146,7 +12146,7 @@ _020cd690:
str r1, [sp, #0x10]
mla r7, r6, r5, r7
ldr r5, _020cd8e0 ; =0xfffff1c7
ldr lr, _020cd8e4 ; =data_02050f54
ldr lr, _020cd8e4 ; =gSinCosTable
add r5, r7, r5
add r0, r5, r0, asr #16
mov r0, r0, lsl #0x10
@@ -12220,12 +12220,12 @@ _020cd7d4:
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r7, r0, lsl #0x1
ldr r0, _020cd8e4 ; =data_02050f54
ldr r0, _020cd8e4 ; =gSinCosTable
mov r5, r7, lsl #0x1
ldrsh r6, [r0, r5]
add r0, r7, #1
mov r5, r0, lsl #0x1
ldr r0, _020cd8e4 ; =data_02050f54
ldr r0, _020cd8e4 ; =gSinCosTable
str r6, [sp]
ldrsh r0, [r0, r5]
add r2, r4, #0x18
@@ -12242,7 +12242,7 @@ _020cd7d4:
_020cd8d8: .word data_027e0764
_020cd8dc: .word 0x00001c73
_020cd8e0: .word 0xfffff1c7
_020cd8e4: .word data_02050f54
_020cd8e4: .word gSinCosTable
arm_func_end func_ov00_020cd62c
.global func_ov00_020cd8e8
@@ -12251,7 +12251,7 @@ func_ov00_020cd8e8: ; 0x020cd8e8
stmdb sp!, {r3, r4, r5, r6, r7, lr}
str r1, [r0]
ldrh r4, [r1, #0x78]
ldr r5, _020cd964 ; =data_02050f54
ldr r5, _020cd964 ; =gSinCosTable
ldr ip, [sp, #0x18]
mov r4, r4, asr #0x4
mov r6, r4, lsl #0x1
@@ -12280,7 +12280,7 @@ func_ov00_020cd8e8: ; 0x020cd8e8
str ip, [r0, #4]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020cd964: .word data_02050f54
_020cd964: .word gSinCosTable
arm_func_end func_ov00_020cd8e8
.global func_ov00_020cd968
@@ -12483,7 +12483,7 @@ _020cdbbc:
mov r6, r2, lsl #0x1
add r2, r6, #1
str r1, [ip]
ldr r5, _020cdca8 ; =data_02050f54
ldr r5, _020cdca8 ; =gSinCosTable
mov r6, r6, lsl #0x1
ldrsh r7, [r5, r6]
mov r2, r2, lsl #0x1
@@ -12516,7 +12516,7 @@ _020cdbbc:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020cdca4: .word data_027e0764
_020cdca8: .word data_02050f54
_020cdca8: .word gSinCosTable
arm_func_end func_ov00_020cdb34
.global func_ov00_020cdcac
@@ -12551,7 +12551,7 @@ func_ov00_020cdcf8: ; 0x020cdcf8
stmdb sp!, {r4, lr}
mov r4, r0
ldrh r2, [r4, #4]
ldr ip, _020cddf4 ; =data_02050f54
ldr ip, _020cddf4 ; =gSinCosTable
ldr r0, [r4]
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
@@ -12612,7 +12612,7 @@ func_ov00_020cdcf8: ; 0x020cdcf8
strh r1, [r4, #6]
ldmia sp!, {r4, pc}
.align 2, 0
_020cddf4: .word data_02050f54
_020cddf4: .word gSinCosTable
arm_func_end func_ov00_020cdcf8
.global func_ov00_020cddf8
@@ -12632,7 +12632,7 @@ func_ov00_020cde0c: ; 0x020cde0c
sub sp, sp, #0x4c
mov r5, r0
ldrh r3, [r5, #4]
ldr r6, _020cdfc4 ; =data_02050f54
ldr r6, _020cdfc4 ; =gSinCosTable
ldr r0, [r5]
mov r3, r3, asr #0x4
mov r3, r3, lsl #0x1
@@ -12684,7 +12684,7 @@ _020cdec8:
bl _ZN5Actor9GetHitboxEP8Cylinder
ldrsh r0, [r5, #4]
mov lr, r6
ldr r1, _020cdfc4 ; =data_02050f54
ldr r1, _020cdfc4 ; =gSinCosTable
add r0, r0, #0x2000
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
@@ -12740,7 +12740,7 @@ _020cdec8:
add sp, sp, #0x4c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020cdfc4: .word data_02050f54
_020cdfc4: .word gSinCosTable
_020cdfc8: .word gMapManager
arm_func_end func_ov00_020cde0c
@@ -12829,7 +12829,7 @@ _020ce0d8:
strh r0, [r3, #0x78]
_020ce0e8:
ldr r0, [r4]
ldr lr, _020ce188 ; =data_02050f54
ldr lr, _020ce188 ; =gSinCosTable
ldrh r2, [r0, #0x78]
mov ip, #0
mov r2, r2, asr #0x4
@@ -12869,7 +12869,7 @@ _020ce0e8:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020ce184: .word data_027e0764
_020ce188: .word data_02050f54
_020ce188: .word gSinCosTable
arm_func_end func_ov00_020ce030
.global func_ov00_020ce18c
@@ -12884,7 +12884,7 @@ func_ov00_020ce18c: ; 0x020ce18c
cmpeq r1, #0
bne _020ce230
ldr r3, _020ce27c ; =data_027e0764
ldr ip, _020ce280 ; =data_02050f54
ldr ip, _020ce280 ; =gSinCosTable
ldr r1, [r3]
ldmib r3, {r0, r2}
umull r5, lr, r2, r1
@@ -12926,7 +12926,7 @@ _020ce230:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _020ce280 ; =data_02050f54
ldr r2, _020ce280 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r2, r1]
mov r0, r0, lsl #0x1
@@ -12938,7 +12938,7 @@ _020ce230:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020ce27c: .word data_027e0764
_020ce280: .word data_02050f54
_020ce280: .word gSinCosTable
arm_func_end func_ov00_020ce18c
.global func_ov00_020ce284
@@ -13536,7 +13536,7 @@ func_ov00_020ce970: ; 0x020ce970
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
add r1, r0, #1
ldr r0, _020cea38 ; =data_02050f54
ldr r0, _020cea38 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r0, [r0, r1]
smull r1, r0, r2, r0
@@ -13568,14 +13568,14 @@ _020cea24:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020cea34: .word data_027e0f64
_020cea38: .word data_02050f54
_020cea38: .word gSinCosTable
arm_func_end func_ov00_020ce970
.global func_ov00_020cea3c
arm_func_start func_ov00_020cea3c
func_ov00_020cea3c: ; 0x020cea3c
mov r1, r0, asr #0x4
ldr r0, _020cea7c ; =data_02050f54
ldr r0, _020cea7c ; =gSinCosTable
mov r1, r1, lsl #0x2
ldrsh r0, [r0, r1]
mov r0, r0, lsl #0x5
@@ -13592,7 +13592,7 @@ _020cea70:
mov r0, r0, asr #0x18
bx lr
.align 2, 0
_020cea7c: .word data_02050f54
_020cea7c: .word gSinCosTable
arm_func_end func_ov00_020cea3c
.global func_ov00_020cea80
@@ -15881,7 +15881,7 @@ func_ov00_020d03f8: ; 0x020d03f8
mov r2, r2, asr #0x10
mov r2, r2, lsl #0x1
add r3, r2, #1
ldr r2, _020d045c ; =data_02050f54
ldr r2, _020d045c ; =gSinCosTable
mov r3, r3, lsl #0x1
ldrsh r2, [r2, r3]
sub r1, r1, r0
@@ -15897,7 +15897,7 @@ func_ov00_020d03f8: ; 0x020d03f8
add r0, r0, r1
bx lr
.align 2, 0
_020d045c: .word data_02050f54
_020d045c: .word gSinCosTable
arm_func_end func_ov00_020d03f8
.global func_ov00_020d0460
@@ -16599,7 +16599,7 @@ _020d0cd8:
str r0, [sp, #0xc]
_020d0d04:
ldrh r2, [sp, #0x7c]
ldr r3, _020d1048 ; =data_02050f54
ldr r3, _020d1048 ; =gSinCosTable
add r0, r4, r4, lsr #31
mov r2, r2, asr #0x4
mov r5, r2, lsl #0x1
@@ -16808,7 +16808,7 @@ _020d1038: .word data_027e0d44
_020d103c: .word 0x040004a8
_020d1040: .word 0x040004ac
_020d1044: .word data_ov00_020df27c
_020d1048: .word data_02050f54
_020d1048: .word gSinCosTable
_020d104c: .word 0x04000500
_020d1050: .word 0x04000488
arm_func_end func_ov00_020d0b7c
asm/ov00/ov00_020d59f0.inc
+3 -3
View File
@@ -100,7 +100,7 @@ func_ov00_020d5a68: ; 0x020d5a68
mov r2, r4, asr #0x4
add r0, r1, #0x800
mov r0, r0, asr #0x10
ldr r1, _020d5c4c ; =data_02050f54
ldr r1, _020d5c4c ; =gSinCosTable
mov r2, r2, lsl #0x2
mov r0, r0, lsl #0x2
ldrsh r6, [r1, r2]
@@ -110,7 +110,7 @@ func_ov00_020d5a68: ; 0x020d5a68
mul r1, r7, r4
add r1, r1, #0x800
mov r1, r1, asr #0x10
ldr r2, _020d5c4c ; =data_02050f54
ldr r2, _020d5c4c ; =gSinCosTable
mov r3, r1, lsl #0x2
mov r1, r6
mov r4, r0
@@ -160,7 +160,7 @@ _020d5bac:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov00_020d5a68
_020d5c4c: .word data_02050f54
_020d5c4c: .word gSinCosTable
.global func_ov00_020d5c50
arm_func_start func_ov00_020d5c50
asm/ov02.inc
+1 -1
View File
@@ -17,7 +17,7 @@
.extern _ZNK11ItemManager21HasTreasurePriceShownEj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_020691a0
.extern data_027e037c
asm/ov02.s
+8 -8
View File
@@ -5249,7 +5249,7 @@ func_ov02_020f30f8: ; 0x020f30f8
strh r2, [r4, #0x16]
ldrsh r1, [r4, #0x16]
ldrsh ip, [r4, #0x14]
ldr r0, _020f31ec ; =data_02050f54
ldr r0, _020f31ec ; =gSinCosTable
add r1, r1, r1, lsr #31
mov r2, r1, lsl #0xf
add r1, ip, ip, lsr #31
@@ -5300,7 +5300,7 @@ func_ov02_020f30f8: ; 0x020f30f8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020f31e8: .word data_ov09_0211f530
_020f31ec: .word data_02050f54
_020f31ec: .word gSinCosTable
arm_func_end func_ov02_020f30f8
.global func_ov02_020f31f0
@@ -5574,7 +5574,7 @@ func_ov02_020f34e8: ; 0x020f34e8
ldr r1, _020f35d4 ; =data_027e0384
str r2, [sp, #8]
str r1, [sp, #0xc]
ldr r2, _020f35d8 ; =data_02050f54
ldr r2, _020f35d8 ; =gSinCosTable
mov r3, r3, lsl #0x1
mov r1, r0, lsl #0x1
ldrsh r0, [r2, r3]
@@ -5619,7 +5619,7 @@ func_ov02_020f34e8: ; 0x020f34e8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020f35d4: .word data_027e0384
_020f35d8: .word data_02050f54
_020f35d8: .word gSinCosTable
_020f35dc: .word data_027e037c
_020f35e0: .word data_027e03c8
arm_func_end func_ov02_020f34e8
@@ -8950,7 +8950,7 @@ func_ov02_020f6324: ; 0x020f6324
addlt sp, sp, #0x54
ldmltia sp!, {r3, r4, pc}
ldrh r1, [r4, #0x20]
ldr r3, _020f6428 ; =data_02050f54
ldr r3, _020f6428 ; =gSinCosTable
add r0, sp, #0x30
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8961,7 +8961,7 @@ func_ov02_020f6324: ; 0x020f6324
ldrsh r2, [r3, r2]
blx func_01ff8230
ldrh r1, [r4, #0x1c]
ldr r3, _020f6428 ; =data_02050f54
ldr r3, _020f6428 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8977,7 +8977,7 @@ func_ov02_020f6324: ; 0x020f6324
bl func_01ff8690
ldrh r2, [r4, #0x22]
ldrh r1, [r4, #0x1e]
ldr r3, _020f6428 ; =data_02050f54
ldr r3, _020f6428 ; =gSinCosTable
add r0, sp, #0xc
add r1, r2, r1
mov r1, r1, lsl #0x10
@@ -9008,7 +9008,7 @@ func_ov02_020f6324: ; 0x020f6324
add sp, sp, #0x54
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020f6428: .word data_02050f54
_020f6428: .word gSinCosTable
arm_func_end func_ov02_020f6324
.global func_ov02_020f642c
asm/ov03.inc
+1 -1
View File
@@ -59,7 +59,7 @@
.extern _ZNK11ItemManager10GetNumKeysEv
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02057b18
.extern data_020683f4
asm/ov03.s
+2 -2
View File
@@ -13287,7 +13287,7 @@ _020f6bc8:
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x2
ldr r1, _020f6d2c ; =data_02050f54
ldr r1, _020f6d2c ; =gSinCosTable
mov r2, #0x800
ldrsh r1, [r1, r3]
mov r0, #0x1000
@@ -13360,7 +13360,7 @@ _020f6cfc:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_020f6d28: .word data_027e0d38
_020f6d2c: .word data_02050f54
_020f6d2c: .word gSinCosTable
_020f6d30: .word gAdventureFlags
arm_func_end func_ov03_020f6b18
asm/ov05.inc
+1 -1
View File
@@ -160,7 +160,7 @@
.extern _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02057200
.extern data_020691a0
asm/ov05.s
+43 -43
View File
@@ -1164,7 +1164,7 @@ func_ov05_0210199c: ; 0x0210199c
ldr r1, _02101aa8 ; =data_027e0384
str r2, [sp, #8]
str r1, [sp, #0xc]
ldr r2, _02101aac ; =data_02050f54
ldr r2, _02101aac ; =gSinCosTable
mov r3, r3, lsl #0x1
mov r1, r0, lsl #0x1
ldrsh r0, [r2, r3]
@@ -1216,7 +1216,7 @@ func_ov05_0210199c: ; 0x0210199c
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02101aa8: .word data_027e0384
_02101aac: .word data_02050f54
_02101aac: .word gSinCosTable
_02101ab0: .word data_027e037c
_02101ab4: .word data_027e03c8
arm_func_end func_ov05_0210199c
@@ -3584,24 +3584,24 @@ func_ov05_02103ad4: ; 0x02103ad4
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
add r1, r0, #1
ldr r0, _02103af0 ; =data_02050f54
ldr r0, _02103af0 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r0, [r0, r1]
bx lr
.align 2, 0
_02103af0: .word data_02050f54
_02103af0: .word gSinCosTable
arm_func_end func_ov05_02103ad4
.global func_ov05_02103af4
arm_func_start func_ov05_02103af4
func_ov05_02103af4: ; 0x02103af4
mov r1, r0, asr #0x4
ldr r0, _02103b08 ; =data_02050f54
ldr r0, _02103b08 ; =gSinCosTable
mov r1, r1, lsl #0x2
ldrsh r0, [r0, r1]
bx lr
.align 2, 0
_02103b08: .word data_02050f54
_02103b08: .word gSinCosTable
arm_func_end func_ov05_02103af4
.global func_ov05_02103b0c
@@ -5325,7 +5325,7 @@ func_ov05_02104f28: ; 0x02104f28
str r1, [sp, #8]
add r0, r8, #0x200
ldrh r3, [r0, #0x48]
ldr r2, _0210513c ; =data_02050f54
ldr r2, _0210513c ; =gSinCosTable
mov r4, #0xc000
mov r3, r3, asr #0x4
mov r3, r3, lsl #0x2
@@ -5399,7 +5399,7 @@ _021050cc:
_02105130: .word data_027e0f64
_02105134: .word gPlayerPos
_02105138: .word data_ov00_020e9360
_0210513c: .word data_02050f54
_0210513c: .word gSinCosTable
arm_func_end func_ov05_02104f28
.global func_ov05_02105140
@@ -6102,7 +6102,7 @@ _02105a38:
mov r1, r5, asr #0x4
mov r2, r1, lsl #0x1
mov r7, r2, lsl #0x1
ldr r5, _02105c10 ; =data_02050f54
ldr r5, _02105c10 ; =gSinCosTable
add r2, r2, #1
mov r2, r2, lsl #0x1
ldrsh lr, [r5, r7]
@@ -6210,7 +6210,7 @@ _02105c00: .word 0x00000113
_02105c04: .word 0x00000666
_02105c08: .word data_ov05_021124f0
_02105c0c: .word gMapManager
_02105c10: .word data_02050f54
_02105c10: .word gSinCosTable
_02105c14: .word 0x00000266
_02105c18: .word 0x00000115
_02105c1c: .word 0x00000116
@@ -6281,7 +6281,7 @@ _02105ce4:
mov r1, r6, asr #0x4
mov r2, r1, lsl #0x1
add r1, r2, #1
ldr r3, _02105d80 ; =data_02050f54
ldr r3, _02105d80 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r2, [r3, r2]
mov r1, r1, lsl #0x1
@@ -6313,7 +6313,7 @@ _02105ce4:
.align 2, 0
_02105d78: .word data_ov05_021124f0
_02105d7c: .word data_ov05_021125ac
_02105d80: .word data_02050f54
_02105d80: .word gSinCosTable
arm_func_end func_ov05_02105c28
.global func_ov05_02105d84
@@ -6555,7 +6555,7 @@ _02106074:
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
add r1, r2, #1
ldr r3, _02106604 ; =data_02050f54
ldr r3, _02106604 ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r1, r1, lsl #0x1
ldrsh r2, [r3, r2]
@@ -6911,7 +6911,7 @@ _021065f4: .word 0x00000ccd
_021065f8: .word data_ov05_0211257c
_021065fc: .word data_ov05_0211258c
_02106600: .word 0x00000266
_02106604: .word data_02050f54
_02106604: .word gSinCosTable
_02106608: .word data_ov05_021124f0
_0210660c: .word data_ov05_021125fc
_02106610: .word data_ov05_0211255c
@@ -8004,7 +8004,7 @@ _021074c8:
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
mov r1, r0, asr #0x4
ldr r0, _021075b0 ; =data_02050f54
ldr r0, _021075b0 ; =gSinCosTable
mov r1, r1, lsl #0x2
ldrsh r0, [r0, r1]
mov r3, #0
@@ -8049,7 +8049,7 @@ _021075a0: .word 0x0000030a
_021075a4: .word 0x00000614
_021075a8: .word data_ov00_020eec9c
_021075ac: .word 0x00002aab
_021075b0: .word data_02050f54
_021075b0: .word gSinCosTable
_021075b4: .word data_ov05_021126ac
_021075b8: .word data_ov05_021126d4
arm_func_end func_ov05_021073b8
@@ -8126,7 +8126,7 @@ _02107664:
movle r4, #0
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r0, [r0]
ldr r2, _0210785c ; =data_02050f54
ldr r2, _0210785c ; =gSinCosTable
add r1, sp, #0xc
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -8230,7 +8230,7 @@ _021077e8:
_02107850: .word data_027e0e58
_02107854: .word 0x0000011f
_02107858: .word data_ov05_0211274c
_0210785c: .word data_02050f54
_0210785c: .word gSinCosTable
_02107860: .word data_ov05_021126ac
_02107864: .word gActorManager
_02107868: .word 0x00000614
@@ -11347,7 +11347,7 @@ _0210a208:
add r0, r2, r0
str r0, [sp, #0x6c]
ldr r0, [r3, #0x28]
ldr r3, _0210a4c0 ; =data_02050f54
ldr r3, _0210a4c0 ; =gSinCosTable
add r0, r1, r0
str r0, [sp, #0x70]
ldrh r1, [r5, #0x78]
@@ -11515,7 +11515,7 @@ _0210a4ac:
_0210a4b4: .word gItemManager
_0210a4b8: .word data_ov05_02112308
_0210a4bc: .word data_ov05_02112770
_0210a4c0: .word data_02050f54
_0210a4c0: .word gSinCosTable
_0210a4c4: .word data_ov00_020e9c88
_0210a4c8: .word func_ov05_0210a4d4
_0210a4cc: .word data_ov05_021122f0
@@ -11552,7 +11552,7 @@ func_ov05_0210a4e0: ; 0x0210a4e0
add r0, r2, r0
str r0, [sp, #0x34]
ldr r0, [r3, #0x28]
ldr r3, _0210a604 ; =data_02050f54
ldr r3, _0210a604 ; =gSinCosTable
add r0, r1, r0
str r0, [sp, #0x38]
ldrh r1, [r4, #0x78]
@@ -11609,7 +11609,7 @@ _0210a5e4:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0210a600: .word data_ov05_02112770
_0210a604: .word data_02050f54
_0210a604: .word gSinCosTable
_0210a608: .word gItemManager
_0210a60c: .word data_ov00_020e9360
arm_func_end func_ov05_0210a4e0
@@ -12263,7 +12263,7 @@ _0210ae98:
mov r0, r5
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r0, [r0]
ldr r3, _0210b288 ; =data_02050f54
ldr r3, _0210b288 ; =gSinCosTable
mov r1, #0x800
mov r0, r0, asr #0x4
mov r7, r0, lsl #0x1
@@ -12338,7 +12338,7 @@ _0210ae98:
sub ip, r0, #0x1800
add r0, r1, #1
mov r2, r1, lsl #0x1
ldr r1, _0210b288 ; =data_02050f54
ldr r1, _0210b288 ; =gSinCosTable
mov r0, r0, lsl #0x1
ldrsh r7, [r1, r2]
ldrsh r6, [r1, r0]
@@ -12511,7 +12511,7 @@ _0210b264:
.align 2, 0
_0210b280: .word gActorManager
_0210b284: .word gAdventureFlags
_0210b288: .word data_02050f54
_0210b288: .word gSinCosTable
_0210b28c: .word 0x0000ffff
_0210b290: .word gMapManager
_0210b294: .word data_027e0fb8
@@ -13570,7 +13570,7 @@ _0210c040:
mov r1, r5, asr #0x4
mov r1, r1, lsl #0x1
add r2, r1, #1
ldr r3, _0210c204 ; =data_02050f54
ldr r3, _0210c204 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r6, [r3, r1]
ldr r1, _0210c208 ; =0x0000019a
@@ -13636,7 +13636,7 @@ _0210c19c:
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0210c200: .word data_027e0fb8
_0210c204: .word data_02050f54
_0210c204: .word gSinCosTable
_0210c208: .word 0x0000019a
arm_func_end func_ov05_0210bf50
@@ -14273,7 +14273,7 @@ _0210cacc:
str r1, [r4, #4]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r1, [r0]
ldr r5, _0210cb7c ; =data_02050f54
ldr r5, _0210cb7c ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -14305,7 +14305,7 @@ _0210cacc:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0210cb7c: .word data_02050f54
_0210cb7c: .word gSinCosTable
arm_func_end func_ov05_0210ca80
.global func_ov05_0210cb80
@@ -15064,7 +15064,7 @@ _0210d4e8:
mov r1, r1, lsr #0x10
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
ldr r1, _0210d6d8 ; =data_02050f54
ldr r1, _0210d6d8 ; =gSinCosTable
mov r2, r3, lsl #0x1
ldrsh r2, [r1, r2]
add r1, r1, r3, lsl #1
@@ -15146,7 +15146,7 @@ _0210d6c4:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0210d6d4: .word data_027e0764
_0210d6d8: .word data_02050f54
_0210d6d8: .word gSinCosTable
arm_func_end func_ov05_0210d474
.global func_ov05_0210d6dc
@@ -16983,7 +16983,7 @@ _0210ef74:
mov r2, r0, lsl #0x1
add r1, r2, #1
ldr r0, _0210f69c ; =data_ov00_020dc550
ldr r3, _0210f6a0 ; =data_02050f54
ldr r3, _0210f6a0 ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r1, r1, lsl #0x1
ldrsh r2, [r3, r2]
@@ -17463,7 +17463,7 @@ _0210f690: .word data_ov00_020dc558
_0210f694: .word 0x000002aa
_0210f698: .word data_ov00_020e5adc
_0210f69c: .word data_ov00_020dc550
_0210f6a0: .word data_02050f54
_0210f6a0: .word gSinCosTable
_0210f6a4: .word data_ov00_020dc554
_0210f6a8: .word 0x88888889
_0210f6ac: .word data_027e0c54
@@ -17710,7 +17710,7 @@ _0210f8dc:
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
add r1, r0, #1
ldr r0, _021101dc ; =data_02050f54
ldr r0, _021101dc ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r0, r1]
ldr r0, _021101e0 ; =data_ov05_02112acc
@@ -18003,7 +18003,7 @@ _0210fdcc:
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
mov r1, r0, asr #0x4
ldr r0, _021101dc ; =data_02050f54
ldr r0, _021101dc ; =gSinCosTable
add r0, r0, r1, lsl #2
ldrsh r1, [r0, #2]
mov r0, r1, asr #0x1f
@@ -18276,7 +18276,7 @@ _021101cc:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021101d8: .word data_027e0fb8
_021101dc: .word data_02050f54
_021101dc: .word gSinCosTable
_021101e0: .word data_ov05_02112acc
_021101e4: .word 0x00000ccd
_021101e8: .word func_ov05_02110220
@@ -19087,7 +19087,7 @@ _02110c50:
strh r1, [sp, #0x16]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r2, [r0]
ldr r1, _02110e00 ; =data_02050f54
ldr r1, _02110e00 ; =gSinCosTable
mov r0, r5
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x2
@@ -19096,7 +19096,7 @@ _02110c50:
strh r1, [sp, #0x12]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r2, [r0]
ldr r1, _02110e00 ; =data_02050f54
ldr r1, _02110e00 ; =gSinCosTable
mov r0, r5
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
@@ -19136,7 +19136,7 @@ _02110d30:
strh r1, [sp, #0x10]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r2, [r0]
ldr r1, _02110e00 ; =data_02050f54
ldr r1, _02110e00 ; =gSinCosTable
mov r0, r5
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x2
@@ -19145,7 +19145,7 @@ _02110d30:
strh r1, [sp, #0xc]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r2, [r0]
ldr r1, _02110e00 ; =data_02050f54
ldr r1, _02110e00 ; =gSinCosTable
mov r0, r5
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
@@ -19172,7 +19172,7 @@ _02110df0: .word data_027e0fd4
_02110df4: .word 0x00000253
_02110df8: .word 0x000001e7
_02110dfc: .word data_ov05_021123a0
_02110e00: .word data_02050f54
_02110e00: .word gSinCosTable
_02110e04: .word func_ov05_0210f6e4
_02110e08: .word data_027e0e58
arm_func_end func_ov05_02110be8
@@ -19212,7 +19212,7 @@ func_ov05_02110e28: ; 0x02110e28
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
add r1, r2, #1
ldr r3, _02110f40 ; =data_02050f54
ldr r3, _02110f40 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r2, [r3, r2]
mov r1, r1, lsl #0x1
@@ -19265,7 +19265,7 @@ _02110ef4:
bl _ZN13LinkStateBase18func_ov00_020a8ab0Ei
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02110f40: .word data_02050f54
_02110f40: .word gSinCosTable
_02110f44: .word data_ov00_020eec9c
_02110f48: .word data_ov05_02112b24
_02110f4c: .word data_ov00_020e5694
asm/ov09.inc
+1 -1
View File
@@ -19,7 +19,7 @@
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern _ZNK11ItemManager19GetEquippedShipPartEj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_0205785c
.extern data_02057878
asm/ov09.s
+10 -10
View File
@@ -4777,7 +4777,7 @@ func_ov09_0211530c: ; 0x0211530c
bl func_ov00_020a9624
ldrh r1, [r9, #0x94]
mov r4, r0
ldr r3, _02115404 ; =data_02050f54
ldr r3, _02115404 ; =gSinCosTable
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
mov r1, r2, lsl #0x1
@@ -4825,7 +4825,7 @@ func_ov09_0211530c: ; 0x0211530c
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02115404: .word data_02050f54
_02115404: .word gSinCosTable
arm_func_end func_ov09_0211530c
.global func_ov09_02115408
@@ -5068,7 +5068,7 @@ _021156e8:
bl func_ov09_02115e38
add r0, r6, #0x5c
add r11, r6, #0x1ac
ldr r7, _02115a9c ; =data_02050f54
ldr r7, _02115a9c ; =gSinCosTable
str r0, [sp, #0xc]
mov r4, #0
add r8, sp, #0xac
@@ -5291,7 +5291,7 @@ _02115a44:
add sp, sp, #0xdc
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02115a9c: .word data_02050f54
_02115a9c: .word gSinCosTable
_02115aa0: .word data_ov09_0211e870
arm_func_end func_ov09_021156a4
@@ -17932,7 +17932,7 @@ func_ov09_0211cd40: ; 0x0211cd40
bl func_01ffa8d4
ldrh r0, [r4, #0x58]
mov r5, #0x190000
ldr r2, _0211ce60 ; =data_02050f54
ldr r2, _0211ce60 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
str r5, [sp]
@@ -17999,7 +17999,7 @@ func_ov09_0211cd40: ; 0x0211cd40
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0211ce60: .word data_02050f54
_0211ce60: .word gSinCosTable
_0211ce64: .word 0x00001555
_0211ce68: .word data_027e037c
_0211ce6c: .word data_027e03c8
@@ -18213,7 +18213,7 @@ func_ov09_0211d00c: ; 0x0211d00c
add r4, r1, #0
add r5, r0, #0
ldrh r0, [r4, #0x14]
ldr r3, _0211d08c ; =data_02050f54
ldr r3, _0211d08c ; =gSinCosTable
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -18224,7 +18224,7 @@ func_ov09_0211d00c: ; 0x0211d00c
add r0, sp, #0x24
bl func_01ff8230
ldrh r0, [r4, #0x10]
ldr r3, _0211d08c ; =data_02050f54
ldr r3, _0211d08c ; =gSinCosTable
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -18240,7 +18240,7 @@ func_ov09_0211d00c: ; 0x0211d00c
blx func_01ff8690
ldrh r1, [r4, #0x16]
ldrh r0, [r4, #0x12]
ldr r3, _0211d08c ; =data_02050f54
ldr r3, _0211d08c ; =gSinCosTable
add r0, r1, r0
lsl r0, r0, #0x10
lsr r0, r0, #0x10
@@ -18269,7 +18269,7 @@ _0211d07c:
add sp, #0x48
pop {r3, r4, r5, pc}
.align 2, 0
_0211d08c: .word data_02050f54
_0211d08c: .word gSinCosTable
thumb_func_end func_ov09_0211d00c
.global func_ov09_0211d090
asm/ov12.inc
+1 -1
View File
@@ -121,7 +121,7 @@
.extern _ZNK11ItemManager18func_ov00_020ad594Ei
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02057200
.extern data_02068e9c
asm/ov12.s
+29 -29
View File
@@ -2477,7 +2477,7 @@ func_ov12_02114bf8: ; 0x02114bf8
mov r6, r0
ldrh r0, [r6, #0x78]
mov r4, #0
ldr r2, _02114f0c ; =data_02050f54
ldr r2, _02114f0c ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -2679,7 +2679,7 @@ _02114f00:
add sp, sp, #0x54
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02114f0c: .word data_02050f54
_02114f0c: .word gSinCosTable
_02114f10: .word data_ov12_02137c64
_02114f14: .word data_ov12_02134538
_02114f18: .word data_ov12_0213453c
@@ -3899,7 +3899,7 @@ _02116014:
add r0, sp, #0x34
bl func_01ffbe34
ldrh r4, [r4, #0x78]
ldr r3, _02116188 ; =data_02050f54
ldr r3, _02116188 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r4, asr #0x4
mov r2, r1, lsl #0x1
@@ -3917,7 +3917,7 @@ _02116014:
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
add r1, r3, #1
ldr r2, _02116188 ; =data_02050f54
ldr r2, _02116188 ; =gSinCosTable
mov r3, r3, lsl #0x1
mov r1, r1, lsl #0x1
ldrsh lr, [r2, r3]
@@ -3983,7 +3983,7 @@ _02116178: .word data_027e0d3c
_0211617c: .word data_ov12_02137c68
_02116180: .word data_ov00_020ee698
_02116184: .word data_ov12_02137d20
_02116188: .word data_02050f54
_02116188: .word gSinCosTable
_0211618c: .word data_027e0d0c
_02116190: .word data_027e0c38
arm_func_end func_ov12_02115ed0
@@ -10691,7 +10691,7 @@ _0211b7a4:
bl func_ov00_020a9624
mov r4, r0
add r0, r7, #1
ldr r3, _0211b8b8 ; =data_02050f54
ldr r3, _0211b8b8 ; =gSinCosTable
mov r2, r7, lsl #0x1
mov r1, r0, lsl #0x1
ldrsh r2, [r3, r2]
@@ -10749,7 +10749,7 @@ _0211b894:
bl func_ov00_020aa0f0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0211b8b8: .word data_02050f54
_0211b8b8: .word gSinCosTable
arm_func_end func_ov12_0211b698
.global func_ov12_0211b8bc
@@ -24262,8 +24262,8 @@ _02126868:
ldr r0, [r5, #0x2c]
_02126888:
ldrh r2, [r5, #0xd6]
ldr r1, _0212692c ; =data_02050f54
ldr r3, _0212692c ; =data_02050f54
ldr r1, _0212692c ; =gSinCosTable
ldr r3, _0212692c ; =gSinCosTable
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
add r2, r2, #1
@@ -24303,7 +24303,7 @@ _02126888:
str r0, [r5, #0x3c]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0212692c: .word data_02050f54
_0212692c: .word gSinCosTable
arm_func_end func_ov12_021267d0
.global func_ov12_02126930
@@ -27382,8 +27382,8 @@ _021291d8:
ldmia sp!, {r4, r5, r6, pc}
_021291dc:
ldrh r2, [r5, #0xd6]
ldr r1, _02129280 ; =data_02050f54
ldr r3, _02129280 ; =data_02050f54
ldr r1, _02129280 ; =gSinCosTable
ldr r3, _02129280 ; =gSinCosTable
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
add r2, r2, #1
@@ -27423,7 +27423,7 @@ _021291dc:
str r0, [r5, #0x3c]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02129280: .word data_02050f54
_02129280: .word gSinCosTable
arm_func_end func_ov12_021290cc
.global func_ov12_02129284
@@ -29804,7 +29804,7 @@ func_ov12_0212b188: ; 0x0212b188
bl func_0201987c
ldrh r2, [r4, #0x20]
ldr r1, _0212b260 ; =data_ov12_02134928
ldr r3, _0212b264 ; =data_02050f54
ldr r3, _0212b264 ; =gSinCosTable
ldr r1, [r1, r2, lsl #2]
add r0, sp, #0xc
str r1, [sp, #0x30]
@@ -29839,7 +29839,7 @@ func_ov12_0212b188: ; 0x0212b188
.align 2, 0
_0212b25c: .word data_ov00_020e9360
_0212b260: .word data_ov12_02134928
_0212b264: .word data_02050f54
_0212b264: .word gSinCosTable
arm_func_end func_ov12_0212b188
.global func_ov12_0212b268
@@ -30989,7 +30989,7 @@ _0212c10c:
ldr r0, [r7, #4]
ldr r2, [r6, #4]
ldr r0, [r0, #0x240]
ldr r1, _0212c1bc ; =data_02050f54
ldr r1, _0212c1bc ; =gSinCosTable
add r0, r2, r0
str r0, [r6, #4]
ldr r3, [r7, #4]
@@ -31031,7 +31031,7 @@ _0212c1ac: .word gPlayerVel
_0212c1b0: .word gPlayerAngle
_0212c1b4: .word gActorManager
_0212c1b8: .word data_027e0c68
_0212c1bc: .word data_02050f54
_0212c1bc: .word gSinCosTable
arm_func_end func_ov12_0212bff0
.global func_ov12_0212c1c0
@@ -35805,7 +35805,7 @@ _0212fc68:
ldrh r0, [r4, #0xc]
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
ldr r1, _0212fe94 ; =data_02050f54
ldr r1, _0212fe94 ; =gSinCosTable
mov r2, r0, lsl #0x1
add r0, r0, #1
ldrsh ip, [r1, r2]
@@ -35875,7 +35875,7 @@ _0212fe78:
ldmia sp!, {r4, pc}
.align 2, 0
_0212fe90: .word 0xfffff666
_0212fe94: .word data_02050f54
_0212fe94: .word gSinCosTable
_0212fe98: .word 0x000004cd
_0212fe9c: .word gMapManager
_0212fea0: .word 0x0000026e
@@ -36045,7 +36045,7 @@ func_ov12_021300c4: ; 0x021300c4
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _0213011c ; =data_02050f54
ldr r3, _0213011c ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -36064,7 +36064,7 @@ func_ov12_021300c4: ; 0x021300c4
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0213011c: .word data_02050f54
_0213011c: .word gSinCosTable
arm_func_end func_ov12_021300c4
.global func_ov12_02130120
@@ -36117,7 +36117,7 @@ _021301b4:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _02130244 ; =data_02050f54
ldr r1, _02130244 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh lr, [r1, r2]
mov r0, r0, lsl #0x1
@@ -36151,7 +36151,7 @@ _021301b4:
add sp, sp, #0x48
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02130244: .word data_02050f54
_02130244: .word gSinCosTable
_02130248: .word data_027e0d3c
arm_func_end func_ov12_02130120
@@ -37839,7 +37839,7 @@ _0213189c:
_021318ac:
sub r0, ip, #0x8000
mov r9, #0
ldr r7, _02131a20 ; =data_02050f54
ldr r7, _02131a20 ; =gSinCosTable
ldr r6, _02131a24 ; =0x0000ffff
strh r0, [sp, #0x1a]
add r4, r10, #0x8c
@@ -37934,7 +37934,7 @@ _02131a00:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02131a1c: .word data_027e0764
_02131a20: .word data_02050f54
_02131a20: .word gSinCosTable
_02131a24: .word 0x0000ffff
_02131a28: .word gMapManager
_02131a2c: .word data_ov12_02137680
@@ -37960,7 +37960,7 @@ func_ov12_02131a30: ; 0x02131a30
mul r1, r0, r1
ldrh r0, [r4, #0x78]
add r2, r1, #0x800
ldr ip, _02131b1c ; =data_02050f54
ldr ip, _02131b1c ; =gSinCosTable
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
ldrsh r1, [ip, r0]
@@ -38005,7 +38005,7 @@ _02131b0c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02131b18: .word 0x00000aab
_02131b1c: .word data_02050f54
_02131b1c: .word gSinCosTable
arm_func_end func_ov12_02131a30
.global func_ov12_02131b20
@@ -41151,7 +41151,7 @@ func_ov12_021343bc: ; 0x021343bc
mov r0, #1
strb r0, [r4, #0xa4]
ldr r0, [r4, #0x60]
ldr r2, _0213449c ; =data_02050f54
ldr r2, _0213449c ; =gSinCosTable
cmp r0, #0x14
moveq r0, #0x8000
rsbeq r0, r0, #0
@@ -41198,7 +41198,7 @@ func_ov12_021343bc: ; 0x021343bc
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0213449c: .word data_02050f54
_0213449c: .word gSinCosTable
_021344a0: .word data_ov00_020eec9c
_021344a4: .word data_027e0e2c
_021344a8: .word func_ov12_021342e8
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -142,7 +142,7 @@
.extern _ZNK11ItemManager18func_ov00_020ad560Ei
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02052f54
.extern data_02056be4
.extern data_02063e4c
asm/ov14/ov14_0211f640.s
+62 -62
View File
@@ -772,7 +772,7 @@ func_ov14_0211ff04: ; 0x0211ff04
mov r0, #0
str r0, [r4, #0x130]
ldrh r0, [r4, #0x24]
ldr r2, _0212003c ; =data_02050f54
ldr r2, _0212003c ; =gSinCosTable
cmp r0, #1
moveq r0, #0x78
movne r0, #0x3c
@@ -845,7 +845,7 @@ _0212002c:
str r1, [r4, #0xa0]
ldmia sp!, {r4, pc}
.align 2, 0
_0212003c: .word data_02050f54
_0212003c: .word gSinCosTable
_02120040: .word 0x00001266
_02120044: .word data_027e0fd4
_02120048: .word data_ov14_0215abec
@@ -1306,7 +1306,7 @@ _02120618:
b _02120710
_02120688:
ldrh r1, [r6, #0x78]
ldr r2, _02120770 ; =data_02050f54
ldr r2, _02120770 ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r4, r1, lsl #0x1
@@ -1368,7 +1368,7 @@ _02120760: .word 0x0000019a
_02120764: .word 0x00001555
_02120768: .word 0xfffff1c7
_0212076c: .word gActorManager
_02120770: .word data_02050f54
_02120770: .word gSinCosTable
arm_func_end func_ov14_02120300
.global func_ov14_02120774
@@ -1601,7 +1601,7 @@ _02120a7c: .word data_027e0d0c
arm_func_start func_ov14_02120a80
func_ov14_02120a80: ; 0x02120a80
ldrh r1, [r1, #0x78]
ldr ip, _02120ac0 ; =data_02050f54
ldr ip, _02120ac0 ; =gSinCosTable
mov r2, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -1617,7 +1617,7 @@ func_ov14_02120a80: ; 0x02120a80
strh r1, [r0, #0x54]
bx lr
.align 2, 0
_02120ac0: .word data_02050f54
_02120ac0: .word gSinCosTable
arm_func_end func_ov14_02120a80
.global func_ov14_02120ac4
@@ -1686,7 +1686,7 @@ func_ov14_02120ac4: ; 0x02120ac4
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r0, [r5, #0x78]
ldr lr, _02120c80 ; =data_02050f54
ldr lr, _02120c80 ; =gSinCosTable
ldr r4, _02120c84 ; =0x000004cd
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
@@ -1736,7 +1736,7 @@ _02120c70:
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02120c80: .word data_02050f54
_02120c80: .word gSinCosTable
_02120c84: .word 0x000004cd
_02120c88: .word data_027e0ffc
_02120c8c: .word 0x0000019b
@@ -1766,7 +1766,7 @@ func_ov14_02120c98: ; 0x02120c98
add r2, ip, #1
add r0, r1, #0x8000
mov r1, r0, lsl #0x10
ldr r3, _02120d54 ; =data_02050f54
ldr r3, _02120d54 ; =gSinCosTable
mov ip, ip, lsl #0x1
ldrsh ip, [r3, ip]
mov r0, r2, lsl #0x1
@@ -1795,7 +1795,7 @@ func_ov14_02120c98: ; 0x02120c98
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02120d54: .word data_02050f54
_02120d54: .word gSinCosTable
arm_func_end func_ov14_02120c98
.global func_ov14_02120d58
@@ -1954,7 +1954,7 @@ func_ov14_02120ee4: ; 0x02120ee4
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r1, [r8, #0x78]
ldr r2, _021213ac ; =data_02050f54
ldr r2, _021213ac ; =gSinCosTable
add r0, sp, #0xa8
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -1974,7 +1974,7 @@ func_ov14_02120ee4: ; 0x02120ee4
beq _02121030
add r0, r8, #0x100
ldrsh r1, [r0, #0xb2]
ldr r2, _021213ac ; =data_02050f54
ldr r2, _021213ac ; =gSinCosTable
add r0, sp, #0x78
add r1, r3, r1
mov r1, r1, lsl #0x10
@@ -2250,7 +2250,7 @@ _02121354:
add sp, sp, #0xcc
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_021213ac: .word data_02050f54
_021213ac: .word gSinCosTable
_021213b0: .word 0x00000333
_021213b4: .word 0x010700c0
_021213b8: .word 0x4210ffff
@@ -3221,7 +3221,7 @@ _0212204c:
str r3, [r5, #0x68]
add r7, r5, #0x200
ldrh r0, [r7, #0x68]
ldr r9, _02122ac4 ; =data_02050f54
ldr r9, _02122ac4 ; =gSinCosTable
ldr r6, _02122ac8 ; =0x000004cd
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
@@ -3910,7 +3910,7 @@ _02122ab4: .word data_ov14_0215ac40
_02122ab8: .word 0x000014cd
_02122abc: .word 0x0000059a
_02122ac0: .word 0x00000333
_02122ac4: .word data_02050f54
_02122ac4: .word gSinCosTable
_02122ac8: .word 0x000004cd
_02122acc: .word gMapManager
_02122ad0: .word 0x00000e66
@@ -4900,7 +4900,7 @@ func_ov14_0212373c: ; 0x0212373c
addeq sp, sp, #0x3c
ldmeqia sp!, {r3, r4, pc}
ldrh r1, [r4, #0x78]
ldr r3, _021237e4 ; =data_02050f54
ldr r3, _021237e4 ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4931,7 +4931,7 @@ func_ov14_0212373c: ; 0x0212373c
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021237e4: .word data_02050f54
_021237e4: .word gSinCosTable
_021237e8: .word data_ov00_020e9370
arm_func_end func_ov14_0212373c
@@ -6671,7 +6671,7 @@ _02124e80:
ldmia sp!, {r4, pc}
_02124ee0:
ldrh r1, [r4, #0x78]
ldr r3, _02124f50 ; =data_02050f54
ldr r3, _02124f50 ; =gSinCosTable
add r0, sp, #0x38
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -6699,7 +6699,7 @@ _02124ee0:
ldmia sp!, {r4, pc}
.align 2, 0
_02124f4c: .word data_027e0d3c
_02124f50: .word data_02050f54
_02124f50: .word gSinCosTable
_02124f54: .word data_02063e4c
arm_func_end func_ov14_02124e4c
@@ -6720,7 +6720,7 @@ func_ov14_02124f58: ; 0x02124f58
add r0, r4, #0x100
ldrsh r1, [r0, #0x7c]
ldrsh r2, [r4, #0x78]
ldr r3, _02124fe4 ; =data_02050f54
ldr r3, _02124fe4 ; =gSinCosTable
add r0, sp, #0
add r1, r2, r1
mov r1, r1, lsl #0x10
@@ -6742,7 +6742,7 @@ func_ov14_02124f58: ; 0x02124f58
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02124fe4: .word data_02050f54
_02124fe4: .word gSinCosTable
arm_func_end func_ov14_02124f58
.global func_ov14_02124fe8
@@ -7714,7 +7714,7 @@ func_ov14_02125c24: ; 0x02125c24
sub sp, sp, #0x30
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02125c90 ; =data_02050f54
ldr r3, _02125c90 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -7738,7 +7738,7 @@ func_ov14_02125c24: ; 0x02125c24
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_02125c90: .word data_02050f54
_02125c90: .word gSinCosTable
_02125c94: .word data_ov14_02153c18
arm_func_end func_ov14_02125c24
@@ -8528,7 +8528,7 @@ func_ov14_021264b0: ; 0x021264b0
sub sp, sp, #0x30
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02126528 ; =data_02050f54
ldr r3, _02126528 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8555,7 +8555,7 @@ func_ov14_021264b0: ; 0x021264b0
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_02126528: .word data_02050f54
_02126528: .word gSinCosTable
arm_func_end func_ov14_021264b0
.global func_ov14_0212652c
@@ -8576,7 +8576,7 @@ func_ov14_0212652c: ; 0x0212652c
str r1, [sp, #0x38]
str r4, [sp, #0x48]
ldrh r4, [r5, #0xc]
ldr r3, _021265e8 ; =data_02050f54
ldr r3, _021265e8 ; =gSinCosTable
add r0, sp, #4
mov r1, r4, asr #0x4
mov r2, r1, lsl #0x1
@@ -8609,7 +8609,7 @@ func_ov14_0212652c: ; 0x0212652c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021265e4: .word 0x00000666
_021265e8: .word data_02050f54
_021265e8: .word gSinCosTable
_021265ec: .word data_027e0e58
_021265f0: .word 0x00000272
arm_func_end func_ov14_0212652c
@@ -9976,7 +9976,7 @@ _0212786c:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0212796c ; =data_02050f54
ldr r2, _0212796c ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -10006,7 +10006,7 @@ _0212786c:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0212796c ; =data_02050f54
ldr r2, _0212796c ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -10034,7 +10034,7 @@ _0212786c:
_02127960: .word data_027e0f64
_02127964: .word 0x45800000
_02127968: .word 0x46800000
_0212796c: .word data_02050f54
_0212796c: .word gSinCosTable
arm_func_end func_ov14_021277f0
.global func_ov14_02127970
@@ -10625,7 +10625,7 @@ func_ov14_02127f84: ; 0x02127f84
mov r1, r0, lsl #0x1
add r0, r1, #1
mov r2, r0, lsl #0x1
ldr r3, _0212810c ; =data_02050f54
ldr r3, _0212810c ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
@@ -10690,7 +10690,7 @@ _021280dc:
_02128100: .word 0xfffff004
_02128104: .word 0x45800000
_02128108: .word 0x46800000
_0212810c: .word data_02050f54
_0212810c: .word gSinCosTable
_02128110: .word 0x00000547
arm_func_end func_ov14_02127f84
@@ -11182,7 +11182,7 @@ _021287ac:
add r0, r0, #1
strh r0, [r7, #0x7a]
ldrh r0, [r7, #0x7a]
ldr r4, _0212899c ; =data_02050f54
ldr r4, _0212899c ; =gSinCosTable
mov r3, #0
add r0, r0, r0, lsl #1
mov r0, r0, lsl #0xc
@@ -11306,7 +11306,7 @@ _0212898c: .word data_027e0ffc
_02128990: .word 0x000001b2
_02128994: .word gAdventureFlags
_02128998: .word 0x0b60b60b
_0212899c: .word data_02050f54
_0212899c: .word gSinCosTable
_021289a0: .word gPlayer
arm_func_end func_ov14_02128328
@@ -11660,7 +11660,7 @@ func_ov14_02128e28: ; 0x02128e28
mov r1, r0, lsl #0x1
mov ip, r1, lsl #0x1
add r1, r1, #1
ldr r3, _02129318 ; =data_02050f54
ldr r3, _02129318 ; =gSinCosTable
mov r2, r1, lsl #0x1
ldrsh r1, [r3, ip]
ldrsh r2, [r3, r2]
@@ -11727,7 +11727,7 @@ _02128f5c:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02129318 ; =data_02050f54
ldr r2, _02129318 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -11970,7 +11970,7 @@ _021292f4:
.align 2, 0
_02129310: .word 0x45800000
_02129314: .word 0x46800000
_02129318: .word data_02050f54
_02129318: .word gSinCosTable
_0212931c: .word 0xfffff148
_02129320: .word 0x00000eb8
_02129324: .word data_02052f54
@@ -12249,7 +12249,7 @@ func_ov14_02129674: ; 0x02129674
mov r1, r0, lsl #0x1
add r0, r1, #1
mov r2, r0, lsl #0x1
ldr r3, _021297fc ; =data_02050f54
ldr r3, _021297fc ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
@@ -12314,7 +12314,7 @@ _021297cc:
_021297f0: .word 0xfffff004
_021297f4: .word 0x45800000
_021297f8: .word 0x46800000
_021297fc: .word data_02050f54
_021297fc: .word gSinCosTable
_02129800: .word 0x00000547
arm_func_end func_ov14_02129674
@@ -13261,7 +13261,7 @@ _0212a390:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0212a45c ; =data_02050f54
ldr r2, _0212a45c ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -13307,7 +13307,7 @@ _0212a430:
.align 2, 0
_0212a454: .word 0x45800000
_0212a458: .word 0x46800000
_0212a45c: .word data_02050f54
_0212a45c: .word gSinCosTable
arm_func_end func_ov14_0212a2c0
.global func_ov14_0212a460
@@ -16853,7 +16853,7 @@ func_ov14_0212d1c4: ; 0x0212d1c4
func_ov14_0212d1cc: ; 0x0212d1cc
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x24
ldr r2, _0212d20c ; =data_02050f54
ldr r2, _0212d20c ; =gSinCosTable
mov r4, r0
ldrsh r1, [r2]
ldrsh r2, [r2, #2]
@@ -16868,7 +16868,7 @@ func_ov14_0212d1cc: ; 0x0212d1cc
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0212d20c: .word data_02050f54
_0212d20c: .word gSinCosTable
arm_func_end func_ov14_0212d1cc
.global func_ov14_0212d210
@@ -17036,7 +17036,7 @@ func_ov14_0212d384: ; 0x0212d384
mov r0, r0, lsl #0x1
add r1, r0, #1
mov r2, r1, lsl #0x1
ldr r3, _0212d498 ; =data_02050f54
ldr r3, _0212d498 ; =gSinCosTable
mov r1, r0, lsl #0x1
ldr r0, [r4, #0xb4]
ldrsh r2, [r3, r2]
@@ -17044,7 +17044,7 @@ func_ov14_0212d384: ; 0x0212d384
add r0, r0, #0x28
blx func_01ff81f8
ldrh r1, [r5, #0x60]
ldr r3, _0212d498 ; =data_02050f54
ldr r3, _0212d498 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -17063,7 +17063,7 @@ func_ov14_0212d384: ; 0x0212d384
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0212d494: .word data_ov14_02153cf8
_0212d498: .word data_02050f54
_0212d498: .word gSinCosTable
arm_func_end func_ov14_0212d384
.global func_ov14_0212d49c
@@ -19200,7 +19200,7 @@ func_ov14_0212ee58: ; 0x0212ee58
mov r1, r0, lsl #0x1
mov r4, r1, lsl #0x1
add r1, r1, #1
ldr r3, _0212f088 ; =data_02050f54
ldr r3, _0212f088 ; =gSinCosTable
mov r2, r1, lsl #0x1
ldrsh r1, [r3, r4]
ldrsh r2, [r3, r2]
@@ -19263,7 +19263,7 @@ _0212f078: .word data_ov00_020ec9d6
_0212f07c: .word data_ov00_020ec9d4
_0212f080: .word data_027e0d44
_0212f084: .word 0x001e4081
_0212f088: .word data_02050f54
_0212f088: .word gSinCosTable
arm_func_end func_ov14_0212ee58
.global func_ov14_0212f08c
@@ -22401,7 +22401,7 @@ func_ov14_02131a24: ; 0x02131a24
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02131a7c ; =data_02050f54
ldr r3, _02131a7c ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -22420,7 +22420,7 @@ func_ov14_02131a24: ; 0x02131a24
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02131a7c: .word data_02050f54
_02131a7c: .word gSinCosTable
arm_func_end func_ov14_02131a24
.global func_ov14_02131a80
@@ -22913,7 +22913,7 @@ func_ov14_021320c8: ; 0x021320c8
mov r4, r0
add r0, r4, #0x70
bl func_ov14_0213215c
ldr r2, _02132110 ; =data_02050f54
ldr r2, _02132110 ; =gSinCosTable
add r0, sp, #0
ldrsh r1, [r2]
ldrsh r2, [r2, #2]
@@ -22927,7 +22927,7 @@ func_ov14_021320c8: ; 0x021320c8
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02132110: .word data_02050f54
_02132110: .word gSinCosTable
arm_func_end func_ov14_021320c8
.global func_ov14_02132114
@@ -26213,7 +26213,7 @@ func_ov14_02134c14: ; 0x02134c14
addeq sp, sp, #0x48
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrh r1, [r10, #0xc]
ldr r3, _02134e04 ; =data_02050f54
ldr r3, _02134e04 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -26334,7 +26334,7 @@ _02134d7c:
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02134e04: .word data_02050f54
_02134e04: .word gSinCosTable
_02134e08: .word data_ov14_02153e10
_02134e0c: .word 0x0000099a
_02134e10: .word data_ov00_020e9370
@@ -28723,7 +28723,7 @@ _02136c04:
blx ip
ldrh r2, [r4, #0x78]
mov r0, #0
ldr r1, _02136d04 ; =data_02050f54
ldr r1, _02136d04 ; =gSinCosTable
str r0, [sp, #8]
mov r0, r2, asr #0x4
mov r3, r0, lsl #0x1
@@ -28759,7 +28759,7 @@ _02136c04:
ldmia sp!, {r4, pc}
.align 2, 0
_02136d00: .word 0xfffff666
_02136d04: .word data_02050f54
_02136d04: .word gSinCosTable
_02136d08: .word 0x000004cd
_02136d0c: .word gMapManager
_02136d10: .word 0x0000026e
@@ -29274,7 +29274,7 @@ func_ov14_021373d8: ; 0x021373d8
addeq sp, sp, #0x3c
ldmeqia sp!, {r3, r4, pc}
ldrh r1, [r4, #0x78]
ldr r3, _0213747c ; =data_02050f54
ldr r3, _0213747c ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -29306,7 +29306,7 @@ func_ov14_021373d8: ; 0x021373d8
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0213747c: .word data_02050f54
_0213747c: .word gSinCosTable
_02137480: .word data_ov00_020e9370
arm_func_end func_ov14_021373d8
@@ -30296,7 +30296,7 @@ func_ov14_02138128: ; 0x02138128
addeq sp, sp, #0x24
ldmeqia sp!, {r3, r4, pc}
ldrh r1, [r4, #0x78]
ldr r3, _02138198 ; =data_02050f54
ldr r3, _02138198 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -30315,7 +30315,7 @@ func_ov14_02138128: ; 0x02138128
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02138198: .word data_02050f54
_02138198: .word gSinCosTable
arm_func_end func_ov14_02138128
.global func_ov14_0213819c
@@ -33259,7 +33259,7 @@ _0213a68c:
add r0, r5, #0x100
ldrsh r4, [r0, #0x58]
ldrsh r2, [r0, #0x5a]
ldr r3, _0213a818 ; =data_02050f54
ldr r3, _0213a818 ; =gSinCosTable
mov r1, #0x800
add r2, r4, r2
strh r2, [r0, #0x58]
@@ -33362,7 +33362,7 @@ _0213a7fc:
_0213a80c: .word gPlayer
_0213a810: .word gPlayerLink
_0213a814: .word data_ov00_020eec9c
_0213a818: .word data_02050f54
_0213a818: .word gSinCosTable
_0213a81c: .word gMapManager
arm_func_end func_ov14_0213a4c8
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -138,7 +138,7 @@
.extern _ZNK11ItemManager9HasPotionEj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02057200
.extern data_02063e4c
asm/ov14/ov14_0213b778.s
+39 -39
View File
@@ -3541,7 +3541,7 @@ _0213e0b0:
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
mov r1, r0, lsl #0x1
ldr r2, _0213e140 ; =data_02050f54
ldr r2, _0213e140 ; =gSinCosTable
add r0, r0, #1
ldrsh r1, [r2, r1]
mov r0, r0, lsl #0x1
@@ -3561,7 +3561,7 @@ _0213e12c:
.align 2, 0
_0213e138: .word 0x00000333
_0213e13c: .word 0x0000019a
_0213e140: .word data_02050f54
_0213e140: .word gSinCosTable
arm_func_end func_ov14_0213dfbc
.global func_ov14_0213e144
@@ -4022,11 +4022,11 @@ _0213e788:
mov r7, r3
ldmia r0, {r0, r1, r2}
stmia r7, {r0, r1, r2}
ldr r0, _0213eab4 ; =data_02050f54
ldr r0, _0213eab4 ; =gSinCosTable
mov r1, r8, lsl #0x1
add r0, r0, r8, lsl #1
ldrsh r8, [r0, #2]
ldr r0, _0213eab4 ; =data_02050f54
ldr r0, _0213eab4 ; =gSinCosTable
ldr lr, [sp, #0x74]
ldrsh ip, [r0, r1]
ldr r0, [sp, #0x7c]
@@ -4218,7 +4218,7 @@ _0213eaa4: .word data_027e0d0c
_0213eaa8: .word data_027e0d44
_0213eaac: .word 0x0000ffff
_0213eab0: .word 0x001f20c0
_0213eab4: .word data_02050f54
_0213eab4: .word gSinCosTable
arm_func_end func_ov14_0213e55c
.global func_ov14_0213eab8
@@ -7698,7 +7698,7 @@ _021412a8:
ldr r0, _021415bc ; =gItemManager
add r1, r2, #1
ldr r0, [r0]
ldr r3, _021415c0 ; =data_02050f54
ldr r3, _021415c0 ; =gSinCosTable
mov r5, r2, lsl #0x1
mov r2, r1, lsl #0x1
mov r1, #0x25
@@ -7900,7 +7900,7 @@ _0214159c:
_021415b4: .word data_027e0c54
_021415b8: .word data_027e0d38
_021415bc: .word gItemManager
_021415c0: .word data_02050f54
_021415c0: .word gSinCosTable
_021415c4: .word 0x00007fff
_021415c8: .word data_ov14_0215b250
_021415cc: .word func_ov14_0213fa38
@@ -9354,7 +9354,7 @@ func_ov14_0214290c: ; 0x0214290c
addeq sp, sp, #0x30
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrsh r1, [r10, #0xc]
ldr r3, _02142b58 ; =data_02050f54
ldr r3, _02142b58 ; =gSinCosTable
add r0, sp, #0xc
add r1, r1, #0x4000
mov r1, r1, lsl #0x10
@@ -9501,7 +9501,7 @@ _02142b3c:
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02142b58: .word data_02050f54
_02142b58: .word gSinCosTable
arm_func_end func_ov14_0214290c
.global func_ov14_02142b5c
@@ -14351,7 +14351,7 @@ func_ov14_02146294: ; 0x02146294
func_ov14_021462b0: ; 0x021462b0
stmdb sp!, {r4, r5, r6, lr}
ldrh r1, [r0, #0x20]
ldr ip, _021463d0 ; =data_02050f54
ldr ip, _021463d0 ; =gSinCosTable
cmp r1, #2
ldreq r2, _021463d4 ; =0x0000059a
mov r1, #0
@@ -14422,7 +14422,7 @@ func_ov14_021462b0: ; 0x021462b0
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_021463d0: .word data_02050f54
_021463d0: .word gSinCosTable
_021463d4: .word 0x0000059a
_021463d8: .word 0x00000333
_021463dc: .word 0x00000b33
@@ -14613,7 +14613,7 @@ func_ov14_02146634: ; 0x02146634
strh r0, [r1, #2]
strh r0, [r1, #4]
ldrsh r0, [r4, #0x78]
ldr r1, _0214672c ; =data_02050f54
ldr r1, _0214672c ; =gSinCosTable
sub r0, r0, #0x8000
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
@@ -14664,7 +14664,7 @@ _0214670c:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0214672c: .word data_02050f54
_0214672c: .word gSinCosTable
_02146730: .word data_027e0e58
_02146734: .word 0x000001c5
_02146738: .word func_ov14_02146230
@@ -14731,7 +14731,7 @@ func_ov14_021467b8: ; 0x021467b8
add r0, r10, #0x100
ldrsh r1, [r0, #0x58]
ldrh r0, [r10, #0x20]
ldr r3, _021469cc ; =data_02050f54
ldr r3, _021469cc ; =gSinCosTable
rsb r1, r1, #0xe
mov r1, r1, lsl #0x1
rsb r5, r1, #0x1f
@@ -14852,7 +14852,7 @@ _0214696c:
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021469cc: .word data_02050f54
_021469cc: .word gSinCosTable
_021469d0: .word 0x00000b33
_021469d4: .word 0x00000333
_021469d8: .word data_027e0d44
@@ -19487,7 +19487,7 @@ func_ov14_0214a618: ; 0x0214a618
cmpeq r0, #2
bne _0214a6f4
ldr r4, [r5, #0xb4]
ldr r3, _0214a71c ; =data_02050f54
ldr r3, _0214a71c ; =gSinCosTable
ldr r1, [r4]
add r0, sp, #0x24
bic r1, r1, #2
@@ -19509,7 +19509,7 @@ func_ov14_0214a618: ; 0x0214a618
mov r2, r1
bl func_01ff8690
ldrh r1, [r6, #0x6a]
ldr r3, _0214a71c ; =data_02050f54
ldr r3, _0214a71c ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -19535,7 +19535,7 @@ _0214a6f4:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0214a718: .word data_ov14_02153f50
_0214a71c: .word data_02050f54
_0214a71c: .word gSinCosTable
arm_func_end func_ov14_0214a618
.global func_ov14_0214a720
@@ -22076,7 +22076,7 @@ _0214c7c0:
_0214c7d0:
sub r0, r11, #0x8000
mov r7, #0
ldr r6, _0214c93c ; =data_02050f54
ldr r6, _0214c93c ; =gSinCosTable
ldr r4, _0214c940 ; =gMapManager
strh r0, [sp, #0x1a]
add r11, sp, #0x1c
@@ -22170,7 +22170,7 @@ _0214c92c:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0214c938: .word data_027e0764
_0214c93c: .word data_02050f54
_0214c93c: .word gSinCosTable
_0214c940: .word gMapManager
_0214c944: .word 0x0000ffff
arm_func_end func_ov14_0214c678
@@ -23158,7 +23158,7 @@ _0214d46c:
blx ip
ldrh r2, [r4, #0xc]
mov r0, #0
ldr r1, _0214d6a8 ; =data_02050f54
ldr r1, _0214d6a8 ; =gSinCosTable
str r0, [sp, #0x10]
mov r0, r2, asr #0x4
mov r3, r0, lsl #0x1
@@ -23235,7 +23235,7 @@ _0214d68c:
.align 2, 0
_0214d6a0: .word 0xfffff666
_0214d6a4: .word data_027e0d38
_0214d6a8: .word data_02050f54
_0214d6a8: .word gSinCosTable
_0214d6ac: .word 0x000004cd
_0214d6b0: .word gMapManager
_0214d6b4: .word 0x0000026e
@@ -23633,7 +23633,7 @@ func_ov14_0214dc20: ; 0x0214dc20
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _0214dc78 ; =data_02050f54
ldr r3, _0214dc78 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -23652,7 +23652,7 @@ func_ov14_0214dc20: ; 0x0214dc20
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0214dc78: .word data_02050f54
_0214dc78: .word gSinCosTable
arm_func_end func_ov14_0214dc20
.global func_ov14_0214dc7c
@@ -25686,7 +25686,7 @@ func_ov14_0214f774: ; 0x0214f774
sub sp, sp, #0x30
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _0214f7ec ; =data_02050f54
ldr r3, _0214f7ec ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -25713,7 +25713,7 @@ func_ov14_0214f774: ; 0x0214f774
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_0214f7ec: .word data_02050f54
_0214f7ec: .word gSinCosTable
arm_func_end func_ov14_0214f774
.global func_ov14_0214f7f0
@@ -25824,7 +25824,7 @@ func_ov14_0214f8f0: ; 0x0214f8f0
bl func_0202bbbc
cmp r0, #3
ldreq r0, [r5, #8]
ldr r2, _0214fa3c ; =data_02050f54
ldr r2, _0214fa3c ; =gSinCosTable
cmpeq r0, #5
moveq r4, #0
mov r0, r4, asr #0x4
@@ -25878,7 +25878,7 @@ func_ov14_0214f8f0: ; 0x0214f8f0
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0214fa38: .word 0x00000b33
_0214fa3c: .word data_02050f54
_0214fa3c: .word gSinCosTable
_0214fa40: .word data_027e0e58
_0214fa44: .word 0x00000272
arm_func_end func_ov14_0214f8f0
@@ -26531,7 +26531,7 @@ _02150200:
add r0, sp, #0xc
bne _0215023c
ldrh r2, [r10, #0xc]
ldr r1, _02150308 ; =data_02050f54
ldr r1, _02150308 ; =gSinCosTable
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
mov r3, r2, lsl #0x1
@@ -26542,7 +26542,7 @@ _02150200:
b _0215026c
_0215023c:
ldrsh r1, [r10, #0xc]
ldr r3, _02150308 ; =data_02050f54
ldr r3, _02150308 ; =gSinCosTable
sub r1, r1, #0x8000
mov r1, r1, lsl #0x10
mov r1, r1, lsr #0x10
@@ -26596,7 +26596,7 @@ _021502ec:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02150304: .word data_027e0f68
_02150308: .word data_02050f54
_02150308: .word gSinCosTable
arm_func_end func_ov14_02150168
.global func_ov14_0215030c
@@ -26606,7 +26606,7 @@ func_ov14_0215030c: ; 0x0215030c
sub sp, sp, #0x30
mov r10, r0
ldrh r1, [r10, #0xc]
ldr r3, _021504d4 ; =data_02050f54
ldr r3, _021504d4 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -26660,7 +26660,7 @@ _021503d0:
add r0, sp, #0xc
bne _0215040c
ldrh r2, [r10, #0xc]
ldr r1, _021504d4 ; =data_02050f54
ldr r1, _021504d4 ; =gSinCosTable
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
mov r3, r2, lsl #0x1
@@ -26671,7 +26671,7 @@ _021503d0:
b _0215043c
_0215040c:
ldrsh r1, [r10, #0xc]
ldr r3, _021504d4 ; =data_02050f54
ldr r3, _021504d4 ; =gSinCosTable
sub r1, r1, #0x8000
mov r1, r1, lsl #0x10
mov r1, r1, lsr #0x10
@@ -26724,7 +26724,7 @@ _021504bc:
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021504d4: .word data_02050f54
_021504d4: .word gSinCosTable
_021504d8: .word data_027e0f68
arm_func_end func_ov14_0215030c
@@ -26735,7 +26735,7 @@ func_ov14_021504dc: ; 0x021504dc
sub sp, sp, #0x30
mov r10, r0
ldrh r1, [r10, #0xc]
ldr r3, _02150604 ; =data_02050f54
ldr r3, _02150604 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -26809,7 +26809,7 @@ _021505ec:
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02150604: .word data_02050f54
_02150604: .word gSinCosTable
_02150608: .word data_027e0f68
arm_func_end func_ov14_021504dc
@@ -27902,7 +27902,7 @@ func_ov14_02151164: ; 0x02151164
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _021511bc ; =data_02050f54
ldr r3, _021511bc ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -27921,7 +27921,7 @@ func_ov14_02151164: ; 0x02151164
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021511bc: .word data_02050f54
_021511bc: .word gSinCosTable
arm_func_end func_ov14_02151164
.global func_ov14_021511c0
asm/ov15.inc
+1 -1
View File
@@ -176,7 +176,7 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051f54
.extern data_02053f54
.extern data_02056be4
asm/ov15.s
+395 -395
View File
File diff suppressed because it is too large Load Diff
asm/ov17.inc
+1 -1
View File
@@ -78,7 +78,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18func_ov00_020ad594Ei
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02063e4c
.extern data_027e0618
.extern data_027e071c
asm/ov17.s
+48 -48
View File
@@ -1463,7 +1463,7 @@ _0215c4ec:
str r4, [sp, #0x40]
str r4, [sp, #0x44]
ldrh r4, [r5, #0xc]
ldr r3, _0215c668 ; =data_02050f54
ldr r3, _0215c668 ; =gSinCosTable
add r0, sp, #0x10
mov r1, r4, asr #0x4
mov r2, r1, lsl #0x1
@@ -1550,7 +1550,7 @@ _0215c658: .word gAdventureFlags
_0215c65c: .word data_027e0e58
_0215c660: .word data_027e0ffc
_0215c664: .word 0x000014cd
_0215c668: .word data_02050f54
_0215c668: .word gSinCosTable
_0215c66c: .word 0x0000022a
_0215c670: .word 0xffffed1f
_0215c674: .word 0x000001b9
@@ -3387,7 +3387,7 @@ _0215de58:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r1, [r4, #0x78]
ldr r3, _0215dfc8 ; =data_02050f54
ldr r3, _0215dfc8 ; =gSinCosTable
add r0, sp, #0x54
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -3399,7 +3399,7 @@ _0215de58:
blx func_01ff8214
add r0, r4, #0x200
ldrh r1, [r0, #0x2c]
ldr r3, _0215dfc8 ; =data_02050f54
ldr r3, _0215dfc8 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -3478,7 +3478,7 @@ _0215df54:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0215dfc4: .word gPlayerLink
_0215dfc8: .word data_02050f54
_0215dfc8: .word gSinCosTable
_0215dfcc: .word data_ov00_020e9360
_0215dfd0: .word 0x000004cd
_0215dfd4: .word data_ov00_020e9370
@@ -4239,7 +4239,7 @@ func_ov17_0215e9f4: ; 0x0215e9f4
ldmia sp!, {r3, r4, r5, pc}
_0215ea3c:
ldrsh r0, [r4, #0x78]
ldr r2, _0215ea88 ; =data_02050f54
ldr r2, _0215ea88 ; =gSinCosTable
ldr r1, _0215ea8c ; =0x00000333
add r0, r0, r0, lsl #1
mov r0, r0, lsl #0x10
@@ -4258,7 +4258,7 @@ _0215ea3c:
bl Approach_thunk
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0215ea88: .word data_02050f54
_0215ea88: .word gSinCosTable
_0215ea8c: .word 0x00000333
_0215ea90: .word 0x0000019a
arm_func_end func_ov17_0215e9f4
@@ -4564,7 +4564,7 @@ func_ov17_0215ee6c: ; 0x0215ee6c
mov r1, #1
bl func_0201987c
ldrh r1, [r4, #0x78]
ldr r3, _0215ef68 ; =data_02050f54
ldr r3, _0215ef68 ; =gSinCosTable
add r0, sp, #0x54
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4576,7 +4576,7 @@ func_ov17_0215ee6c: ; 0x0215ee6c
blx func_01ff8214
add r0, r4, #0x200
ldrh r1, [r0, #0x58]
ldr r3, _0215ef68 ; =data_02050f54
ldr r3, _0215ef68 ; =gSinCosTable
add r0, sp, #0x30
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4608,7 +4608,7 @@ func_ov17_0215ee6c: ; 0x0215ee6c
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0215ef64: .word data_ov00_020e9360
_0215ef68: .word data_02050f54
_0215ef68: .word gSinCosTable
arm_func_end func_ov17_0215ee6c
.global func_ov17_0215ef6c
@@ -5221,7 +5221,7 @@ func_ov17_0215f728: ; 0x0215f728
ldmeqia sp!, {r4, pc}
_0215f770:
ldrh r1, [r4, #0x78]
ldr r3, _0215f850 ; =data_02050f54
ldr r3, _0215f850 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -5277,7 +5277,7 @@ _0215f770:
ldmia sp!, {r4, pc}
.align 2, 0
_0215f84c: .word gPlayerLink
_0215f850: .word data_02050f54
_0215f850: .word gSinCosTable
_0215f854: .word data_027e0f78
_0215f858: .word data_ov00_020e9370
arm_func_end func_ov17_0215f728
@@ -7198,7 +7198,7 @@ func_ov17_02160ee4: ; 0x02160ee4
cmp r0, #0
beq _02160f48
ldrh r1, [r4, #0x78]
ldr r3, _02160f90 ; =data_02050f54
ldr r3, _02160f90 ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -7234,7 +7234,7 @@ _02160f48:
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02160f90: .word data_02050f54
_02160f90: .word gSinCosTable
_02160f94: .word 0x00000266
_02160f98: .word data_ov00_020e9370
arm_func_end func_ov17_02160ee4
@@ -7862,7 +7862,7 @@ func_ov17_021617a8: ; 0x021617a8
sub sp, sp, #0x30
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02161820 ; =data_02050f54
ldr r3, _02161820 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -7889,7 +7889,7 @@ func_ov17_021617a8: ; 0x021617a8
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_02161820: .word data_02050f54
_02161820: .word gSinCosTable
arm_func_end func_ov17_021617a8
.global func_ov17_02161824
@@ -7997,7 +7997,7 @@ func_ov17_02161918: ; 0x02161918
bl func_0202bbbc
cmp r0, #3
ldreq r0, [r5, #8]
ldr r2, _02161a64 ; =data_02050f54
ldr r2, _02161a64 ; =gSinCosTable
cmpeq r0, #5
moveq r4, #0
mov r0, r4, asr #0x4
@@ -8051,7 +8051,7 @@ func_ov17_02161918: ; 0x02161918
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02161a60: .word 0x00000b33
_02161a64: .word data_02050f54
_02161a64: .word gSinCosTable
_02161a68: .word data_027e0e58
_02161a6c: .word 0x00000272
arm_func_end func_ov17_02161918
@@ -8343,7 +8343,7 @@ func_ov17_02161d50: ; 0x02161d50
str r3, [sp, #0x2c]
str r1, [sp, #0x28]
ldrh r1, [r4, #0xc]
ldr r3, _02161df4 ; =data_02050f54
ldr r3, _02161df4 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8363,7 +8363,7 @@ func_ov17_02161d50: ; 0x02161d50
ldmia sp!, {r4, pc}
.align 2, 0
_02161df0: .word 0x00002666
_02161df4: .word data_02050f54
_02161df4: .word gSinCosTable
arm_func_end func_ov17_02161d50
.global func_ov17_02161df8
@@ -8929,7 +8929,7 @@ func_ov17_02162530: ; 0x02162530
sub sp, sp, #0x48
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02162608 ; =data_02050f54
ldr r3, _02162608 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8944,7 +8944,7 @@ func_ov17_02162530: ; 0x02162530
add r0, sp, #0
bne _021625b0
ldrsh r1, [r4, #0x60]
ldr r3, _02162608 ; =data_02050f54
ldr r3, _02162608 ; =gSinCosTable
rsb r1, r1, #0
mov r1, r1, lsl #0x10
mov r1, r1, lsr #0x10
@@ -8959,7 +8959,7 @@ func_ov17_02162530: ; 0x02162530
b _021625d8
_021625b0:
ldrh r1, [r4, #0x60]
ldr r3, _02162608 ; =data_02050f54
ldr r3, _02162608 ; =gSinCosTable
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
add r1, r2, #1
@@ -8982,7 +8982,7 @@ _021625d8:
add sp, sp, #0x48
ldmia sp!, {r4, pc}
.align 2, 0
_02162608: .word data_02050f54
_02162608: .word gSinCosTable
arm_func_end func_ov17_02162530
.global func_ov17_0216260c
@@ -9121,7 +9121,7 @@ func_ov17_0216274c: ; 0x0216274c
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _021627a4 ; =data_02050f54
ldr r3, _021627a4 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -9140,7 +9140,7 @@ func_ov17_0216274c: ; 0x0216274c
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021627a4: .word data_02050f54
_021627a4: .word gSinCosTable
arm_func_end func_ov17_0216274c
.global func_ov17_021627a8
@@ -10101,7 +10101,7 @@ func_ov17_02163390: ; 0x02163390
addeq sp, sp, #0x34
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, pc}
ldrh r1, [r7, #0xc]
ldr r3, _021634d4 ; =data_02050f54
ldr r3, _021634d4 ; =gSinCosTable
add r0, sp, #0x10
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -10176,7 +10176,7 @@ _021634c0:
add sp, sp, #0x34
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_021634d4: .word data_02050f54
_021634d4: .word gSinCosTable
arm_func_end func_ov17_02163390
.global func_ov17_021634d8
@@ -10647,7 +10647,7 @@ func_ov17_02163ab8: ; 0x02163ab8
mov r4, r0
add r0, r4, #0x6c
bl func_ov14_0213215c
ldr r2, _02163b00 ; =data_02050f54
ldr r2, _02163b00 ; =gSinCosTable
add r0, sp, #0
ldrsh r1, [r2]
ldrsh r2, [r2, #2]
@@ -10661,7 +10661,7 @@ func_ov17_02163ab8: ; 0x02163ab8
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02163b00: .word data_02050f54
_02163b00: .word gSinCosTable
arm_func_end func_ov17_02163ab8
.global func_ov17_02163b04
@@ -11874,7 +11874,7 @@ func_ov17_02164aa4: ; 0x02164aa4
sub sp, sp, #0x30
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02164b58 ; =data_02050f54
ldr r3, _02164b58 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -11916,7 +11916,7 @@ func_ov17_02164aa4: ; 0x02164aa4
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_02164b58: .word data_02050f54
_02164b58: .word gSinCosTable
_02164b5c: .word 0x0000099a
arm_func_end func_ov17_02164aa4
@@ -12326,7 +12326,7 @@ func_ov17_02165068: ; 0x02165068
sub sp, sp, #0x30
mov r4, r0
ldrh r1, [r4, #0x64]
ldr r3, _021650e0 ; =data_02050f54
ldr r3, _021650e0 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -12353,7 +12353,7 @@ func_ov17_02165068: ; 0x02165068
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_021650e0: .word data_02050f54
_021650e0: .word gSinCosTable
arm_func_end func_ov17_02165068
.global func_ov17_021650e4
@@ -15049,7 +15049,7 @@ _02167188:
bl func_01ffa9fc
_02167208:
ldrsh r1, [r4, #0x78]
ldr r3, _021672d0 ; =data_02050f54
ldr r3, _021672d0 ; =gSinCosTable
add r0, sp, #0x20
sub r1, r1, #0x8000
mov r1, r1, lsl #0x10
@@ -15099,7 +15099,7 @@ _02167208:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_021672cc: .word 0x000008a4
_021672d0: .word data_02050f54
_021672d0: .word gSinCosTable
arm_func_end func_ov17_021670c0
.global func_ov17_021672d4
@@ -15192,7 +15192,7 @@ _021673a0:
bl func_01ffa9fc
_02167424:
ldrsh r1, [r4, #0x78]
ldr r2, _021674e4 ; =data_02050f54
ldr r2, _021674e4 ; =gSinCosTable
add r0, sp, #0x20
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -15240,7 +15240,7 @@ _02167424:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_021674e0: .word 0x000008a4
_021674e4: .word data_02050f54
_021674e4: .word gSinCosTable
arm_func_end func_ov17_021672d4
.global func_ov17_021674e8
@@ -16108,7 +16108,7 @@ func_ov17_0216808c: ; 0x0216808c
mov r3, #0x400
bl func_ov00_0208b8e0
ldrh r1, [r4, #0xc]
ldr r3, _02168104 ; =data_02050f54
ldr r3, _02168104 ; =gSinCosTable
add r0, sp, #8
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -16128,7 +16128,7 @@ func_ov17_0216808c: ; 0x0216808c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02168100: .word 0x0000059a
_02168104: .word data_02050f54
_02168104: .word gSinCosTable
arm_func_end func_ov17_0216808c
.global func_ov17_02168108
@@ -17160,7 +17160,7 @@ func_ov17_02168d10: ; 0x02168d10
cmp r1, r0
ldmneia sp!, {r3, r4, r5, pc}
ldr r1, [r4, #0xb4]
ldr r3, _02168d88 ; =data_02050f54
ldr r3, _02168d88 ; =gSinCosTable
ldr r0, [r1]
bic r0, r0, #2
str r0, [r1]
@@ -17178,7 +17178,7 @@ func_ov17_02168d10: ; 0x02168d10
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02168d84: .word data_ov17_0216b1e4
_02168d88: .word data_02050f54
_02168d88: .word gSinCosTable
arm_func_end func_ov17_02168d10
.global func_ov17_02168d8c
@@ -17683,7 +17683,7 @@ func_ov17_0216940c: ; 0x0216940c
addeq sp, sp, #0x24
ldmeqia sp!, {r3, r4, pc}
ldrsh r1, [r4, #0xc]
ldr r3, _02169488 ; =data_02050f54
ldr r3, _02169488 ; =gSinCosTable
add r0, sp, #0
sub r1, r1, #0x4000
mov r1, r1, lsl #0x10
@@ -17705,7 +17705,7 @@ func_ov17_0216940c: ; 0x0216940c
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02169488: .word data_02050f54
_02169488: .word gSinCosTable
arm_func_end func_ov17_0216940c
.global func_ov17_0216948c
@@ -19037,7 +19037,7 @@ func_ov17_0216a5b8: ; 0x0216a5b8
sub sp, sp, #0x30
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _0216a630 ; =data_02050f54
ldr r3, _0216a630 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -19064,7 +19064,7 @@ func_ov17_0216a5b8: ; 0x0216a5b8
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_0216a630: .word data_02050f54
_0216a630: .word gSinCosTable
arm_func_end func_ov17_0216a5b8
.global func_ov17_0216a634
@@ -19165,7 +19165,7 @@ func_ov17_0216a734: ; 0x0216a734
bl func_0202bbbc
cmp r0, #3
ldreq r0, [r5, #8]
ldr r2, _0216a80c ; =data_02050f54
ldr r2, _0216a80c ; =gSinCosTable
cmpeq r0, #5
moveq r4, #0
mov r0, r4, asr #0x4
@@ -19200,7 +19200,7 @@ func_ov17_0216a734: ; 0x0216a734
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0216a808: .word 0x00000b33
_0216a80c: .word data_02050f54
_0216a80c: .word gSinCosTable
_0216a810: .word data_027e0e58
_0216a814: .word 0x00000272
arm_func_end func_ov17_0216a734
asm/ov18.inc
+1 -1
View File
@@ -69,7 +69,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051054
.extern data_02057840
.extern data_0205785c
asm/ov18.s
+52 -52
View File
@@ -2374,7 +2374,7 @@ _0215d2e0:
strh r0, [r5, #0x7a]
_0215d2e8:
ldr r0, [r5, #0x48]
ldr ip, _0215d578 ; =data_02050f54
ldr ip, _0215d578 ; =gSinCosTable
sub r0, r0, #0x800
str r0, [r5, #0x48]
ldr r0, [r5, #0x50]
@@ -2538,7 +2538,7 @@ _0215d2e8:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0215d578: .word data_02050f54
_0215d578: .word gSinCosTable
_0215d57c: .word data_ov18_0216c280
_0215d580: .word data_ov18_0216c25c
arm_func_end func_ov18_0215d28c
@@ -3025,7 +3025,7 @@ _0215dbb0:
bl _ZN14AdventureFlags18func_Ov00_02097810Ei
str r0, [r4, #0x168]
ldrh r0, [r4, #0x78]
ldr ip, _0215dea8 ; =data_02050f54
ldr ip, _0215dea8 ; =gSinCosTable
mov r2, #0
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
@@ -3183,7 +3183,7 @@ _0215de94:
.align 2, 0
_0215dea0: .word data_ov00_020eec68
_0215dea4: .word gAdventureFlags
_0215dea8: .word data_02050f54
_0215dea8: .word gSinCosTable
_0215deac: .word data_027e103c
_0215deb0: .word data_027e0d38
_0215deb4: .word data_027e0ffc
@@ -3377,7 +3377,7 @@ _0215e108:
str r1, [r0, #0x58]
_0215e114:
ldrh r1, [r4, #0x78]
ldr r3, _0215e1ec ; =data_02050f54
ldr r3, _0215e1ec ; =gSinCosTable
add r0, sp, #0x2c
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -3431,7 +3431,7 @@ _0215e114:
ldmia sp!, {r4, pc}
.align 2, 0
_0215e1e8: .word data_027e0d38
_0215e1ec: .word data_02050f54
_0215e1ec: .word gSinCosTable
_0215e1f0: .word 0x0000023d
arm_func_end func_ov18_0215e0a4
@@ -4465,7 +4465,7 @@ func_ov18_0215ef78: ; 0x0215ef78
ldmeqia sp!, {r4, pc}
_0215efb0:
ldrh r1, [r4, #0xc]
ldr r3, _0215f01c ; =data_02050f54
ldr r3, _0215f01c ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4492,7 +4492,7 @@ _0215efb0:
ldmia sp!, {r4, pc}
.align 2, 0
_0215f018: .word data_027e0d38
_0215f01c: .word data_02050f54
_0215f01c: .word gSinCosTable
arm_func_end func_ov18_0215ef78
.global func_ov18_0215f020
@@ -6532,7 +6532,7 @@ func_ov18_021608c8: ; 0x021608c8
addeq sp, sp, #0x30
ldmeqia sp!, {r4, pc}
ldrh r1, [r4, #0xc]
ldr r3, _02160954 ; =data_02050f54
ldr r3, _02160954 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -6558,7 +6558,7 @@ func_ov18_021608c8: ; 0x021608c8
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_02160954: .word data_02050f54
_02160954: .word gSinCosTable
arm_func_end func_ov18_021608c8
.global func_ov18_02160958
@@ -7336,7 +7336,7 @@ func_ov18_021612d8: ; 0x021612d8
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02161330 ; =data_02050f54
ldr r3, _02161330 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -7355,7 +7355,7 @@ func_ov18_021612d8: ; 0x021612d8
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02161330: .word data_02050f54
_02161330: .word gSinCosTable
arm_func_end func_ov18_021612d8
.global func_ov18_02161334
@@ -7557,7 +7557,7 @@ func_ov18_021615a0: ; 0x021615a0
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _021615f8 ; =data_02050f54
ldr r3, _021615f8 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -7576,7 +7576,7 @@ func_ov18_021615a0: ; 0x021615a0
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021615f8: .word data_02050f54
_021615f8: .word gSinCosTable
arm_func_end func_ov18_021615a0
.global func_ov18_021615fc
@@ -7892,7 +7892,7 @@ func_ov18_021619a8: ; 0x021619a8
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02161a00 ; =data_02050f54
ldr r3, _02161a00 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -7911,7 +7911,7 @@ func_ov18_021619a8: ; 0x021619a8
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02161a00: .word data_02050f54
_02161a00: .word gSinCosTable
arm_func_end func_ov18_021619a8
.global func_ov18_02161a04
@@ -8113,7 +8113,7 @@ func_ov18_02161c70: ; 0x02161c70
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02161cc8 ; =data_02050f54
ldr r3, _02161cc8 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8132,7 +8132,7 @@ func_ov18_02161c70: ; 0x02161c70
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02161cc8: .word data_02050f54
_02161cc8: .word gSinCosTable
arm_func_end func_ov18_02161c70
.global func_ov18_02161ccc
@@ -8284,7 +8284,7 @@ func_ov18_02161e48: ; 0x02161e48
str r2, [sp, #0x2c]
str r1, [sp, #0x28]
ldrh r1, [r4, #0xc]
ldr r3, _02161ebc ; =data_02050f54
ldr r3, _02161ebc ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8303,7 +8303,7 @@ func_ov18_02161e48: ; 0x02161e48
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_02161ebc: .word data_02050f54
_02161ebc: .word gSinCosTable
arm_func_end func_ov18_02161e48
.global func_ov18_02161ec0
@@ -8757,7 +8757,7 @@ func_ov18_0216244c: ; 0x0216244c
ldmneia sp!, {r4, pc}
ldrh r0, [r4, #0x74]
ldr r1, _02162504 ; =0x00002ee0
ldr r2, _02162508 ; =data_02050f54
ldr r2, _02162508 ; =gSinCosTable
add r0, r0, #1
strh r0, [r4, #0x74]
ldrh r3, [r4, #0x74]
@@ -8791,7 +8791,7 @@ func_ov18_0216244c: ; 0x0216244c
ldmia sp!, {r4, pc}
.align 2, 0
_02162504: .word 0x00002ee0
_02162508: .word data_02050f54
_02162508: .word gSinCosTable
arm_func_end func_ov18_0216244c
.global func_ov18_0216250c
@@ -8963,7 +8963,7 @@ func_ov18_0216272c: ; 0x0216272c
str r2, [sp, #0x10]
ldrh r0, [r5, #0x72]
mov r4, r1
ldr r3, _021627d0 ; =data_02050f54
ldr r3, _021627d0 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -8995,7 +8995,7 @@ func_ov18_0216272c: ; 0x0216272c
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021627d0: .word data_02050f54
_021627d0: .word gSinCosTable
_021627d4: .word data_ov18_0216b514
_021627d8: .word data_ov18_0216b4fc
arm_func_end func_ov18_0216272c
@@ -13918,7 +13918,7 @@ func_ov18_02166810: ; 0x02166810
sub sp, sp, #0x18
ldrh r2, [sp, #0x40]
ldr r1, [sp, #0x2c]
ldr ip, _021668d0 ; =data_02050f54
ldr ip, _021668d0 ; =gSinCosTable
mov r2, r2, asr #0x4
mov r4, r2, lsl #0x1
mov r2, r4, lsl #0x1
@@ -13962,7 +13962,7 @@ func_ov18_02166810: ; 0x02166810
add sp, sp, #0x10
bx lr
.align 2, 0
_021668d0: .word data_02050f54
_021668d0: .word gSinCosTable
arm_func_end func_ov18_02166810
.global func_ov18_021668d4
@@ -14037,7 +14037,7 @@ func_ov18_021669a0: ; 0x021669a0
ldr r0, [sp, #0x34]
mov r1, r1, asr #0x4
mov r5, r1, lsl #0x1
ldr r3, _02166b4c ; =data_02050f54
ldr r3, _02166b4c ; =gSinCosTable
mov r1, r5, lsl #0x1
ldrsh r2, [r3, r1]
add r1, r5, #1
@@ -14139,7 +14139,7 @@ _02166adc:
add sp, sp, #0x10
bx lr
.align 2, 0
_02166b4c: .word data_02050f54
_02166b4c: .word gSinCosTable
arm_func_end func_ov18_021669a0
.global func_ov18_02166b50
@@ -14466,7 +14466,7 @@ func_ov18_02166f20: ; 0x02166f20
add r1, r1, #0x2800
str r1, [r4, #0x4c]
ldrh r0, [r0, #0x20]
ldr r1, _02167058 ; =data_02050f54
ldr r1, _02167058 ; =gSinCosTable
mov r3, #0
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
@@ -14523,7 +14523,7 @@ func_ov18_02166f20: ; 0x02166f20
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02167054: .word data_ov18_0216d604
_02167058: .word data_02050f54
_02167058: .word gSinCosTable
_0216705c: .word data_ov18_0216d0bc
_02167060: .word gAdventureFlags
arm_func_end func_ov18_02166f20
@@ -14790,7 +14790,7 @@ _021673b8:
stmia r3, {r0, r1, r2}
ldrh r1, [r6, #0x12]
ldr r0, _02167610 ; =gPlayerLink
ldr r4, _02167614 ; =data_02050f54
ldr r4, _02167614 ; =gSinCosTable
mov r1, r1, asr #0x4
mov r6, r1, lsl #0x1
mov r2, r6, lsl #0x1
@@ -14914,7 +14914,7 @@ _02167604: .word 0x00000465
_02167608: .word 0x0000019a
_0216760c: .word data_ov18_0216d604
_02167610: .word gPlayerLink
_02167614: .word data_02050f54
_02167614: .word gSinCosTable
_02167618: .word 0x00000333
_0216761c: .word 0x00000666
_02167620: .word 0x000004cd
@@ -15288,7 +15288,7 @@ _02167aec:
mov r2, #0x16c
bl func_0202b154
ldrh r1, [r4, #0x78]
ldr r0, _02167df8 ; =data_02050f54
ldr r0, _02167df8 ; =gSinCosTable
ldr r2, _02167de8 ; =0x00000333
mov r1, r1, asr #0x4
mov r6, r1, lsl #0x1
@@ -15311,7 +15311,7 @@ _02167aec:
mov r0, r5
add r1, r6, #1
str r0, [sp]
ldr r0, _02167df8 ; =data_02050f54
ldr r0, _02167df8 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r6, [r0, r1]
ldr r2, _02167de8 ; =0x00000333
@@ -15392,7 +15392,7 @@ _02167c78:
ldrsh r1, [ip, #0x26]
ldrsh r0, [r4, #0x12]
ldr r8, [r4, #0x50]
ldr r5, _02167df8 ; =data_02050f54
ldr r5, _02167df8 ; =gSinCosTable
add r0, r1, r0
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
@@ -15484,7 +15484,7 @@ _02167de8: .word 0x00000333
_02167dec: .word 0xfffffee1
_02167df0: .word data_027e0f64
_02167df4: .word 0x00001555
_02167df8: .word data_02050f54
_02167df8: .word gSinCosTable
_02167dfc: .word gActorManager
_02167e00: .word gAdventureFlags
arm_func_end func_ov18_02167838
@@ -15581,7 +15581,7 @@ _02167f1c:
ldr r2, _021681e0 ; =0xffffe38e
str r1, [sp, #0x2c]
ldr r5, [r3, #8]
ldr r1, _021681e4 ; =data_02050f54
ldr r1, _021681e4 ; =gSinCosTable
str r5, [sp, #0x30]
ldrsh r3, [r4, #0x78]
mov r8, #0x1800
@@ -15757,7 +15757,7 @@ _021681ac:
.align 2, 0
_021681dc: .word gPlayerLink
_021681e0: .word 0xffffe38e
_021681e4: .word data_02050f54
_021681e4: .word gSinCosTable
_021681e8: .word data_ov18_0216d604
_021681ec: .word gPlayerPos
_021681f0: .word 0x00000333
@@ -15883,7 +15883,7 @@ _02168368:
_02168388:
add r0, r6, #0x500
ldrh r1, [r0, #0x1a]
ldr r3, _021686d4 ; =data_02050f54
ldr r3, _021686d4 ; =gSinCosTable
add r0, sp, #0x88
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -15895,7 +15895,7 @@ _02168388:
blx func_01ff8230
add r0, r6, #0x500
ldrh r1, [r0, #0x18]
ldr r3, _021686d4 ; =data_02050f54
ldr r3, _021686d4 ; =gSinCosTable
add r0, sp, #0xd0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -15906,7 +15906,7 @@ _02168388:
ldrsh r1, [r3, r1]
blx func_01ff81f8
ldrh r1, [r6, #0x78]
ldr r3, _021686d4 ; =data_02050f54
ldr r3, _021686d4 ; =gSinCosTable
add r0, sp, #0xac
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -16093,7 +16093,7 @@ _02168388:
_021686c8: .word data_027e0fec
_021686cc: .word data_ov18_0216b5f8
_021686d0: .word data_ov18_0216b60c
_021686d4: .word data_02050f54
_021686d4: .word gSinCosTable
_021686d8: .word gActorManager
_021686dc: .word data_ov18_0216d604
_021686e0: .word data_02051054
@@ -16292,7 +16292,7 @@ _02168950: ; jump table
_02168960:
ldrh r0, [r4, #0xe6]
ldr r1, _02168a78 ; =0x00002ee0
ldr r2, _02168a7c ; =data_02050f54
ldr r2, _02168a7c ; =gSinCosTable
add r0, r0, #1
strh r0, [r4, #0xe6]
ldrh r3, [r4, #0xe6]
@@ -16363,7 +16363,7 @@ _021689e8:
ldmia sp!, {r4, pc}
.align 2, 0
_02168a78: .word 0x00002ee0
_02168a7c: .word data_02050f54
_02168a7c: .word gSinCosTable
_02168a80: .word 0x000005dc
_02168a84: .word 0x000038e4
arm_func_end func_ov18_02168924
@@ -16636,7 +16636,7 @@ func_ov18_02168dd0: ; 0x02168dd0
ldr lr, [r1, #0xb4]
mov ip, #0
ldr r2, [lr]
ldr r3, _02168e68 ; =data_02050f54
ldr r3, _02168e68 ; =gSinCosTable
bic r2, r2, #6
str r2, [lr]
ldr lr, [r0, #0xd4]
@@ -16660,7 +16660,7 @@ func_ov18_02168dd0: ; 0x02168dd0
bl func_01ff8248
ldmia sp!, {r3, pc}
.align 2, 0
_02168e68: .word data_02050f54
_02168e68: .word gSinCosTable
arm_func_end func_ov18_02168dd0
.global func_ov18_02168e6c
@@ -16703,7 +16703,7 @@ func_ov18_02168eb8: ; 0x02168eb8
str r1, [sp, #8]
str r1, [sp, #0xc]
ldrh r1, [r5, #0xe4]
ldr r3, _02168f74 ; =data_02050f54
ldr r3, _02168f74 ; =gSinCosTable
add r0, sp, #0x14
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -16740,7 +16740,7 @@ _02168f48:
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02168f74: .word data_02050f54
_02168f74: .word gSinCosTable
_02168f78: .word 0x000004cd
arm_func_end func_ov18_02168eb8
@@ -18613,7 +18613,7 @@ func_ov18_0216a780: ; 0x0216a780
strb r0, [sp, #0x37]
str r1, [sp, #0x30]
ldrsh r1, [r4, #0x12]
ldr r3, _0216a868 ; =data_02050f54
ldr r3, _0216a868 ; =gSinCosTable
add r0, sp, #0x1c
add r1, r1, #0xf
mov r1, r1, lsl #0x10
@@ -18662,7 +18662,7 @@ func_ov18_0216a780: ; 0x0216a780
add sp, sp, #0x4c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0216a868: .word data_02050f54
_0216a868: .word gSinCosTable
_0216a86c: .word data_027e0d3c
_0216a870: .word data_02063e4c
arm_func_end func_ov18_0216a780
@@ -18784,7 +18784,7 @@ func_ov18_0216a9dc: ; 0x0216a9dc
strb r0, [sp, #0x37]
str r1, [sp, #0x30]
ldrsh r1, [r9, #0x12]
ldr r3, _0216ab38 ; =data_02050f54
ldr r3, _0216ab38 ; =gSinCosTable
add r0, sp, #0x1c
add r1, r1, #0xf
mov r1, r1, lsl #0x10
@@ -18866,7 +18866,7 @@ _0216ab20:
add sp, sp, #0x4c
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0216ab38: .word data_02050f54
_0216ab38: .word gSinCosTable
_0216ab3c: .word data_027e0d3c
_0216ab40: .word data_02063e4c
arm_func_end func_ov18_0216a9dc
asm/ov19.inc
+1 -1
View File
@@ -103,7 +103,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051254
.extern data_027e0764
.extern data_027e0c54
asm/ov19.s
+25 -25
View File
@@ -431,7 +431,7 @@ _0216dc18:
ldr r8, [r3, #0x658]
mov r6, r2, asr #0x4
mov r0, r0, asr #0x4
ldr r2, _0216dda4 ; =data_02050f54
ldr r2, _0216dda4 ; =gSinCosTable
mov r6, r6, lsl #0x2
mov r0, r0, lsl #0x2
ldrsh lr, [r2, r6]
@@ -512,7 +512,7 @@ _0216dd94: .word gPlayerPos
_0216dd98: .word 0x00000266
_0216dd9c: .word 0x00000b33
_0216dda0: .word 0x000004cd
_0216dda4: .word data_02050f54
_0216dda4: .word gSinCosTable
_0216dda8: .word 0x0000038e
arm_func_end func_ov19_0216dac8
@@ -649,7 +649,7 @@ func_ov19_0216df14: ; 0x0216df14
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0216df90 ; =data_02050f54
ldr r2, _0216df90 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r2, r1]
mov r0, r0, lsl #0x1
@@ -665,7 +665,7 @@ func_ov19_0216df14: ; 0x0216df14
ldmia sp!, {r4, pc}
.align 2, 0
_0216df8c: .word gPlayerPos
_0216df90: .word data_02050f54
_0216df90: .word gSinCosTable
_0216df94: .word 0x0000019a
arm_func_end func_ov19_0216df14
@@ -989,7 +989,7 @@ func_ov19_0216e334: ; 0x0216e334
str r1, [sp, #0x70]
bl func_ov00_020c3348
ldr r0, [r4, #8]
ldr r5, _0216e688 ; =data_02050f54
ldr r5, _0216e688 ; =gSinCosTable
str r0, [sp, #0x6c]
ldr r0, [r4, #0xc]
mov r3, #0x800
@@ -1146,7 +1146,7 @@ _0216e46c:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
str r1, [sp, #0x3c]
ldr r0, _0216e688 ; =data_02050f54
ldr r0, _0216e688 ; =gSinCosTable
mov r1, r2, lsl #0x1
ldrsh r1, [r0, r1]
add r0, r0, r2, lsl #1
@@ -1199,7 +1199,7 @@ _0216e67c:
add sp, sp, #0x7c
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0216e688: .word data_02050f54
_0216e688: .word gSinCosTable
_0216e68c: .word 0x00004001
_0216e690: .word data_027e0764
_0216e694: .word 0x57425341
@@ -1617,7 +1617,7 @@ _0216eb88:
mov r2, r0, lsl #0x1
add r0, r2, #1
mov lr, #0
ldr r1, _0216ed00 ; =data_02050f54
ldr r1, _0216ed00 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r3, [r1, r2]
mov r0, r0, lsl #0x1
@@ -1693,7 +1693,7 @@ _0216ece8:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0216ecfc: .word gPlayerLink
_0216ed00: .word data_02050f54
_0216ed00: .word gSinCosTable
arm_func_end func_ov19_0216eb38
.global func_ov19_0216ed04
@@ -4406,7 +4406,7 @@ func_ov19_0217102c: ; 0x0217102c
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, [sp, #0x34]
ldr r3, _021710c8 ; =data_02050f54
ldr r3, _021710c8 ; =gSinCosTable
add r0, r0, ip
str r0, [sp, #0x34]
ldr r1, [r4, #0x1c]
@@ -4432,7 +4432,7 @@ func_ov19_0217102c: ; 0x0217102c
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021710c8: .word data_02050f54
_021710c8: .word gSinCosTable
arm_func_end func_ov19_0217102c
.global func_ov19_021710cc
@@ -4589,7 +4589,7 @@ func_ov19_02171290: ; 0x02171290
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, [sp, #0x34]
ldr r3, _0217132c ; =data_02050f54
ldr r3, _0217132c ; =gSinCosTable
add r0, r0, ip
str r0, [sp, #0x34]
ldr r1, [r4, #0x1c]
@@ -4615,7 +4615,7 @@ func_ov19_02171290: ; 0x02171290
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217132c: .word data_02050f54
_0217132c: .word gSinCosTable
arm_func_end func_ov19_02171290
.global func_ov19_02171330
@@ -4785,7 +4785,7 @@ func_ov19_02171528: ; 0x02171528
mov r0, r5
bl Vec3p_Add
ldr r0, [r4, #0x1c]
ldr r3, _021715f0 ; =data_02050f54
ldr r3, _021715f0 ; =gSinCosTable
ldrh r1, [r0, #0x78]
add r0, sp, #0x24
mov r1, r1, asr #0x4
@@ -4818,7 +4818,7 @@ func_ov19_02171528: ; 0x02171528
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021715ec: .word 0x00000733
_021715f0: .word data_02050f54
_021715f0: .word gSinCosTable
_021715f4: .word data_02051254
arm_func_end func_ov19_02171528
@@ -5334,7 +5334,7 @@ _02171ca8:
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
mov r2, r0, lsl #0x1
ldr r1, _02171e58 ; =data_02050f54
ldr r1, _02171e58 ; =gSinCosTable
add r0, r0, #1
ldrsh r2, [r1, r2]
mov r0, r0, lsl #0x1
@@ -5442,7 +5442,7 @@ _02171e48: .word gActorManager
_02171e4c: .word 0x0000099a
_02171e50: .word data_027e0764
_02171e54: .word 0xffffd555
_02171e58: .word data_02050f54
_02171e58: .word gSinCosTable
_02171e5c: .word 0x0000019a
_02171e60: .word data_027e0e58
arm_func_end func_ov19_02171a9c
@@ -6933,7 +6933,7 @@ func_ov19_0217314c: ; 0x0217314c
mov r5, r0
ldrh r0, [r5, #0xc]
mov r4, r1
ldr r2, _021731e0 ; =data_02050f54
ldr r2, _021731e0 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -6966,7 +6966,7 @@ func_ov19_0217314c: ; 0x0217314c
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021731e0: .word data_02050f54
_021731e0: .word gSinCosTable
_021731e4: .word 0x0000042d
arm_func_end func_ov19_0217314c
@@ -7104,7 +7104,7 @@ func_ov19_02173354: ; 0x02173354
cmp r1, r0
ldmneia sp!, {r3, r4, r5, pc}
ldr r2, [r4, #0xb4]
ldr r1, _021733d8 ; =data_02050f54
ldr r1, _021733d8 ; =gSinCosTable
ldr r0, [r2]
bic r0, r0, #2
str r0, [r2]
@@ -7125,7 +7125,7 @@ func_ov19_02173354: ; 0x02173354
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021733d4: .word data_ov19_02175e38
_021733d8: .word data_02050f54
_021733d8: .word gSinCosTable
arm_func_end func_ov19_02173354
.global func_ov19_021733dc
@@ -7563,7 +7563,7 @@ _02173908:
mov r2, #3
bl func_01ffa9fc
ldrh r1, [r4, #0xc]
ldr r3, _02173bf4 ; =data_02050f54
ldr r3, _02173bf4 ; =gSinCosTable
add r0, sp, #0x50
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -7713,7 +7713,7 @@ _02173be4: .word data_ov00_020ec9d6
_02173be8: .word data_ov00_020ec9d4
_02173bec: .word 0x00004210
_02173bf0: .word 0xffffeccd
_02173bf4: .word data_02050f54
_02173bf4: .word gSinCosTable
_02173bf8: .word 0x00002666
_02173bfc: .word data_027e0d44
_02173c00: .word 0x001f0081
@@ -9664,7 +9664,7 @@ _02175654:
cmp r0, #0x37000
movge r5, #0
_0217565c:
ldr r2, _021756c0 ; =data_02050f54
ldr r2, _021756c0 ; =gSinCosTable
add r0, sp, #0x24
ldrsh r1, [r2]
ldrsh r2, [r2, #2]
@@ -9690,7 +9690,7 @@ _0217565c:
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021756c0: .word data_02050f54
_021756c0: .word gSinCosTable
arm_func_end func_ov19_021755d8
.global func_ov19_021756c4
asm/ov20.inc
+1 -1
View File
@@ -98,7 +98,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_027e0764
.extern data_027e077c
asm/ov20.s
+31 -31
View File
@@ -197,7 +197,7 @@ _0216d8d0:
blt _0216d8d0
mov r7, #0
add r0, r10, #0x24c
ldr r6, _0216da10 ; =data_02050f54
ldr r6, _0216da10 ; =gSinCosTable
ldr r4, _0216da14 ; =0x55555556
mov r8, r7
add r9, r0, #0x800
@@ -247,7 +247,7 @@ _0216da00: .word data_ov20_02178320
_0216da04: .word 0x46425331
_0216da08: .word data_027e0fe8
_0216da0c: .word gActorManager
_0216da10: .word data_02050f54
_0216da10: .word gSinCosTable
_0216da14: .word 0x55555556
arm_func_end func_ov20_0216d848
@@ -431,7 +431,7 @@ _0216dc44:
bl func_ov00_020c5a5c
mov r6, r4
ldr r5, _0216e530 ; =data_ov20_0217786c
ldr r4, _0216e534 ; =data_02050f54
ldr r4, _0216e534 ; =gSinCosTable
add r11, sp, #0xa4
_0216dc60:
add r0, sp, #0xb0
@@ -576,7 +576,7 @@ _0216de60:
add r0, r0, #0xab
add r0, r0, #0x2a00
mov r5, r4
ldr r4, _0216e534 ; =data_02050f54
ldr r4, _0216e534 ; =gSinCosTable
mov r6, r0, lsl #0x10
_0216de88:
add r0, sp, #0x8c
@@ -801,7 +801,7 @@ _0216e120:
mov r0, r0, asr #0x4
mov lr, r0, lsl #0x1
sub r5, r1, #0x7000
ldr r0, _0216e534 ; =data_02050f54
ldr r0, _0216e534 ; =gSinCosTable
mov r4, lr, lsl #0x1
ldrsh r0, [r0, r4]
add r1, sp, #0x5c
@@ -809,7 +809,7 @@ _0216e120:
str r0, [sp, #0xc]
add r0, lr, #1
mov r4, r0, lsl #0x1
ldr r0, _0216e534 ; =data_02050f54
ldr r0, _0216e534 ; =gSinCosTable
add r3, r3, #0x800
ldrsh r4, [r0, r4]
ldr r0, [sp, #0xc]
@@ -1022,7 +1022,7 @@ _0216e524: .word data_ov00_020eec68
_0216e528: .word data_027e103c
_0216e52c: .word 0x000900e1
_0216e530: .word data_ov20_0217786c
_0216e534: .word data_02050f54
_0216e534: .word gSinCosTable
_0216e538: .word 0x55555556
_0216e53c: .word data_ov20_02177878
_0216e540: .word data_027e0ffc
@@ -1813,7 +1813,7 @@ _0216f03c:
mov r2, r0, lsl #0x1
add r0, r2, #1
mov r3, #0
ldr r1, _0216f488 ; =data_02050f54
ldr r1, _0216f488 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r6, [r1, r2]
mov r0, r0, lsl #0x1
@@ -2078,7 +2078,7 @@ _0216f478: .word data_027e0ffc
_0216f47c: .word 0x00000267
_0216f480: .word 0x0000019a
_0216f484: .word data_027e0764
_0216f488: .word data_02050f54
_0216f488: .word gSinCosTable
_0216f48c: .word data_027e0e58
_0216f490: .word 0x00001008
_0216f494: .word 0x00001009
@@ -2205,7 +2205,7 @@ func_ov20_0216f5b0: ; 0x0216f5b0
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0216f710 ; =data_02050f54
ldr r2, _0216f710 ; =gSinCosTable
mov r3, r1, lsl #0x1
mov r1, r0, lsl #0x1
add r0, r9, #0x60
@@ -2282,7 +2282,7 @@ _0216f6f8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0216f70c: .word 0x0000071c
_0216f710: .word data_02050f54
_0216f710: .word gSinCosTable
_0216f714: .word 0x0000019a
_0216f718: .word 0xfffffe66
_0216f71c: .word 0x00000733
@@ -3554,7 +3554,7 @@ _021706a0:
add r1, r4, #0x300
ldrsh r2, [r1, #0x5c]
mov lr, #0
ldr r1, _02170738 ; =data_02050f54
ldr r1, _02170738 ; =gSinCosTable
add r0, r0, r2
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
@@ -3590,7 +3590,7 @@ _021706a0:
_0217072c: .word 0xffffce39
_02170730: .word 0x0000071c
_02170734: .word 0xfffff8e4
_02170738: .word data_02050f54
_02170738: .word gSinCosTable
_0217073c: .word gPlayerPos
arm_func_end func_ov20_021705ec
@@ -3620,7 +3620,7 @@ func_ov20_02170740: ; 0x02170740
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
mov r2, r0, lsl #0x1
ldr r3, _02170808 ; =data_02050f54
ldr r3, _02170808 ; =gSinCosTable
add r0, r0, #1
mov r1, #0
ldrsh r2, [r3, r2]
@@ -3648,7 +3648,7 @@ func_ov20_02170740: ; 0x02170740
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02170804: .word 0x0000071c
_02170808: .word data_02050f54
_02170808: .word gSinCosTable
_0217080c: .word 0x0000019a
arm_func_end func_ov20_02170740
@@ -5320,7 +5320,7 @@ _02171e20:
mla r6, r0, r1, r6
adds r1, r3, r7
ldr r0, [ip, #0x14]
ldr r7, _02172090 ; =data_02050f54
ldr r7, _02172090 ; =gSinCosTable
adc r0, r0, r6
mov r3, r0, lsr #0x10
mov r3, r3, lsl #0x10
@@ -5433,7 +5433,7 @@ _02171fa8:
mov r7, r3, lsl #0x1
add lr, r7, #1
str r1, [ip]
ldr r6, _02172090 ; =data_02050f54
ldr r6, _02172090 ; =gSinCosTable
mov r7, r7, lsl #0x1
mov r1, lr, lsl #0x1
str r0, [ip, #4]
@@ -5466,7 +5466,7 @@ _02172078:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0217208c: .word data_027e0764
_02172090: .word data_02050f54
_02172090: .word gSinCosTable
_02172094: .word data_027e0e58
_02172098: .word 0x00000263
_0217209c: .word gMapManager
@@ -5830,7 +5830,7 @@ func_ov20_02172570: ; 0x02172570
beq _021725f0
add r0, r4, #0x100
ldrh r1, [r0, #0x88]
ldr r3, _0217262c ; =data_02050f54
ldr r3, _0217262c ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -5864,7 +5864,7 @@ _021725f0:
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217262c: .word data_02050f54
_0217262c: .word gSinCosTable
_02172630: .word data_ov00_020e9370
arm_func_end func_ov20_02172570
@@ -7715,7 +7715,7 @@ func_ov20_02173e60: ; 0x02173e60
addeq sp, sp, #0x3c
ldmeqia sp!, {r4, r5, pc}
ldrh r1, [r4, #0x78]
ldr r3, _02173f5c ; =data_02050f54
ldr r3, _02173f5c ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -7769,7 +7769,7 @@ func_ov20_02173e60: ; 0x02173e60
add sp, sp, #0x3c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02173f5c: .word data_02050f54
_02173f5c: .word gSinCosTable
_02173f60: .word data_ov00_020e9360
_02173f64: .word data_ov00_020e9370
arm_func_end func_ov20_02173e60
@@ -8339,7 +8339,7 @@ func_ov20_021745f4: ; 0x021745f4
ldmia sp!, {r3, r4, r5, pc}
_02174618:
ldrh r1, [r0, #0x78]
ldr r5, _02174728 ; =data_02050f54
ldr r5, _02174728 ; =gSinCosTable
mov r2, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x2
@@ -8374,7 +8374,7 @@ _02174618:
ldmia sp!, {r3, r4, r5, pc}
_021746a0:
ldrh r2, [r0, #0x78]
ldr lr, _02174728 ; =data_02050f54
ldr lr, _02174728 ; =gSinCosTable
ldr r1, _0217472c ; =0x00000614
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x2
@@ -8408,7 +8408,7 @@ _021746a0:
str r3, [r0, #0x64]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02174728: .word data_02050f54
_02174728: .word gSinCosTable
_0217472c: .word 0x00000614
arm_func_end func_ov20_021745f4
@@ -8780,7 +8780,7 @@ _02174be4:
bl func_01fffbec
_02174bf0:
ldrh r1, [r4, #0x78]
ldr r3, _02174c74 ; =data_02050f54
ldr r3, _02174c74 ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8813,7 +8813,7 @@ _02174bf0:
ldmia sp!, {r4, pc}
.align 2, 0
_02174c70: .word 0x00001333
_02174c74: .word data_02050f54
_02174c74: .word gSinCosTable
_02174c78: .word 0x00000666
_02174c7c: .word data_ov00_020e9370
arm_func_end func_ov20_02174ba8
@@ -11781,7 +11781,7 @@ func_ov20_02177190: ; 0x02177190
sub sp, sp, #0x30
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02177230 ; =data_02050f54
ldr r3, _02177230 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -11818,7 +11818,7 @@ func_ov20_02177190: ; 0x02177190
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_02177230: .word data_02050f54
_02177230: .word gSinCosTable
_02177234: .word 0x0000259a
arm_func_end func_ov20_02177190
@@ -11840,7 +11840,7 @@ func_ov20_02177238: ; 0x02177238
str r1, [sp, #0x38]
str r4, [sp, #0x48]
ldrh r4, [r5, #0xc]
ldr r3, _021772f0 ; =data_02050f54
ldr r3, _021772f0 ; =gSinCosTable
add r0, sp, #4
mov r1, r4, asr #0x4
mov r2, r1, lsl #0x1
@@ -11872,7 +11872,7 @@ func_ov20_02177238: ; 0x02177238
add sp, sp, #0x4c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021772f0: .word data_02050f54
_021772f0: .word gSinCosTable
_021772f4: .word data_027e0e58
_021772f8: .word 0x00000272
arm_func_end func_ov20_02177238
asm/ov21.inc
+1 -1
View File
@@ -68,7 +68,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0764
.extern data_027e077c
.extern data_027e0d3c
asm/ov21.s
+4 -4
View File
@@ -289,7 +289,7 @@ func_ov21_0216d950: ; 0x0216d950
mov r1, r0, lsl #0x1
add r0, r1, #1
mov r2, r0, lsl #0x1
ldr r3, _0216dad8 ; =data_02050f54
ldr r3, _0216dad8 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
@@ -354,7 +354,7 @@ _0216daa8:
_0216dacc: .word 0xfffff004
_0216dad0: .word 0x45800000
_0216dad4: .word 0x46800000
_0216dad8: .word data_02050f54
_0216dad8: .word gSinCosTable
_0216dadc: .word 0x00000547
arm_func_end func_ov21_0216d950
@@ -1378,7 +1378,7 @@ _0216e78c:
cmp r0, #0
beq _0216e830
ldrh r0, [r4, #0x78]
ldr ip, _0216e8c4 ; =data_02050f54
ldr ip, _0216e8c4 ; =gSinCosTable
ldr lr, _0216e8c8 ; =0x000009be
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
@@ -1452,7 +1452,7 @@ _0216e868:
bl func_01fffd04
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0216e8c4: .word data_02050f54
_0216e8c4: .word gSinCosTable
_0216e8c8: .word 0x000009be
_0216e8cc: .word data_027e0ffc
_0216e8d0: .word 0x0000024f
asm/ov22.inc
+1 -1
View File
@@ -101,7 +101,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_027e0764
.extern data_027e0d0c
asm/ov22.s
+35 -35
View File
@@ -1992,7 +1992,7 @@ func_ov22_0216f0e0: ; 0x0216f0e0
addeq sp, sp, #0x48
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrh r1, [r10, #0xc]
ldr r3, _0216f2b8 ; =data_02050f54
ldr r3, _0216f2b8 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -2107,7 +2107,7 @@ _0216f22c:
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0216f2b8: .word data_02050f54
_0216f2b8: .word gSinCosTable
_0216f2bc: .word 0x0000099a
_0216f2c0: .word data_ov00_020e9370
arm_func_end func_ov22_0216f0e0
@@ -2782,7 +2782,7 @@ _0216fb20:
str r0, [r1, #4]
str r0, [r1, #8]
ldrh r0, [r5, #0x12]
ldr r6, _0216fd60 ; =data_02050f54
ldr r6, _0216fd60 ; =gSinCosTable
add r2, sp, #0x5c
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -2920,7 +2920,7 @@ _0216fd04:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0216fd5c: .word gAdventureFlags
_0216fd60: .word data_02050f54
_0216fd60: .word gSinCosTable
_0216fd64: .word 0x534e4d42
_0216fd68: .word func_ov22_0216f5a8
_0216fd6c: .word data_ov22_0217863c
@@ -3635,7 +3635,7 @@ func_ov22_02170628: ; 0x02170628
str r1, [r0, #4]
str r1, [r0, #8]
ldrh r2, [r4, #0x12]
ldr r3, _02170810 ; =data_02050f54
ldr r3, _02170810 ; =gSinCosTable
add r1, sp, #0x20
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
@@ -3738,7 +3738,7 @@ _021707fc:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0217080c: .word gPlayerPos
_02170810: .word data_02050f54
_02170810: .word gSinCosTable
_02170814: .word 0x0000019a
_02170818: .word 0x0000038e
arm_func_end func_ov22_02170628
@@ -3788,7 +3788,7 @@ func_ov22_02170854: ; 0x02170854
str r1, [r0, #4]
str r1, [r0, #8]
ldrh r2, [r4, #0x12]
ldr r3, _02170938 ; =data_02050f54
ldr r3, _02170938 ; =gSinCosTable
add r1, sp, #0x18
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
@@ -3824,7 +3824,7 @@ func_ov22_02170854: ; 0x02170854
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02170934: .word gPlayerPos
_02170938: .word data_02050f54
_02170938: .word gSinCosTable
arm_func_end func_ov22_02170854
.global func_ov22_0217093c
@@ -3888,7 +3888,7 @@ func_ov22_021709e0: ; 0x021709e0
mov r5, r0
ldrh r0, [r5, #0x78]
mov r2, #0
ldr r1, _02170b04 ; =data_02050f54
ldr r1, _02170b04 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
add r0, r3, #1
@@ -3915,7 +3915,7 @@ func_ov22_021709e0: ; 0x021709e0
mov r1, r1, asr #0x10
bl func_ov00_020a6110
add r1, r4, #1
ldr r0, _02170b04 ; =data_02050f54
ldr r0, _02170b04 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r2, [r0, r1]
mov r1, #0x600
@@ -3957,7 +3957,7 @@ func_ov22_021709e0: ; 0x021709e0
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02170b04: .word data_02050f54
_02170b04: .word gSinCosTable
_02170b08: .word data_027e0ffc
arm_func_end func_ov22_021709e0
@@ -4847,7 +4847,7 @@ func_ov22_02171694: ; 0x02171694
stmdb sp!, {r4, r5, r6, lr}
mov r5, r0
ldrh r1, [r5, #0x78]
ldr r2, _02171764 ; =data_02050f54
ldr r2, _02171764 ; =gSinCosTable
add r0, r5, #0x21c
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -4899,7 +4899,7 @@ _0217171c:
bl func_01fffd04
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02171764: .word data_02050f54
_02171764: .word gSinCosTable
_02171768: .word 0x00000333
_0217176c: .word 0x0000071c
arm_func_end func_ov22_02171694
@@ -4958,7 +4958,7 @@ _021717d8:
mov r3, r0, lsl #0x1
add r0, r3, #1
mov lr, #0
ldr r2, _0217193c ; =data_02050f54
ldr r2, _0217193c ; =gSinCosTable
mov r3, r3, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh ip, [r2, r0]
@@ -5028,7 +5028,7 @@ _0217190c:
_02171930: .word gMapManager
_02171934: .word gPlayerPos
_02171938: .word 0x0000071c
_0217193c: .word data_02050f54
_0217193c: .word gSinCosTable
_02171940: .word 0x00000333
arm_func_end func_ov22_02171770
@@ -7429,7 +7429,7 @@ _02173820:
cmp r0, #2
bne _021738b0
ldr r5, [r6, #0xb4]
ldr r3, _0217391c ; =data_02050f54
ldr r3, _0217391c ; =gSinCosTable
ldr r1, [r5]
add r0, sp, #0
bic r1, r1, #2
@@ -7481,7 +7481,7 @@ _021738b0:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_02173918: .word data_ov22_02178858
_0217391c: .word data_02050f54
_0217391c: .word gSinCosTable
arm_func_end func_ov22_021737ec
.global func_ov22_02173920
@@ -8084,7 +8084,7 @@ _02174120:
strh r0, [r1, #0x7a]
_02174134:
ldrh r0, [r5, #0x78]
ldr r2, _02174614 ; =data_02050f54
ldr r2, _02174614 ; =gSinCosTable
mov r1, #0x52
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -8214,7 +8214,7 @@ _02174308:
b _021744c8
_02174318:
ldrh r1, [r5, #0x78]
ldr r3, _02174614 ; =data_02050f54
ldr r3, _02174614 ; =gSinCosTable
mov r0, #0x1ec
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -8300,7 +8300,7 @@ _021743d8:
strh r1, [r0, #0x7a]
_0217445c:
ldrh r1, [r5, #0x78]
ldr r3, _02174614 ; =data_02050f54
ldr r3, _02174614 ; =gSinCosTable
mov r0, #0x1ec
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -8422,7 +8422,7 @@ _02174604:
.align 2, 0
_0217460c: .word gMapManager
_02174610: .word data_027e0764
_02174614: .word data_02050f54
_02174614: .word gSinCosTable
_02174618: .word gPlayerPos
_0217461c: .word 0x00001555
_02174620: .word 0x000005dc
@@ -8554,7 +8554,7 @@ func_ov22_0217477c: ; 0x0217477c
ble _021747f4
add r1, r0, #0x300
ldrh r1, [r1, #0x78]
ldr r3, _02174820 ; =data_02050f54
ldr r3, _02174820 ; =gSinCosTable
mov r1, r1, asr #0x4
mov ip, r1, lsl #0x1
mov r1, ip, lsl #0x1
@@ -8592,7 +8592,7 @@ _02174814:
bl func_ov22_02173c18
ldmia sp!, {r3, pc}
.align 2, 0
_02174820: .word data_02050f54
_02174820: .word gSinCosTable
arm_func_end func_ov22_0217477c
.global func_ov22_02174824
@@ -8921,7 +8921,7 @@ func_ov22_02174be8: ; 0x02174be8
cmp r6, #0
bne _02174c50
ldrh r1, [r4, #0x78]
ldr r3, _02174cac ; =data_02050f54
ldr r3, _02174cac ; =gSinCosTable
add r0, sp, #0x30
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8966,7 +8966,7 @@ _02174ca0:
add sp, sp, #0x54
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02174cac: .word data_02050f54
_02174cac: .word gSinCosTable
arm_func_end func_ov22_02174be8
.global func_ov22_02174cb0
@@ -8980,7 +8980,7 @@ func_ov22_02174cb0: ; 0x02174cb0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrsh r1, [r4, #0x78]
ldr r0, _02174da8 ; =data_02050f54
ldr r0, _02174da8 ; =gSinCosTable
ldr ip, _02174dac ; =0x00000266
add r1, r1, #0x4000
mov r1, r1, lsl #0x10
@@ -9035,7 +9035,7 @@ func_ov22_02174cb0: ; 0x02174cb0
add sp, sp, #0x30
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02174da8: .word data_02050f54
_02174da8: .word gSinCosTable
_02174dac: .word 0x00000266
_02174db0: .word gMapManager
_02174db4: .word 0x0000059a
@@ -9994,7 +9994,7 @@ func_ov22_02175958: ; 0x02175958
mov r5, r2, lsl #0x1
sub r3, r1, #0xc00
ldr r1, [r0]
ldr r6, _02175a68 ; =data_02050f54
ldr r6, _02175a68 ; =gSinCosTable
mov r2, ip, lsl #0xa
ldrsh r7, [r6, r7]
ldrsh r5, [r6, r5]
@@ -10039,7 +10039,7 @@ _02175a5c:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02175a64: .word data_ov22_0217a568
_02175a68: .word data_02050f54
_02175a68: .word gSinCosTable
_02175a6c: .word 0x000004cd
_02175a70: .word data_ov00_020eec9c
_02175a74: .word 0x0000010f
@@ -11124,7 +11124,7 @@ _021767ac:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02176878 ; =data_02050f54
ldr r2, _02176878 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -11170,7 +11170,7 @@ _0217684c:
.align 2, 0
_02176870: .word 0x45800000
_02176874: .word 0x46800000
_02176878: .word data_02050f54
_02176878: .word gSinCosTable
arm_func_end func_ov22_021766dc
.global func_ov22_0217687c
@@ -11927,7 +11927,7 @@ func_ov22_02177278: ; 0x02177278
bxne lr
add r2, r0, #0x300
ldrh r3, [r2, #0x2c]
ldr r2, _02177320 ; =data_02050f54
ldr r2, _02177320 ; =gSinCosTable
ldr r1, [r1, #0xb0]
mov r3, r3, asr #0x4
mov r3, r3, lsl #0x2
@@ -11959,7 +11959,7 @@ func_ov22_02177278: ; 0x02177278
strh r0, [r1, #0x2e]
bx lr
.align 2, 0
_02177320: .word data_02050f54
_02177320: .word gSinCosTable
_02177324: .word 0x00007fff
arm_func_end func_ov22_02177278
@@ -13224,7 +13224,7 @@ func_ov22_0217822c: ; 0x0217822c
mov r0, r5
bl Vec3p_Add
ldr r0, [r4, #0x1c]
ldr r3, _021782d4 ; =data_02050f54
ldr r3, _021782d4 ; =gSinCosTable
ldrh r1, [r0, #0x78]
add r0, sp, #0
mov r1, r1, asr #0x4
@@ -13248,7 +13248,7 @@ func_ov22_0217822c: ; 0x0217822c
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021782d0: .word 0x0000059a
_021782d4: .word data_02050f54
_021782d4: .word gSinCosTable
arm_func_end func_ov22_0217822c
.global func_ov22_021782d8
asm/ov23.inc
+1 -1
View File
@@ -126,7 +126,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02057200
.extern data_02063e4c
asm/ov23.s
+31 -31
View File
@@ -330,7 +330,7 @@ _0216da90:
str r0, [r1, #4]
str r0, [r1, #8]
ldrh r0, [r4, #0x12]
ldr r8, _0216ddd0 ; =data_02050f54
ldr r8, _0216ddd0 ; =gSinCosTable
add r2, sp, #0x5c
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -541,7 +541,7 @@ _0216ddb8:
add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0216ddd0: .word data_02050f54
_0216ddd0: .word gSinCosTable
_0216ddd4: .word 0x47524e43
_0216ddd8: .word 0x47524342
_0216dddc: .word data_ov23_02179030
@@ -887,7 +887,7 @@ func_ov23_0216e180: ; 0x0216e180
str r1, [r0, #4]
str r1, [r0, #8]
ldrh r2, [r4, #0x12]
ldr r3, _0216e364 ; =data_02050f54
ldr r3, _0216e364 ; =gSinCosTable
add r1, sp, #0x20
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
@@ -989,7 +989,7 @@ _0216e350:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0216e360: .word gPlayerPos
_0216e364: .word data_02050f54
_0216e364: .word gSinCosTable
_0216e368: .word 0x0000019a
_0216e36c: .word 0x0000038e
arm_func_end func_ov23_0216e180
@@ -1042,7 +1042,7 @@ func_ov23_0216e3b4: ; 0x0216e3b4
str r1, [r0, #4]
str r1, [r0, #8]
ldrh r2, [r4, #0x12]
ldr r3, _0216e4a8 ; =data_02050f54
ldr r3, _0216e4a8 ; =gSinCosTable
add r1, sp, #0x18
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
@@ -1082,7 +1082,7 @@ func_ov23_0216e3b4: ; 0x0216e3b4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0216e4a4: .word gPlayerPos
_0216e4a8: .word data_02050f54
_0216e4a8: .word gSinCosTable
_0216e4ac: .word data_ov14_02153e98
_0216e4b0: .word func_ov23_0216d7f8
arm_func_end func_ov23_0216e3b4
@@ -1249,7 +1249,7 @@ func_ov23_0216e65c: ; 0x0216e65c
str r0, [r1, #4]
str r0, [r1, #8]
ldrh r0, [r5, #0x12]
ldr ip, _0216e770 ; =data_02050f54
ldr ip, _0216e770 ; =gSinCosTable
add r2, sp, #0xc
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -1291,7 +1291,7 @@ _0216e74c:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0216e770: .word data_02050f54
_0216e770: .word gSinCosTable
arm_func_end func_ov23_0216e65c
.global func_ov23_0216e774
@@ -5328,7 +5328,7 @@ _02171bd8:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _021720a0 ; =data_02050f54
ldr r1, _021720a0 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r2, [r1, r2]
mov r0, r0, lsl #0x1
@@ -5495,7 +5495,7 @@ _02171e18:
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r2, [r0]
mov r0, #0
ldr r1, _021720a0 ; =data_02050f54
ldr r1, _021720a0 ; =gSinCosTable
str r0, [sp, #8]
mov r0, r2, asr #0x4
mov r3, r0, lsl #0x1
@@ -5639,7 +5639,7 @@ _02172090: .word gAdventureFlags
_02172094: .word 0x00000666
_02172098: .word 0x00000333
_0217209c: .word data_027e0d38
_021720a0: .word data_02050f54
_021720a0: .word gSinCosTable
_021720a4: .word 0xffffb8e4
_021720a8: .word 0x000002e1
_021720ac: .word 0x50574253
@@ -6891,7 +6891,7 @@ func_ov23_02173014: ; 0x02173014
ldmia r1, {r0, r1, r2}
stmia r4, {r0, r1, r2}
ldr r0, _0217311c ; =0x00000ccd
ldr r4, _02173120 ; =data_02050f54
ldr r4, _02173120 ; =gSinCosTable
str r0, [r3, #0x590]
ldrh r1, [r3, #0x78]
ldr r0, [r3, #0x48]
@@ -6951,7 +6951,7 @@ func_ov23_02173014: ; 0x02173014
.align 2, 0
_02173118: .word data_ov23_02179500
_0217311c: .word 0x00000ccd
_02173120: .word data_02050f54
_02173120: .word gSinCosTable
arm_func_end func_ov23_02173014
.global func_ov23_02173124
@@ -6963,7 +6963,7 @@ func_ov23_02173124: ; 0x02173124
bl func_ov23_02173014
ldrh r0, [r6, #0x78]
mov r2, #0
ldr r1, _021734c8 ; =data_02050f54
ldr r1, _021734c8 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
add r0, r3, #1
@@ -7058,7 +7058,7 @@ _02173260:
add r0, r4, #0x48
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
ldr r1, _021734c8 ; =data_02050f54
ldr r1, _021734c8 ; =gSinCosTable
mov r2, r3, lsl #0x1
ldrsh r2, [r1, r2]
add r1, r1, r3, lsl #1
@@ -7155,7 +7155,7 @@ _02173388:
ldrh r1, [r6, #0x78]
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
ldr r1, _021734c8 ; =data_02050f54
ldr r1, _021734c8 ; =gSinCosTable
mov r2, r3, lsl #0x1
ldrsh ip, [r1, r2]
add r2, r1, r3, lsl #1
@@ -7199,7 +7199,7 @@ _021734a8:
add sp, sp, #0x10c
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021734c8: .word data_02050f54
_021734c8: .word gSinCosTable
_021734cc: .word data_027e0ffc
_021734d0: .word _ZTV11FilterActor
_021734d4: .word 0x424f4d42
@@ -7303,7 +7303,7 @@ _0217362c:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r0, [r4, #0x78]
ldr r3, _021738b0 ; =data_02050f54
ldr r3, _021738b0 ; =gSinCosTable
ldr lr, [sp, #8]
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
@@ -7390,7 +7390,7 @@ _0217375c:
cmpne r0, #0xd
beq _02173890
ldrh r3, [r4, #0x78]
ldr r5, _021738b0 ; =data_02050f54
ldr r5, _021738b0 ; =gSinCosTable
mov r0, #0x800
mov r3, r3, asr #0x4
mov r7, r3, lsl #0x1
@@ -7465,7 +7465,7 @@ _021738a0: .word 0xffff8001
_021738a4: .word 0x00006aab
_021738a8: .word 0x41525257
_021738ac: .word data_ov23_0217950c
_021738b0: .word data_02050f54
_021738b0: .word gSinCosTable
_021738b4: .word data_027e0ffc
_021738b8: .word 0x424f4d42
_021738bc: .word 0x00000273
@@ -8200,7 +8200,7 @@ func_ov23_02174204: ; 0x02174204
add r0, r5, #1
mov r3, r0, lsl #0x1
ldr r2, _02174384 ; =0x66666667
ldr ip, _02174388 ; =data_02050f54
ldr ip, _02174388 ; =gSinCosTable
mov r1, r5, lsl #0x1
ldrsh r5, [ip, r1]
mov r0, lr, lsr #0x1f
@@ -8231,7 +8231,7 @@ _02174378: .word gActorManager
_0217437c: .word data_027e0764
_02174380: .word 0x00001801
_02174384: .word 0x66666667
_02174388: .word data_02050f54
_02174388: .word gSinCosTable
_0217438c: .word 0x0000047b
arm_func_end func_ov23_02174204
@@ -8759,7 +8759,7 @@ _021749f8:
ldmia r0, {r0, r1, r2}
str r3, [sp, #0x44]
ldr r3, [r5, #0x1c]
ldr ip, _02174d14 ; =data_02050f54
ldr ip, _02174d14 ; =gSinCosTable
ldrsh r7, [r3, #0x78]
mov r3, #0
sub r3, r3, #1
@@ -8945,7 +8945,7 @@ _02174d04: .word 0x00000279
_02174d08: .word 0x00000276
_02174d0c: .word 0x00000275
_02174d10: .word data_ov23_02179640
_02174d14: .word data_02050f54
_02174d14: .word gSinCosTable
_02174d18: .word data_027e0fe8
_02174d1c: .word 0x41525257
_02174d20: .word gActorManager
@@ -11293,7 +11293,7 @@ func_ov23_02176bc0: ; 0x02176bc0
addeq sp, sp, #0x60
ldmeqia sp!, {r4, pc}
ldrh r1, [r4, #0xc]
ldr r3, _02176ca8 ; =data_02050f54
ldr r3, _02176ca8 ; =gSinCosTable
add r0, sp, #0x3c
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -11304,7 +11304,7 @@ func_ov23_02176bc0: ; 0x02176bc0
ldrsh r2, [r3, r2]
blx func_01ff8214
ldrh r1, [r4, #0x74]
ldr r3, _02176ca8 ; =data_02050f54
ldr r3, _02176ca8 ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -11342,7 +11342,7 @@ func_ov23_02176bc0: ; 0x02176bc0
add sp, sp, #0x60
ldmia sp!, {r4, pc}
.align 2, 0
_02176ca8: .word data_02050f54
_02176ca8: .word gSinCosTable
arm_func_end func_ov23_02176bc0
.global func_ov23_02176cac
@@ -12489,7 +12489,7 @@ func_ov23_02177aa4: ; 0x02177aa4
sub sp, sp, #0x30
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02177b44 ; =data_02050f54
ldr r3, _02177b44 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -12526,7 +12526,7 @@ func_ov23_02177aa4: ; 0x02177aa4
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_02177b44: .word data_02050f54
_02177b44: .word gSinCosTable
_02177b48: .word 0x00002666
arm_func_end func_ov23_02177aa4
@@ -13685,7 +13685,7 @@ func_ov23_02178ab0: ; 0x02178ab0
mov r0, r4
bl _ZN10MapManager16MapData_vfunc_60Ev
mov r7, #0
ldr r11, _02179018 ; =data_02050f54
ldr r11, _02179018 ; =gSinCosTable
str r0, [sp]
mov r8, r7
str r7, [sp, #0x44]
@@ -14037,7 +14037,7 @@ _02178fd8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02179014: .word gMapManager
_02179018: .word data_02050f54
_02179018: .word gSinCosTable
_0217901c: .word 0x00000333
_02179020: .word data_027e0d38
_02179024: .word 0xfffff99a
asm/ov24.inc
+1 -1
View File
@@ -97,7 +97,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051f54
.extern data_02057200
.extern data_027e0764
asm/ov24.s
+35 -35
View File
@@ -411,7 +411,7 @@ func_ov24_0216db90: ; 0x0216db90
addeq sp, sp, #0x30
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrh r1, [r10, #0xc]
ldr r3, _0216dca8 ; =data_02050f54
ldr r3, _0216dca8 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -475,7 +475,7 @@ _0216dc90:
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0216dca8: .word data_02050f54
_0216dca8: .word gSinCosTable
arm_func_end func_ov24_0216db90
.global func_ov24_0216dcac
@@ -2653,7 +2653,7 @@ func_ov24_0216f88c: ; 0x0216f88c
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, [r4, #0x6c]
ldr r3, _0216f9a8 ; =data_02050f54
ldr r3, _0216f9a8 ; =gSinCosTable
add r0, r0, #1
str r0, [r4, #0x6c]
ldr r1, [r4, #0x70]
@@ -2711,7 +2711,7 @@ _0216f990:
ldmia sp!, {r4, pc}
.align 2, 0
_0216f9a4: .word 0x00001555
_0216f9a8: .word data_02050f54
_0216f9a8: .word gSinCosTable
_0216f9ac: .word 0x00000333
_0216f9b0: .word gMapManager
arm_func_end func_ov24_0216f88c
@@ -2924,7 +2924,7 @@ func_ov24_0216fc70: ; 0x0216fc70
sub sp, sp, #0x48
mov r4, r0
ldrh r1, [r4, #0x62]
ldr r3, _0216fd54 ; =data_02050f54
ldr r3, _0216fd54 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -2978,7 +2978,7 @@ func_ov24_0216fc70: ; 0x0216fc70
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0216fd54: .word data_02050f54
_0216fd54: .word gSinCosTable
_0216fd58: .word 0xfffff333
_0216fd5c: .word 0x00000666
_0216fd60: .word 0xfffffe66
@@ -4086,7 +4086,7 @@ _02170b24:
mov r1, r1, lsr #0x10
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
ldr r1, _02170ca8 ; =data_02050f54
ldr r1, _02170ca8 ; =gSinCosTable
mov r2, r3, lsl #0x1
ldrsh r8, [r1, r2]
ldr r5, _02170cac ; =0x0000059a
@@ -4154,7 +4154,7 @@ _02170c98: .word 0x000003a7
_02170c9c: .word data_027e0764
_02170ca0: .word gPlayerPos
_02170ca4: .word data_ov24_021792ac
_02170ca8: .word data_02050f54
_02170ca8: .word gSinCosTable
_02170cac: .word 0x0000059a
arm_func_end func_ov24_02170930
@@ -4534,7 +4534,7 @@ func_ov24_02171120: ; 0x02171120
ble _021711b8
add r0, r4, #0x300
ldrh r0, [r0, #0x52]
ldr r2, _0217120c ; =data_02050f54
ldr r2, _0217120c ; =gSinCosTable
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
mov r0, r3, lsl #0x1
@@ -4590,7 +4590,7 @@ _021711f4:
bl func_01fffd04
ldmia sp!, {r4, pc}
.align 2, 0
_0217120c: .word data_02050f54
_0217120c: .word gSinCosTable
arm_func_end func_ov24_02171120
.global func_ov24_02171210
@@ -6653,7 +6653,7 @@ func_ov24_02172cf4: ; 0x02172cf4
strh r5, [sp, #0x38]
ldrh r0, [r4, #0x78]
ldr r2, [r4, #0x48]
ldr r1, _02172e44 ; =data_02050f54
ldr r1, _02172e44 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
mov r0, r3, lsl #0x1
@@ -6716,7 +6716,7 @@ func_ov24_02172cf4: ; 0x02172cf4
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02172e40: .word data_ov24_021792b8
_02172e44: .word data_02050f54
_02172e44: .word gSinCosTable
_02172e48: .word data_027e0fe8
_02172e4c: .word 0x53544c42
arm_func_end func_ov24_02172cf4
@@ -7749,7 +7749,7 @@ _02173bd8:
stmia r3, {r0, r1, r2}
ldrh r0, [r4, #0x78]
ldr r9, [r4, #0x48]
ldr r2, _02173cf0 ; =data_02050f54
ldr r2, _02173cf0 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -7814,7 +7814,7 @@ _02173bd8:
_02173ce4: .word gPlayerPos
_02173ce8: .word 0xffff8001
_02173cec: .word data_ov24_021792d0
_02173cf0: .word data_02050f54
_02173cf0: .word gSinCosTable
_02173cf4: .word data_027e0fe8
_02173cf8: .word 0x53544c42
arm_func_end func_ov24_02173b18
@@ -8178,7 +8178,7 @@ func_ov24_0217411c: ; 0x0217411c
mov r2, r0, lsl #0x1
add r0, r2, #1
mov lr, #0
ldr r1, _02174194 ; =data_02050f54
ldr r1, _02174194 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r5, [r1, r2]
mov r0, r0, lsl #0x1
@@ -8199,7 +8199,7 @@ func_ov24_0217411c: ; 0x0217411c
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02174194: .word data_02050f54
_02174194: .word gSinCosTable
arm_func_end func_ov24_0217411c
.global func_ov24_02174198
@@ -9666,7 +9666,7 @@ _021754f4:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _02175ec4 ; =0x00000b33
ldr r6, _02175ec8 ; =data_02050f54
ldr r6, _02175ec8 ; =gSinCosTable
str r0, [r4, #0x6b4]
ldrh r1, [r4, #0x78]
ldr r0, [r4, #0x48]
@@ -9790,7 +9790,7 @@ _021756e8:
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
add r0, r3, #1
ldr r2, _02175ec8 ; =data_02050f54
ldr r2, _02175ec8 ; =gSinCosTable
mov r3, r3, lsl #0x1
ldrsh ip, [r2, r3]
mov r0, r0, lsl #0x1
@@ -10330,7 +10330,7 @@ _02175eb8: .word gMapManager
_02175ebc: .word gActorManager
_02175ec0: .word data_ov24_021792e4
_02175ec4: .word 0x00000b33
_02175ec8: .word data_02050f54
_02175ec8: .word gSinCosTable
_02175ecc: .word gPlayer
_02175ed0: .word gItemManager
_02175ed4: .word data_027e0ffc
@@ -10785,7 +10785,7 @@ func_ov24_02176408: ; 0x02176408
mov r1, r0, lsl #0x1
mov ip, r1, lsl #0x1
add r1, r1, #1
ldr r3, _021764d0 ; =data_02050f54
ldr r3, _021764d0 ; =gSinCosTable
mov r2, r1, lsl #0x1
ldrsh r1, [r3, ip]
ldrsh r2, [r3, r2]
@@ -10803,7 +10803,7 @@ func_ov24_02176408: ; 0x02176408
.align 2, 0
_021764c8: .word data_ov24_021793ac
_021764cc: .word data_02051f54
_021764d0: .word data_02050f54
_021764d0: .word gSinCosTable
arm_func_end func_ov24_02176408
.global func_ov24_021764d4
@@ -11016,7 +11016,7 @@ func_ov24_02176738: ; 0x02176738
mov r4, r0
bl func_ov00_020ca8a4
ldrh r1, [r4, #0x78]
ldr r3, _021767c8 ; =data_02050f54
ldr r3, _021767c8 ; =gSinCosTable
add r0, r4, #0x394
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -11050,7 +11050,7 @@ _021767a4:
ldmia sp!, {r4, pc}
.align 2, 0
_021767c4: .word data_ov24_0217a908
_021767c8: .word data_02050f54
_021767c8: .word gSinCosTable
arm_func_end func_ov24_02176738
.global func_ov24_021767cc
@@ -11237,7 +11237,7 @@ func_ov24_02176954: ; 0x02176954
bl func_ov00_020ceacc
_02176988:
ldrh r1, [r4, #0x78]
ldr r3, _021769c4 ; =data_02050f54
ldr r3, _021769c4 ; =gSinCosTable
add r0, r4, #0x394
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -11252,7 +11252,7 @@ _02176988:
_021769b8: .word 0x0000038e
_021769bc: .word data_027e0ffc
_021769c0: .word 0x00000283
_021769c4: .word data_02050f54
_021769c4: .word gSinCosTable
arm_func_end func_ov24_02176954
.global func_ov24_021769c8
@@ -11343,7 +11343,7 @@ func_ov24_02176a94: ; 0x02176a94
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02176bd4 ; =data_02050f54
ldr r2, _02176bd4 ; =gSinCosTable
mov r3, r1, lsl #0x1
mov r1, r0, lsl #0x1
add r0, r9, #0x60
@@ -11419,7 +11419,7 @@ _02176bc0:
bl Vec3p_Add
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02176bd4: .word data_02050f54
_02176bd4: .word gSinCosTable
_02176bd8: .word 0x0000019a
_02176bdc: .word 0xfffffe66
_02176be0: .word 0x00000733
@@ -11544,7 +11544,7 @@ _02176d68:
str r1, [r0, #0x10]
add r2, r4, #0x300
ldrh r1, [r2, #0xb8]
ldr r5, _02176eac ; =data_02050f54
ldr r5, _02176eac ; =gSinCosTable
mov r0, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -11622,7 +11622,7 @@ _02176e90:
str r1, [r0, #0x10]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02176eac: .word data_02050f54
_02176eac: .word gSinCosTable
_02176eb0: .word 0x0000019a
_02176eb4: .word 0x00000333
arm_func_end func_ov24_02176be4
@@ -12123,7 +12123,7 @@ func_ov24_0217751c: ; 0x0217751c
cmp r1, #0
bne _021775d8
ldrh r3, [r0, #0x78]
ldr r5, _021775e8 ; =data_02050f54
ldr r5, _021775e8 ; =gSinCosTable
mov r2, #0
mov r3, r3, asr #0x4
mov r3, r3, lsl #0x1
@@ -12172,7 +12172,7 @@ _021775d8:
str r1, [r0, #0x130]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021775e8: .word data_02050f54
_021775e8: .word gSinCosTable
_021775ec: .word 0x00000333
arm_func_end func_ov24_0217751c
@@ -12274,7 +12274,7 @@ func_ov24_02177718: ; 0x02177718
ldmeqia sp!, {r3, r4, pc}
add r0, r4, #0x100
ldrh r1, [r0, #0xb4]
ldr r3, _021777d4 ; =data_02050f54
ldr r3, _021777d4 ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -12311,7 +12311,7 @@ func_ov24_02177718: ; 0x02177718
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021777d4: .word data_02050f54
_021777d4: .word gSinCosTable
_021777d8: .word 0x000004cd
_021777dc: .word 0x0000019a
_021777e0: .word data_ov00_020e9370
@@ -14310,7 +14310,7 @@ func_ov24_0217912c: ; 0x0217912c
sub sp, sp, #0x30
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _021791cc ; =data_02050f54
ldr r3, _021791cc ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -14347,7 +14347,7 @@ func_ov24_0217912c: ; 0x0217912c
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_021791cc: .word data_02050f54
_021791cc: .word gSinCosTable
arm_func_end func_ov24_0217912c
.global func_ov24_021791d0
asm/ov25.inc
+1 -1
View File
@@ -99,7 +99,7 @@
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0178
.extern data_027e0764
.extern data_027e0c54
asm/ov25.s
+24 -24
View File
@@ -839,7 +839,7 @@ func_ov25_0216e174: ; 0x0216e174
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _0216e230 ; =data_02050f54
ldr r1, _0216e230 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r2, [r1, r2]
mov r0, r0, lsl #0x1
@@ -871,7 +871,7 @@ func_ov25_0216e174: ; 0x0216e174
str r1, [r4, #0x68]
ldmia sp!, {r4, pc}
.align 2, 0
_0216e230: .word data_02050f54
_0216e230: .word gSinCosTable
_0216e234: .word 0x00000333
arm_func_end func_ov25_0216e174
@@ -2155,7 +2155,7 @@ _0216f2e4:
str r1, [sp, #0xc]
ldrh r1, [r0, #0x5c]
ldr r0, [r4, #0x48]
ldr r2, _0216f438 ; =data_02050f54
ldr r2, _0216f438 ; =gSinCosTable
str r0, [r4, #0x63c]
ldr r0, [r4, #0x4c]
mov r1, r1, asr #0x4
@@ -2231,7 +2231,7 @@ _0216f428: .word data_027e0764
_0216f42c: .word 0x0000038f
_0216f430: .word 0x0000071e
_0216f434: .word 0x00000aac
_0216f438: .word data_02050f54
_0216f438: .word gSinCosTable
_0216f43c: .word data_027e0e58
arm_func_end func_ov25_0216efb0
@@ -2348,7 +2348,7 @@ _0216f5b8:
str r1, [sp, #0x14]
ldrh r1, [r0, #0x5c]
ldr r0, [r4, #0x48]
ldr r2, _0216f7f0 ; =data_02050f54
ldr r2, _0216f7f0 ; =gSinCosTable
str r0, [r4, #0x63c]
ldr r0, [r4, #0x4c]
mov r1, r1, asr #0x4
@@ -2485,7 +2485,7 @@ _0216f780:
.align 2, 0
_0216f7e8: .word data_027e0e58
_0216f7ec: .word 0x88888889
_0216f7f0: .word data_02050f54
_0216f7f0: .word gSinCosTable
_0216f7f4: .word data_027e0178
_0216f7f8: .word 0x0000019a
_0216f7fc: .word data_027e0ffc
@@ -3268,7 +3268,7 @@ _021702c8:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _021703b8 ; =data_02050f54
ldr r1, _021703b8 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r7, [r1, r2]
mov r0, r0, lsl #0x1
@@ -3327,7 +3327,7 @@ _021703a8: .word data_027e0764
_021703ac: .word gPlayerLink
_021703b0: .word data_ov00_020eec68
_021703b4: .word 0x00000e39
_021703b8: .word data_02050f54
_021703b8: .word gSinCosTable
arm_func_end func_ov25_0216ff44
.global func_ov25_021703bc
@@ -4110,7 +4110,7 @@ func_ov25_02170e64: ; 0x02170e64
stmia r3, {r0, r1, r2}
ldrh r0, [r8, #0x78]
ldr r7, [r8, #0x48]
ldr r4, _02171334 ; =data_02050f54
ldr r4, _02171334 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -4336,7 +4336,7 @@ _02171200:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r0, [r8, #0x78]
ldr r4, _02171334 ; =data_02050f54
ldr r4, _02171334 ; =gSinCosTable
ldr r1, [r8, #0x48]
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
@@ -4409,7 +4409,7 @@ _02171200:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02171330: .word data_ov25_02179340
_02171334: .word data_02050f54
_02171334: .word gSinCosTable
_02171338: .word data_027e0764
_0217133c: .word 0xffffeaab
_02171340: .word 0x00000266
@@ -5824,7 +5824,7 @@ func_ov25_021724fc: ; 0x021724fc
add ip, r4, #0x100
ldrh r0, [ip, #0x70]
ldr r7, [r4, #0x48]
ldr r6, _021726c8 ; =data_02050f54
ldr r6, _021726c8 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r8, r0, lsl #0x1
str r7, [sp, #0x10]
@@ -5917,7 +5917,7 @@ func_ov25_021724fc: ; 0x021724fc
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_021726c4: .word data_ov25_02179524
_021726c8: .word data_02050f54
_021726c8: .word gSinCosTable
_021726cc: .word data_027e0fe8
_021726d0: .word 0x43425334
arm_func_end func_ov25_021724fc
@@ -5948,7 +5948,7 @@ func_ov25_021726d4: ; 0x021726d4
add r6, r4, #0x100
ldrh r0, [r6, #0x70]
ldr r6, [r4, #0x48]
ldr r5, _021728cc ; =data_02050f54
ldr r5, _021728cc ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
mov r0, r1, lsl #0x1
@@ -6052,7 +6052,7 @@ func_ov25_021726d4: ; 0x021726d4
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_021728c8: .word data_ov25_02179530
_021728cc: .word data_02050f54
_021728cc: .word gSinCosTable
_021728d0: .word data_027e0fe8
_021728d4: .word 0x43425334
arm_func_end func_ov25_021726d4
@@ -10956,7 +10956,7 @@ _02176ac4: .word 0x000004cd
func_ov25_02176ac8: ; 0x02176ac8
stmdb sp!, {r4, lr}
ldrh r2, [r0, #0x78]
ldr r4, _02176b80 ; =data_02050f54
ldr r4, _02176b80 ; =gSinCosTable
mov r1, #0
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
@@ -11001,7 +11001,7 @@ func_ov25_02176ac8: ; 0x02176ac8
str r2, [r0, #0x68]
ldmia sp!, {r4, pc}
.align 2, 0
_02176b80: .word data_02050f54
_02176b80: .word gSinCosTable
_02176b84: .word 0x00000266
arm_func_end func_ov25_02176ac8
@@ -12330,7 +12330,7 @@ func_ov25_02177bbc: ; 0x02177bbc
mov ip, #0
str r0, [sp, #0x30]
ldrb r2, [r4, #0x124]
ldr r5, _02177ca4 ; =data_02050f54
ldr r5, _02177ca4 ; =gSinCosTable
ldr r0, _02177ca8 ; =0x000004cd
str r2, [sp, #0x34]
ldrh lr, [r4, #0x78]
@@ -12372,7 +12372,7 @@ func_ov25_02177bbc: ; 0x02177bbc
add sp, sp, #0x3c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02177ca4: .word data_02050f54
_02177ca4: .word gSinCosTable
_02177ca8: .word 0x000004cd
_02177cac: .word data_027e0fe8
_02177cb0: .word 0x47534642
@@ -12492,7 +12492,7 @@ func_ov25_02177dc4: ; 0x02177dc4
add r1, r4, #0x100
strh r0, [r1, #0x5c]
ldrh r1, [r1, #0x5c]
ldr r3, _02177f00 ; =data_02050f54
ldr r3, _02177f00 ; =gSinCosTable
mov r0, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -12558,7 +12558,7 @@ func_ov25_02177dc4: ; 0x02177dc4
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02177efc: .word gPlayerPos
_02177f00: .word data_02050f54
_02177f00: .word gSinCosTable
_02177f04: .word data_027e0764
arm_func_end func_ov25_02177dc4
@@ -12598,7 +12598,7 @@ func_ov25_02177f08: ; 0x02177f08
tst r0, #0xff
add r0, r4, #0x100
ldrnesh r0, [r0, #0x5c]
ldr r2, _02178094 ; =data_02050f54
ldr r2, _02178094 ; =gSinCosTable
addne r0, r0, #0x2000
ldreqsh r0, [r0, #0x5c]
subeq r0, r0, #0x2000
@@ -12634,7 +12634,7 @@ _02177fe0:
bl func_0202dc38
add r1, r4, #0x100
ldrh r0, [r1, #0x6c]
ldr ip, _02178094 ; =data_02050f54
ldr ip, _02178094 ; =gSinCosTable
ldr r2, _02178098 ; =0x0000019a
add r0, r0, #0x3b8
add r0, r0, #0x800
@@ -12666,7 +12666,7 @@ _02177fe0:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02178090: .word data_027e0764
_02178094: .word data_02050f54
_02178094: .word gSinCosTable
_02178098: .word 0x0000019a
arm_func_end func_ov25_02177f08
asm/ov26.inc
+1 -1
View File
@@ -94,7 +94,7 @@
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02063e4c
.extern data_027e0194
asm/ov26.s
+19 -19
View File
@@ -639,7 +639,7 @@ func_ov26_0216dccc: ; 0x0216dccc
mov r4, r1
bl _ZN5Actor12GetOffsetPosEP5Vec3p
ldrh r0, [r5, #0x78]
ldr r2, _0216dd34 ; =data_02050f54
ldr r2, _0216dd34 ; =gSinCosTable
ldr r1, [r4]
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
@@ -661,7 +661,7 @@ func_ov26_0216dccc: ; 0x0216dccc
str r0, [r4, #8]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0216dd34: .word data_02050f54
_0216dd34: .word gSinCosTable
arm_func_end func_ov26_0216dccc
.global func_ov26_0216dd38
@@ -3172,7 +3172,7 @@ _0216fc2c:
add r0, r5, #0x400
ldrh r0, [r0, #0xb0]
mov lr, #0
ldr r1, _0216fd8c ; =data_02050f54
ldr r1, _0216fd8c ; =gSinCosTable
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
@@ -3258,7 +3258,7 @@ _0216fc2c:
_0216fd80: .word gPlayerPos
_0216fd84: .word data_027e0764
_0216fd88: .word 0x00008001
_0216fd8c: .word data_02050f54
_0216fd8c: .word gSinCosTable
_0216fd90: .word data_027e0d0c
_0216fd94: .word gMapManager
arm_func_end func_ov26_0216fba8
@@ -3751,7 +3751,7 @@ func_ov26_02170320: ; 0x02170320
smlabb r0, r2, r0, r3
strh r0, [r4, #0x78]
ldrsh r0, [r6, #0xe8]
ldr r3, _0217057c ; =data_02050f54
ldr r3, _0217057c ; =gSinCosTable
ldr r11, _02170580 ; =0x0000019a
add r0, r0, #0x31c
add r0, r0, #0x400
@@ -3892,7 +3892,7 @@ func_ov26_02170320: ; 0x02170320
.align 2, 0
_02170574: .word 0x0000071c
_02170578: .word gPlayerAngle
_0217057c: .word data_02050f54
_0217057c: .word gSinCosTable
_02170580: .word 0x0000019a
_02170584: .word gPlayerPos
_02170588: .word gPlayerVel
@@ -3913,7 +3913,7 @@ func_ov26_02170590: ; 0x02170590
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02170648 ; =data_02050f54
ldr r2, _02170648 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh lr, [r2, r1]
mov r1, r0, lsl #0x1
@@ -3949,7 +3949,7 @@ func_ov26_02170590: ; 0x02170590
strh r0, [r4, #0x9c]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02170648: .word data_02050f54
_02170648: .word gSinCosTable
_0217064c: .word 0x000004cd
arm_func_end func_ov26_02170590
@@ -5827,7 +5827,7 @@ func_ov26_02171f24: ; 0x02171f24
mov r1, r0, lsl #0x1
add r0, r1, #1
mov r2, r0, lsl #0x1
ldr r3, _021720ac ; =data_02050f54
ldr r3, _021720ac ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
@@ -5892,7 +5892,7 @@ _0217207c:
_021720a0: .word 0xfffff004
_021720a4: .word 0x45800000
_021720a8: .word 0x46800000
_021720ac: .word data_02050f54
_021720ac: .word gSinCosTable
_021720b0: .word 0x00000547
arm_func_end func_ov26_02171f24
@@ -5931,7 +5931,7 @@ _02172110:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0217220c ; =data_02050f54
ldr r2, _0217220c ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -5961,7 +5961,7 @@ _02172110:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0217220c ; =data_02050f54
ldr r2, _0217220c ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -5988,7 +5988,7 @@ _02172110:
.align 2, 0
_02172204: .word 0x45800000
_02172208: .word 0x46800000
_0217220c: .word data_02050f54
_0217220c: .word gSinCosTable
arm_func_end func_ov26_021720b4
.global func_ov26_02172210
@@ -7705,7 +7705,7 @@ func_ov26_02173884: ; 0x02173884
addeq sp, sp, #0x24
ldmeqia sp!, {r4, r5, pc}
ldrh r1, [r5, #0xc]
ldr r3, _02173904 ; =data_02050f54
ldr r3, _02173904 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -7727,7 +7727,7 @@ func_ov26_02173884: ; 0x02173884
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02173904: .word data_02050f54
_02173904: .word gSinCosTable
arm_func_end func_ov26_02173884
.global func_ov26_02173908
@@ -8973,7 +8973,7 @@ func_ov26_02174258: ; 0x02174258
lsl r0, r0, #1
add r1, r0, #1
lsl r2, r1, #1
ldr r1, _021743f4 ; =data_02050f54
ldr r1, _021743f4 ; =gSinCosTable
lsl r0, r0, #1
ldrsh r2, [r1, r2]
ldrsh r1, [r1, r0]
@@ -8986,7 +8986,7 @@ func_ov26_02174258: ; 0x02174258
lsl r0, r0, #1
add r1, r0, #1
lsl r2, r1, #1
ldr r1, _021743f4 ; =data_02050f54
ldr r1, _021743f4 ; =gSinCosTable
lsl r0, r0, #1
ldrsh r2, [r1, r2]
ldrsh r1, [r1, r0]
@@ -8999,7 +8999,7 @@ func_ov26_02174258: ; 0x02174258
lsl r0, r0, #1
add r1, r0, #1
lsl r2, r1, #1
ldr r1, _021743f4 ; =data_02050f54
ldr r1, _021743f4 ; =gSinCosTable
lsl r0, r0, #1
ldrsh r2, [r1, r2]
ldrsh r1, [r1, r0]
@@ -9048,7 +9048,7 @@ _021743e4: .word data_ov26_021794e4
_021743e8: .word data_ov26_021794f8
_021743ec: .word data_ov26_0217950c
_021743f0: .word data_ov00_020e9360
_021743f4: .word data_02050f54
_021743f4: .word gSinCosTable
_021743f8: .word 0xfffffc00
_021743fc: .word data_027e0e58
thumb_func_end func_ov26_02174258
asm/ov27.inc
+1 -1
View File
@@ -81,7 +81,7 @@
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern _ZNK11ItemManager19GetMaxTreasureCountEv
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_027e0618
.extern data_027e0764
asm/ov27.s
+46 -46
View File
@@ -740,7 +740,7 @@ _0216e0d8:
stmia r3, {r0, r1, r2}
ldrh r1, [r5, #0x78]
mov r2, r3
ldr r3, _0216e95c ; =data_02050f54
ldr r3, _0216e95c ; =gSinCosTable
mov r1, r1, asr #0x4
mov r6, r1, lsl #0x1
mov r1, r6, lsl #0x1
@@ -1201,7 +1201,7 @@ _0216e7f8:
ldr r2, [r2, #0x34]
blx r2
ldrh r1, [r5, #0x78]
ldr r2, _0216e95c ; =data_02050f54
ldr r2, _0216e95c ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r6, r1, lsl #0x1
@@ -1277,7 +1277,7 @@ _0216e94c: .word 0x00000235
_0216e950: .word gPlayerPos
_0216e954: .word gPlayerLink
_0216e958: .word data_027e0f64
_0216e95c: .word data_02050f54
_0216e95c: .word gSinCosTable
_0216e960: .word data_027e0e58
_0216e964: .word data_ov00_020eec68
_0216e968: .word 0xffffaaab
@@ -2222,7 +2222,7 @@ func_ov27_0216f608: ; 0x0216f608
cmp r1, #0
ble _0216f6dc
ldrh r1, [r4, #0x78]
ldr r2, _0216f8e0 ; =data_02050f54
ldr r2, _0216f8e0 ; =gSinCosTable
ldr r0, _0216f8e4 ; =0x00000133
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -2318,7 +2318,7 @@ _0216f764:
strb r0, [r4, #0x468]
ldrsh r0, [r4, #0x78]
ldr r1, _0216f8f8 ; =0x0000105b
ldr r2, _0216f8e0 ; =data_02050f54
ldr r2, _0216f8e0 ; =gSinCosTable
strh r0, [sp]
ldr r0, [r4, #0x138]
sub r3, r1, #0x5b0
@@ -2344,7 +2344,7 @@ _0216f764:
ldr r2, [r2, #0x34]
blx r2
ldrh r0, [sp]
ldr r2, _0216f8e0 ; =data_02050f54
ldr r2, _0216f8e0 ; =gSinCosTable
mov r1, #0
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -2403,7 +2403,7 @@ _0216f8a8:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0216f8e0: .word data_02050f54
_0216f8e0: .word gSinCosTable
_0216f8e4: .word 0x00000133
_0216f8e8: .word gMapManager
_0216f8ec: .word 0x00000171
@@ -3071,7 +3071,7 @@ func_ov27_02170194: ; 0x02170194
mov r1, #0x400
bl func_ov27_021713d4
ldrh r0, [r4, #0x78]
ldr r1, _02170264 ; =data_02050f54
ldr r1, _02170264 ; =gSinCosTable
mov ip, #0
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
@@ -3114,7 +3114,7 @@ _02170238:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02170264: .word data_02050f54
_02170264: .word gSinCosTable
_02170268: .word data_027e0ffc
arm_func_end func_ov27_02170194
@@ -3272,7 +3272,7 @@ func_ov27_02170480: ; 0x02170480
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x38
ldr r1, _021708a4 ; =gPlayerAngle
ldr r3, _021708a8 ; =data_02050f54
ldr r3, _021708a8 ; =gSinCosTable
ldrh r2, [r1]
ldr r1, _021708ac ; =0x00001b85
mov r6, #0
@@ -3330,7 +3330,7 @@ func_ov27_02170480: ; 0x02170480
cmpeq r0, #0
beq _02170630
ldr r5, [r4, #0x48]
ldr r8, _021708a8 ; =data_02050f54
ldr r8, _021708a8 ; =gSinCosTable
str r5, [sp, #0x2c]
ldr r0, [r4, #0x4c]
ldr r6, _021708ac ; =0x00001b85
@@ -3412,7 +3412,7 @@ _02170630:
mov r2, r6
ldrh r6, [r4, #0x78]
ldr r3, _021708c4 ; =data_027e0e58
ldr r7, _021708a8 ; =data_02050f54
ldr r7, _021708a8 ; =gSinCosTable
mov r6, r6, asr #0x4
mov lr, r6, lsl #0x1
mov r6, lr, lsl #0x1
@@ -3504,7 +3504,7 @@ _021707f8:
mov r2, r2, asr #0x4
mov r3, r2, lsl #0x1
add r2, r3, #1
ldr r5, _021708a8 ; =data_02050f54
ldr r5, _021708a8 ; =gSinCosTable
mov r3, r3, lsl #0x1
mov r2, r2, lsl #0x1
ldrsh r3, [r5, r3]
@@ -3539,7 +3539,7 @@ _021707f8:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_021708a4: .word gPlayerAngle
_021708a8: .word data_02050f54
_021708a8: .word gSinCosTable
_021708ac: .word 0x00001b85
_021708b0: .word gPlayerPos
_021708b4: .word 0x00000333
@@ -3869,7 +3869,7 @@ _02170d04:
ldr r2, [r2, #0x34]
blx r2
ldrh r1, [r4, #0x78]
ldr r2, _02170e20 ; =data_02050f54
ldr r2, _02170e20 ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov ip, r1, lsl #0x1
@@ -3937,7 +3937,7 @@ _02170dd0:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02170e1c: .word 0x0000071c
_02170e20: .word data_02050f54
_02170e20: .word gSinCosTable
arm_func_end func_ov27_02170cbc
.global func_ov27_02170e24
@@ -3966,7 +3966,7 @@ func_ov27_02170e24: ; 0x02170e24
mov r1, #2
bl func_ov14_0214a720
ldrh r0, [r4, #0x78]
ldr r3, _02170f7c ; =data_02050f54
ldr r3, _02170f7c ; =gSinCosTable
ldr r1, _02170f80 ; =0x00000266
mov r0, r0, asr #0x4
mov r5, r0, lsl #0x1
@@ -4031,7 +4031,7 @@ _02170f5c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02170f78: .word 0x0000071c
_02170f7c: .word data_02050f54
_02170f7c: .word gSinCosTable
_02170f80: .word 0x00000266
_02170f84: .word gMapManager
arm_func_end func_ov27_02170e24
@@ -4134,7 +4134,7 @@ _021710d8:
mov r2, r0, lsl #0x1
mov r0, #0
str r0, [sp, #0x30]
ldr r0, _02171384 ; =data_02050f54
ldr r0, _02171384 ; =gSinCosTable
mov r1, r2, lsl #0x1
ldrsh r1, [r0, r1]
add r0, r0, r2, lsl #1
@@ -4308,7 +4308,7 @@ _02171374: .word gPlayerPos
_02171378: .word 0x00000bb8
_0217137c: .word data_ov27_021794c0
_02171380: .word 0x00001133
_02171384: .word data_02050f54
_02171384: .word gSinCosTable
_02171388: .word 0x00000266
arm_func_end func_ov27_02170f88
@@ -4355,7 +4355,7 @@ func_ov27_021713d4: ; 0x021713d4
mov r1, #2
bl func_ov14_0214a720
ldrh r1, [r5, #0x78]
ldr r3, _02171484 ; =data_02050f54
ldr r3, _02171484 ; =gSinCosTable
mov r0, r5
mov r1, r1, asr #0x4
mov ip, r1, lsl #0x1
@@ -4384,7 +4384,7 @@ func_ov27_021713d4: ; 0x021713d4
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02171484: .word data_02050f54
_02171484: .word gSinCosTable
arm_func_end func_ov27_021713d4
.global func_ov27_02171488
@@ -5230,7 +5230,7 @@ func_ov27_02171f3c: ; 0x02171f3c
mov r1, r1, asr #0x4
mov r5, r1, lsl #0x1
add r1, r5, #1
ldr r2, _0217247c ; =data_02050f54
ldr r2, _0217247c ; =gSinCosTable
mov r5, r5, lsl #0x1
ldrsh r5, [r2, r5]
mov r1, r1, lsl #0x1
@@ -5273,7 +5273,7 @@ _02172018:
ldr r0, _02172478 ; =gAdventureFlags
ldrh r1, [r1, #0x78]
mov r3, #0
ldr r2, _0217247c ; =data_02050f54
ldr r2, _0217247c ; =gSinCosTable
mov r1, r1, asr #0x4
mov r5, r1, lsl #0x1
add r1, r5, #1
@@ -5383,7 +5383,7 @@ _02172154:
add r0, r6, #0x300
strh r1, [r0, #0x96]
ldrsh r1, [r0, #0x96]
ldr r3, _0217247c ; =data_02050f54
ldr r3, _0217247c ; =gSinCosTable
ldr r0, _02172480 ; =0x0000019a
strh r1, [r6, #0x78]
ldrh r2, [r6, #0x78]
@@ -5549,7 +5549,7 @@ _0217245c:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02172478: .word gAdventureFlags
_0217247c: .word data_02050f54
_0217247c: .word gSinCosTable
_02172480: .word 0x0000019a
_02172484: .word gMapManager
_02172488: .word 0x00000b33
@@ -5583,7 +5583,7 @@ func_ov27_021724b4: ; 0x021724b4
mov r2, r2, lsr #0x10
mov r2, r2, asr #0x4
mov r3, r2, lsl #0x1
ldr r4, _02172588 ; =data_02050f54
ldr r4, _02172588 ; =gSinCosTable
mov r2, r3, lsl #0x1
add r3, r3, #1
ldrsh r6, [r4, r2]
@@ -5632,7 +5632,7 @@ func_ov27_021724b4: ; 0x021724b4
bl func_ov00_020ceacc
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02172588: .word data_02050f54
_02172588: .word gSinCosTable
_0217258c: .word 0x0000019a
_02172590: .word 0x00002710
_02172594: .word data_027e0ffc
@@ -5672,7 +5672,7 @@ func_ov27_02172598: ; 0x02172598
str r0, [sp, #0xa4]
add r0, r5, #0x300
ldrh r1, [r0, #0x90]
ldr r3, _0217282c ; =data_02050f54
ldr r3, _0217282c ; =gSinCosTable
add r0, sp, #0x78
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -5684,7 +5684,7 @@ func_ov27_02172598: ; 0x02172598
blx func_01ff8214
add r0, r5, #0x300
ldrh r1, [r0, #0x96]
ldr r3, _0217282c ; =data_02050f54
ldr r3, _0217282c ; =gSinCosTable
add r0, sp, #0x54
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -5700,7 +5700,7 @@ func_ov27_02172598: ; 0x02172598
bl func_0202e030
add r0, r5, #0x300
ldrh r1, [r0, #0x94]
ldr r3, _0217282c ; =data_02050f54
ldr r3, _0217282c ; =gSinCosTable
add r0, sp, #0x54
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -5807,7 +5807,7 @@ func_ov27_02172598: ; 0x02172598
add sp, sp, #0xa8
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0217282c: .word data_02050f54
_0217282c: .word gSinCosTable
_02172830: .word 0xfffff99a
_02172834: .word 0xfffffa66
_02172838: .word gMapManager
@@ -7991,7 +7991,7 @@ func_ov27_02174454: ; 0x02174454
ldr r0, _021746e8 ; =gPlayerAngle
str r2, [r4, #0x48]
ldr r2, [r1, #4]
ldr r7, _021746ec ; =data_02050f54
ldr r7, _021746ec ; =gSinCosTable
str r2, [r4, #0x4c]
ldr r1, [r1, #8]
mov r2, #0x800
@@ -8150,7 +8150,7 @@ func_ov27_02174454: ; 0x02174454
.align 2, 0
_021746e4: .word gPlayerPos
_021746e8: .word gPlayerAngle
_021746ec: .word data_02050f54
_021746ec: .word gSinCosTable
_021746f0: .word data_027e0c68
_021746f4: .word 0x00060015
_021746f8: .word gMapManager
@@ -10153,7 +10153,7 @@ func_ov27_021760b0: ; 0x021760b0
mov r1, #0x400
bl func_ov27_02176ed0
ldr r0, [r4, #0x4d0]
ldr r1, _02176160 ; =data_02050f54
ldr r1, _02176160 ; =gSinCosTable
sub r0, r0, #0x400
str r0, [r4, #0x4d0]
ldrh r0, [r4, #0x78]
@@ -10193,7 +10193,7 @@ _0217613c:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02176160: .word data_02050f54
_02176160: .word gSinCosTable
arm_func_end func_ov27_021760b0
.global func_ov27_02176164
@@ -10944,7 +10944,7 @@ _02176bec:
mov r2, r0, lsl #0x1
mov r0, #0
str r0, [sp, #0x30]
ldr r0, _02176e80 ; =data_02050f54
ldr r0, _02176e80 ; =gSinCosTable
mov r1, r2, lsl #0x1
ldrsh r1, [r0, r1]
add r0, r0, r2, lsl #1
@@ -11112,7 +11112,7 @@ _02176e54:
_02176e74: .word gPlayerPos
_02176e78: .word data_ov27_02179bc4
_02176e7c: .word 0x00001133
_02176e80: .word data_02050f54
_02176e80: .word gSinCosTable
_02176e84: .word 0x0000019a
arm_func_end func_ov27_02176aac
@@ -11158,7 +11158,7 @@ func_ov27_02176ed0: ; 0x02176ed0
mov r1, #2
bl func_ov14_0214a720
ldrh r1, [r5, #0x78]
ldr r3, _02176f84 ; =data_02050f54
ldr r3, _02176f84 ; =gSinCosTable
mov r0, r5
mov r1, r1, asr #0x4
mov ip, r1, lsl #0x1
@@ -11188,7 +11188,7 @@ func_ov27_02176ed0: ; 0x02176ed0
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02176f84: .word data_02050f54
_02176f84: .word gSinCosTable
arm_func_end func_ov27_02176ed0
.global func_ov27_02176f88
@@ -12836,7 +12836,7 @@ _02178588:
cmp r3, #0
beq _02178600
ldrh r0, [r6, #0x78]
ldr r2, _02178674 ; =data_02050f54
ldr r2, _02178674 ; =gSinCosTable
ldr ip, [r6, #0x50]
mov r0, r0, asr #0x4
mov r7, r0, lsl #0x1
@@ -12895,7 +12895,7 @@ _02178664: .word 0x00001001
_02178668: .word data_027e0ffc
_0217866c: .word 0x00000412
_02178670: .word 0x00000413
_02178674: .word data_02050f54
_02178674: .word gSinCosTable
_02178678: .word data_ov00_020e9370
arm_func_end func_ov27_021783a8
@@ -13093,7 +13093,7 @@ _021788d4:
str ip, [sp, #0x18]
str r4, [sp, #0x24]
ldrh r4, [r0, #0x78]
ldr r5, _02178a00 ; =data_02050f54
ldr r5, _02178a00 ; =gSinCosTable
ldr r2, [r0, #0x50]
mov r4, r4, asr #0x4
mov r7, r4, lsl #0x1
@@ -13163,7 +13163,7 @@ _021789f4:
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_02178a00: .word data_02050f54
_02178a00: .word gSinCosTable
arm_func_end func_ov27_021788b4
.global func_ov27_02178a04
@@ -13388,7 +13388,7 @@ func_ov27_02178c14: ; 0x02178c14
bl func_0202bbbc
cmp r0, #3
ldreq r0, [r5, #8]
ldr r2, _02178cec ; =data_02050f54
ldr r2, _02178cec ; =gSinCosTable
cmpeq r0, #5
moveq r4, #0
mov r0, r4, asr #0x4
@@ -13423,7 +13423,7 @@ func_ov27_02178c14: ; 0x02178c14
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02178ce8: .word 0x00000333
_02178cec: .word data_02050f54
_02178cec: .word gSinCosTable
_02178cf0: .word data_027e0e58
_02178cf4: .word 0x00000272
arm_func_end func_ov27_02178c14
asm/ov28.inc
+1 -1
View File
@@ -89,7 +89,7 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051054
.extern data_02051154
.extern data_02051354
asm/ov28.s
+45 -45
View File
@@ -1686,7 +1686,7 @@ _0216eddc:
_0216edf8:
add r2, r5, #0x800
ldrsh r3, [r2, #0xe0]
ldr r0, _0216eed0 ; =data_02050f54
ldr r0, _0216eed0 ; =gSinCosTable
mov r1, #0x7b
add r3, r3, #0x3e8
strh r3, [r2, #0xe0]
@@ -1710,7 +1710,7 @@ _0216edf8:
str r0, [r5, #0x884]
sub r0, r1, #0x5b0
ldrsh r4, [r2, #0xd8]
ldr r1, _0216eed0 ; =data_02050f54
ldr r1, _0216eed0 ; =gSinCosTable
sub r0, r4, r0
strh r0, [r2, #0xd8]
ldrsh r0, [r2, #0xda]
@@ -1739,7 +1739,7 @@ _0216eec0: .word 0x00000333
_0216eec4: .word 0x00000e39
_0216eec8: .word 0x0000011f
_0216eecc: .word 0xffffe38e
_0216eed0: .word data_02050f54
_0216eed0: .word gSinCosTable
arm_func_end func_ov28_0216ead4
.global func_ov28_0216eed4
@@ -1754,7 +1754,7 @@ func_ov28_0216eed4: ; 0x0216eed4
str r1, [sp, #0x28]
str r1, [sp, #0x2c]
ldrh r1, [r0, #0xc8]
ldr r3, _0216ef4c ; =data_02050f54
ldr r3, _0216ef4c ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1776,7 +1776,7 @@ func_ov28_0216eed4: ; 0x0216eed4
ldmia sp!, {r4, pc}
.align 2, 0
_0216ef48: .word 0x00000b33
_0216ef4c: .word data_02050f54
_0216ef4c: .word gSinCosTable
arm_func_end func_ov28_0216eed4
.global func_ov28_0216ef50
@@ -1791,7 +1791,7 @@ func_ov28_0216ef50: ; 0x0216ef50
str r1, [sp, #0x70]
str r1, [sp, #0x74]
ldrh r1, [r0, #0xca]
ldr r3, _0216f008 ; =data_02050f54
ldr r3, _0216f008 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1803,7 +1803,7 @@ func_ov28_0216ef50: ; 0x0216ef50
blx func_01ff8230
add r0, r4, #0x800
ldrh r1, [r0, #0xd6]
ldr r3, _0216f008 ; =data_02050f54
ldr r3, _0216f008 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1829,7 +1829,7 @@ func_ov28_0216ef50: ; 0x0216ef50
ldmia sp!, {r4, pc}
.align 2, 0
_0216f004: .word 0x00000b33
_0216f008: .word data_02050f54
_0216f008: .word gSinCosTable
arm_func_end func_ov28_0216ef50
.global func_ov28_0216f00c
@@ -1844,7 +1844,7 @@ func_ov28_0216f00c: ; 0x0216f00c
str r1, [sp, #0x70]
str r1, [sp, #0x74]
ldrh r1, [r0, #0xcc]
ldr r3, _0216f0c8 ; =data_02050f54
ldr r3, _0216f0c8 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1856,7 +1856,7 @@ func_ov28_0216f00c: ; 0x0216f00c
blx func_01ff8214
add r0, r4, #0x800
ldrh r1, [r0, #0xd0]
ldr r3, _0216f0c8 ; =data_02050f54
ldr r3, _0216f0c8 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1883,7 +1883,7 @@ func_ov28_0216f00c: ; 0x0216f00c
ldmia sp!, {r4, pc}
.align 2, 0
_0216f0c4: .word 0x00000b33
_0216f0c8: .word data_02050f54
_0216f0c8: .word gSinCosTable
arm_func_end func_ov28_0216f00c
.global func_ov28_0216f0cc
@@ -1898,7 +1898,7 @@ func_ov28_0216f0cc: ; 0x0216f0cc
str r1, [sp, #0x28]
str r1, [sp, #0x2c]
ldrh r1, [r0, #0xce]
ldr r3, _0216f148 ; =data_02050f54
ldr r3, _0216f148 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1921,7 +1921,7 @@ func_ov28_0216f0cc: ; 0x0216f0cc
ldmia sp!, {r4, pc}
.align 2, 0
_0216f144: .word 0x00000b33
_0216f148: .word data_02050f54
_0216f148: .word gSinCosTable
arm_func_end func_ov28_0216f0cc
.global func_ov28_0216f14c
@@ -1936,7 +1936,7 @@ func_ov28_0216f14c: ; 0x0216f14c
str r1, [sp, #0x28]
str r1, [sp, #0x2c]
ldrh r1, [r0, #0xd2]
ldr r3, _0216f1c4 ; =data_02050f54
ldr r3, _0216f1c4 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1958,7 +1958,7 @@ func_ov28_0216f14c: ; 0x0216f14c
ldmia sp!, {r4, pc}
.align 2, 0
_0216f1c0: .word 0x00000b33
_0216f1c4: .word data_02050f54
_0216f1c4: .word gSinCosTable
arm_func_end func_ov28_0216f14c
.global func_ov28_0216f1c8
@@ -1966,7 +1966,7 @@ _0216f1c4: .word data_02050f54
func_ov28_0216f1c8: ; 0x0216f1c8
stmdb sp!, {r4, lr}
sub sp, sp, #0x30
ldr r2, _0216f224 ; =data_02050f54
ldr r2, _0216f224 ; =gSinCosTable
mov r3, #0x1000
ldrsh r1, [r2]
ldrsh r2, [r2, #2]
@@ -1988,7 +1988,7 @@ func_ov28_0216f1c8: ; 0x0216f1c8
add sp, sp, #0x30
ldmia sp!, {r4, pc}
.align 2, 0
_0216f224: .word data_02050f54
_0216f224: .word gSinCosTable
arm_func_end func_ov28_0216f1c8
.global func_ov28_0216f228
@@ -4115,7 +4115,7 @@ func_ov28_02170c2c: ; 0x02170c2c
sub sp, sp, #0x18
ldrh r2, [sp, #0x40]
ldr r1, [sp, #0x2c]
ldr ip, _02170ce8 ; =data_02050f54
ldr ip, _02170ce8 ; =gSinCosTable
mov r2, r2, asr #0x4
mov r4, r2, lsl #0x1
mov r2, r4, lsl #0x1
@@ -4158,7 +4158,7 @@ func_ov28_02170c2c: ; 0x02170c2c
add sp, sp, #0x10
bx lr
.align 2, 0
_02170ce8: .word data_02050f54
_02170ce8: .word gSinCosTable
arm_func_end func_ov28_02170c2c
.global func_ov28_02170cec
@@ -4412,7 +4412,7 @@ func_ov28_02170fa0: ; 0x02170fa0
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr ip, [sp, #0xc]
ldr r3, _02171070 ; =data_02050f54
ldr r3, _02171070 ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldr r1, [sp, #4]
@@ -4442,7 +4442,7 @@ func_ov28_02170fa0: ; 0x02170fa0
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0217106c: .word data_027e0ffc
_02171070: .word data_02050f54
_02171070: .word gSinCosTable
arm_func_end func_ov28_02170fa0
.global func_ov28_02171074
@@ -5717,7 +5717,7 @@ func_ov28_021720e8: ; 0x021720e8
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02172140 ; =data_02050f54
ldr r3, _02172140 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -5736,7 +5736,7 @@ func_ov28_021720e8: ; 0x021720e8
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02172140: .word data_02050f54
_02172140: .word gSinCosTable
arm_func_end func_ov28_021720e8
.global func_ov28_02172144
@@ -6118,7 +6118,7 @@ func_ov28_021725fc: ; 0x021725fc
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _02172654 ; =data_02050f54
ldr r3, _02172654 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -6137,7 +6137,7 @@ func_ov28_021725fc: ; 0x021725fc
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02172654: .word data_02050f54
_02172654: .word gSinCosTable
arm_func_end func_ov28_021725fc
.global func_ov28_02172658
@@ -8521,7 +8521,7 @@ _02174428:
bne _02174488
add r1, r4, #0x200
ldrh r0, [r1, #0x34]
ldr r2, _021744bc ; =data_02050f54
ldr r2, _021744bc ; =gSinCosTable
add sp, sp, #0x14
add r0, r0, #0xee0
add r0, r0, #0x2000
@@ -8552,7 +8552,7 @@ _02174488:
_021744b0: .word gAdventureFlags
_021744b4: .word data_027e0e58
_021744b8: .word data_ov00_020eec9c
_021744bc: .word data_02050f54
_021744bc: .word gSinCosTable
arm_func_end func_ov28_02174388
.global func_ov28_021744c0
@@ -10531,7 +10531,7 @@ _02175d58:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02175f44 ; =data_02050f54
ldr r2, _02175f44 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r2, r1]
mov r0, r0, lsl #0x1
@@ -10634,7 +10634,7 @@ _02175f3c:
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02175f44: .word data_02050f54
_02175f44: .word gSinCosTable
arm_func_end func_ov28_02175d1c
.global func_ov28_02175f48
@@ -11209,7 +11209,7 @@ func_ov28_0217671c: ; 0x0217671c
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0x12]
ldr r3, _02176778 ; =data_02050f54
ldr r3, _02176778 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -11229,7 +11229,7 @@ func_ov28_0217671c: ; 0x0217671c
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02176778: .word data_02050f54
_02176778: .word gSinCosTable
arm_func_end func_ov28_0217671c
.global func_ov28_0217677c
@@ -11245,7 +11245,7 @@ func_ov28_0217677c: ; 0x0217677c
str r2, [sp, #0x28]
str r1, [sp, #0x2c]
ldrh r1, [r4, #0x12]
ldr r3, _021767f4 ; =data_02050f54
ldr r3, _021767f4 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -11266,7 +11266,7 @@ func_ov28_0217677c: ; 0x0217677c
ldmia sp!, {r4, pc}
.align 2, 0
_021767f0: .word 0xffffe99a
_021767f4: .word data_02050f54
_021767f4: .word gSinCosTable
arm_func_end func_ov28_0217677c
.global func_ov28_021767f8
@@ -11310,7 +11310,7 @@ func_ov28_021767f8: ; 0x021767f8
add r0, sp, #4
add r2, r2, #0x400
bl func_01ff8e84
ldr r2, _021768d8 ; =data_02050f54
ldr r2, _021768d8 ; =gSinCosTable
add r0, sp, #4
ldrsh r1, [r2]
ldrsh r2, [r2, #2]
@@ -11329,7 +11329,7 @@ func_ov28_021767f8: ; 0x021767f8
.align 2, 0
_021768d0: .word data_02051354
_021768d4: .word data_02051054
_021768d8: .word data_02050f54
_021768d8: .word gSinCosTable
arm_func_end func_ov28_021767f8
.global func_ov28_021768dc
@@ -11353,7 +11353,7 @@ func_ov28_021768dc: ; 0x021768dc
mov r3, #0x400
str ip, [sp]
bl func_01ff8988
ldr r2, _021769d8 ; =data_02050f54
ldr r2, _021769d8 ; =gSinCosTable
add r0, sp, #4
ldrsh r1, [r2, #0xf4]
ldrsh r2, [r2, #0xf6]
@@ -11399,7 +11399,7 @@ func_ov28_021768dc: ; 0x021768dc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_021769d4: .word 0x0000063d
_021769d8: .word data_02050f54
_021769d8: .word gSinCosTable
_021769dc: .word data_02051154
_021769e0: .word data_02051f54
_021769e4: .word gItemManager
@@ -11445,7 +11445,7 @@ func_ov28_021769e8: ; 0x021769e8
add r0, sp, #0xc
add r2, r2, #0x400
bl func_01ff8e84
ldr r2, _02176bd0 ; =data_02050f54
ldr r2, _02176bd0 ; =gSinCosTable
add r0, sp, #0xc
ldrsh r1, [r2]
ldrsh r2, [r2, #2]
@@ -11534,7 +11534,7 @@ _02176bc0: .word 0xfffffe66
_02176bc4: .word 0x00000333
_02176bc8: .word data_02054054
_02176bcc: .word data_02054b54
_02176bd0: .word data_02050f54
_02176bd0: .word gSinCosTable
_02176bd4: .word data_027e0e58
arm_func_end func_ov28_021769e8
@@ -11742,7 +11742,7 @@ _02176e40:
addne sp, sp, #0x24
ldmneia sp!, {r4, r5, pc}
ldr r4, [r4, #0xb4]
ldr r3, _02176ef4 ; =data_02050f54
ldr r3, _02176ef4 ; =gSinCosTable
ldr r1, [r4]
add r0, sp, #0
bic r1, r1, #2
@@ -11761,7 +11761,7 @@ _02176e40:
mov r2, r1
bl func_0202e030
ldrh r1, [r5, #0x5c]
ldr r3, _02176ef4 ; =data_02050f54
ldr r3, _02176ef4 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -11779,7 +11779,7 @@ _02176e40:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02176ef0: .word data_ov28_021784dc
_02176ef4: .word data_02050f54
_02176ef4: .word gSinCosTable
arm_func_end func_ov28_02176e04
.global func_ov28_02176ef8
@@ -12847,7 +12847,7 @@ func_ov28_02177bec: ; 0x02177bec
mov r2, #0x21
bl Approach_thunk
ldrh r0, [r4, #0x78]
ldr r2, _02178040 ; =data_02050f54
ldr r2, _02178040 ; =gSinCosTable
ldr r6, [r4, #0x188]
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -12894,7 +12894,7 @@ _02177cd0:
sub r0, r0, #1
str r0, [r4, #0x18c]
ldrh r0, [r4, #0x78]
ldr r1, _02178040 ; =data_02050f54
ldr r1, _02178040 ; =gSinCosTable
ldr r3, _02178044 ; =data_027e0e58
mov r0, r0, asr #0x4
mov r5, r0, lsl #0x1
@@ -13113,7 +13113,7 @@ _02177fb0:
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_02178040: .word data_02050f54
_02178040: .word gSinCosTable
_02178044: .word data_027e0e58
_02178048: .word 0x00000b33
_0217804c: .word data_027e0764
asm/ov29.inc
+1 -1
View File
@@ -73,7 +73,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051354
.extern data_02052f54
.extern data_02054b54
asm/ov29.s
+42 -42
View File
@@ -5448,7 +5448,7 @@ _02171f74:
beq _02172028
ldrh r0, [r5, #0x78]
mov r1, #0
ldr r3, _02172070 ; =data_02050f54
ldr r3, _02172070 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
@@ -5510,7 +5510,7 @@ _0217204c:
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02172070: .word data_02050f54
_02172070: .word gSinCosTable
arm_func_end func_ov29_02171f4c
.global func_ov29_02172074
@@ -5795,7 +5795,7 @@ func_ov29_021723f0: ; 0x021723f0
addeq sp, sp, #0x24
ldmeqia sp!, {r3, r4, pc}
ldrh r1, [r4, #0x78]
ldr r3, _02172460 ; =data_02050f54
ldr r3, _02172460 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -5814,7 +5814,7 @@ func_ov29_021723f0: ; 0x021723f0
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02172460: .word data_02050f54
_02172460: .word gSinCosTable
arm_func_end func_ov29_021723f0
.global func_ov29_02172464
@@ -6219,7 +6219,7 @@ func_ov29_02172938: ; 0x02172938
bne _02172ad8
ldrh r0, [r6, #0x78]
ldr r1, [r6, #0x48]
ldr r2, _02172bb0 ; =data_02050f54
ldr r2, _02172bb0 ; =gSinCosTable
str r1, [sp, #0x24]
ldr r7, [r6, #0x4c]
mov r3, r0, asr #0x4
@@ -6308,7 +6308,7 @@ _02172ad8:
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r4, [sp, #0x14]
ldr r3, _02172bb0 ; =data_02050f54
ldr r3, _02172bb0 ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r2, [r3, r2]
@@ -6345,7 +6345,7 @@ _02172ba0:
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_02172bac: .word 0x41525257
_02172bb0: .word data_02050f54
_02172bb0: .word gSinCosTable
_02172bb4: .word data_027e0e58
_02172bb8: .word 0x00001001
_02172bbc: .word data_027e0ffc
@@ -7154,7 +7154,7 @@ _02173654:
ldrsh r3, [r0, #0x94]
ldrsh r2, [r1, #0x9a]
ldrh r0, [r1, #0x94]
ldr r1, _02173820 ; =data_02050f54
ldr r1, _02173820 ; =gSinCosTable
sub r2, r3, r2
sub r3, r2, #0x8000
mov r2, r0, asr #0x4
@@ -7167,7 +7167,7 @@ _02173690:
add r0, r5, #0x200
ldrsh r3, [r0, #0x94]
mov r1, #0x8000
ldr r2, _02173820 ; =data_02050f54
ldr r2, _02173820 ; =gSinCosTable
add r3, r3, #0xc00
strh r3, [r0, #0x94]
ldrh r3, [r0, #0x94]
@@ -7208,7 +7208,7 @@ _021736d4:
bl func_ov38_021854e4
ldrsh r0, [r5, #0x78]
mov r2, #0
ldr r1, _02173820 ; =data_02050f54
ldr r1, _02173820 ; =gSinCosTable
add r0, r0, r0, lsr #31
mov r0, r0, lsl #0xf
mov r0, r0, lsr #0x10
@@ -7267,7 +7267,7 @@ _021737d4:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02173820: .word data_02050f54
_02173820: .word gSinCosTable
_02173824: .word 0x00001555
_02173828: .word 0x0000019a
_0217382c: .word 0x00000ccd
@@ -7707,7 +7707,7 @@ _02173e68:
mov r0, r4
bl func_ov29_02173314
ldrsh r1, [r4, #0x78]
ldr r6, _02174040 ; =data_02050f54
ldr r6, _02174040 ; =gSinCosTable
add r0, r4, #0x200
add r1, r1, r1, lsr #31
mov r1, r1, lsl #0xf
@@ -7823,7 +7823,7 @@ _02174030: .word 0x00000e39
_02174034: .word 0x00000ccd
_02174038: .word 0x00000266
_0217403c: .word 0x0000019a
_02174040: .word data_02050f54
_02174040: .word gSinCosTable
arm_func_end func_ov29_021739d4
.global func_ov29_02174044
@@ -8107,7 +8107,7 @@ _02174410:
str r0, [r4, #0x284]
add r0, r4, #0x200
ldrh r1, [r0, #0x9a]
ldr r3, _02174730 ; =data_02050f54
ldr r3, _02174730 ; =gSinCosTable
mov r0, #0x5000
mov r1, r1, asr #0x4
mov r5, r1, lsl #0x1
@@ -8192,7 +8192,7 @@ _02174514:
bl func_ov29_02174cc8
_02174578:
ldrsh r1, [r4, #0x78]
ldr r6, _02174730 ; =data_02050f54
ldr r6, _02174730 ; =gSinCosTable
add r0, r4, #0x200
add r1, r1, r1, lsr #31
mov r1, r1, lsl #0xf
@@ -8302,7 +8302,7 @@ _02174720: .word 0x00000d9a
_02174724: .word data_027e0e58
_02174728: .word data_027e0ffc
_0217472c: .word 0x0000043d
_02174730: .word data_02050f54
_02174730: .word gSinCosTable
_02174734: .word 0x00005c72
_02174738: .word 0x00000333
arm_func_end func_ov29_021742e0
@@ -8407,7 +8407,7 @@ func_ov29_02174814: ; 0x02174814
bne _02174910
add r3, r4, #0x200
ldrsh r2, [r3, #0x94]
ldr r1, _0217494c ; =data_02050f54
ldr r1, _0217494c ; =gSinCosTable
mov r0, #0
add r2, r2, #0x710
add r2, r2, #0x2000
@@ -8441,7 +8441,7 @@ func_ov29_02174814: ; 0x02174814
str r1, [r4, #0x21c]
ldmia sp!, {r3, r4, pc}
_02174910:
ldr r0, _0217494c ; =data_02050f54
ldr r0, _0217494c ; =gSinCosTable
mov r2, #0
ldrsh r1, [r0]
str r2, [r4, #0x210]
@@ -8457,7 +8457,7 @@ _02174910:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217494c: .word data_02050f54
_0217494c: .word gSinCosTable
arm_func_end func_ov29_02174814
.global func_ov29_02174950
@@ -8472,7 +8472,7 @@ func_ov29_02174950: ; 0x02174950
bl func_0202b2e8
cmp r0, #0
ldrne r0, [r4, #0x248]
ldr r1, _02174cb4 ; =data_02050f54
ldr r1, _02174cb4 ; =gSinCosTable
addne r0, r0, #0x1400
strne r0, [r4, #0x248]
add r0, r4, #0x200
@@ -8502,7 +8502,7 @@ func_ov29_02174950: ; 0x02174950
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
ldr r6, _02174cb4 ; =data_02050f54
ldr r6, _02174cb4 ; =gSinCosTable
add r0, r1, #1
mov r2, r1, lsl #0x1
mov r1, r0, lsl #0x1
@@ -8591,7 +8591,7 @@ _02174b2c:
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
ldr r6, _02174cb4 ; =data_02050f54
ldr r6, _02174cb4 ; =gSinCosTable
add r0, r1, #1
mov r2, r1, lsl #0x1
mov r1, r0, lsl #0x1
@@ -8683,7 +8683,7 @@ _02174c88:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02174cb4: .word data_02050f54
_02174cb4: .word gSinCosTable
_02174cb8: .word 0x0000019a
_02174cbc: .word data_02054b54
_02174cc0: .word 0x00000333
@@ -9340,7 +9340,7 @@ func_ov29_021753ac: ; 0x021753ac
strh r0, [r1, #0xbc]
ldrh r0, [r1, #0xbc]
ldrh r5, [r1, #0xbe]
ldr r2, _021755b0 ; =data_02050f54
ldr r2, _021755b0 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -9353,7 +9353,7 @@ func_ov29_021753ac: ; 0x021753ac
mov r0, r5, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _021755b0 ; =data_02050f54
ldr r2, _021755b0 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -9379,7 +9379,7 @@ _021755a0: .word data_ov38_02189238
_021755a4: .word 0x0000071d
_021755a8: .word 0xfffffc72
_021755ac: .word 0xffffe38e
_021755b0: .word data_02050f54
_021755b0: .word gSinCosTable
arm_func_end func_ov29_021753ac
.global func_ov29_021755b4
@@ -9967,7 +9967,7 @@ _02175d70:
add r0, r6, #0x200
ldrh r1, [r0, #0xbc]
ldrh r4, [r0, #0xbe]
ldr r2, _02175ec8 ; =data_02050f54
ldr r2, _02175ec8 ; =gSinCosTable
mov r0, r1, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -9980,7 +9980,7 @@ _02175d70:
mov r0, r4, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02175ec8 ; =data_02050f54
ldr r2, _02175ec8 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -10043,7 +10043,7 @@ _02175eac:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02175ec4: .word data_ov29_0217bc78
_02175ec8: .word data_02050f54
_02175ec8: .word gSinCosTable
_02175ecc: .word 0x000004cd
arm_func_end func_ov29_02175d40
@@ -10074,7 +10074,7 @@ func_ov29_02175ed0: ; 0x02175ed0
add r0, r5, #0x200
ldrh r1, [r0, #0xbc]
ldrh r4, [r0, #0xbe]
ldr r2, _02175fec ; =data_02050f54
ldr r2, _02175fec ; =gSinCosTable
mov r0, r1, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -10087,7 +10087,7 @@ func_ov29_02175ed0: ; 0x02175ed0
mov r0, r4, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02175fec ; =data_02050f54
ldr r2, _02175fec ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -10123,7 +10123,7 @@ _02175fc0:
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02175fec: .word data_02050f54
_02175fec: .word gSinCosTable
_02175ff0: .word 0x00001333
arm_func_end func_ov29_02175ed0
@@ -11623,7 +11623,7 @@ _02177350:
add r4, r5, #1
str r3, [lr, #0x10]
ldr r2, [r1, #4]
ldr r6, _02177414 ; =data_02050f54
ldr r6, _02177414 ; =gSinCosTable
str r2, [lr, #0x14]
mov r5, r5, lsl #0x1
mov r4, r4, lsl #0x1
@@ -11667,7 +11667,7 @@ _021773b4:
_02177408: .word data_ov29_0217bce0
_0217740c: .word gPlayerAngle
_02177410: .word gPlayerPos
_02177414: .word data_02050f54
_02177414: .word gSinCosTable
_02177418: .word data_ov29_0217a244
arm_func_end func_ov29_021772f8
@@ -11763,7 +11763,7 @@ _02177558:
ldmia r0, {r0, r1, r2}
stmia ip, {r0, r1, r2}
ldr r0, _021778ac ; =data_ov29_0217bce0
ldr r2, _021778cc ; =data_02050f54
ldr r2, _021778cc ; =gSinCosTable
ldrsh r5, [r0, #0x22]
ldr r1, [sp, #0xc]
ldr r0, [sp, #0x14]
@@ -11996,7 +11996,7 @@ _021778bc: .word 0x54535350
_021778c0: .word gActorManager
_021778c4: .word data_ov29_0217bd02
_021778c8: .word 0x00007fff
_021778cc: .word data_02050f54
_021778cc: .word gSinCosTable
_021778d0: .word 0x0000019a
_021778d4: .word data_027e0d38
_021778d8: .word data_027e0c54
@@ -13468,7 +13468,7 @@ _02178bfc:
bl func_ov14_0214aa0c
add r0, r4, #0x500
ldrh r3, [r0, #0x20]
ldr r2, _02178c9c ; =data_02050f54
ldr r2, _02178c9c ; =gSinCosTable
mov r1, #0x148
add r3, r3, #0x3e8
strh r3, [r0, #0x20]
@@ -13498,7 +13498,7 @@ _02178c7c:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02178c98: .word 0x00000aab
_02178c9c: .word data_02050f54
_02178c9c: .word gSinCosTable
arm_func_end func_ov29_02178b28
.global func_ov29_02178ca0
@@ -13528,7 +13528,7 @@ _02178ce0:
bl Approach_thunk
add r1, r4, #0x500
ldrh r2, [r1, #0x20]
ldr r1, _02178da8 ; =data_02050f54
ldr r1, _02178da8 ; =gSinCosTable
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x2
ldrsh r1, [r1, r2]
@@ -13575,7 +13575,7 @@ _02178d98:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02178da8: .word data_02050f54
_02178da8: .word gSinCosTable
_02178dac: .word gPlayerLink
arm_func_end func_ov29_02178ca0
@@ -13632,7 +13632,7 @@ func_ov29_02178e00: ; 0x02178e00
ldr r0, [r4, #0x1dc]
bl func_020197bc
ldrh r1, [r4, #0x78]
ldr r3, _02178f14 ; =data_02050f54
ldr r3, _02178f14 ; =gSinCosTable
add r0, sp, #0x54
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -13689,7 +13689,7 @@ func_ov29_02178e00: ; 0x02178e00
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02178f10: .word data_ov00_020e9360
_02178f14: .word data_02050f54
_02178f14: .word gSinCosTable
_02178f18: .word data_02051354
arm_func_end func_ov29_02178e00
asm/ov30.inc
+1 -1
View File
@@ -74,7 +74,7 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02063e4c
.extern data_027e0764
.extern data_027e0c38
asm/ov30.s
+16 -16
View File
@@ -3097,7 +3097,7 @@ _0217e5d4:
ldr r0, [r5, #0x844]
cmp r0, #2
bne _0217e690
ldr r4, _0217e760 ; =data_02050f54
ldr r4, _0217e760 ; =gSinCosTable
mov r10, #0
mov r9, #0x3000
add r8, sp, #0x24
@@ -3134,7 +3134,7 @@ _0217e620:
_0217e690:
cmp r0, #3
bne _0217e71c
ldr r4, _0217e760 ; =data_02050f54
ldr r4, _0217e760 ; =gSinCosTable
mov r10, #0
mov r9, #0x3000
add r8, sp, #0xc
@@ -3188,7 +3188,7 @@ _0217e72c:
add sp, sp, #0x30
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_0217e760: .word data_02050f54
_0217e760: .word gSinCosTable
arm_func_end func_ov30_0217e5a4
.global func_ov30_0217e764
@@ -5246,7 +5246,7 @@ _02180330:
mov r2, r0, lsl #0x1
add r0, r2, #1
mov lr, #0
ldr r1, _02180400 ; =data_02050f54
ldr r1, _02180400 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r6, [r1, r2]
mov r0, r0, lsl #0x1
@@ -5291,7 +5291,7 @@ _021803f4:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_021803fc: .word gPlayerPos
_02180400: .word data_02050f54
_02180400: .word gSinCosTable
_02180404: .word 0x0000019a
arm_func_end func_ov30_02180208
@@ -7845,7 +7845,7 @@ _02181fd4:
beq _02182038
add r0, r4, #0x800
ldrsh r2, [r0, #0x7c]
ldr r1, _02182318 ; =data_02050f54
ldr r1, _02182318 ; =gSinCosTable
add r2, r2, #0xc00
strh r2, [r0, #0x7c]
ldrh r0, [r0, #0x7c]
@@ -7871,7 +7871,7 @@ _02182038:
add r0, r4, #0x800
beq _0218209c
ldrsh r2, [r0, #0x7c]
ldr r1, _02182318 ; =data_02050f54
ldr r1, _02182318 ; =gSinCosTable
add r2, r2, #0xc00
strh r2, [r0, #0x7c]
ldrh r0, [r0, #0x7c]
@@ -7970,7 +7970,7 @@ _0218219c:
add r0, sp, #0x34
bl func_01ffbe34
ldrh r4, [r4, #0x78]
ldr r3, _02182318 ; =data_02050f54
ldr r3, _02182318 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r4, asr #0x4
mov r2, r1, lsl #0x1
@@ -7988,7 +7988,7 @@ _0218219c:
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
add r1, r3, #1
ldr r2, _02182318 ; =data_02050f54
ldr r2, _02182318 ; =gSinCosTable
mov r3, r3, lsl #0x1
mov r1, r1, lsl #0x1
ldrsh lr, [r2, r3]
@@ -8059,7 +8059,7 @@ _0218219c:
_0218230c: .word 0x0000ffff
_02182310: .word data_027e0d3c
_02182314: .word data_02063e4c
_02182318: .word data_02050f54
_02182318: .word gSinCosTable
_0218231c: .word data_027e0d0c
_02182320: .word data_027e0d38
_02182324: .word data_027e0c38
@@ -8432,7 +8432,7 @@ _021827c0:
_021827d4:
ldrh r0, [r4, #0x78]
mov r1, #0
ldr r3, _02182ac8 ; =data_02050f54
ldr r3, _02182ac8 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
@@ -8463,7 +8463,7 @@ _021827d4:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r1, [r4, #0x78]
ldr r3, _02182ac8 ; =data_02050f54
ldr r3, _02182ac8 ; =gSinCosTable
ldr r0, [r4, #0x48]
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8545,7 +8545,7 @@ _02182960:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r0, [r4, #0x78]
ldr r3, _02182ac8 ; =data_02050f54
ldr r3, _02182ac8 ; =gSinCosTable
ldr r8, [sp, #0x24]
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
@@ -8621,7 +8621,7 @@ _02182ab8: .word gMapManager
_02182abc: .word _ZTV11FilterActor
_02182ac0: .word 0x424f4d42
_02182ac4: .word gActorManager
_02182ac8: .word data_02050f54
_02182ac8: .word gSinCosTable
_02182acc: .word 0x43485334
_02182ad0: .word data_ov30_021887e4
_02182ad4: .word data_027e0e58
@@ -8674,7 +8674,7 @@ func_ov30_02182b4c: ; 0x02182b4c
stmia r4, {r0, r1, r2}
ldrh r1, [r3, #0x78]
ldr r0, [r3, #0x48]
ldr r4, _02182c54 ; =data_02050f54
ldr r4, _02182c54 ; =gSinCosTable
str r0, [r3, #0x860]
ldr r0, [r3, #0x4c]
mov r1, r1, asr #0x4
@@ -8732,7 +8732,7 @@ func_ov30_02182b4c: ; 0x02182b4c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02182c50: .word data_ov30_021887fc
_02182c54: .word data_02050f54
_02182c54: .word gSinCosTable
arm_func_end func_ov30_02182b4c
.global func_ov30_02182c58
asm/ov31.inc
+1 -1
View File
@@ -63,7 +63,7 @@
.extern _ZNK11ItemManager7GetAmmoEi
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_0205785c
.extern data_02057878
.extern data_027e071c
asm/ov31.s
+9 -9
View File
@@ -4340,7 +4340,7 @@ _0217f1c8:
bl func_01ff80d4
add r0, r6, #0x100
ldrh r1, [r0, #0x68]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x78
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4356,7 +4356,7 @@ _0217f1c8:
bl func_01ff8690
add r0, r6, #0x100
ldrh r1, [r0, #0x6a]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x54
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4372,7 +4372,7 @@ _0217f1c8:
bl func_01ff8690
add r0, r6, #0x100
ldrh r1, [r0, #0x6c]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x30
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4400,7 +4400,7 @@ _0217f1c8:
add r1, r1, #1
mov r0, r0, asr #0x4
mov r2, r1, lsl #0x1
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
mov r1, r0, lsl #0x2
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
@@ -4424,7 +4424,7 @@ _0217f1c8:
add r1, r1, #1
mov r0, r0, asr #0x4
mov r2, r1, lsl #0x1
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
mov r1, r0, lsl #0x2
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
@@ -4436,7 +4436,7 @@ _0217f1c8:
bl func_01ff8690
add r0, r6, #0x100
ldrh r1, [r0, #0x6e]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x78
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4452,7 +4452,7 @@ _0217f1c8:
bl func_01ff8690
add r0, r6, #0x100
ldrh r1, [r0, #0x70]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x54
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4468,7 +4468,7 @@ _0217f1c8:
bl func_01ff8690
add r0, r6, #0x100
ldrh r1, [r0, #0x72]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x30
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4498,7 +4498,7 @@ _0217f1c8:
_0217f444: .word data_ov31_02183e88
_0217f448: .word data_ov00_020e9360
_0217f44c: .word 0x0000199a
_0217f450: .word data_02050f54
_0217f450: .word gSinCosTable
arm_func_end func_ov31_0217f120
.global func_ov31_0217f454
asm/ov32.inc
+1 -1
View File
@@ -78,7 +78,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051f54
.extern data_02056be4
.extern data_027e0618
asm/ov32.s
+50 -50
View File
@@ -1472,7 +1472,7 @@ _0217cf34:
moveq r2, #1
streq r2, [r0, #0x4b0]
ldrh r2, [r0, #0x78]
ldr r3, _0217cfa0 ; =data_02050f54
ldr r3, _0217cfa0 ; =gSinCosTable
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x2
ldrsh r2, [r3, r2]
@@ -1496,7 +1496,7 @@ _0217cf34:
str r2, [r0, #0x68]
bx lr
.align 2, 0
_0217cfa0: .word data_02050f54
_0217cfa0: .word gSinCosTable
arm_func_end func_ov32_0217cf08
.global func_ov32_0217cfa4
@@ -1593,7 +1593,7 @@ _0217d0a4:
strh r1, [r5, #0x78]
_0217d0f8:
ldrh r1, [r5, #0x78]
ldr r2, _0217d184 ; =data_02050f54
ldr r2, _0217d184 ; =gSinCosTable
mov r0, r5
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x2
@@ -1628,7 +1628,7 @@ _0217d174: .word gMapManager
_0217d178: .word 0x0000071c
_0217d17c: .word data_027e0764
_0217d180: .word 0x0000038e
_0217d184: .word data_02050f54
_0217d184: .word gSinCosTable
arm_func_end func_ov32_0217cfa4
.global func_ov32_0217d188
@@ -1668,7 +1668,7 @@ func_ov32_0217d1bc: ; 0x0217d1bc
mov r0, #2
str r0, [r4, #0x12c]
ldrh r0, [r4, #0x9c]
ldr r2, _0217d280 ; =data_02050f54
ldr r2, _0217d280 ; =gSinCosTable
orr r0, r0, #2
strh r0, [r4, #0x9c]
ldrh r0, [r4, #0x78]
@@ -1702,7 +1702,7 @@ func_ov32_0217d1bc: ; 0x0217d1bc
.align 2, 0
_0217d278: .word 0x00000c58
_0217d27c: .word 0x00001f3a
_0217d280: .word data_02050f54
_0217d280: .word gSinCosTable
arm_func_end func_ov32_0217d1bc
.global func_ov32_0217d284
@@ -3134,7 +3134,7 @@ _0217e4bc:
strh r1, [r5, #0x78]
_0217e514:
ldrh r1, [r5, #0x78]
ldr r2, _0217e5a0 ; =data_02050f54
ldr r2, _0217e5a0 ; =gSinCosTable
mov r0, r5
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x2
@@ -3169,7 +3169,7 @@ _0217e590: .word gMapManager
_0217e594: .word 0x0000071c
_0217e598: .word data_027e0764
_0217e59c: .word 0x0000038e
_0217e5a0: .word data_02050f54
_0217e5a0: .word gSinCosTable
arm_func_end func_ov32_0217e3c4
.global func_ov32_0217e5a4
@@ -3811,7 +3811,7 @@ func_ov32_0217eddc: ; 0x0217eddc
ldr r0, _0217efc4 ; =0x00007fff
ldr r4, [sp, #4]
rsb r0, r0, #0
ldr r8, _0217efc8 ; =data_02050f54
ldr r8, _0217efc8 ; =gSinCosTable
mov r5, r6, asr #0x1f
str r0, [sp, #0xc]
_0217ee34:
@@ -3920,7 +3920,7 @@ _0217ef94:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0217efc4: .word 0x00007fff
_0217efc8: .word data_02050f54
_0217efc8: .word gSinCosTable
_0217efcc: .word gPlayer
_0217efd0: .word gPlayerAngle
_0217efd4: .word 0x00005555
@@ -3955,7 +3955,7 @@ _0217f014:
bl func_ov00_020cc1f8
_0217f01c:
ldrh r1, [r4, #0x78]
ldr r3, _0217f0dc ; =data_02050f54
ldr r3, _0217f0dc ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4006,7 +4006,7 @@ _0217f0c4:
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217f0dc: .word data_02050f54
_0217f0dc: .word gSinCosTable
arm_func_end func_ov32_0217efe8
.global func_ov32_0217f0e0
@@ -5096,7 +5096,7 @@ func_ov32_0217fd94: ; 0x0217fd94
mov r1, #0
strh r1, [r0]
ldrh r1, [r4, #0x78]
ldr ip, _0217fe50 ; =data_02050f54
ldr ip, _0217fe50 ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x2
@@ -5131,7 +5131,7 @@ func_ov32_0217fd94: ; 0x0217fd94
str r0, [r4, #0x64]
ldmia sp!, {r4, pc}
.align 2, 0
_0217fe50: .word data_02050f54
_0217fe50: .word gSinCosTable
arm_func_end func_ov32_0217fd94
.global func_ov32_0217fe54
@@ -5242,7 +5242,7 @@ _0217ff84:
strh r4, [r6, #0x78]
_0217ffd0:
ldrh r0, [r6, #0x78]
ldr r2, _02180058 ; =data_02050f54
ldr r2, _02180058 ; =gSinCosTable
ldr r1, [r6, #0x3f8]
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
@@ -5276,7 +5276,7 @@ _02180048: .word gPlayerPos
_0218004c: .word gMapManager
_02180050: .word data_027e0764
_02180054: .word 0x0000ffff
_02180058: .word data_02050f54
_02180058: .word gSinCosTable
arm_func_end func_ov32_0217feac
.global func_ov32_0218005c
@@ -5337,7 +5337,7 @@ func_ov32_021800e0: ; 0x021800e0
mov r7, r0
str r1, [r7, #0x64]
mov r6, #0
ldr r4, _02180280 ; =data_02050f54
ldr r4, _02180280 ; =gSinCosTable
str r6, [r7, #0x12c]
add r5, r7, #0x48
mov r11, #0x1800
@@ -5398,7 +5398,7 @@ _02180108:
blt _02180108
_021801e0:
ldrsh r1, [r7, #0x78]
ldr r0, _02180280 ; =data_02050f54
ldr r0, _02180280 ; =gSinCosTable
ldr r2, _02180284 ; =0x00000199
sub r1, r1, #0x8000
mov r1, r1, lsl #0x10
@@ -5438,7 +5438,7 @@ _021801e0:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0218027c: .word 0x000005ed
_02180280: .word data_02050f54
_02180280: .word gSinCosTable
_02180284: .word 0x00000199
arm_func_end func_ov32_021800e0
@@ -5613,7 +5613,7 @@ func_ov32_021804a4: ; 0x021804a4
ldmia r0, {r0, r1, r2}
stmia r8, {r0, r1, r2}
ldrsh r1, [r10, #0x78]
ldr r0, _02180858 ; =data_02050f54
ldr r0, _02180858 ; =gSinCosTable
mov r3, r4, lsl #0x10
sub r1, r1, r4
mov r1, r1, lsl #0x10
@@ -5843,7 +5843,7 @@ _02180840:
_0218084c: .word 0x0000071c
_02180850: .word gPlayerAngle
_02180854: .word gPlayerPos
_02180858: .word data_02050f54
_02180858: .word gSinCosTable
_0218085c: .word 0x00000333
_02180860: .word gPlayerVel
_02180864: .word data_027e0f6c
@@ -5877,7 +5877,7 @@ func_ov32_02180870: ; 0x02180870
b _0218099c
_021808c4:
bl _ZN5Actor14GetAngleToLinkEv
ldr r4, _02180a38 ; =data_02050f54
ldr r4, _02180a38 ; =gSinCosTable
strh r0, [r7, #0x78]
mov r6, #0
add r5, r7, #0x48
@@ -5942,7 +5942,7 @@ _0218099c:
mov r2, #7
bl func_ov14_0213b904
ldrh r0, [r7, #0x78]
ldr r2, _02180a38 ; =data_02050f54
ldr r2, _02180a38 ; =gSinCosTable
ldr r1, [sp, #0xc]
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -5972,7 +5972,7 @@ _0218099c:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02180a34: .word gPlayerPos
_02180a38: .word data_02050f54
_02180a38: .word gSinCosTable
_02180a3c: .word 0x0000099a
arm_func_end func_ov32_02180870
@@ -6331,7 +6331,7 @@ func_ov32_02180e4c: ; 0x02180e4c
orr r2, r2, r0, lsl #20
str r2, [sp, #0x4c]
ldr r0, [r4, #0x404]
ldr r3, _0218104c ; =data_02050f54
ldr r3, _0218104c ; =gSinCosTable
smull r2, r0, r1, r0
adds r1, r2, #0x800
adc r0, r0, #0
@@ -6352,7 +6352,7 @@ func_ov32_02180e4c: ; 0x02180e4c
cmp r0, #3
bne _02180f24
ldrh r1, [r4, #0x78]
ldr r3, _0218104c ; =data_02050f54
ldr r3, _0218104c ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -6369,7 +6369,7 @@ _02180f24:
bne _02180f64
add r0, r4, #0x400
ldrh r1, [r0]
ldr r3, _0218104c ; =data_02050f54
ldr r3, _0218104c ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -6389,7 +6389,7 @@ _02180f64:
ldrsh r2, [r2, #2]
blx func_01ff8230
ldrsh r1, [r4, #0x78]
ldr r3, _0218104c ; =data_02050f54
ldr r3, _0218104c ; =gSinCosTable
add r0, sp, #0x24
rsb r1, r1, #0
mov r1, r1, lsl #0x10
@@ -6440,7 +6440,7 @@ _02180fbc:
add sp, sp, #0x54
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0218104c: .word data_02050f54
_0218104c: .word gSinCosTable
_02181050: .word data_02051f54
_02181054: .word 0x00000666
_02181058: .word data_ov00_020e9370
@@ -8183,7 +8183,7 @@ func_ov32_0218286c: ; 0x0218286c
sub sp, sp, #0x48
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _021829e0 ; =data_02050f54
ldr r3, _021829e0 ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8274,7 +8274,7 @@ _02182984:
add sp, sp, #0x48
ldmia sp!, {r4, pc}
.align 2, 0
_021829e0: .word data_02050f54
_021829e0: .word gSinCosTable
arm_func_end func_ov32_0218286c
.global func_ov32_021829e4
@@ -8737,7 +8737,7 @@ _02182f28:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02183024 ; =data_02050f54
ldr r2, _02183024 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -8767,7 +8767,7 @@ _02182f28:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02183024 ; =data_02050f54
ldr r2, _02183024 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -8794,7 +8794,7 @@ _02182f28:
.align 2, 0
_0218301c: .word 0x45800000
_02183020: .word 0x46800000
_02183024: .word data_02050f54
_02183024: .word gSinCosTable
arm_func_end func_ov32_02182ecc
.global func_ov32_02183028
@@ -8972,7 +8972,7 @@ func_ov32_0218318c: ; 0x0218318c
mla r0, r1, r2, r0
add r1, r6, #1
mov r7, r6, lsl #0x1
ldr r6, _02183340 ; =data_02050f54
ldr r6, _02183340 ; =gSinCosTable
str r5, [ip, #4]
add r2, r0, #0x800
ldrsh r7, [r6, r7]
@@ -9035,7 +9035,7 @@ _02183330: .word data_027e0764
_02183334: .word 0x00000e39
_02183338: .word 0xfffff8e4
_0218333c: .word 0x00001801
_02183340: .word data_02050f54
_02183340: .word gSinCosTable
_02183344: .word gMapManager
arm_func_end func_ov32_0218318c
@@ -9230,7 +9230,7 @@ func_ov32_021835a0: ; 0x021835a0
mov r6, r4, lsl #0x1
add r4, r6, #1
str r2, [lr]
ldr r5, _021836f0 ; =data_02050f54
ldr r5, _021836f0 ; =gSinCosTable
mov r6, r6, lsl #0x1
mov r2, r4, lsl #0x1
str r1, [lr, #4]
@@ -9292,7 +9292,7 @@ func_ov32_021835a0: ; 0x021835a0
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_021836ec: .word data_027e0764
_021836f0: .word data_02050f54
_021836f0: .word gSinCosTable
_021836f4: .word 0x00000b34
arm_func_end func_ov32_021835a0
@@ -9307,7 +9307,7 @@ func_ov32_021836f8: ; 0x021836f8
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0218380c ; =data_02050f54
ldr r2, _0218380c ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r2, r1]
mov r0, r0, lsl #0x1
@@ -9369,7 +9369,7 @@ func_ov32_021836f8: ; 0x021836f8
str r0, [r4, #0x234]
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_0218380c: .word data_02050f54
_0218380c: .word gSinCosTable
_02183810: .word data_027e0764
_02183814: .word 0x00000b34
arm_func_end func_ov32_021836f8
@@ -9911,7 +9911,7 @@ func_ov32_02183ecc: ; 0x02183ecc
mov r1, r1, asr #0x4
mov ip, lr, lsr #0xc
orr ip, ip, r2, lsl #20
ldr r0, _02183f80 ; =data_02050f54
ldr r0, _02183f80 ; =gSinCosTable
mov r1, r1, lsl #0x2
ldrsh r0, [r0, r1]
ldrsh r2, [r3, #0x2a]
@@ -9929,7 +9929,7 @@ func_ov32_02183ecc: ; 0x02183ecc
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02183f7c: .word 0x00e39000
_02183f80: .word data_02050f54
_02183f80: .word gSinCosTable
arm_func_end func_ov32_02183ecc
.global func_ov32_02183f84
@@ -10202,7 +10202,7 @@ func_ov32_021842c0: ; 0x021842c0
ldmltia sp!, {r3, r4, pc}
_021842f8:
ldrh r1, [r4, #0x78]
ldr r3, _02184390 ; =data_02050f54
ldr r3, _02184390 ; =gSinCosTable
add r0, sp, #0x28
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -10240,7 +10240,7 @@ _021842f8:
add sp, sp, #0x4c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02184390: .word data_02050f54
_02184390: .word gSinCosTable
_02184394: .word 0x000004cd
_02184398: .word data_ov00_020e9370
arm_func_end func_ov32_021842c0
@@ -10303,7 +10303,7 @@ func_ov32_0218439c: ; 0x0218439c
add r0, r4, #0x48
str r2, [sp, #0x2c]
ldr r2, [r4, #0xc]
ldr r3, _02184548 ; =data_02050f54
ldr r3, _02184548 ; =gSinCosTable
str r2, [sp, #0x30]
str r1, [sp, #0x34]
ldmia r0, {r0, r1, r2}
@@ -10356,7 +10356,7 @@ func_ov32_0218439c: ; 0x0218439c
_0218453c: .word gActorManager
_02184540: .word _ZTV11FilterActor
_02184544: .word 0x42454530
_02184548: .word data_02050f54
_02184548: .word gSinCosTable
_0218454c: .word 0x0000019a
_02184550: .word data_027e0fe8
arm_func_end func_ov32_0218439c
@@ -10753,7 +10753,7 @@ func_ov32_02184a00: ; 0x02184a00
cmp r5, #0
bne _02184a68
ldrh r1, [r4, #0x78]
ldr r3, _02184a98 ; =data_02050f54
ldr r3, _02184a98 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -10787,7 +10787,7 @@ _02184a8c:
add sp, sp, #0x24
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02184a98: .word data_02050f54
_02184a98: .word gSinCosTable
arm_func_end func_ov32_02184a00
.global func_ov32_02184a9c
@@ -10801,7 +10801,7 @@ func_ov32_02184a9c: ; 0x02184a9c
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrsh r1, [r4, #0x78]
ldr r0, _02184b94 ; =data_02050f54
ldr r0, _02184b94 ; =gSinCosTable
ldr ip, _02184b98 ; =0x00000266
add r1, r1, #0x4000
mov r1, r1, lsl #0x10
@@ -10856,7 +10856,7 @@ func_ov32_02184a9c: ; 0x02184a9c
add sp, sp, #0x30
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02184b94: .word data_02050f54
_02184b94: .word gSinCosTable
_02184b98: .word 0x00000266
_02184b9c: .word gMapManager
_02184ba0: .word 0x0000059a
asm/ov33.inc
+1 -1
View File
@@ -61,7 +61,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_020691a0
.extern data_027e0764
.extern data_027e077c
asm/ov33.s
+14 -14
View File
@@ -862,7 +862,7 @@ func_ov33_0217c808: ; 0x0217c808
bl _ZN5Actor14GetAngleToLinkEv
strh r0, [r4, #0x78]
ldrh r0, [r4, #0x78]
ldr ip, _0217c8f0 ; =data_02050f54
ldr ip, _0217c8f0 ; =gSinCosTable
ldr lr, _0217c8f4 ; =0x00000666
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
@@ -901,7 +901,7 @@ func_ov33_0217c808: ; 0x0217c808
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_0217c8ec: .word gMapManager
_0217c8f0: .word data_02050f54
_0217c8f0: .word gSinCosTable
_0217c8f4: .word 0x00000666
_0217c8f8: .word data_027e0ffc
arm_func_end func_ov33_0217c808
@@ -2877,7 +2877,7 @@ func_ov33_0217e1c8: ; 0x0217e1c8
mov r1, ip
mla r3, r1, r0, r3
ldr r0, _0217e410 ; =0xffffdc72
ldr r1, _0217e414 ; =data_02050f54
ldr r1, _0217e414 ; =gSinCosTable
add r0, r3, r0
add r0, r5, r0
mov r0, r0, lsl #0x10
@@ -2939,7 +2939,7 @@ _0217e29c:
str r6, [r2, #4]
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _0217e414 ; =data_02050f54
ldr r1, _0217e414 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r3, [r1, r2]
mov r0, r0, lsl #0x1
@@ -2956,7 +2956,7 @@ _0217e29c:
ldmia sp!, {r4, r5, r6, r7, pc}
_0217e36c:
ldr lr, _0217e408 ; =data_027e0764
ldr r2, _0217e414 ; =data_02050f54
ldr r2, _0217e414 ; =gSinCosTable
ldr r1, [lr]
ldmib lr, {r0, r3}
umull r6, r5, r3, r1
@@ -2998,7 +2998,7 @@ _0217e36c:
_0217e408: .word data_027e0764
_0217e40c: .word 0x0000471d
_0217e410: .word 0xffffdc72
_0217e414: .word data_02050f54
_0217e414: .word gSinCosTable
_0217e418: .word 0x00002aab
arm_func_end func_ov33_0217e1c8
@@ -3128,7 +3128,7 @@ func_ov33_0217e56c: ; 0x0217e56c
str r1, [r0, #0x6c]
add r2, r0, #0x300
ldrsh r2, [r2, #0xdc]
ldr r4, _0217e614 ; =data_02050f54
ldr r4, _0217e614 ; =gSinCosTable
add r3, r1, #0x148
sub r2, r2, #0x8000
mov r2, r2, lsl #0x10
@@ -3166,7 +3166,7 @@ func_ov33_0217e56c: ; 0x0217e56c
str r2, [r0, #0x68]
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0217e614: .word data_02050f54
_0217e614: .word gSinCosTable
arm_func_end func_ov33_0217e56c
.global func_ov33_0217e618
@@ -4036,7 +4036,7 @@ _0217f1b8:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r0, [r4, #0x78]
ldr r3, _0217f3e0 ; =data_02050f54
ldr r3, _0217f3e0 ; =gSinCosTable
ldr r2, [r4, #0x48]
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
@@ -4171,7 +4171,7 @@ _0217f3d0: .word 0x00000242
_0217f3d4: .word gPlayerAngle
_0217f3d8: .word gPlayerLink
_0217f3dc: .word data_ov33_0217fb80
_0217f3e0: .word data_02050f54
_0217f3e0: .word gSinCosTable
_0217f3e4: .word data_027e0e58
arm_func_end func_ov33_0217ecb4
@@ -4497,7 +4497,7 @@ func_ov33_0217f744: ; 0x0217f744
mov r1, r5
bl func_ov33_0217dec4
ldr r0, _0217f890 ; =data_027e0764
ldr r11, _0217f894 ; =data_02050f54
ldr r11, _0217f894 ; =gSinCosTable
ldr r6, [r0, #8]
ldr lr, [r0]
ldr ip, [r0, #4]
@@ -4553,7 +4553,7 @@ func_ov33_0217f744: ; 0x0217f744
.align 2, 0
_0217f88c: .word 0x00000666
_0217f890: .word data_027e0764
_0217f894: .word data_02050f54
_0217f894: .word gSinCosTable
_0217f898: .word gPlayerPos
arm_func_end func_ov33_0217f744
@@ -4573,7 +4573,7 @@ func_ov33_0217f8b0: ; 0x0217f8b0
stmdb sp!, {r4, r5, r6, lr}
mov ip, r0
ldrh r0, [ip, #0x78]
ldr r3, _0217f94c ; =data_02050f54
ldr r3, _0217f94c ; =gSinCosTable
ldr lr, _0217f950 ; =0x00000333
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
@@ -4610,7 +4610,7 @@ func_ov33_0217f8b0: ; 0x0217f8b0
mov r0, #0
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0217f94c: .word data_02050f54
_0217f94c: .word gSinCosTable
_0217f950: .word 0x00000333
arm_func_end func_ov33_0217f8b0
asm/ov34.inc
+1 -1
View File
@@ -64,7 +64,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_027e0194
.extern data_027e03c8
asm/ov34.s
+27 -27
View File
@@ -2994,12 +2994,12 @@ func_ov34_0217e674: ; 0x0217e674
ldr r2, [r1, #0xab0]
mov r3, r4, lsl #0x1
str r2, [r1, #0xa70]
ldr r2, _0217e8c4 ; =data_02050f54
ldr r2, _0217e8c4 ; =gSinCosTable
ldr r5, [r1, #0xab4]
ldrsh r2, [r2, r3]
add r3, r4, #1
mov r4, r3, lsl #0x1
ldr r3, _0217e8c4 ; =data_02050f54
ldr r3, _0217e8c4 ; =gSinCosTable
str r5, [r1, #0xa74]
ldrsh r3, [r3, r4]
mul r4, lr, r2
@@ -3088,7 +3088,7 @@ _0217e8b4: .word data_027e0764
_0217e8b8: .word 0x00001001
_0217e8bc: .word 0x00005557
_0217e8c0: .word 0xffffd555
_0217e8c4: .word data_02050f54
_0217e8c4: .word gSinCosTable
_0217e8c8: .word data_ov34_021861a0
_0217e8cc: .word 0xffffe19a
_0217e8d0: .word 0x0000019a
@@ -3418,7 +3418,7 @@ _0217ece0:
add r2, r4, #0x1000
str r0, [sp, #0x30]
ldrsh r0, [r1, #0x80]
ldr r3, _0217ee48 ; =data_02050f54
ldr r3, _0217ee48 ; =gSinCosTable
mov ip, #0
strh r0, [sp, #0x24]
ldr r4, [r2, #0xaa4]
@@ -3479,7 +3479,7 @@ _0217ece0:
_0217ee3c: .word gPlayerPos
_0217ee40: .word 0x00000e66
_0217ee44: .word data_027e0764
_0217ee48: .word data_02050f54
_0217ee48: .word gSinCosTable
_0217ee4c: .word data_027e0fe8
_0217ee50: .word 0x47524f42
_0217ee54: .word data_027e0ffc
@@ -3764,7 +3764,7 @@ _0217f1f0:
add r3, r4, #0x1000
add r2, r1, #1
ldr r0, [r3, #0xa7c]
ldr ip, _0217f520 ; =data_02050f54
ldr ip, _0217f520 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r5, [ip, r1]
mov r1, #0x5400
@@ -3952,7 +3952,7 @@ _0217f4c0:
.align 2, 0
_0217f518: .word data_027e0ffc
_0217f51c: .word 0x000002f7
_0217f520: .word data_02050f54
_0217f520: .word gSinCosTable
_0217f524: .word 0xfffffccd
_0217f528: .word 0x000006cd
_0217f52c: .word 0x0000019a
@@ -4214,7 +4214,7 @@ _0217f860:
add r3, r5, #0x1000
add r2, r1, #1
ldr r0, [r3, #0xa7c]
ldr r4, _02180080 ; =data_02050f54
ldr r4, _02180080 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh lr, [r4, r1]
mov r1, #0x5400
@@ -4729,7 +4729,7 @@ _02180038:
_02180074: .word gPlayerPos
_02180078: .word data_027e0ffc
_0218007c: .word 0x000002f7
_02180080: .word data_02050f54
_02180080: .word gSinCosTable
_02180084: .word 0xfffffccd
_02180088: .word 0x000006cd
_0218008c: .word data_ov34_021861e0
@@ -5056,7 +5056,7 @@ _02180488:
add r3, r5, #0x1000
add r2, r1, #1
ldr r0, [r3, #0xa7c]
ldr r4, _02180824 ; =data_02050f54
ldr r4, _02180824 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh lr, [r4, r1]
mov r1, #0x5400
@@ -5272,7 +5272,7 @@ _021807c0:
_02180818: .word gPlayerPos
_0218081c: .word data_027e0ffc
_02180820: .word 0x000002f7
_02180824: .word data_02050f54
_02180824: .word gSinCosTable
_02180828: .word 0xfffffccd
_0218082c: .word 0x000006cd
_02180830: .word 0x0000019a
@@ -5340,7 +5340,7 @@ _021808d8:
bl func_0202b154
add r0, r5, #0x1d00
ldrh r1, [r0, #0x82]
ldr r0, _02180998 ; =data_02050f54
ldr r0, _02180998 ; =gSinCosTable
add r3, r5, #0x1000
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x2
@@ -5379,7 +5379,7 @@ _02180960:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02180994: .word 0x000031c7
_02180998: .word data_02050f54
_02180998: .word gSinCosTable
arm_func_end func_ov34_02180854
.global func_ov34_0218099c
@@ -6634,7 +6634,7 @@ _02181b50:
add r0, r0, #0xcd
add r1, r5, #1
add r2, r0, #0x400
ldr r4, _02181d04 ; =data_02050f54
ldr r4, _02181d04 ; =gSinCosTable
mov r0, r1, lsl #0x1
mov r5, r5, lsl #0x1
ldrsh r1, [r4, r5]
@@ -6722,7 +6722,7 @@ _02181c8c:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02181d00: .word gMapManager
_02181d04: .word data_02050f54
_02181d04: .word gSinCosTable
_02181d08: .word data_027e0ffc
_02181d0c: .word 0x000002fa
_02181d10: .word data_027e0e58
@@ -8033,7 +8033,7 @@ _02182ed0:
arm_func_start func_ov34_02182ee0
func_ov34_02182ee0: ; 0x02182ee0
ldrh r1, [r1, #0x78]
ldr ip, _02182f18 ; =data_02050f54
ldr ip, _02182f18 ; =gSinCosTable
mov r2, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -8047,7 +8047,7 @@ func_ov34_02182ee0: ; 0x02182ee0
strh r1, [r0, #0x54]
bx lr
.align 2, 0
_02182f18: .word data_02050f54
_02182f18: .word gSinCosTable
arm_func_end func_ov34_02182ee0
.global func_ov34_02182f1c
@@ -8644,7 +8644,7 @@ _02183710:
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
add r1, r3, #1
ldr r4, _02183d08 ; =data_02050f54
ldr r4, _02183d08 ; =gSinCosTable
mov r3, r3, lsl #0x1
mov r1, r1, lsl #0x1
ldrsh r3, [r4, r3]
@@ -8784,7 +8784,7 @@ _02183710:
_0218398c:
add r1, r10, #0x1d00
ldrsh r1, [r1, #0x86]
ldr r5, _02183d08 ; =data_02050f54
ldr r5, _02183d08 ; =gSinCosTable
add r4, r0, r0, lsr #31
add r0, r1, r1, lsr #31
mov r0, r0, lsl #0xf
@@ -9008,7 +9008,7 @@ _02183cf8: .word data_ov34_0218577c
_02183cfc: .word 0x000002cb
_02183d00: .word data_ov34_021861cc
_02183d04: .word 0x00005555
_02183d08: .word data_02050f54
_02183d08: .word gSinCosTable
_02183d0c: .word 0x00000333
_02183d10: .word data_ov34_02185740
arm_func_end func_ov34_02183474
@@ -9368,7 +9368,7 @@ _02184200:
stmia r3, {r0, r1, r2}
add r0, r5, #0x1d00
ldrh r0, [r0, #0x7e]
ldr r1, _021843c4 ; =data_02050f54
ldr r1, _021843c4 ; =gSinCosTable
ldr r4, [sp, #0xc]
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
@@ -9409,7 +9409,7 @@ _0218429c:
stmia r3, {r0, r1, r2}
add r0, r5, #0x1d00
ldrh r1, [r0, #0x7e]
ldr r2, _021843c4 ; =data_02050f54
ldr r2, _021843c4 ; =gSinCosTable
ldr r0, [sp]
mov r1, r1, asr #0x4
mov ip, r1, lsl #0x1
@@ -9483,7 +9483,7 @@ _021843b4:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021843c0: .word data_ov34_02185788
_021843c4: .word data_02050f54
_021843c4: .word gSinCosTable
_021843c8: .word 0x00001666
_021843cc: .word 0x0000119a
_021843d0: .word gPlayerLink
@@ -9806,7 +9806,7 @@ func_ov34_02184778: ; 0x02184778
mov r4, #4
str r6, [r0, #0x90]
ldr r2, [r2, #8]
ldr r6, _02184880 ; =data_02050f54
ldr r6, _02184880 ; =gSinCosTable
str r2, [r0, #0x94]
str lr, [r0, #0x98]
strb r1, [r0, #0x9f]
@@ -9851,7 +9851,7 @@ func_ov34_02184778: ; 0x02184778
.align 2, 0
_02184878: .word data_027e0d0c
_0218487c: .word data_ov34_02186394
_02184880: .word data_02050f54
_02184880: .word gSinCosTable
_02184884: .word data_ov34_021861fd
arm_func_end func_ov34_02184778
@@ -10208,7 +10208,7 @@ func_ov34_02184cec: ; 0x02184cec
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02184f2c ; =data_02050f54
ldr r2, _02184f2c ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r2, r1]
mov r0, r0, lsl #0x1
@@ -10336,7 +10336,7 @@ _02184efc:
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02184f2c: .word data_02050f54
_02184f2c: .word gSinCosTable
_02184f30: .word data_027e0d0c
arm_func_end func_ov34_02184cec
asm/ov35.inc
+1 -1
View File
@@ -77,7 +77,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0194
.extern data_027e037c
.extern data_027e03c8
asm/ov35.s
+42 -42
View File
@@ -2657,7 +2657,7 @@ _0217e168:
bl func_0202b154
_0217e174:
ldrh r1, [r5, #0x78]
ldr r2, _0217e2f4 ; =data_02050f54
ldr r2, _0217e2f4 ; =gSinCosTable
ldr r0, _0217e2f8 ; =0x00000133
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -2758,7 +2758,7 @@ _0217e2e4: .word 0x00fe9400
_0217e2e8: .word 0xffff80b6
_0217e2ec: .word 0x00000222
_0217e2f0: .word 0x00000444
_0217e2f4: .word data_02050f54
_0217e2f4: .word gSinCosTable
_0217e2f8: .word 0x00000133
_0217e2fc: .word data_027e0ffc
_0217e300: .word 0x00000231
@@ -3052,7 +3052,7 @@ func_ov35_0217e6bc: ; 0x0217e6bc
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _0217e728 ; =data_02050f54
ldr r2, _0217e728 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -3069,7 +3069,7 @@ func_ov35_0217e6bc: ; 0x0217e6bc
add sp, sp, #0x10
bx lr
.align 2, 0
_0217e728: .word data_02050f54
_0217e728: .word gSinCosTable
arm_func_end func_ov35_0217e6bc
.global func_ov35_0217e72c
@@ -3287,7 +3287,7 @@ _0217e96c: .word data_027e0fe0
func_ov35_0217e970: ; 0x0217e970
stmdb sp!, {r4, lr}
ldrh r2, [r1]
ldr r3, _0217e9e8 ; =data_02050f54
ldr r3, _0217e9e8 ; =gSinCosTable
mov r1, #0x800
mov r2, r2, asr #0x4
mov r4, r2, lsl #0x1
@@ -3316,7 +3316,7 @@ func_ov35_0217e970: ; 0x0217e970
strh r2, [r0, #0x54]
ldmia sp!, {r4, pc}
.align 2, 0
_0217e9e8: .word data_02050f54
_0217e9e8: .word gSinCosTable
arm_func_end func_ov35_0217e970
.global func_ov35_0217e9ec
@@ -4160,7 +4160,7 @@ _0217f5f8:
ldr r0, _021800b8 ; =data_027e0d0c
str r1, [r4, #0x53c]
ldr r1, [r0]
ldr r5, _021800bc ; =data_02050f54
ldr r5, _021800bc ; =gSinCosTable
str r1, [r4, #0x60]
ldr r1, [r0, #4]
str r1, [r4, #0x64]
@@ -4275,7 +4275,7 @@ _0217f790:
b _02180974
_0217f7bc:
ldrh r1, [r4, #0x78]
ldr r2, _021800bc ; =data_02050f54
ldr r2, _021800bc ; =gSinCosTable
ldr r0, _021800e0 ; =0x00000171
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -4365,7 +4365,7 @@ _0217f8d0:
ldr r2, _021800e8 ; =0xfffff333
str r1, [r4, #0x50c]
ldr r3, [r4, #0x4c]
ldr r1, _021800bc ; =data_02050f54
ldr r1, _021800bc ; =gSinCosTable
str r3, [r4, #0x510]
ldr r3, [r4, #0x50]
add r2, r0, r2
@@ -4457,7 +4457,7 @@ _0217fa0c:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, [sp, #0x60]
ldr r5, _021800bc ; =data_02050f54
ldr r5, _021800bc ; =gSinCosTable
str r0, [r4, #0x48]
ldr r0, [sp, #0x64]
ldr r2, _021800f0 ; =0x00001ccd
@@ -4752,7 +4752,7 @@ _0217fee0:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r1, [r4, #0x78]
ldr r2, _021800bc ; =data_02050f54
ldr r2, _021800bc ; =gSinCosTable
ldr r0, _02180108 ; =0x00001b33
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -4866,7 +4866,7 @@ _021800ac: .word gPlayerLink
_021800b0: .word data_027e071c
_021800b4: .word 0x00000333
_021800b8: .word data_027e0d0c
_021800bc: .word data_02050f54
_021800bc: .word gSinCosTable
_021800c0: .word data_027e0c54
_021800c4: .word func_ov35_0217e9ec
_021800c8: .word data_027e0ffc
@@ -4902,7 +4902,7 @@ _0218010c:
stmia r3, {r0, r1, r2}
ldrh r0, [r4, #0x78]
mov lr, #0
ldr r2, _021800bc ; =data_02050f54
ldr r2, _021800bc ; =gSinCosTable
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
mov r0, r3, lsl #0x1
@@ -5764,7 +5764,7 @@ _02180d74:
mov r0, #5
strb r0, [r4, #0x3b8]
ldrh r2, [r4, #0x78]
ldr r3, _02180eb4 ; =data_02050f54
ldr r3, _02180eb4 ; =gSinCosTable
rsb r1, r0, #0x338
mov r2, r2, asr #0x4
mov r6, r2, lsl #0x1
@@ -5845,7 +5845,7 @@ _02180e8c:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02180eb4: .word data_02050f54
_02180eb4: .word gSinCosTable
_02180eb8: .word data_027e0ffc
_02180ebc: .word data_027e0c54
_02180ec0: .word func_ov35_0217e9ec
@@ -5878,7 +5878,7 @@ func_ov35_02180ec4: ; 0x02180ec4
ldr r0, _02180fc4 ; =data_027e0d0c
str r1, [r4, #0x53c]
ldr r1, [r0]
ldr ip, _02180fcc ; =data_02050f54
ldr ip, _02180fcc ; =gSinCosTable
str r1, [r4, #0x60]
ldr r1, [r0, #4]
str r1, [r4, #0x64]
@@ -5921,7 +5921,7 @@ func_ov35_02180ec4: ; 0x02180ec4
.align 2, 0
_02180fc4: .word data_027e0d0c
_02180fc8: .word 0x00000666
_02180fcc: .word data_02050f54
_02180fcc: .word gSinCosTable
arm_func_end func_ov35_02180ec4
.global func_ov35_02180fd0
@@ -6272,7 +6272,7 @@ _02181484:
mov r2, #0x2d8
bl func_0202b154
ldrh r1, [r4, #0x78]
ldr r2, _0218156c ; =data_02050f54
ldr r2, _0218156c ; =gSinCosTable
ldr r0, _02181570 ; =0x00000171
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -6323,7 +6323,7 @@ _02181530:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02181568: .word data_027e0764
_0218156c: .word data_02050f54
_0218156c: .word gSinCosTable
_02181570: .word 0x00000171
_02181574: .word data_027e0ffc
arm_func_end func_ov35_02181410
@@ -6595,7 +6595,7 @@ _021818ec:
mvn r0, #0
str r0, [r4, #0x544]
ldrh r2, [r4, #0x78]
ldr r3, _0218198c ; =data_02050f54
ldr r3, _0218198c ; =gSinCosTable
ldr r1, _02181990 ; =0xffffe4cd
mov r2, r2, asr #0x4
mov r5, r2, lsl #0x1
@@ -6633,7 +6633,7 @@ _021818ec:
.align 2, 0
_02181984: .word data_027e0c54
_02181988: .word gAdventureFlags
_0218198c: .word data_02050f54
_0218198c: .word gSinCosTable
_02181990: .word 0xffffe4cd
arm_func_end func_ov35_0218187c
@@ -6948,7 +6948,7 @@ _02181dd8:
str lr, [r4, #0x538]
add r0, r4, #0x500
ldrh r1, [r0, #0x5c]
ldr r3, _02181e84 ; =data_02050f54
ldr r3, _02181e84 ; =gSinCosTable
mov r1, r1, asr #0x4
mov ip, r1, lsl #0x1
mov r1, ip, lsl #0x1
@@ -6989,7 +6989,7 @@ _02181e60:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02181e84: .word data_02050f54
_02181e84: .word gSinCosTable
arm_func_end func_ov35_02181d1c
.global func_ov35_02181e88
@@ -7357,7 +7357,7 @@ _021823ac:
bne _0218243c
mov r0, r5, asr #0x4
mov ip, r0, lsl #0x1
ldr r3, _02182468 ; =data_02050f54
ldr r3, _02182468 ; =gSinCosTable
mov r0, ip, lsl #0x1
ldrsh r2, [r3, r0]
ldr r1, [r4, #0x53c]
@@ -7399,7 +7399,7 @@ _0218243c:
.align 2, 0
_02182460: .word 0x00000171
_02182464: .word data_027e0764
_02182468: .word data_02050f54
_02182468: .word gSinCosTable
_0218246c: .word data_027e0ffc
_02182470: .word data_027e0d0c
arm_func_end func_ov35_0218221c
@@ -7415,7 +7415,7 @@ func_ov35_02182474: ; 0x02182474
mov r2, #0x5b0
bl func_0202b154
ldr r0, _02182554 ; =gPlayerPos
ldr ip, _02182558 ; =data_02050f54
ldr ip, _02182558 ; =gSinCosTable
ldr r2, [r0]
ldr r1, _0218255c ; =0xffffe333
str r2, [r4, #0x48]
@@ -7465,7 +7465,7 @@ func_ov35_02182474: ; 0x02182474
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02182554: .word gPlayerPos
_02182558: .word data_02050f54
_02182558: .word gSinCosTable
_0218255c: .word 0xffffe333
arm_func_end func_ov35_02182474
@@ -9228,7 +9228,7 @@ _02183d74:
_02183d8c:
ldrh r0, [r7, #0x78]
ldr r3, [sp, #0x28]
ldr r2, _02183e8c ; =data_02050f54
ldr r2, _02183e8c ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -9291,7 +9291,7 @@ _02183e7c: .word 0xffffe4cd
_02183e80: .word 0x0000019a
_02183e84: .word 0x00000ccd
_02183e88: .word 0x00000555
_02183e8c: .word data_02050f54
_02183e8c: .word gSinCosTable
_02183e90: .word gMapManager
_02183e94: .word data_ov00_020e9370
arm_func_end func_ov35_02183848
@@ -9391,7 +9391,7 @@ _02183f70:
bl func_01ff8988
add r0, r4, #0x400
ldrh r1, [r0, #0x1c]
ldr r3, _02184050 ; =data_02050f54
ldr r3, _02184050 ; =gSinCosTable
add r0, sp, #4
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -9423,7 +9423,7 @@ _02183f70:
.align 2, 0
_02184048: .word data_ov00_020e9360
_0218404c: .word 0x00001666
_02184050: .word data_02050f54
_02184050: .word gSinCosTable
arm_func_end func_ov35_02183f0c
.global func_ov35_02184054
@@ -9514,7 +9514,7 @@ _02184174:
cmp r0, #1
bhi _021841e0
ldr r0, [r4, #0x48]
ldr r2, _02184230 ; =data_02050f54
ldr r2, _02184230 ; =gSinCosTable
str r0, [sp]
ldr r0, [r4, #0x4c]
ldr r1, _02184234 ; =0x0000011f
@@ -9559,7 +9559,7 @@ _021841fc:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02184230: .word data_02050f54
_02184230: .word gSinCosTable
_02184234: .word 0x0000011f
arm_func_end func_ov35_02184140
@@ -9590,7 +9590,7 @@ func_ov35_02184238: ; 0x02184238
mov r0, r1, asr #0x4
mov r2, r0, lsl #0x1
bne _02184314
ldr r1, _02184430 ; =data_02050f54
ldr r1, _02184430 ; =gSinCosTable
add r0, r2, #1
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
@@ -9622,7 +9622,7 @@ func_ov35_02184238: ; 0x02184238
str r0, [sp, #0x18]
b _02184398
_02184314:
ldr r1, _02184430 ; =data_02050f54
ldr r1, _02184430 ; =gSinCosTable
add r0, r2, #1
mov r2, r2, lsl #0x1
ldrsh r5, [r1, r2]
@@ -9696,7 +9696,7 @@ _02184420:
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02184430: .word data_02050f54
_02184430: .word gSinCosTable
_02184434: .word data_027e0e58
_02184438: .word data_027e0ffc
_0218443c: .word 0x0000022b
@@ -9714,7 +9714,7 @@ func_ov35_02184440: ; 0x02184440
ldmneia sp!, {r3, r4, r5, r6, pc}
ldrsh r0, [r0, #0x78]
ldr r2, _02184510 ; =0x000004cd
ldr r3, _02184514 ; =data_02050f54
ldr r3, _02184514 ; =gSinCosTable
add r0, r0, #0x358
add r0, r0, #0x1800
mov r0, r0, lsl #0x10
@@ -9759,7 +9759,7 @@ func_ov35_02184440: ; 0x02184440
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_02184510: .word 0x000004cd
_02184514: .word data_02050f54
_02184514: .word gSinCosTable
_02184518: .word gPlayerLink
arm_func_end func_ov35_02184440
@@ -10343,7 +10343,7 @@ _02184c7c:
add r1, sp, #0x18
bl func_01ff9ec0
mov r2, r7, asr #0x4
ldr r1, _02184d5c ; =data_02050f54
ldr r1, _02184d5c ; =gSinCosTable
mov r2, r2, lsl #0x2
ldrsh r2, [r1, r2]
ldr r1, [sp, #0x24]
@@ -10397,7 +10397,7 @@ _02184d3c:
_02184d50: .word data_027e0ffc
_02184d54: .word 0x0000019d
_02184d58: .word 0x41525257
_02184d5c: .word data_02050f54
_02184d5c: .word gSinCosTable
arm_func_end func_ov35_02184b28
.global func_ov35_02184d60
@@ -10613,7 +10613,7 @@ func_ov35_02184f74: ; 0x02184f74
str r5, [r6, #0x50]
mov r5, r1, lsl #0x1
add r1, r1, #1
ldr r3, _02185098 ; =data_02050f54
ldr r3, _02185098 ; =gSinCosTable
mov r2, r1, lsl #0x1
ldrsh r1, [r3, r5]
ldrsh r2, [r3, r2]
@@ -10638,7 +10638,7 @@ func_ov35_02184f74: ; 0x02184f74
.align 2, 0
_02185090: .word data_ov35_02185604
_02185094: .word data_ov35_021855f8
_02185098: .word data_02050f54
_02185098: .word gSinCosTable
arm_func_end func_ov35_02184f74
.global func_ov35_0218509c
asm/ov36.inc
+1 -1
View File
@@ -66,7 +66,7 @@
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
.extern gSinCosTable
.extern data_02063e4c
.extern data_027e071c
.extern data_027e0764
asm/ov36.s
+53 -53
View File
@@ -27,7 +27,7 @@ _0217bdb0: .word 0x00001b10
func_ov36_0217bdb4: ; 0x0217bdb4
stmdb sp!, {r4, lr}
ldrh r2, [r1]
ldr r3, _0217be2c ; =data_02050f54
ldr r3, _0217be2c ; =gSinCosTable
mov r1, #0x800
mov r2, r2, asr #0x4
mov r4, r2, lsl #0x1
@@ -56,7 +56,7 @@ func_ov36_0217bdb4: ; 0x0217bdb4
strh r2, [r0, #0x54]
ldmia sp!, {r4, pc}
.align 2, 0
_0217be2c: .word data_02050f54
_0217be2c: .word gSinCosTable
arm_func_end func_ov36_0217bdb4
.global func_ov36_0217be30
@@ -245,7 +245,7 @@ func_ov36_0217c070: ; 0x0217c070
mov r0, r5
bl Vec3p_Add
ldr r0, [r4, #0x1c]
ldr r3, _0217c11c ; =data_02050f54
ldr r3, _0217c11c ; =gSinCosTable
ldrh r1, [r0, #0x78]
add r0, sp, #0
mov r1, r1, asr #0x4
@@ -270,7 +270,7 @@ func_ov36_0217c070: ; 0x0217c070
.align 2, 0
_0217c114: .word 0xfffffc39
_0217c118: .word 0x00000ccd
_0217c11c: .word data_02050f54
_0217c11c: .word gSinCosTable
arm_func_end func_ov36_0217c070
.global func_ov36_0217c120
@@ -493,7 +493,7 @@ _0217c370:
cmp r0, #2
bne _0217c3e4
ldr r5, [r7, #0xb4]
ldr r3, _0217c518 ; =data_02050f54
ldr r3, _0217c518 ; =gSinCosTable
ldr r1, [r5]
add r0, sp, #0x60
bic r1, r1, #2
@@ -598,7 +598,7 @@ _0217c508: .word data_ov36_02186b44
_0217c50c: .word data_ov36_02186b58
_0217c510: .word data_ov36_02186b6c
_0217c514: .word data_ov36_02186b80
_0217c518: .word data_02050f54
_0217c518: .word gSinCosTable
arm_func_end func_ov36_0217c274
.global func_ov36_0217c51c
@@ -2003,7 +2003,7 @@ _0217d844:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r0, [r5, #0x78]
ldr r2, _0217d9fc ; =data_02050f54
ldr r2, _0217d9fc ; =gSinCosTable
ldr r1, [sp, #0x10]
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -2046,7 +2046,7 @@ _0217d844:
ldr r0, [r0]
bl func_ov00_02093a5c
ldr r0, [r5, #0x48]
ldr r6, _0217d9fc ; =data_02050f54
ldr r6, _0217d9fc ; =gSinCosTable
str r0, [sp, #0xc]
ldr r1, [r5, #0x4c]
ldr r2, _0217da04 ; =0x0000199a
@@ -2104,7 +2104,7 @@ _0217d9d8:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0217d9f8: .word data_027e077c
_0217d9fc: .word data_02050f54
_0217d9fc: .word gSinCosTable
_0217da00: .word data_027e0f6c
_0217da04: .word 0x0000199a
arm_func_end func_ov36_0217d810
@@ -2259,7 +2259,7 @@ _0217dbac:
stmia r3, {r0, r1, r2}
add r0, r5, #1
mov r2, r5, lsl #0x1
ldr r1, _0217dd70 ; =data_02050f54
ldr r1, _0217dd70 ; =gSinCosTable
mov r0, r0, lsl #0x1
ldrsh r7, [r1, r0]
mov r0, #4
@@ -2343,7 +2343,7 @@ _0217dbac:
_0217dd64: .word gPlayerLink
_0217dd68: .word data_027e0f64
_0217dd6c: .word data_ov36_02186768
_0217dd70: .word data_02050f54
_0217dd70: .word gSinCosTable
_0217dd74: .word 0x0000099a
_0217dd78: .word data_027e0ff8
arm_func_end func_ov36_0217da6c
@@ -2835,7 +2835,7 @@ func_ov36_0217e3e0: ; 0x0217e3e0
mov r2, #0x2000
bl func_ov36_02183070
ldrh r0, [r4, #0x78]
ldr r1, _0217e4ec ; =data_02050f54
ldr r1, _0217e4ec ; =gSinCosTable
mov r2, #0
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
@@ -2868,7 +2868,7 @@ func_ov36_0217e3e0: ; 0x0217e3e0
.align 2, 0
_0217e4e4: .word data_ov36_02186c88
_0217e4e8: .word data_027e0764
_0217e4ec: .word data_02050f54
_0217e4ec: .word gSinCosTable
_0217e4f0: .word 0x00000112
arm_func_end func_ov36_0217e3e0
@@ -2932,7 +2932,7 @@ _0217e5ac:
add r0, r4, #0x78
bl func_0202b154
ldrh r1, [r4, #0x78]
ldr r2, _0217e6b0 ; =data_02050f54
ldr r2, _0217e6b0 ; =gSinCosTable
ldr r0, _0217e6b4 ; =0x00000112
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -2995,7 +2995,7 @@ _0217e694:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0217e6ac: .word data_027e0764
_0217e6b0: .word data_02050f54
_0217e6b0: .word gSinCosTable
_0217e6b4: .word 0x00000112
arm_func_end func_ov36_0217e4f4
@@ -3215,7 +3215,7 @@ _0217e978:
ldr r4, _0217eb34 ; =0x00000337
bl _ZN10MapManager18func_ov00_02083770Eji
ldrh r2, [r6, #0x78]
ldr r5, _0217eb50 ; =data_02050f54
ldr r5, _0217eb50 ; =gSinCosTable
mov r1, #0x3800
mov r2, r2, asr #0x4
mov ip, r2, lsl #0x1
@@ -3244,7 +3244,7 @@ _0217e978:
bl func_ov00_0207c474
ldrsh r0, [r6, #0x78]
ldr r1, [r6, #0x6a0]
ldr r3, _0217eb50 ; =data_02050f54
ldr r3, _0217eb50 ; =gSinCosTable
add r0, r0, #0x8000
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
@@ -3291,7 +3291,7 @@ _0217ea64:
_0217eacc:
strb r5, [r6, #0x8ab]
ldrh r1, [r6, #0x78]
ldr r3, _0217eb50 ; =data_02050f54
ldr r3, _0217eb50 ; =gSinCosTable
mov r0, r6
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -3323,7 +3323,7 @@ _0217eb40: .word gActorManager
_0217eb44: .word 0x504c444d
_0217eb48: .word 0x0000219a
_0217eb4c: .word gMapManager
_0217eb50: .word data_02050f54
_0217eb50: .word gSinCosTable
_0217eb54: .word data_027e0e58
arm_func_end func_ov36_0217e818
@@ -3334,7 +3334,7 @@ func_ov36_0217eb58: ; 0x0217eb58
sub sp, sp, #0x18
mov r4, r0
ldrsh r0, [r4, #0x78]
ldr ip, _0217ecb8 ; =data_02050f54
ldr ip, _0217ecb8 ; =gSinCosTable
ldr r3, _0217ecbc ; =0x000024cd
strh r0, [sp, #8]
ldrh r1, [sp, #8]
@@ -3419,7 +3419,7 @@ func_ov36_0217eb58: ; 0x0217eb58
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0217ecb8: .word data_02050f54
_0217ecb8: .word gSinCosTable
_0217ecbc: .word 0x000024cd
_0217ecc0: .word func_ov36_0217bdb4
_0217ecc4: .word data_027e0e58
@@ -4160,7 +4160,7 @@ _0217f650:
_0217f68c:
str r0, [r5, #0x868]
ldrh r1, [r5, #0x78]
ldr r2, _0217f97c ; =data_02050f54
ldr r2, _0217f97c ; =gSinCosTable
ldr r0, _0217f980 ; =0xfffffccd
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -4208,7 +4208,7 @@ _0217f710:
_0217f744:
str r0, [r5, #0x868]
ldrh r1, [r5, #0x78]
ldr r2, _0217f97c ; =data_02050f54
ldr r2, _0217f97c ; =gSinCosTable
ldr r0, _0217f984 ; =0x0000028f
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -4272,7 +4272,7 @@ _0217f7fc:
mov r1, #0xb4000
bl Divide
ldr r2, [r5, #0x874]
ldr r1, _0217f97c ; =data_02050f54
ldr r1, _0217f97c ; =gSinCosTable
mul r0, r2, r0
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
@@ -4353,7 +4353,7 @@ _0217f96c: .word gActorManager
_0217f970: .word data_027e0f64
_0217f974: .word data_027e0ffc
_0217f978: .word 0x000002cd
_0217f97c: .word data_02050f54
_0217f97c: .word gSinCosTable
_0217f980: .word 0xfffffccd
_0217f984: .word 0x0000028f
_0217f988: .word 0x000002c5
@@ -4556,7 +4556,7 @@ _0217fc40:
mov r1, r6, asr #0x4
mov r2, r1, lsl #0x1
add r1, r2, #1
ldr r3, _0217fde8 ; =data_02050f54
ldr r3, _0217fde8 ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r1, r1, lsl #0x1
ldrsh r2, [r3, r2]
@@ -4659,7 +4659,7 @@ _0217fdd8: .word 0x00000207
_0217fddc: .word data_ov36_02186cb0
_0217fde0: .word 0x000002cb
_0217fde4: .word 0x00000ccd
_0217fde8: .word data_02050f54
_0217fde8: .word gSinCosTable
_0217fdec: .word 0x000002c7
arm_func_end func_ov36_0217f9f0
@@ -4710,7 +4710,7 @@ func_ov36_0217fe3c: ; 0x0217fe3c
mov r1, #0xb4000
bl Divide
ldr r2, [r5, #0x874]
ldr r1, _0217ffcc ; =data_02050f54
ldr r1, _0217ffcc ; =gSinCosTable
mul r0, r2, r0
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
@@ -4793,7 +4793,7 @@ _0217ff88:
.align 2, 0
_0217ffc4: .word data_027e0ffc
_0217ffc8: .word 0x000002c5
_0217ffcc: .word data_02050f54
_0217ffcc: .word gSinCosTable
_0217ffd0: .word 0x009c4000
_0217ffd4: .word data_027e0fe8
_0217ffd8: .word 0x50424652
@@ -5361,7 +5361,7 @@ _021806cc:
b _02180860
_02180730:
ldrsh r1, [r7, #0x78]
ldr r10, _0218098c ; =data_02050f54
ldr r10, _0218098c ; =gSinCosTable
mov r9, #5
strh r1, [r0, #0x9c]
add r0, r1, #0x2000
@@ -5515,7 +5515,7 @@ _0218091c:
_02180980: .word data_027e0d0c
_02180984: .word data_ov36_02186cd4
_02180988: .word data_ov36_02186838
_0218098c: .word data_02050f54
_0218098c: .word gSinCosTable
_02180990: .word 0x000004cd
_02180994: .word gMapManager
_02180998: .word data_027e0f64
@@ -5924,7 +5924,7 @@ _02180f44:
movs r4, r0
beq _02181000
ldrh r1, [r4, #0x78]
ldr r2, _02181030 ; =data_02050f54
ldr r2, _02181030 ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov ip, r1, lsl #0x1
@@ -5973,7 +5973,7 @@ _02181020: .word 0x00000ccd
_02181024: .word data_027e0ffc
_02181028: .word 0x000002c1
_0218102c: .word gActorManager
_02181030: .word data_02050f54
_02181030: .word gSinCosTable
arm_func_end func_ov36_02180e24
.global func_ov36_02181034
@@ -8539,7 +8539,7 @@ _0218354c:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r1, [r5, #0x78]
ldr r2, _02183a10 ; =data_02050f54
ldr r2, _02183a10 ; =gSinCosTable
mov r0, #0x800
mov r1, r1, asr #0x4
mov r6, r1, lsl #0x1
@@ -8839,7 +8839,7 @@ _021839f4:
.align 2, 0
_02183a08: .word gActorManager
_02183a0c: .word 0x424d5459
_02183a10: .word data_02050f54
_02183a10: .word gSinCosTable
_02183a14: .word data_027e0f64
_02183a18: .word 0x000004cd
_02183a1c: .word 0x00001e84
@@ -9083,7 +9083,7 @@ _02183ce8:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _0218409c ; =data_02050f54
ldr r1, _0218409c ; =gSinCosTable
mov r0, r0, lsl #0x1
ldrsh r3, [r1, r0]
mov r0, r2, lsl #0x1
@@ -9311,7 +9311,7 @@ _0218408c: .word 0x424d5459
_02184090: .word gItemManager
_02184094: .word gPlayerPos
_02184098: .word data_027e0fd4
_0218409c: .word data_02050f54
_0218409c: .word gSinCosTable
_021840a0: .word 0x0000219a
_021840a4: .word 0x5342454d
_021840a8: .word data_027e0ffc
@@ -9426,7 +9426,7 @@ _02184160:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _02184418 ; =data_02050f54
ldr r1, _02184418 ; =gSinCosTable
mov r0, r0, lsl #0x1
ldrsh r7, [r1, r0]
mov r0, r2, lsl #0x1
@@ -9556,7 +9556,7 @@ _02184408: .word data_027e0ffc
_0218440c: .word 0x0000019d
_02184410: .word 0x524f5045
_02184414: .word 0x41525257
_02184418: .word data_02050f54
_02184418: .word gSinCosTable
_0218441c: .word 0x00000ccd
_02184420: .word gItemManager
_02184424: .word data_027e0f64
@@ -9626,7 +9626,7 @@ _02184508:
mov r0, #2
str r0, [sp, #0x2c]
ldrh r1, [r5, #0x78]
ldr r2, _0218461c ; =data_02050f54
ldr r2, _0218461c ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r4, r1, lsl #0x1
@@ -9693,7 +9693,7 @@ _0218460c: .word 0x0000ffff
_02184610: .word data_027e0d3c
_02184614: .word data_02063e4c
_02184618: .word data_027e0c68
_0218461c: .word data_02050f54
_0218461c: .word gSinCosTable
_02184620: .word data_027e0c38
arm_func_end func_ov36_0218442c
@@ -9730,7 +9730,7 @@ _02184684:
cmp r0, #0
bne _021846c4
ldrh r1, [r4, #0x78]
ldr r3, _021848e4 ; =data_02050f54
ldr r3, _021848e4 ; =gSinCosTable
add r0, sp, #0xa8
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -9745,7 +9745,7 @@ _021846c4:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _021848e4 ; =data_02050f54
ldr r2, _021848e4 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -9753,7 +9753,7 @@ _021846c4:
add r0, sp, #0xa8
blx func_01ff8230
ldrh r1, [r4, #0x78]
ldr r3, _021848e4 ; =data_02050f54
ldr r3, _021848e4 ; =gSinCosTable
add r0, sp, #0x84
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -9883,7 +9883,7 @@ _02184898:
add sp, sp, #0xcc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_021848e4: .word data_02050f54
_021848e4: .word gSinCosTable
_021848e8: .word 0x00000333
_021848ec: .word 0x0000219a
_021848f0: .word 0x00000b34
@@ -10609,7 +10609,7 @@ func_ov36_02185274: ; 0x02185274
_02185294:
add r1, r0, #0x800
ldrh r1, [r1, #0x9a]
ldr ip, _021852f8 ; =data_02050f54
ldr ip, _021852f8 ; =gSinCosTable
ldr r2, [r0, #0x858]
mov r1, r1, asr #0x4
mov lr, r1, lsl #0x1
@@ -10633,7 +10633,7 @@ _02185294:
str r2, [r0, #0x68]
ldmia sp!, {r3, pc}
.align 2, 0
_021852f8: .word data_02050f54
_021852f8: .word gSinCosTable
arm_func_end func_ov36_02185274
.global func_ov36_021852fc
@@ -10749,7 +10749,7 @@ func_ov36_0218543c: ; 0x0218543c
add r1, r4, #0x800
ldrh r1, [r1, #0x9a]
mov ip, #0
ldr r2, _021854e4 ; =data_02050f54
ldr r2, _021854e4 ; =gSinCosTable
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
add r1, r3, #1
@@ -10782,7 +10782,7 @@ func_ov36_0218543c: ; 0x0218543c
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_021854e4: .word data_02050f54
_021854e4: .word gSinCosTable
arm_func_end func_ov36_0218543c
.global func_ov36_021854e8
@@ -10908,7 +10908,7 @@ _0218563c:
_0218568c:
add r1, r6, #0x800
ldrh r3, [r1, #0x98]
ldr r2, _021856c8 ; =data_02050f54
ldr r2, _021856c8 ; =gSinCosTable
mov r0, #0x1f4
mov r3, r3, asr #0x4
mov r3, r3, lsl #0x2
@@ -10922,7 +10922,7 @@ _0218568c:
strh r0, [r1, #0x98]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_021856c8: .word data_02050f54
_021856c8: .word gSinCosTable
arm_func_end func_ov36_021855ec
.global func_ov36_021856cc
@@ -11746,7 +11746,7 @@ _021861c8:
add r7, r6, #0x1000
str r4, [r0, #0xa8]
ldr r6, [r1, #4]
ldr r4, _021862b4 ; =data_02050f54
ldr r4, _021862b4 ; =gSinCosTable
str r6, [r0, #0xac]
ldr r6, [r1, #8]
add r1, r2, #0x264
@@ -11789,7 +11789,7 @@ _021861c8:
_021862a8: .word 0x00001004
_021862ac: .word data_027e0d0c
_021862b0: .word 0x00001007
_021862b4: .word data_02050f54
_021862b4: .word gSinCosTable
arm_func_end func_ov36_02186110
.global func_ov36_021862b8
asm/ov37.inc
+1 -1
View File
@@ -74,7 +74,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0764
.extern data_027e0c54
.extern data_027e0d0c
asm/ov37.s
+64 -64
View File
@@ -2771,7 +2771,7 @@ _0217e358: .word gPlayerVel
_0217e35c: .word 0xffff8001
_0217e360: .word 0x00000e39
_0217e364: .word 0xfffff8e4
_0217e368: .word data_02050f54
_0217e368: .word gSinCosTable
_0217e36c: .word data_ov37_02189160
_0217e370:
ldr r0, _0217e364 ; =0xfffff8e4
@@ -2784,7 +2784,7 @@ _0217e380:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _0217e368 ; =data_02050f54
ldr r1, _0217e368 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh lr, [r1, r2]
mov r0, r0, lsl #0x1
@@ -3008,7 +3008,7 @@ _0217e690:
mov r2, r0, lsl #0x1
add r0, r2, #1
mov r3, #0
ldr r1, _0217e368 ; =data_02050f54
ldr r1, _0217e368 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r6, [r1, r2]
mov r0, r0, lsl #0x1
@@ -3796,7 +3796,7 @@ func_ov37_0217f288: ; 0x0217f288
ldmia r1, {r0, r1, r2}
stmia r4, {r0, r1, r2}
ldrh r0, [r3, #0x78]
ldr r4, _0217f374 ; =data_02050f54
ldr r4, _0217f374 ; =gSinCosTable
ldr r8, [sp, #8]
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
@@ -3848,7 +3848,7 @@ func_ov37_0217f288: ; 0x0217f288
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0217f370: .word data_ov37_02187df4
_0217f374: .word data_02050f54
_0217f374: .word gSinCosTable
arm_func_end func_ov37_0217f288
.global func_ov37_0217f378
@@ -3862,7 +3862,7 @@ func_ov37_0217f378: ; 0x0217f378
ldmia r1, {r0, r1, r2}
stmia r4, {r0, r1, r2}
ldrh r0, [r3, #0x78]
ldr r4, _0217f464 ; =data_02050f54
ldr r4, _0217f464 ; =gSinCosTable
ldr r8, [sp, #8]
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
@@ -3914,7 +3914,7 @@ func_ov37_0217f378: ; 0x0217f378
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0217f460: .word data_ov37_02187e00
_0217f464: .word data_02050f54
_0217f464: .word gSinCosTable
arm_func_end func_ov37_0217f378
.global func_ov37_0217f468
@@ -4105,7 +4105,7 @@ func_ov37_0217f6d8: ; 0x0217f6d8
mov r4, r0
ldrh r0, [r4, #0x78]
mov r1, #0
ldr r3, _0217f76c ; =data_02050f54
ldr r3, _0217f76c ; =gSinCosTable
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
@@ -4138,7 +4138,7 @@ func_ov37_0217f6d8: ; 0x0217f6d8
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217f76c: .word data_02050f54
_0217f76c: .word gSinCosTable
arm_func_end func_ov37_0217f6d8
.global func_ov37_0217f770
@@ -4149,7 +4149,7 @@ func_ov37_0217f770: ; 0x0217f770
mov r4, r0
ldrh r0, [r4, #0x78]
mov r1, #0
ldr r3, _0217f808 ; =data_02050f54
ldr r3, _0217f808 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
@@ -4183,7 +4183,7 @@ func_ov37_0217f770: ; 0x0217f770
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217f808: .word data_02050f54
_0217f808: .word gSinCosTable
arm_func_end func_ov37_0217f770
.global func_ov37_0217f80c
@@ -4609,7 +4609,7 @@ func_ov37_0217fd14: ; 0x0217fd14
mov r0, ip, lsl #0x10
mov r0, r0, lsr #0x10
mov r1, r0, asr #0x4
ldr r0, _0217fd98 ; =data_02050f54
ldr r0, _0217fd98 ; =gSinCosTable
mov r1, r1, lsl #0x2
ldrsh ip, [r0, r1]
mov r0, r3, lsr #0x1f
@@ -4625,7 +4625,7 @@ func_ov37_0217fd14: ; 0x0217fd14
_0217fd8c: .word 0x0005fffa
_0217fd90: .word 0x0000059a
_0217fd94: .word 0x38e38e39
_0217fd98: .word data_02050f54
_0217fd98: .word gSinCosTable
arm_func_end func_ov37_0217fd14
.global func_ov37_0217fd9c
@@ -5028,7 +5028,7 @@ func_ov37_02180290: ; 0x02180290
cmp r3, r0
bne _02180338
ldr ip, [r4, #0xb4]
ldr r3, _021803cc ; =data_02050f54
ldr r3, _021803cc ; =gSinCosTable
ldr r2, [ip]
add r0, sp, #0x24
bic r2, r2, #2
@@ -5066,7 +5066,7 @@ _02180338:
ldr r2, [r4, #0xb4]
ldr r0, _021803c8 ; =data_ov37_02189190
ldr r1, [r2]
ldr r3, _021803cc ; =data_02050f54
ldr r3, _021803cc ; =gSinCosTable
bic r1, r1, #2
str r1, [r2]
ldr r1, [r0]
@@ -5093,7 +5093,7 @@ _02180338:
ldmia sp!, {r4, pc}
.align 2, 0
_021803c8: .word data_ov37_02189190
_021803cc: .word data_02050f54
_021803cc: .word gSinCosTable
arm_func_end func_ov37_02180290
.global func_ov37_021803d0
@@ -6060,7 +6060,7 @@ _021810fc:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r7, [r5, #0x1c]
ldr r1, _02181ee0 ; =data_02050f54
ldr r1, _02181ee0 ; =gSinCosTable
ldrh r0, [r7, #0x78]
ldr r2, [r7, #0x48]
ldr r3, [sp, #0x304]
@@ -6127,7 +6127,7 @@ _02181204:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r7, [r5, #0x1c]
ldr r1, _02181ee0 ; =data_02050f54
ldr r1, _02181ee0 ; =gSinCosTable
ldrh r0, [r7, #0x78]
ldr r2, [r7, #0x48]
ldr r3, [sp, #0x2ec]
@@ -6227,7 +6227,7 @@ _02181388:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x2c8]
@@ -6290,7 +6290,7 @@ _02181480:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x2b0]
@@ -6353,7 +6353,7 @@ _02181578:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x298]
@@ -6416,7 +6416,7 @@ _02181670:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x280]
@@ -6479,7 +6479,7 @@ _02181768:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x268]
@@ -6596,7 +6596,7 @@ _0218192c:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x250]
@@ -6672,7 +6672,7 @@ _02181a58:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x238]
@@ -6849,7 +6849,7 @@ _02181d00:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r10, [r5, #0x1c]
ldr r1, _02181ee0 ; =data_02050f54
ldr r1, _02181ee0 ; =gSinCosTable
ldrh r0, [r10, #0x78]
ldr r9, [r10, #0x48]
ldr r6, [sp, #0x208]
@@ -6962,7 +6962,7 @@ _02181e2c:
_02181ed4: .word data_027e0ffc
_02181ed8: .word data_027e0e58
_02181edc: .word data_ov37_02187fbc
_02181ee0: .word data_02050f54
_02181ee0: .word gSinCosTable
_02181ee4: .word 0x00001018
_02181ee8: .word data_ov37_02187fc8
_02181eec: .word 0x00001017
@@ -7010,7 +7010,7 @@ _02181f70:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x1e4]
@@ -7077,7 +7077,7 @@ _02182070:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr ip, [r5, #0x1c]
ldr r1, _02181ee0 ; =data_02050f54
ldr r1, _02181ee0 ; =gSinCosTable
ldrh r0, [ip, #0x78]
ldr r11, [ip, #0x48]
ldr r8, [sp, #0x1cc]
@@ -7207,7 +7207,7 @@ _02182268:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x1a8]
@@ -7426,7 +7426,7 @@ _021825a4:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x178]
@@ -7498,7 +7498,7 @@ _021826c0:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x160]
@@ -7570,7 +7570,7 @@ _021827dc:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x148]
@@ -7642,7 +7642,7 @@ _021828f8:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x130]
@@ -7714,7 +7714,7 @@ _02182a14:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x118]
@@ -7786,7 +7786,7 @@ _02182b30:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x100]
@@ -7858,7 +7858,7 @@ _02182c4c:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0xe8]
@@ -7930,7 +7930,7 @@ _02182d68:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02181ee0 ; =data_02050f54
ldr r3, _02181ee0 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0xd0]
@@ -8002,7 +8002,7 @@ _02182e84:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02183018 ; =data_02050f54
ldr r3, _02183018 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0xb8]
@@ -8074,7 +8074,7 @@ _02182fa0:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02183018 ; =data_02050f54
ldr r3, _02183018 ; =gSinCosTable
b _02183020
.align 2, 0
_02182fd4: .word 0x000002ad
@@ -8094,7 +8094,7 @@ _02183008: .word data_ov37_021880ac
_0218300c: .word data_027e0e58
_02183010: .word data_027e0ffc
_02183014: .word data_ov37_021880b8
_02183018: .word data_02050f54
_02183018: .word gSinCosTable
_0218301c: .word data_ov37_021880c4
_02183020:
ldrh r2, [r11, #0x78]
@@ -8168,7 +8168,7 @@ _0218310c:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02183018 ; =data_02050f54
ldr r3, _02183018 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x88]
@@ -8240,7 +8240,7 @@ _02183228:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02183018 ; =data_02050f54
ldr r3, _02183018 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x70]
@@ -8303,7 +8303,7 @@ _02183320:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r11, [r5, #0x1c]
ldr r3, _02183018 ; =data_02050f54
ldr r3, _02183018 ; =gSinCosTable
ldrh r2, [r11, #0x78]
ldr r1, [r11, #0x48]
ldr r0, [sp, #0x58]
@@ -10018,7 +10018,7 @@ func_ov37_0218494c: ; 0x0218494c
arm_func_start func_ov37_02184960
func_ov37_02184960: ; 0x02184960
ldrh r1, [r1, #0x78]
ldr ip, _021849a0 ; =data_02050f54
ldr ip, _021849a0 ; =gSinCosTable
mov r2, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -10034,7 +10034,7 @@ func_ov37_02184960: ; 0x02184960
strh r1, [r0, #0x54]
bx lr
.align 2, 0
_021849a0: .word data_02050f54
_021849a0: .word gSinCosTable
arm_func_end func_ov37_02184960
.global func_ov37_021849a4
@@ -10103,7 +10103,7 @@ func_ov37_021849a4: ; 0x021849a4
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r0, [r5, #0x78]
ldr lr, _02184b60 ; =data_02050f54
ldr lr, _02184b60 ; =gSinCosTable
ldr r4, _02184b64 ; =0x000004cd
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
@@ -10153,7 +10153,7 @@ _02184b50:
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02184b60: .word data_02050f54
_02184b60: .word gSinCosTable
_02184b64: .word 0x000004cd
_02184b68: .word data_027e0ffc
_02184b6c: .word 0x0000019b
@@ -10214,7 +10214,7 @@ func_ov37_02184bc0: ; 0x02184bc0
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _0218503c ; =data_02050f54
ldr r1, _0218503c ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r4, [r1, r2]
@@ -10483,7 +10483,7 @@ _02184d70:
add sp, sp, #0xb4
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0218503c: .word data_02050f54
_0218503c: .word gSinCosTable
_02185040: .word 0x00000333
_02185044: .word data_ov37_02188508
_02185048: .word 0x010800c0
@@ -11443,7 +11443,7 @@ _02185c08: ; jump table
_02185c20:
ldrh r1, [r4, #0x78]
ldr r0, [sp]
ldr r2, _02186178 ; =data_02050f54
ldr r2, _02186178 ; =gSinCosTable
str r0, [r7]
ldr r0, [sp, #4]
mov r1, r1, asr #0x4
@@ -11500,7 +11500,7 @@ _02185c20:
_02185d00:
ldrh r1, [r4, #0x78]
ldr r0, [sp]
ldr r2, _02186178 ; =data_02050f54
ldr r2, _02186178 ; =gSinCosTable
str r0, [r7]
ldr r0, [sp, #4]
mov r1, r1, asr #0x4
@@ -11557,7 +11557,7 @@ _02185d00:
_02185de0:
ldrh r1, [r4, #0x78]
ldr r0, [sp]
ldr r2, _02186178 ; =data_02050f54
ldr r2, _02186178 ; =gSinCosTable
str r0, [r7]
ldr r0, [sp, #4]
mov r1, r1, asr #0x4
@@ -11614,7 +11614,7 @@ _02185de0:
_02185ec0:
ldrh r1, [r4, #0x78]
ldr r0, [sp]
ldr r2, _02186178 ; =data_02050f54
ldr r2, _02186178 ; =gSinCosTable
str r0, [r7]
ldr r0, [sp, #4]
mov r1, r1, asr #0x4
@@ -11671,7 +11671,7 @@ _02185ec0:
_02185fa0:
ldrh r1, [r4, #0x78]
ldr r0, [sp]
ldr r2, _02186178 ; =data_02050f54
ldr r2, _02186178 ; =gSinCosTable
str r0, [r7]
ldr r0, [sp, #4]
mov r1, r1, asr #0x4
@@ -11728,7 +11728,7 @@ _02185fa0:
_02186080:
ldrh r1, [r4, #0x78]
ldr r0, [sp]
ldr r2, _02186178 ; =data_02050f54
ldr r2, _02186178 ; =gSinCosTable
str r0, [r7]
ldr r0, [sp, #4]
mov r1, r1, asr #0x4
@@ -11790,7 +11790,7 @@ _02186168: .word data_ov37_02188658
_0218616c: .word data_ov37_02188664
_02186170: .word data_ov37_02188670
_02186174: .word data_ov37_0218867c
_02186178: .word data_02050f54
_02186178: .word gSinCosTable
arm_func_end func_ov37_02185b6c
.global func_ov37_0218617c
@@ -13525,7 +13525,7 @@ func_ov37_021878ac: ; 0x021878ac
mov r1, #0
bl func_ov37_02185b6c
ldrh r0, [r4, #0x78]
ldr r1, _02187bcc ; =data_02050f54
ldr r1, _02187bcc ; =gSinCosTable
mov ip, #0
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
@@ -13552,7 +13552,7 @@ func_ov37_021878ac: ; 0x021878ac
bl func_ov37_02185b6c
ldrh r2, [r4, #0x78]
mov r0, #0
ldr r1, _02187bcc ; =data_02050f54
ldr r1, _02187bcc ; =gSinCosTable
str r0, [sp, #4]
mov r0, r2, asr #0x4
mov r3, r0, lsl #0x1
@@ -13582,7 +13582,7 @@ func_ov37_021878ac: ; 0x021878ac
add r2, sp, #0x18
bl func_ov37_02185b6c
ldrsh r0, [r4, #0x78]
ldr r1, _02187bcc ; =data_02050f54
ldr r1, _02187bcc ; =gSinCosTable
add r0, r0, #0xab
add r0, r0, #0x2a00
mov r0, r0, lsl #0x10
@@ -13615,7 +13615,7 @@ func_ov37_021878ac: ; 0x021878ac
bl func_ov37_02185b6c
ldrsh r1, [r4, #0x78]
ldr r0, _02187bd8 ; =0xffffd555
ldr r2, _02187bcc ; =data_02050f54
ldr r2, _02187bcc ; =gSinCosTable
add r0, r1, r0
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
@@ -13652,7 +13652,7 @@ func_ov37_021878ac: ; 0x021878ac
bl func_ov37_02185b6c
ldrsh r2, [r4, #0x78]
mov r0, #0
ldr r1, _02187bcc ; =data_02050f54
ldr r1, _02187bcc ; =gSinCosTable
str r0, [sp, #4]
add r0, r2, #0xab
add r0, r0, #0x2a00
@@ -13684,7 +13684,7 @@ func_ov37_021878ac: ; 0x021878ac
bl func_ov37_02185b6c
ldrsh r2, [r4, #0x78]
ldr r0, _02187bd8 ; =0xffffd555
ldr r1, _02187bcc ; =data_02050f54
ldr r1, _02187bcc ; =gSinCosTable
add r0, r2, r0
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
@@ -13718,7 +13718,7 @@ func_ov37_021878ac: ; 0x021878ac
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02187bcc: .word data_02050f54
_02187bcc: .word gSinCosTable
_02187bd0: .word data_027e0ffc
_02187bd4: .word 0x000002b1
_02187bd8: .word 0xffffd555
asm/ov38.inc
+1 -1
View File
@@ -68,7 +68,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051054
.extern data_02057200
.extern data_027e01b8
asm/ov38.s
+49 -49
View File
@@ -1267,7 +1267,7 @@ func_ov38_0217ce84: ; 0x0217ce84
ldr r4, [r1, #0xb4]
add r0, r0, #0x1000
ldr r1, [r4]
ldr r3, _0217cee4 ; =data_02050f54
ldr r3, _0217cee4 ; =gSinCosTable
bic r1, r1, #2
str r1, [r4]
ldrh r1, [r0, #0x88]
@@ -1287,7 +1287,7 @@ func_ov38_0217ce84: ; 0x0217ce84
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217cee4: .word data_02050f54
_0217cee4: .word gSinCosTable
arm_func_end func_ov38_0217ce84
.global func_ov38_0217cee8
@@ -1302,7 +1302,7 @@ func_ov38_0217cee8: ; 0x0217cee8
bic r1, r1, #2
str r1, [r4]
ldrh r1, [r0, #0x8c]
ldr r3, _0217cf8c ; =data_02050f54
ldr r3, _0217cf8c ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1318,7 +1318,7 @@ func_ov38_0217cee8: ; 0x0217cee8
bl func_0202e030
add r0, r5, #0x1000
ldrh r1, [r0, #0x8a]
ldr r3, _0217cf8c ; =data_02050f54
ldr r3, _0217cf8c ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1335,7 +1335,7 @@ func_ov38_0217cee8: ; 0x0217cee8
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217cf8c: .word data_02050f54
_0217cf8c: .word gSinCosTable
arm_func_end func_ov38_0217cee8
.global func_ov38_0217cf90
@@ -1498,7 +1498,7 @@ _0217cff0:
str r0, [r2, #0x40]
ldrsh r0, [r10, #0x78]
add r1, r10, #0x1000
ldr r5, _0217d540 ; =data_02050f54
ldr r5, _0217d540 ; =gSinCosTable
strh r0, [r1, #0x7c]
ldr r0, [r3]
mov r2, #0
@@ -1710,7 +1710,7 @@ _0217d530: .word data_ov38_02188a9c
_0217d534: .word data_ov38_02188ab0
_0217d538: .word data_ov38_02188ac4
_0217d53c: .word data_027e0d0c
_0217d540: .word data_02050f54
_0217d540: .word gSinCosTable
_0217d544: .word data_027e01b8
_0217d548: .word data_ov38_02189224
_0217d54c: .word data_027e0fe8
@@ -1946,7 +1946,7 @@ _0217d874:
blx r2
ldrsh r1, [r4, #0x78]
mov r0, #0
ldr lr, _0217d914 ; =data_02050f54
ldr lr, _0217d914 ; =gSinCosTable
add r1, r1, r1, lsr #31
mov r1, r1, lsl #0xf
mov r1, r1, lsr #0x10
@@ -1973,7 +1973,7 @@ _0217d904: .word 0xffffe99a
_0217d908: .word gPlayerPos
_0217d90c: .word 0x00000d9a
_0217d910: .word data_027e0ffc
_0217d914: .word data_02050f54
_0217d914: .word gSinCosTable
arm_func_end func_ov38_0217d6d8
.global func_ov38_0217d918
@@ -2064,7 +2064,7 @@ _0217da20:
blx r2
ldrsh r1, [r7, #0x78]
mov r0, #0
ldr r6, _0217dabc ; =data_02050f54
ldr r6, _0217dabc ; =gSinCosTable
add r1, r1, r1, lsr #31
mov r1, r1, lsl #0xf
mov r1, r1, lsr #0x10
@@ -2090,7 +2090,7 @@ _0217da20:
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0217dabc: .word data_02050f54
_0217dabc: .word gSinCosTable
arm_func_end func_ov38_0217d918
.global func_ov38_0217dac0
@@ -2216,7 +2216,7 @@ _0217dbbc:
blx r2
ldrsh r0, [r4, #0x78]
mov ip, #0
ldr r2, _0217dcd8 ; =data_02050f54
ldr r2, _0217dcd8 ; =gSinCosTable
add r0, r0, r0, lsr #31
mov r0, r0, lsl #0xf
mov r0, r0, lsr #0x10
@@ -2240,7 +2240,7 @@ _0217dbbc:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0217dcd4: .word 0x00000f33
_0217dcd8: .word data_02050f54
_0217dcd8: .word gSinCosTable
arm_func_end func_ov38_0217dad0
.global func_ov38_0217dcdc
@@ -2279,7 +2279,7 @@ func_ov38_0217dcdc: ; 0x0217dcdc
bl func_ov38_0217ca70
ldrsh r0, [r4, #0x78]
mov r2, #0
ldr lr, _0217ddc4 ; =data_02050f54
ldr lr, _0217ddc4 ; =gSinCosTable
add r0, r0, r0, lsr #31
mov r0, r0, lsl #0xf
mov r0, r0, lsr #0x10
@@ -2305,7 +2305,7 @@ func_ov38_0217dcdc: ; 0x0217dcdc
_0217ddb8: .word data_027e0d0c
_0217ddbc: .word 0x0000019a
_0217ddc0: .word 0x00000266
_0217ddc4: .word data_02050f54
_0217ddc4: .word gSinCosTable
arm_func_end func_ov38_0217dcdc
.global func_ov38_0217ddc8
@@ -2323,7 +2323,7 @@ func_ov38_0217ddc8: ; 0x0217ddc8
add r0, r4, #0x78
bl func_ov38_0217c994
ldrsh r1, [r4, #0x78]
ldr lr, _0217de54 ; =data_02050f54
ldr lr, _0217de54 ; =gSinCosTable
mov r0, #0
add r1, r1, r1, lsr #31
mov r1, r1, lsl #0xf
@@ -2347,7 +2347,7 @@ func_ov38_0217ddc8: ; 0x0217ddc8
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217de54: .word data_02050f54
_0217de54: .word gSinCosTable
arm_func_end func_ov38_0217ddc8
.global func_ov38_0217de58
@@ -2363,7 +2363,7 @@ func_ov38_0217de58: ; 0x0217de58
mov r1, r1, lsr #0x10
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
ldr r4, _0217debc ; =data_02050f54
ldr r4, _0217debc ; =gSinCosTable
mov lr, r1, lsl #0x1
add r1, r1, #1
mov ip, r1, lsl #0x1
@@ -2379,7 +2379,7 @@ func_ov38_0217de58: ; 0x0217de58
bl func_ov00_020d5cd8
ldmia sp!, {r4, pc}
.align 2, 0
_0217debc: .word data_02050f54
_0217debc: .word gSinCosTable
arm_func_end func_ov38_0217de58
.global func_ov38_0217dec0
@@ -3633,7 +3633,7 @@ _0217f074:
mov r0, r1, lsl #0x10
mov r0, r0, lsr #0x10
mov r1, r0, asr #0x4
ldr r0, _0217f21c ; =data_02050f54
ldr r0, _0217f21c ; =gSinCosTable
mov r1, r1, lsl #0x2
ldrsh r1, [r0, r1]
mov r0, #0x3400
@@ -3691,7 +3691,7 @@ _0217f114:
bl func_ov00_020a61ac
add r0, r4, #0x1000
ldrsh r0, [r0, #0x82]
ldr r1, _0217f21c ; =data_02050f54
ldr r1, _0217f21c ; =gSinCosTable
mov r3, #0
add r0, r0, r0, lsr #31
mov r0, r0, lsl #0xf
@@ -3742,7 +3742,7 @@ _0217f20c: .word 0x0000042e
_0217f210: .word 0x00000733
_0217f214: .word 0x00007fff
_0217f218: .word 0x00005555
_0217f21c: .word data_02050f54
_0217f21c: .word gSinCosTable
_0217f220: .word gPlayerLink
_0217f224: .word data_ov00_020eec9c
_0217f228: .word 0x0000042c
@@ -7137,7 +7137,7 @@ _02182140:
str r3, [r1, #0x38]
str r0, [r1, #0x3c]
ldrh r0, [r1, #0x7c]
ldr r2, _02182224 ; =data_02050f54
ldr r2, _02182224 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
ldrsh r0, [r2, r0]
@@ -7173,7 +7173,7 @@ _021821d4:
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_02182220: .word data_027e0764
_02182224: .word data_02050f54
_02182224: .word gSinCosTable
arm_func_end func_ov38_02182094
.global func_ov38_02182228
@@ -7271,7 +7271,7 @@ func_ov38_0218233c: ; 0x0218233c
strh r1, [r0, #0x84]
add r0, r6, #0x1000
ldrh r1, [r0, #0x84]
ldr r2, _0218254c ; =data_02050f54
ldr r2, _0218254c ; =gSinCosTable
mov r1, r1, asr #0x4
mov r4, r1, lsl #0x1
add r1, r4, #1
@@ -7390,7 +7390,7 @@ _02182528:
add sp, sp, #0x10
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0218254c: .word data_02050f54
_0218254c: .word gSinCosTable
_02182550: .word 0x00003d9a
_02182554: .word 0x00001e66
_02182558: .word data_027e0ffc
@@ -7456,7 +7456,7 @@ _02182610:
add r1, r9, #0x1000
ldrsh r2, [r1, #0x84]
add r0, r9, #0x38
ldr r4, _02182d94 ; =data_02050f54
ldr r4, _02182d94 ; =gSinCosTable
add r2, r2, r6
strh r2, [r1, #0x84]
ldrh r2, [r1, #0x84]
@@ -7538,7 +7538,7 @@ _02182610:
str r2, [sp, #0xb0]
add r0, r1, #1
mov r3, r1, lsl #0x1
ldr r2, _02182d94 ; =data_02050f54
ldr r2, _02182d94 ; =gSinCosTable
mov r1, r0, lsl #0x1
ldrsh r3, [r2, r3]
ldrsh r2, [r2, r1]
@@ -7731,7 +7731,7 @@ _021829c0:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _02182d94 ; =data_02050f54
ldr r1, _02182d94 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r5, [r1, r2]
mov r0, r0, lsl #0x1
@@ -7915,7 +7915,7 @@ _02182cd4:
add r0, r9, #0x1000
ldrsh r0, [r0, #0x82]
mov r3, r4
ldr r1, _02182d94 ; =data_02050f54
ldr r1, _02182d94 ; =gSinCosTable
add r0, r0, r0, lsr #31
mov r0, r0, lsl #0xf
mov r0, r0, lsr #0x10
@@ -7951,7 +7951,7 @@ _02182d8c:
add sp, sp, #0xc4
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02182d94: .word data_02050f54
_02182d94: .word gSinCosTable
_02182d98: .word 0x0000299a
_02182d9c: .word data_027e0ffc
_02182da0: .word 0x00000446
@@ -8525,7 +8525,7 @@ _02183528:
cmp r2, #0
beq _021835f4
ldrsh r1, [lr, #0x92]
ldr r0, _02183808 ; =data_02050f54
ldr r0, _02183808 ; =gSinCosTable
ldr ip, _0218380c ; =0x00000e39
mov r3, r1, lsl #0x12
mov r3, r3, lsr #0x10
@@ -8698,7 +8698,7 @@ _021837c4:
_021837fc: .word 0x0000099a
_02183800: .word 0x00000b33
_02183804: .word 0x00000266
_02183808: .word data_02050f54
_02183808: .word gSinCosTable
_0218380c: .word 0x00000e39
_02183810: .word 0x00000333
_02183814: .word 0x00001333
@@ -8993,7 +8993,7 @@ _02183bf4:
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r3, [sp, #0xc]
ldr r2, _02183cb0 ; =data_02050f54
ldr r2, _02183cb0 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -9027,7 +9027,7 @@ _02183ca0: .word data_027e0ffc
_02183ca4: .word 0x00000191
_02183ca8: .word data_ov00_020eec68
_02183cac: .word gPlayerLink
_02183cb0: .word data_02050f54
_02183cb0: .word gSinCosTable
arm_func_end func_ov38_02183b60
.global func_ov38_02183cb4
@@ -10320,7 +10320,7 @@ _02184de4:
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
mov r2, r1, lsl #0x1
ldr r3, _02184ee0 ; =data_02050f54
ldr r3, _02184ee0 ; =gSinCosTable
str r0, [r10, #0x220]
mov r4, #0
add r1, r1, #1
@@ -10350,7 +10350,7 @@ _02184de4:
.align 2, 0
_02184ed8: .word data_027e0d0c
_02184edc: .word 0x00000133
_02184ee0: .word data_02050f54
_02184ee0: .word gSinCosTable
_02184ee4: .word data_ov38_02189224
arm_func_end func_ov38_02184d9c
@@ -10433,7 +10433,7 @@ func_ov38_02184ee8: ; 0x02184ee8
_0218500c:
add r0, r10, #0x200
ldrh r1, [r0, #0x3a]
ldr r0, _021854cc ; =data_02050f54
ldr r0, _021854cc ; =gSinCosTable
mov r2, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x2
@@ -10748,7 +10748,7 @@ _021854ac:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021854c8: .word 0x00000e66
_021854cc: .word data_02050f54
_021854cc: .word gSinCosTable
_021854d0: .word 0x0000019a
_021854d4: .word 0x00000b9a
_021854d8: .word 0x00000666
@@ -11247,7 +11247,7 @@ func_ov38_02185b14: ; 0x02185b14
mov r2, r8
ldrh r8, [r4, #0x94]
ldr lr, [sp, #0x10]
ldr ip, _02185c3c ; =data_02050f54
ldr ip, _02185c3c ; =gSinCosTable
mov r8, r8, asr #0x4
mov r8, r8, lsl #0x2
add lr, lr, #0xcd
@@ -11289,7 +11289,7 @@ func_ov38_02185b14: ; 0x02185b14
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_02185c38: .word gPlayerPos
_02185c3c: .word data_02050f54
_02185c3c: .word gSinCosTable
_02185c40: .word data_027e0fe8
_02185c44: .word 0x444d534f
_02185c48: .word data_ov29_0217a4ac
@@ -11307,7 +11307,7 @@ func_ov38_02185c4c: ; 0x02185c4c
mov r1, r8
bl func_ov00_02087d34
ldr r0, _02185d30 ; =data_027e0f64
ldr r2, _02185d34 ; =data_02050f54
ldr r2, _02185d34 ; =gSinCosTable
ldr r1, [r0]
mov r0, #0x53
ldr r3, [r1, #4]
@@ -11357,7 +11357,7 @@ func_ov38_02185c4c: ; 0x02185c4c
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02185d30: .word data_027e0f64
_02185d34: .word data_02050f54
_02185d34: .word gSinCosTable
arm_func_end func_ov38_02185c4c
.global func_ov38_02185d38
@@ -11682,7 +11682,7 @@ _02186194:
str r2, [sp, #0x90]
str r0, [sp, #0x94]
ldr r0, [r1, #0x10c]
ldr r2, _02186a3c ; =data_02050f54
ldr r2, _02186a3c ; =gSinCosTable
add r3, r0, #0x500
mov r0, r3, lsl #0x10
mov r0, r0, lsr #0x10
@@ -11904,7 +11904,7 @@ _021864f0:
mov r0, r0, asr #0x4
add ip, r4, #0x800
add r1, r2, #0x800
ldr r4, _02186a3c ; =data_02050f54
ldr r4, _02186a3c ; =gSinCosTable
mov r2, r5, lsl #0x2
mov r0, r0, lsl #0x2
ldrsh r2, [r4, r2]
@@ -12229,7 +12229,7 @@ _02186a2c: .word data_ov38_02189360
_02186a30: .word data_ov38_021893d4
_02186a34: .word gAdventureFlags
_02186a38: .word data_ov38_021892f0
_02186a3c: .word data_02050f54
_02186a3c: .word gSinCosTable
_02186a40: .word 0x00000f9a
_02186a44: .word data_ov38_021893c8
_02186a48: .word data_ov38_021892cc
@@ -13835,7 +13835,7 @@ _021881bc: ; jump table
b _021883dc ; case 4
_021881d0:
ldrsh r1, [ip, #0x22]
ldr r5, _021884bc ; =data_02050f54
ldr r5, _021884bc ; =gSinCosTable
ldr r0, _021884c0 ; =data_ov38_0218943c
add r1, r1, #0x1000
strh r1, [ip, #0x22]
@@ -13973,7 +13973,7 @@ _02188394:
ldmia sp!, {r3, r4, r5, pc}
_021883dc:
ldr r0, _021884d0 ; =gPlayerPos
ldr r3, _021884bc ; =data_02050f54
ldr r3, _021884bc ; =gSinCosTable
ldr r5, [r0]
ldr r1, [r0, #4]
str r5, [sp]
@@ -14031,7 +14031,7 @@ _0218849c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_021884b8: .word data_ov38_02189438
_021884bc: .word data_02050f54
_021884bc: .word gSinCosTable
_021884c0: .word data_ov38_0218943c
_021884c4: .word data_027e0c68
_021884c8: .word data_ov38_02189484
asm/ov39.inc
+1 -1
View File
@@ -71,7 +71,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_027e0194
.extern data_027e01b8
asm/ov39.s
+56 -56
View File
@@ -576,7 +576,7 @@ _0217c4b0:
cmpne r1, r0
bne _0217c524
ldr r4, [r5, #0xb4]
ldr r3, _0217c568 ; =data_02050f54
ldr r3, _0217c568 ; =gSinCosTable
ldr r1, [r4]
add r0, sp, #0
bic r1, r1, #2
@@ -615,7 +615,7 @@ _0217c558: .word data_ov39_021866fc
_0217c55c: .word data_ov39_02186710
_0217c560: .word data_ov39_02186724
_0217c564: .word data_ov39_02186738
_0217c568: .word data_02050f54
_0217c568: .word gSinCosTable
_0217c56c: .word data_ov39_02186cec
arm_func_end func_ov39_0217c338
@@ -2349,7 +2349,7 @@ _0217dd7c:
add r0, r0, #0xc00
bl func_ov17_021687f0
ldrh r1, [r5, #0x78]
ldr r3, _0217dfac ; =data_02050f54
ldr r3, _0217dfac ; =gSinCosTable
add r0, sp, #0x78
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -2490,7 +2490,7 @@ _0217df70:
add sp, sp, #0x9c
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_0217dfac: .word data_02050f54
_0217dfac: .word gSinCosTable
_0217dfb0: .word data_027e0194
_0217dfb4: .word 0xffffe8cd
_0217dfb8: .word 0x00001666
@@ -2871,7 +2871,7 @@ _0217e4a0:
mov r2, r2, asr #0x4
mov r5, r2, lsl #0x1
add r2, r5, #1
ldr r4, _0217e554 ; =data_02050f54
ldr r4, _0217e554 ; =gSinCosTable
mov r5, r5, lsl #0x1
mov r2, r2, lsl #0x1
ldrsh r6, [r4, r5]
@@ -2912,7 +2912,7 @@ _0217e51c:
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0217e554: .word data_02050f54
_0217e554: .word gSinCosTable
_0217e558: .word data_027e0ff8
arm_func_end func_ov39_0217e434
@@ -3012,7 +3012,7 @@ _0217e678:
_0217e69c:
ldrh r0, [r4, #0x78]
mov r9, #0
ldr r2, _0217e820 ; =data_02050f54
ldr r2, _0217e820 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -3110,7 +3110,7 @@ _0217e810: .word data_ov39_021865d8
_0217e814: .word data_ov39_02186620
_0217e818: .word data_ov39_02186590
_0217e81c: .word 0x0000059a
_0217e820: .word data_02050f54
_0217e820: .word gSinCosTable
_0217e824: .word gPlayer
_0217e828: .word data_ov29_0217bd28
arm_func_end func_ov39_0217e5b0
@@ -3679,7 +3679,7 @@ _0217ef50:
mov r1, #0xf
str r1, [r4, #0x180]
ldrsh r1, [r4, #0x78]
ldr r3, _0217f030 ; =data_02050f54
ldr r3, _0217f030 ; =gSinCosTable
ldr ip, [r4, #0x1a8]
add r1, r1, #0x8000
mov r1, r1, lsl #0x10
@@ -3726,7 +3726,7 @@ _0217f020: .word 0x41525257
_0217f024: .word 0x524f5045
_0217f028: .word 0x424f4d42
_0217f02c: .word 0x0000019a
_0217f030: .word data_02050f54
_0217f030: .word gSinCosTable
arm_func_end func_ov39_0217edf4
.global func_ov39_0217f034
@@ -3819,7 +3819,7 @@ func_ov39_0217f10c: ; 0x0217f10c
mov r4, r1, lsl #0xc
mov r0, r0, asr #0x4
mov r6, r0, lsl #0x1
ldr r3, _0217f26c ; =data_02050f54
ldr r3, _0217f26c ; =gSinCosTable
mov r2, r6, lsl #0x1
mov r1, r7
ldrsh r7, [r3, r2]
@@ -3889,7 +3889,7 @@ _0217f23c:
.align 2, 0
_0217f264: .word gPlayerAngle
_0217f268: .word gPlayerPos
_0217f26c: .word data_02050f54
_0217f26c: .word gSinCosTable
_0217f270: .word 0x00002b33
_0217f274: .word gPlayerLink
arm_func_end func_ov39_0217f10c
@@ -4347,7 +4347,7 @@ _0217f868:
cmp r0, #0
beq _0217f97c
ldr r0, [r4, #0x158]
ldr r5, _0217fa38 ; =data_02050f54
ldr r5, _0217fa38 ; =gSinCosTable
orr r0, r0, #0x8000000
str r0, [r4, #0x158]
ldr r0, [r4, #0x284]
@@ -4414,7 +4414,7 @@ _0217f868:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0217f97c:
ldrsh r0, [r4, #0x78]
ldr r2, _0217fa38 ; =data_02050f54
ldr r2, _0217fa38 ; =gSinCosTable
ldr r1, _0217fa3c ; =0x00000a66
add r0, r0, #0x8000
mov r0, r0, lsl #0x10
@@ -4461,7 +4461,7 @@ _0217f97c:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_0217fa38: .word data_02050f54
_0217fa38: .word gSinCosTable
_0217fa3c: .word 0x00000a66
arm_func_end func_ov39_0217f810
@@ -5083,7 +5083,7 @@ _021802bc:
addle sp, sp, #0x130
ldmleia sp!, {r4, r5, r6, pc}
ldrh r1, [r5, #0x78]
ldr r3, _02180f40 ; =data_02050f54
ldr r3, _02180f40 ; =gSinCosTable
mov r0, #0xcd
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -5340,7 +5340,7 @@ _021806a8:
str r0, [r5, #0x1bc]
add r0, r5, #0x100
ldrh r0, [r0, #0x62]
ldr r1, _02180f40 ; =data_02050f54
ldr r1, _02180f40 ; =gSinCosTable
ldr lr, [r5, #0x1b8]
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
@@ -5920,7 +5920,7 @@ _02180f30: .word 0x00000b33
_02180f34: .word 0x00000666
_02180f38: .word gPlayer
_02180f3c: .word gItemManager
_02180f40: .word data_02050f54
_02180f40: .word gSinCosTable
_02180f44: .word data_027e0c68
_02180f48: .word 0x00080015
_02180f4c: .word 0x0008001a
@@ -5989,7 +5989,7 @@ func_ov39_02180ff4: ; 0x02180ff4
mov r4, r0
bl func_ov39_0217e298
ldrh r1, [r4, #0x78]
ldr r3, _021810bc ; =data_02050f54
ldr r3, _021810bc ; =gSinCosTable
mov r0, #0xcd
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -6036,7 +6036,7 @@ func_ov39_02180ff4: ; 0x02180ff4
bl func_ov39_0217d5d4
ldmia sp!, {r4, pc}
.align 2, 0
_021810bc: .word data_02050f54
_021810bc: .word gSinCosTable
_021810c0: .word gPlayerPos
_021810c4: .word 0x00003333
arm_func_end func_ov39_02180ff4
@@ -6452,7 +6452,7 @@ _02181640:
mov r0, #0xf
str r0, [r4, #0x180]
ldrsh r0, [r4, #0x78]
ldr r2, _02181898 ; =data_02050f54
ldr r2, _02181898 ; =gSinCosTable
ldr r3, [r4, #0x1a8]
add r0, r0, #0x8000
mov r0, r0, lsl #0x10
@@ -6541,7 +6541,7 @@ _02181748:
stmia r6, {r0, r1, r2}
str r5, [sp, #0xc]
ldr r0, [sp]
ldr r5, _02181898 ; =data_02050f54
ldr r5, _02181898 ; =gSinCosTable
str r0, [r3, #0x7c]
ldr r0, [sp, #4]
ldr ip, _021818a4 ; =0x00000a66
@@ -6603,7 +6603,7 @@ _02181888: .word data_ov39_02186124
_0218188c: .word 0x00000333
_02181890: .word data_ov39_02186534
_02181894: .word 0x0000019a
_02181898: .word data_02050f54
_02181898: .word gSinCosTable
_0218189c: .word data_027e0764
_021818a0: .word 0x00001333
_021818a4: .word 0x00000a66
@@ -6623,7 +6623,7 @@ func_ov39_021818a8: ; 0x021818a8
strmi r0, [r4, #0x1a8]
_021818cc:
ldrsh r0, [r4, #0x78]
ldr r2, _02181998 ; =data_02050f54
ldr r2, _02181998 ; =gSinCosTable
ldr r3, [r4, #0x1a8]
add r0, r0, #0x8000
mov r0, r0, lsl #0x10
@@ -6676,7 +6676,7 @@ _0218198c:
bl func_ov39_0217d5d4
ldmia sp!, {r4, pc}
.align 2, 0
_02181998: .word data_02050f54
_02181998: .word gSinCosTable
arm_func_end func_ov39_021818a8
.global func_ov39_0218199c
@@ -7061,7 +7061,7 @@ _02181ecc:
strmi r0, [r4, #0x1a8]
_02181efc:
ldrsh r0, [r4, #0x78]
ldr r2, _021820dc ; =data_02050f54
ldr r2, _021820dc ; =gSinCosTable
ldr r3, [r4, #0x1a8]
add r0, r0, #0x8000
mov r0, r0, lsl #0x10
@@ -7188,7 +7188,7 @@ _021820a8:
add sp, sp, #0x20
ldmia sp!, {r4, pc}
.align 2, 0
_021820dc: .word data_02050f54
_021820dc: .word gSinCosTable
_021820e0: .word 0xffffd333
_021820e4: .word 0xffffdccd
_021820e8: .word 0x000014cd
@@ -7366,7 +7366,7 @@ _0218233c:
mov r2, r2, asr #0x4
mov r3, r2, lsl #0x1
add r2, r3, #1
ldr ip, _02182400 ; =data_02050f54
ldr ip, _02182400 ; =gSinCosTable
mov r3, r3, lsl #0x1
mov r2, r2, lsl #0x1
ldrsh r3, [ip, r3]
@@ -7406,7 +7406,7 @@ _021823f0: .word gPlayerPos
_021823f4: .word data_027e0ffc
_021823f8: .word 0x000001bd
_021823fc: .word data_ov29_0217a4ac
_02182400: .word data_02050f54
_02182400: .word gSinCosTable
_02182404: .word gPlayer
_02182408: .word data_ov29_0217bd28
arm_func_end func_ov39_02182284
@@ -7868,7 +7868,7 @@ _02182984:
bl Approach_thunk
add r0, r5, #0x100
ldrh r0, [r0, #0x60]
ldr r2, _02182f24 ; =data_02050f54
ldr r2, _02182f24 ; =gSinCosTable
ldr ip, [r5, #0x1a8]
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -8064,7 +8064,7 @@ _02182cb8:
_02182ccc:
add r0, r5, #0x100
ldrh r0, [r0, #0x60]
ldr r2, _02182f24 ; =data_02050f54
ldr r2, _02182f24 ; =gSinCosTable
ldr ip, [r5, #0x1a8]
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -8219,7 +8219,7 @@ _02182ef4:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02182f20: .word 0x0000011f
_02182f24: .word data_02050f54
_02182f24: .word gSinCosTable
_02182f28: .word data_027e0f64
_02182f2c: .word 0xffffd333
_02182f30: .word 0x000014cd
@@ -8243,7 +8243,7 @@ func_ov39_02182f58: ; 0x02182f58
strh r0, [r4, #0x78]
ldrsh r2, [r4, #0x78]
add r1, r4, #0x100
ldr ip, _02182ff4 ; =data_02050f54
ldr ip, _02182ff4 ; =gSinCosTable
add r2, r2, #0x8000
strh r2, [r1, #0x60]
ldrh r2, [r1, #0x60]
@@ -8277,7 +8277,7 @@ func_ov39_02182f58: ; 0x02182f58
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02182ff4: .word data_02050f54
_02182ff4: .word gSinCosTable
_02182ff8: .word 0x00000666
arm_func_end func_ov39_02182f58
@@ -8295,7 +8295,7 @@ func_ov39_02182ffc: ; 0x02182ffc
bl Approach_thunk
add r0, r4, #0x100
ldrh r0, [r0, #0x60]
ldr r2, _021830d4 ; =data_02050f54
ldr r2, _021830d4 ; =gSinCosTable
ldr lr, [r4, #0x1a8]
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -8339,7 +8339,7 @@ func_ov39_02182ffc: ; 0x02182ffc
bl func_ov39_0217d5d4
ldmia sp!, {r4, pc}
.align 2, 0
_021830d4: .word data_02050f54
_021830d4: .word gSinCosTable
arm_func_end func_ov39_02182ffc
.global func_ov39_021830d8
@@ -8435,7 +8435,7 @@ _0218321c:
mov r0, #3
str r0, [r4, #0x16c]
ldr r0, [r4, #0x48]
ldr r3, _021832c4 ; =data_02050f54
ldr r3, _021832c4 ; =gSinCosTable
str r0, [r4, #0x214]
ldr r0, [r4, #0x4c]
ldr r1, _021832c8 ; =0x00000666
@@ -8475,7 +8475,7 @@ _0218321c:
.align 2, 0
_021832bc: .word gPlayer
_021832c0: .word data_ov29_0217a4ac
_021832c4: .word data_02050f54
_021832c4: .word gSinCosTable
_021832c8: .word 0x00000666
arm_func_end func_ov39_021831d8
@@ -8561,7 +8561,7 @@ func_ov39_021833a4: ; 0x021833a4
mov r0, r5, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02183514 ; =data_02050f54
ldr r2, _02183514 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -8639,7 +8639,7 @@ _02183504:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02183510: .word 0x000006b8
_02183514: .word data_02050f54
_02183514: .word gSinCosTable
_02183518: .word 0x00001022
_0218351c: .word data_027e0f64
_02183520: .word gAdventureFlags
@@ -8667,7 +8667,7 @@ func_ov39_02183528: ; 0x02183528
_02183564:
add r0, r4, #0x100
ldrh r1, [r0, #0x60]
ldr r3, _0218368c ; =data_02050f54
ldr r3, _0218368c ; =gSinCosTable
ldr ip, [r4, #0x1a8]
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -8743,7 +8743,7 @@ _0218367c:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0218368c: .word data_02050f54
_0218368c: .word gSinCosTable
_02183690: .word data_027e0e58
_02183694: .word data_027e0ffc
_02183698: .word 0x0000031b
@@ -8792,7 +8792,7 @@ func_ov39_021836e0: ; 0x021836e0
_0218371c:
add r0, r4, #0x100
ldrh r0, [r0, #0x60]
ldr r2, _02183808 ; =data_02050f54
ldr r2, _02183808 ; =gSinCosTable
ldr r3, [r4, #0x1a8]
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -8852,7 +8852,7 @@ _021837c4:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02183808: .word data_02050f54
_02183808: .word gSinCosTable
_0218380c: .word data_027e0e58
_02183810: .word data_027e0ffc
_02183814: .word 0x0000031b
@@ -9353,7 +9353,7 @@ _02183f0c:
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x1
ldr r1, _02184318 ; =data_02050f54
ldr r1, _02184318 ; =gSinCosTable
mov r5, r6, lsl #0x1
ldrsh ip, [r1, r5]
ldr r5, [sp, #0x5c]
@@ -9370,7 +9370,7 @@ _02183f0c:
orr r4, r4, r3, lsl #20
bl Divide
add r2, r6, #1
ldr r1, _02184318 ; =data_02050f54
ldr r1, _02184318 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r1, [r1, r2]
ldr r3, [r7, #0x4c]
@@ -9596,7 +9596,7 @@ _02183f0c:
_0218430c: .word data_027e0f64
_02184310: .word 0x000009c4
_02184314: .word gAdventureFlags
_02184318: .word data_02050f54
_02184318: .word gSinCosTable
_0218431c: .word data_027e071c
_02184320: .word 0x000014cd
_02184324: .word 0x0000019a
@@ -9810,7 +9810,7 @@ _021845e0:
mov r2, r1, lsl #0x1
add r1, r2, #1
ldr r4, [r6, #0x1cc]
ldr r3, _02184780 ; =data_02050f54
ldr r3, _02184780 ; =gSinCosTable
mov r2, r2, lsl #0x1
add r0, r4, r0
ldr r4, [r6, #0x1d0]
@@ -9898,7 +9898,7 @@ _021845e0:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0218477c: .word 0x0000099a
_02184780: .word data_02050f54
_02184780: .word gSinCosTable
_02184784: .word data_027e0f64
arm_func_end func_ov39_021843c0
@@ -10231,7 +10231,7 @@ func_ov39_02184bb8: ; 0x02184bb8
ldmeqia sp!, {r3, r4, r5, pc}
ldrsh r1, [r0, #0x44]
mov lr, #0x29
ldr r4, _02184c84 ; =data_02050f54
ldr r4, _02184c84 ; =gSinCosTable
mov r3, r1, lsl #0x12
mov r3, r3, lsr #0x10
mov r3, r3, asr #0x4
@@ -10273,7 +10273,7 @@ func_ov39_02184bb8: ; 0x02184bb8
bl func_ov39_02184ab4
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02184c84: .word data_02050f54
_02184c84: .word gSinCosTable
_02184c88: .word 0x00000e39
_02184c8c: .word 0x00000266
arm_func_end func_ov39_02184bb8
@@ -10289,7 +10289,7 @@ func_ov39_02184c90: ; 0x02184c90
addne sp, sp, #0x48
ldmneia sp!, {r3, r4, r5, pc}
ldr r5, [r1, #0xb4]
ldr r3, _02184d3c ; =data_02050f54
ldr r3, _02184d3c ; =gSinCosTable
ldr r1, [r5]
bic r1, r1, #2
str r1, [r5]
@@ -10307,7 +10307,7 @@ func_ov39_02184c90: ; 0x02184c90
mov r0, r4, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _02184d3c ; =data_02050f54
ldr r2, _02184d3c ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -10325,7 +10325,7 @@ func_ov39_02184c90: ; 0x02184c90
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02184d3c: .word data_02050f54
_02184d3c: .word gSinCosTable
arm_func_end func_ov39_02184c90
.global func_ov39_02184d40
@@ -11566,7 +11566,7 @@ func_ov39_02185c3c: ; 0x02185c3c
_02185d1c:
ldrh r0, [r5, #0x78]
mov r4, #0
ldr r1, _02185e98 ; =data_02050f54
ldr r1, _02185e98 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
@@ -11665,7 +11665,7 @@ _02185e88: .word 0x00000e66
_02185e8c: .word gPlayerAngle
_02185e90: .word 0x000031c7
_02185e94: .word gPlayer
_02185e98: .word data_02050f54
_02185e98: .word gSinCosTable
_02185e9c: .word data_027e0ffc
_02185ea0: .word 0x00000313
_02185ea4: .word 0x00000312
asm/ov40.inc
+1 -1
View File
@@ -65,7 +65,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057840
.extern data_02057878
.extern data_020579f8
asm/ov40.s
+9 -9
View File
@@ -2589,7 +2589,7 @@ func_ov40_0217df74: ; 0x0217df74
mov r4, r0
str r3, [r4, #0x5c]
ldr r0, [r1, #4]
ldr r3, _0217dfec ; =data_02050f54
ldr r3, _0217dfec ; =gSinCosTable
str r0, [r4, #0x60]
ldr r1, [r1, #8]
add r0, r4, #0x6c
@@ -2614,7 +2614,7 @@ func_ov40_0217df74: ; 0x0217df74
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0217dfec: .word data_02050f54
_0217dfec: .word gSinCosTable
arm_func_end func_ov40_0217df74
.global func_ov40_0217dff0
@@ -10188,7 +10188,7 @@ _02183c24:
mov r1, r0, lsl #0x1
add r0, r1, #1
mov r5, r1, lsl #0x1
ldr r3, _02183d08 ; =data_02050f54
ldr r3, _02183d08 ; =gSinCosTable
mov r2, r0, lsl #0x1
mov r0, r4
mov r1, #0
@@ -10240,7 +10240,7 @@ _02183c24:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02183d04: .word gItemManager
_02183d08: .word data_02050f54
_02183d08: .word gSinCosTable
arm_func_end func_ov40_02183a6c
.global func_ov40_02183d0c
@@ -12191,7 +12191,7 @@ func_ov40_02185514: ; 0x02185514
addeq sp, sp, #0x78
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
ldrh r1, [r5, #0x78]
ldr r3, _02185628 ; =data_02050f54
ldr r3, _02185628 ; =gSinCosTable
add r0, sp, #0x54
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -12253,7 +12253,7 @@ func_ov40_02185514: ; 0x02185514
add sp, sp, #0x78
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_02185628: .word data_02050f54
_02185628: .word gSinCosTable
arm_func_end func_ov40_02185514
.global func_ov40_0218562c
@@ -14140,7 +14140,7 @@ _02186df8:
add r0, r2, r0
str r0, [r4, #0xc]
ldrsh r0, [r4, #8]
ldr r2, _02186f88 ; =data_02050f54
ldr r2, _02186f88 ; =gSinCosTable
smulbb r0, r0, r1
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
@@ -14159,7 +14159,7 @@ _02186e50:
mov r1, #0xc000
bl Divide
ldr r2, [r4, #0xc]
ldr r1, _02186f88 ; =data_02050f54
ldr r1, _02186f88 ; =gSinCosTable
add r0, r2, r0
str r0, [r4, #0xc]
ldrsh r0, [r4, #8]
@@ -14237,7 +14237,7 @@ _02186f0c:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02186f84: .word 0x00000924
_02186f88: .word data_02050f54
_02186f88: .word gSinCosTable
_02186f8c: .word data_027e0c38
_02186f90: .word 0x00007fff
arm_func_end func_ov40_02186cfc
asm/ov41.inc
+1 -1
View File
@@ -71,7 +71,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_027e0764
.extern data_027e077c
asm/ov41.s
+17 -17
View File
@@ -1661,7 +1661,7 @@ func_ov41_0218a9c0: ; 0x0218a9c0
bl func_020196fc
ldrh r1, [r4, #0x78]
add r0, r4, #0x1c4
ldr r3, _0218aab4 ; =data_02050f54
ldr r3, _0218aab4 ; =gSinCosTable
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
mov r1, r2, lsl #0x1
@@ -1694,7 +1694,7 @@ func_ov41_0218a9c0: ; 0x0218a9c0
ldmia sp!, {r4, pc}
.align 2, 0
_0218aab0: .word data_027e0f78
_0218aab4: .word data_02050f54
_0218aab4: .word gSinCosTable
_0218aab8: .word 0x00000666
_0218aabc: .word data_ov00_020e9370
arm_func_end func_ov41_0218a9c0
@@ -2239,7 +2239,7 @@ _0218b130:
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r3, [sp, #0xc]
ldr r2, _0218b1e4 ; =data_02050f54
ldr r2, _0218b1e4 ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -2271,7 +2271,7 @@ _0218b130:
_0218b1d8: .word data_027e0e5c
_0218b1dc: .word data_027e0ffc
_0218b1e0: .word 0x00000191
_0218b1e4: .word data_02050f54
_0218b1e4: .word gSinCosTable
arm_func_end func_ov41_0218b0d8
.global func_ov41_0218b1e8
@@ -3551,7 +3551,7 @@ func_ov41_0218c204: ; 0x0218c204
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _0218c3d0 ; =data_02050f54
ldr r1, _0218c3d0 ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r3, [r1, r2]
@@ -3612,7 +3612,7 @@ _0218c3c0: .word gPlayerLink
_0218c3c4: .word 0x0000319a
_0218c3c8: .word gAdventureFlags
_0218c3cc: .word gActorManager
_0218c3d0: .word data_02050f54
_0218c3d0: .word gSinCosTable
arm_func_end func_ov41_0218c204
.global func_ov41_0218c3d4
@@ -4046,7 +4046,7 @@ func_ov41_0218c834: ; 0x0218c834
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _0218cbf0 ; =data_02050f54
ldr r1, _0218cbf0 ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r3, [r1, r2]
@@ -4152,7 +4152,7 @@ _0218ca80:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _0218cbf0 ; =data_02050f54
ldr r1, _0218cbf0 ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r3, [r1, r2]
@@ -4222,7 +4222,7 @@ _0218cbe0: .word gAdventureFlags
_0218cbe4: .word gPlayerLink
_0218cbe8: .word gActorManager
_0218cbec: .word gMapManager
_0218cbf0: .word data_02050f54
_0218cbf0: .word gSinCosTable
_0218cbf4: .word 0x4b4f4b4f
arm_func_end func_ov41_0218c834
@@ -4540,7 +4540,7 @@ func_ov41_0218cfa8: ; 0x0218cfa8
mov r2, r0, lsl #0x1
add r0, r2, #1
mov lr, #0
ldr r1, _0218d01c ; =data_02050f54
ldr r1, _0218d01c ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r5, [r1, r2]
mov r0, r0, lsl #0x1
@@ -4560,7 +4560,7 @@ func_ov41_0218cfa8: ; 0x0218cfa8
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0218d01c: .word data_02050f54
_0218d01c: .word gSinCosTable
arm_func_end func_ov41_0218cfa8
.global func_ov41_0218d020
@@ -4576,7 +4576,7 @@ func_ov41_0218d020: ; 0x0218d020
mov r2, r0, lsl #0x1
add r0, r2, #1
mov lr, #0
ldr r1, _0218d0a8 ; =data_02050f54
ldr r1, _0218d0a8 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r5, [r1, r2]
mov r0, r0, lsl #0x1
@@ -4601,7 +4601,7 @@ func_ov41_0218d020: ; 0x0218d020
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0218d0a8: .word data_02050f54
_0218d0a8: .word gSinCosTable
arm_func_end func_ov41_0218d020
.global func_ov41_0218d0ac
@@ -4680,7 +4680,7 @@ _0218d19c:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _0218d204 ; =data_02050f54
ldr r1, _0218d204 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh lr, [r1, r2]
mov r0, r0, lsl #0x1
@@ -4702,7 +4702,7 @@ _0218d19c:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0218d204: .word data_02050f54
_0218d204: .word gSinCosTable
_0218d208: .word 0x0000023d
_0218d20c: .word 0x0000071c
arm_func_end func_ov41_0218d11c
@@ -5308,7 +5308,7 @@ func_ov41_0218d9ec: ; 0x0218d9ec
ldmia r1, {r0, r1, r2}
stmia r4, {r0, r1, r2}
ldr r0, _0218daf4 ; =0x00000ccd
ldr r4, _0218daf8 ; =data_02050f54
ldr r4, _0218daf8 ; =gSinCosTable
str r0, [r3, #0x510]
ldrh r1, [r3, #0x78]
ldr r0, [r3, #0x48]
@@ -5368,7 +5368,7 @@ func_ov41_0218d9ec: ; 0x0218d9ec
.align 2, 0
_0218daf0: .word data_ov41_0218e038
_0218daf4: .word 0x00000ccd
_0218daf8: .word data_02050f54
_0218daf8: .word gSinCosTable
arm_func_end func_ov41_0218d9ec
.global func_ov41_0218dafc
asm/ov42.inc
+1 -1
View File
@@ -54,7 +54,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_027e05f4
.extern data_027e0618
.extern data_027e0764
asm/ov42.s
+5 -5
View File
@@ -1460,7 +1460,7 @@ func_ov42_0218a7a4: ; 0x0218a7a4
ldr r4, [r6, #0xb4]
add r0, r5, #0x400
ldr r1, [r4]
ldr r3, _0218a894 ; =data_02050f54
ldr r3, _0218a894 ; =gSinCosTable
bic r1, r1, #2
str r1, [r4]
ldrsh r1, [r0, #0x70]
@@ -1482,7 +1482,7 @@ func_ov42_0218a7a4: ; 0x0218a7a4
bl func_01ff8690
add r0, r5, #0x400
ldrh r1, [r0, #0x72]
ldr r3, _0218a894 ; =data_02050f54
ldr r3, _0218a894 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -1500,7 +1500,7 @@ func_ov42_0218a7a4: ; 0x0218a7a4
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0218a890: .word data_ov42_0218c728
_0218a894: .word data_02050f54
_0218a894: .word gSinCosTable
arm_func_end func_ov42_0218a7a4
.global func_ov42_0218a898
@@ -3410,7 +3410,7 @@ func_ov42_0218c034: ; 0x0218c034
bl func_020196fc
ldrh r1, [r4, #0x78]
add r0, r4, #0x1c0
ldr r3, _0218c0e8 ; =data_02050f54
ldr r3, _0218c0e8 ; =gSinCosTable
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
mov r1, r2, lsl #0x1
@@ -3429,7 +3429,7 @@ func_ov42_0218c034: ; 0x0218c034
ldmia sp!, {r4, pc}
.align 2, 0
_0218c0e4: .word data_027e0f78
_0218c0e8: .word data_02050f54
_0218c0e8: .word gSinCosTable
arm_func_end func_ov42_0218c034
.global func_ov42_0218c0ec
asm/ov43.inc
+1 -1
View File
@@ -57,7 +57,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0764
.extern data_027e0c68
.extern data_027e0d0c
asm/ov43.s
+9 -9
View File
@@ -622,7 +622,7 @@ _02189d1c:
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _02189e7c ; =data_02050f54
ldr r1, _02189e7c ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r2, [r1, r2]
@@ -710,7 +710,7 @@ _02189e58:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02189e78: .word gPlayerPos
_02189e7c: .word data_02050f54
_02189e7c: .word gSinCosTable
_02189e80: .word 0xffff8001
_02189e84: .word 0x00000ccd
arm_func_end func_ov43_02189c8c
@@ -1300,7 +1300,7 @@ func_ov43_0218a674: ; 0x0218a674
str r1, [sp, #0x20]
ldrh r0, [r4, #0x78]
ldr r10, [r4, #0x48]
ldr r3, _0218a850 ; =data_02050f54
ldr r3, _0218a850 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r5, r0, lsl #0x1
add r0, r5, #1
@@ -1375,7 +1375,7 @@ _0218a784:
_0218a7ac:
ldrh r0, [r4, #0x78]
mov r1, #0
ldr r3, _0218a850 ; =data_02050f54
ldr r3, _0218a850 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
@@ -1416,7 +1416,7 @@ _0218a834:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0218a84c: .word 0x0000099a
_0218a850: .word data_02050f54
_0218a850: .word gSinCosTable
_0218a854: .word gPlayer
_0218a858: .word gPlayerAngle
_0218a85c: .word 0xffff8001
@@ -3456,7 +3456,7 @@ _0218c3bc:
bl func_ov43_0218b7b8
_0218c400:
ldrh r0, [r4, #0x78]
ldr r2, _0218c9c4 ; =data_02050f54
ldr r2, _0218c9c4 ; =gSinCosTable
mov r1, #0
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
@@ -3582,7 +3582,7 @@ _0218c59c:
mov r1, #6
bl func_ov43_0218b7b8
ldrh r0, [r4, #0x78]
ldr r3, _0218c9c4 ; =data_02050f54
ldr r3, _0218c9c4 ; =gSinCosTable
ldr r1, [r4, #0x3d0]
mov r0, r0, asr #0x4
mov r5, r0, lsl #0x1
@@ -3691,7 +3691,7 @@ _0218c730:
bl func_ov00_020ceacc
_0218c76c:
ldrh r0, [r4, #0x78]
ldr r3, _0218c9c4 ; =data_02050f54
ldr r3, _0218c9c4 ; =gSinCosTable
ldr r1, [r4, #0x3d0]
mov r0, r0, asr #0x4
mov r5, r0, lsl #0x1
@@ -3852,7 +3852,7 @@ _0218c9b4: .word 0x00000333
_0218c9b8: .word 0x00000222
_0218c9bc: .word 0x0000038e
_0218c9c0: .word 0x00000133
_0218c9c4: .word data_02050f54
_0218c9c4: .word gSinCosTable
_0218c9c8: .word data_027e0ffc
_0218c9cc: .word 0x00000327
_0218c9d0: .word gAdventureFlags
asm/ov44.inc
+1 -1
View File
@@ -64,7 +64,7 @@
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0194
.extern data_027e0764
.extern data_027e0e58
asm/ov44.s
+13 -13
View File
@@ -2060,7 +2060,7 @@ func_ov44_0218ae78: ; 0x0218ae78
addeq sp, sp, #0x3c
ldmeqia sp!, {r3, r4, pc}
ldrh r1, [r4, #0x78]
ldr r3, _0218af2c ; =data_02050f54
ldr r3, _0218af2c ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -2092,7 +2092,7 @@ func_ov44_0218ae78: ; 0x0218ae78
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0218af2c: .word data_02050f54
_0218af2c: .word gSinCosTable
_0218af30: .word 0x00000266
_0218af34: .word data_ov00_020e9370
arm_func_end func_ov44_0218ae78
@@ -2658,7 +2658,7 @@ func_ov44_0218b450: ; 0x0218b450
mov ip, #0
strh r0, [sp, #0x24]
ldr r2, [r4, #8]
ldr r5, _0218b528 ; =data_02050f54
ldr r5, _0218b528 ; =gSinCosTable
str r2, [sp, #0x2c]
ldr r2, [r4, #0xc]
ldr r0, _0218b52c ; =0x00000666
@@ -2698,7 +2698,7 @@ func_ov44_0218b450: ; 0x0218b450
add sp, sp, #0x3c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0218b528: .word data_02050f54
_0218b528: .word gSinCosTable
_0218b52c: .word 0x00000666
_0218b530: .word data_027e0fe8
_0218b534: .word 0x4f435348
@@ -4545,7 +4545,7 @@ _0218cb44:
_0218cb68:
strh r0, [r4, #0x78]
ldrh r1, [r4, #0x78]
ldr r3, _0218cc68 ; =data_02050f54
ldr r3, _0218cc68 ; =gSinCosTable
mov r0, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -4609,7 +4609,7 @@ _0218cc18:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0218cc64: .word 0xfffff8e4
_0218cc68: .word data_02050f54
_0218cc68: .word gSinCosTable
_0218cc6c: .word 0x0000019a
arm_func_end func_ov44_0218cac4
@@ -4643,7 +4643,7 @@ func_ov44_0218cc70: ; 0x0218cc70
add r0, r4, #0x78
bl func_0202b154
ldrh r1, [r4, #0x78]
ldr r3, _0218cd98 ; =data_02050f54
ldr r3, _0218cd98 ; =gSinCosTable
ldr r0, _0218cd9c ; =0x0000019a
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x2
@@ -4693,7 +4693,7 @@ _0218cd78:
ldmia sp!, {r4, pc}
.align 2, 0
_0218cd94: .word 0x0000038e
_0218cd98: .word data_02050f54
_0218cd98: .word gSinCosTable
_0218cd9c: .word 0x0000019a
arm_func_end func_ov44_0218cc70
@@ -4717,7 +4717,7 @@ func_ov44_0218cda0: ; 0x0218cda0
mov r2, #0x2d8
bl func_0202b154
ldrh r1, [r4, #0x78]
ldr r3, _0218ce9c ; =data_02050f54
ldr r3, _0218ce9c ; =gSinCosTable
ldr r0, _0218cea0 ; =0x0000019a
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x2
@@ -4766,7 +4766,7 @@ _0218ce80:
ldmia sp!, {r4, pc}
.align 2, 0
_0218ce98: .word gPlayerPos
_0218ce9c: .word data_02050f54
_0218ce9c: .word gSinCosTable
_0218cea0: .word 0x0000019a
arm_func_end func_ov44_0218cda0
@@ -6491,7 +6491,7 @@ func_ov44_0218e3e0: ; 0x0218e3e0
addeq sp, sp, #0x3c
ldmeqia sp!, {r4, r5, pc}
ldrh r1, [r4, #0x78]
ldr r3, _0218e498 ; =data_02050f54
ldr r3, _0218e498 ; =gSinCosTable
add r0, sp, #0x18
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -6502,7 +6502,7 @@ func_ov44_0218e3e0: ; 0x0218e3e0
ldrsh r2, [r3, r2]
blx func_01ff8214
ldrh r0, [r4, #0x78]
ldr r1, _0218e498 ; =data_02050f54
ldr r1, _0218e498 ; =gSinCosTable
mov lr, #0
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
@@ -6528,7 +6528,7 @@ func_ov44_0218e3e0: ; 0x0218e3e0
add sp, sp, #0x3c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0218e498: .word data_02050f54
_0218e498: .word gSinCosTable
_0218e49c: .word 0xfffff852
arm_func_end func_ov44_0218e3e0
asm/ov46.inc
+1 -1
View File
@@ -64,7 +64,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_027e0160
.extern data_027e0764
asm/ov46.s
+16 -16
View File
@@ -2478,7 +2478,7 @@ func_ov46_02192040: ; 0x02192040
ldr r4, [r4, #0xb4]
add r0, r5, #0x1f8
ldr r1, [r4]
ldr r3, _02192134 ; =data_02050f54
ldr r3, _02192134 ; =gSinCosTable
bic r1, r1, #2
str r1, [r4]
ldrsh r1, [r0, #0x68]
@@ -2500,7 +2500,7 @@ func_ov46_02192040: ; 0x02192040
bl func_0202e030
add r0, r5, #0x1f8
ldrh r1, [r0, #0x6a]
ldr r3, _02192134 ; =data_02050f54
ldr r3, _02192134 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
@@ -2518,7 +2518,7 @@ func_ov46_02192040: ; 0x02192040
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02192130: .word data_ov46_02194464
_02192134: .word data_02050f54
_02192134: .word gSinCosTable
arm_func_end func_ov46_02192040
.global func_ov46_02192138
@@ -3527,7 +3527,7 @@ func_ov46_02192c90: ; 0x02192c90
mov r6, r0, lsl #0x1
add r5, r6, #1
add r3, r7, #1
ldr r0, _02192fbc ; =data_02050f54
ldr r0, _02192fbc ; =gSinCosTable
mov r9, r6, lsl #0x1
mov r8, r7, lsl #0x1
mov r7, r5, lsl #0x1
@@ -3631,7 +3631,7 @@ _02192fac: .word data_ov46_0219448c
_02192fb0: .word data_027e0d0c
_02192fb4: .word data_ov46_021944a8
_02192fb8: .word data_027e0764
_02192fbc: .word data_02050f54
_02192fbc: .word gSinCosTable
arm_func_end func_ov46_02192c90
.global func_ov46_02192fc0
@@ -3787,7 +3787,7 @@ _02193144:
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
mov r5, r0, lsl #0x1
ldr r2, _0219349c ; =data_02050f54
ldr r2, _0219349c ; =gSinCosTable
ldr r1, [sp, #0x2c]
str r6, [r3]
str r1, [r3, #4]
@@ -3803,19 +3803,19 @@ _02193144:
ldrsh r5, [r2, r5]
add r0, r0, #1
mov r2, r0, lsl #0x1
ldr r0, _0219349c ; =data_02050f54
ldr r0, _0219349c ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh lr, [r0, r2]
mov r0, r5, asr #0x1f
str r0, [sp, #8]
ldr r0, _0219349c ; =data_02050f54
ldr r0, _0219349c ; =gSinCosTable
mov r2, r1, lsl #0x1
ldrsh r0, [r0, r2]
mov r2, #0
str r0, [sp, #0x30]
add r0, r1, #1
mov r1, r0, lsl #0x1
ldr r0, _0219349c ; =data_02050f54
ldr r0, _0219349c ; =gSinCosTable
ldrsh ip, [r0, r1]
ldr r0, [sp, #0x30]
mov r1, #0x800
@@ -3849,7 +3849,7 @@ _02193144:
mov r0, r0, lsl #0x1
add r3, r0, #1
mov r6, r3, lsl #0x1
ldr r3, _0219349c ; =data_02050f54
ldr r3, _0219349c ; =gSinCosTable
ldrsh r10, [r3, r6]
ldr r3, [sp, #0x30]
smull r7, r6, r3, r5
@@ -3861,7 +3861,7 @@ _02193144:
mov r9, r10, asr #0x1f
str r3, [sp, #0x18]
mov r3, r0, lsl #0x1
ldr r0, _0219349c ; =data_02050f54
ldr r0, _0219349c ; =gSinCosTable
ldrsh r7, [r0, r3]
umull r3, r0, ip, lr
adds r3, r3, r1
@@ -3973,7 +3973,7 @@ _02193144:
.align 2, 0
_02193494: .word data_ov46_0219449c
_02193498: .word data_027e0764
_0219349c: .word data_02050f54
_0219349c: .word gSinCosTable
arm_func_end func_ov46_021930e0
.global func_ov46_021934a0
@@ -4198,7 +4198,7 @@ _02193710:
mov r0, r0, lsl #0xf
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
ldr r2, _02193b28 ; =data_02050f54
ldr r2, _02193b28 ; =gSinCosTable
mov r3, r0, lsl #0x1
mov r0, r3, lsl #0x1
ldrsh r10, [r2, r0]
@@ -4413,7 +4413,7 @@ _02193b18: .word data_027e0e58
_02193b1c: .word data_ov22_0217a5d4
_02193b20: .word data_027e0764
_02193b24: .word 0x00004001
_02193b28: .word data_02050f54
_02193b28: .word gSinCosTable
_02193b2c: .word data_ov34_021861e8
arm_func_end func_ov46_02193574
@@ -4963,7 +4963,7 @@ _02194264:
mov r1, r1, lsr #0x10
mov r1, r1, asr #0x4
mov r7, r1, lsl #0x1
ldr r1, _021942f0 ; =data_02050f54
ldr r1, _021942f0 ; =gSinCosTable
mov r2, r7, lsl #0x1
ldrsh r3, [r1, r2]
add r1, r1, r7, lsl #1
@@ -4985,7 +4985,7 @@ _021942d8:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_021942ec: .word data_027e0764
_021942f0: .word data_02050f54
_021942f0: .word gSinCosTable
arm_func_end func_ov46_0219416c
.rodata
asm/ov47.inc
+1 -1
View File
@@ -62,7 +62,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0764
.extern data_027e0e58
.extern gMapManager
asm/ov47.s
+17 -17
View File
@@ -650,7 +650,7 @@ func_ov47_02190878: ; 0x02190878
mov r1, #0
str r1, [r0, #0x64]
ldrh r3, [r0, #0x78]
ldr ip, _02190900 ; =data_02050f54
ldr ip, _02190900 ; =gSinCosTable
ldr r2, _02190904 ; =0x00000206
mov r3, r3, asr #0x4
mov r3, r3, lsl #0x2
@@ -681,7 +681,7 @@ func_ov47_02190878: ; 0x02190878
str r2, [r0, #0x68]
ldmia sp!, {r4, pc}
.align 2, 0
_02190900: .word data_02050f54
_02190900: .word gSinCosTable
_02190904: .word 0x00000206
arm_func_end func_ov47_02190878
@@ -1268,7 +1268,7 @@ func_ov47_021910fc: ; 0x021910fc
blx func_01ff8214
add r0, r4, #0x100
ldrh r1, [r0, #0x74]
ldr r3, _0219120c ; =data_02050f54
ldr r3, _0219120c ; =gSinCosTable
add r0, sp, #0x24
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -1312,7 +1312,7 @@ func_ov47_021910fc: ; 0x021910fc
add sp, sp, #0x78
ldmia sp!, {r4, pc}
.align 2, 0
_0219120c: .word data_02050f54
_0219120c: .word gSinCosTable
_02191210: .word 0x0000099a
_02191214: .word data_ov00_020e9370
arm_func_end func_ov47_021910fc
@@ -1768,7 +1768,7 @@ func_ov47_02191794: ; 0x02191794
stmdb sp!, {r3, r4, r5, r6, r7, lr}
mov r4, r0
ldrh r2, [r4, #0x78]
ldr r3, _02191828 ; =data_02050f54
ldr r3, _02191828 ; =gSinCosTable
ldr r1, _0219182c ; =0x00000666
mov r2, r2, asr #0x4
mov r6, r2, lsl #0x1
@@ -1803,7 +1803,7 @@ func_ov47_02191794: ; 0x02191794
blx r1
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02191828: .word data_02050f54
_02191828: .word gSinCosTable
_0219182c: .word 0x00000666
arm_func_end func_ov47_02191794
@@ -3588,7 +3588,7 @@ func_ov47_02192fcc: ; 0x02192fcc
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldrh r1, [r1, #0x78]
mov r2, #0x800
ldr r4, _02193054 ; =data_02050f54
ldr r4, _02193054 ; =gSinCosTable
mov r1, r1, asr #0x4
mov r1, r1, lsl #0x1
mov r3, r1, lsl #0x1
@@ -3620,7 +3620,7 @@ func_ov47_02192fcc: ; 0x02192fcc
strh r2, [r0, #0x54]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02193054: .word data_02050f54
_02193054: .word gSinCosTable
_02193058: .word 0x00000ee1
arm_func_end func_ov47_02192fcc
@@ -3638,7 +3638,7 @@ func_ov47_0219305c: ; 0x0219305c
str r1, [sp, #0x38]
bl func_ov00_020c3348
ldr r0, [r4, #8]
ldr r1, _02193208 ; =data_02050f54
ldr r1, _02193208 ; =gSinCosTable
str r0, [sp, #0x34]
ldr r0, [r4, #0xc]
mov r3, #2
@@ -3735,7 +3735,7 @@ func_ov47_0219305c: ; 0x0219305c
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02193208: .word data_02050f54
_02193208: .word gSinCosTable
_0219320c: .word 0x00000e3d
_02193210: .word func_ov47_02192fcc
_02193214: .word data_027e0e58
@@ -4012,7 +4012,7 @@ _02193568:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, [r4, #0x1c]
ldr r2, _021939c8 ; =data_02050f54
ldr r2, _021939c8 ; =gSinCosTable
ldrh r0, [r0, #0x78]
ldr r6, [sp, #0x28]
ldr r7, [sp, #0x20]
@@ -4101,7 +4101,7 @@ _021936c4:
addeq sp, sp, #0x38
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
ldr r2, [r4, #0x1c]
ldr r4, _021939c8 ; =data_02050f54
ldr r4, _021939c8 ; =gSinCosTable
ldrh r0, [r2, #0x78]
ldr r1, [r2, #0x48]
mov r3, #0x800
@@ -4298,7 +4298,7 @@ _021939b8: .word data_027e0ffc
_021939bc: .word 0x0000028d
_021939c0: .word data_027e0e58
_021939c4: .word data_ov47_02194218
_021939c8: .word data_02050f54
_021939c8: .word gSinCosTable
_021939cc: .word 0x000001c3
_021939d0: .word 0x00000293
_021939d4: .word 0x00000292
@@ -4583,7 +4583,7 @@ _02193d18: .word data_027e0e58
func_ov47_02193d1c: ; 0x02193d1c
stmdb sp!, {r3, r4, r5, lr}
ldrh r2, [r0, #0x78]
ldr r4, _02193de4 ; =data_02050f54
ldr r4, _02193de4 ; =gSinCosTable
mov r1, #0
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
@@ -4632,7 +4632,7 @@ func_ov47_02193d1c: ; 0x02193d1c
str r3, [r0, #0x6c]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02193de4: .word data_02050f54
_02193de4: .word gSinCosTable
_02193de8: .word 0x000004cd
arm_func_end func_ov47_02193d1c
@@ -4656,7 +4656,7 @@ func_ov47_02193dec: ; 0x02193dec
arm_func_start func_ov47_02193e18
func_ov47_02193e18: ; 0x02193e18
ldrsh r1, [r1, #0x78]
ldr ip, _02193e64 ; =data_02050f54
ldr ip, _02193e64 ; =gSinCosTable
mov r2, #0
sub r1, r1, #0x8000
mov r1, r1, lsl #0x10
@@ -4675,7 +4675,7 @@ func_ov47_02193e18: ; 0x02193e18
strh r1, [r0, #0x54]
bx lr
.align 2, 0
_02193e64: .word data_02050f54
_02193e64: .word gSinCosTable
arm_func_end func_ov47_02193e18
.global func_ov47_02193e68

Some files were not shown because too many files have changed in this diff Show More