mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
Fix merge conflicts
This commit is contained in:
DizzyEggg
commit
3919b7130b
1
.gitignore
vendored
1
.gitignore
vendored
@ -24,3 +24,4 @@ tools/*
|
|||||||
*.sa*
|
*.sa*
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
*.ddump
|
||||||
|
|||||||
@ -1277,5 +1277,4 @@ _0818D9A2:
|
|||||||
bx r1
|
bx r1
|
||||||
.pool
|
.pool
|
||||||
thumb_func_end sub_818D97C
|
thumb_func_end sub_818D97C
|
||||||
|
|
||||||
.align 2, 0 @ Don't pad with nop.
|
.align 2, 0 @ Don't pad with nop.
|
||||||
|
|||||||
@ -2151,7 +2151,7 @@ sub_8147018: @ 8147018
|
|||||||
ands r5, r0
|
ands r5, r0
|
||||||
movs r1, 0
|
movs r1, 0
|
||||||
mov r8, r4
|
mov r8, r4
|
||||||
ldr r6, =gUnknown_02038C08
|
ldr r6, =gFieldEffectSpawnParams
|
||||||
_08147046:
|
_08147046:
|
||||||
lsls r5, 16
|
lsls r5, 16
|
||||||
asrs r5, 16
|
asrs r5, 16
|
||||||
@ -2221,7 +2221,7 @@ _081470C4:
|
|||||||
sub_81470D0: @ 81470D0
|
sub_81470D0: @ 81470D0
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
ldr r0, =gUnknown_085C8E68
|
ldr r0, =gUnknown_085C8E68
|
||||||
ldr r5, =gUnknown_02038C08
|
ldr r5, =gFieldEffectSpawnParams
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
ldrsh r1, [r5, r2]
|
ldrsh r1, [r5, r2]
|
||||||
movs r3, 0x4
|
movs r3, 0x4
|
||||||
|
|||||||
92
asm/bike.s
92
asm/bike.s
@ -15,7 +15,7 @@ MovePlayerOnBike: @ 8119164
|
|||||||
lsrs r4, r1, 16
|
lsrs r4, r1, 16
|
||||||
lsls r2, 16
|
lsls r2, 16
|
||||||
lsrs r2, 16
|
lsrs r2, 16
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
movs r0, 0x2
|
movs r0, 0x2
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -72,7 +72,7 @@ CheckMovementInputMachBike: @ 81191CC
|
|||||||
cmp r1, 0
|
cmp r1, 0
|
||||||
bne _081191F4
|
bne _081191F4
|
||||||
strb r0, [r4]
|
strb r0, [r4]
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r0, [r2, 0xB]
|
ldrb r0, [r2, 0xB]
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
bne _08119208
|
bne _08119208
|
||||||
@ -81,7 +81,7 @@ CheckMovementInputMachBike: @ 81191CC
|
|||||||
b _0811921C
|
b _0811921C
|
||||||
.pool
|
.pool
|
||||||
_081191F4:
|
_081191F4:
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
cmp r1, r3
|
cmp r1, r3
|
||||||
beq _08119218
|
beq _08119218
|
||||||
ldrb r0, [r2, 0x2]
|
ldrb r0, [r2, 0x2]
|
||||||
@ -126,7 +126,7 @@ sub_8119238: @ 8119238
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -161,7 +161,7 @@ sub_8119280: @ 8119280
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
adds r7, r5, 0
|
adds r7, r5, 0
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r1, [r6, 0x5]
|
ldrb r1, [r6, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -255,7 +255,7 @@ sub_8119344: @ 8119344
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
adds r7, r5, 0
|
adds r7, r5, 0
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r0, [r6, 0xB]
|
ldrb r0, [r6, 0xB]
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _0811935A
|
beq _0811935A
|
||||||
@ -352,7 +352,7 @@ CheckMovementInputAcroBike: @ 8119400
|
|||||||
lsls r2, 16
|
lsls r2, 16
|
||||||
lsrs r2, 16
|
lsrs r2, 16
|
||||||
ldr r4, =gUnknown_0859749C
|
ldr r4, =gUnknown_0859749C
|
||||||
ldr r3, =gUnknown_02037590
|
ldr r3, =gPlayerAvatar
|
||||||
ldrb r3, [r3, 0x8]
|
ldrb r3, [r3, 0x8]
|
||||||
lsls r3, 2
|
lsls r3, 2
|
||||||
adds r3, r4
|
adds r3, r4
|
||||||
@ -377,7 +377,7 @@ CheckMovementInputAcroBikeNormal: @ 811942C
|
|||||||
bl player_get_direction_upper_nybble
|
bl player_get_direction_upper_nybble
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r3, r0, 24
|
lsrs r3, r0, 24
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r2, 0xA]
|
strb r0, [r2, 0xA]
|
||||||
ldrb r1, [r4]
|
ldrb r1, [r4]
|
||||||
@ -417,11 +417,11 @@ _0811946C:
|
|||||||
b _081194C0
|
b _081194C0
|
||||||
_0811948A:
|
_0811948A:
|
||||||
ldrb r0, [r4]
|
ldrb r0, [r4]
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
cmp r0, r3
|
cmp r0, r3
|
||||||
beq _081194BC
|
beq _081194BC
|
||||||
_08119492:
|
_08119492:
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x2]
|
ldrb r1, [r0, 0x2]
|
||||||
adds r2, r0, 0
|
adds r2, r0, 0
|
||||||
cmp r1, 0x2
|
cmp r1, 0x2
|
||||||
@ -453,7 +453,7 @@ _081194C0:
|
|||||||
CheckMovementInputAcroBikeChangingDirection: @ 81194C8
|
CheckMovementInputAcroBikeChangingDirection: @ 81194C8
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
ldrb r0, [r4, 0x9]
|
ldrb r0, [r4, 0x9]
|
||||||
strb r0, [r5]
|
strb r0, [r5]
|
||||||
ldrb r0, [r4, 0xA]
|
ldrb r0, [r4, 0xA]
|
||||||
@ -520,7 +520,7 @@ CheckMovementInputAcroBikeStandingWheelie: @ 8119540
|
|||||||
bl player_get_direction_upper_nybble
|
bl player_get_direction_upper_nybble
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r6, r0, 24
|
lsrs r6, r0, 24
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
ldrb r1, [r5, 0x5]
|
ldrb r1, [r5, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -553,7 +553,7 @@ _08119594:
|
|||||||
adds r0, 0x1
|
adds r0, 0x1
|
||||||
strb r0, [r5, 0xA]
|
strb r0, [r5, 0xA]
|
||||||
_0811959A:
|
_0811959A:
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r0, [r1, 0xA]
|
ldrb r0, [r1, 0xA]
|
||||||
cmp r0, 0x27
|
cmp r0, 0x27
|
||||||
bls _081195B4
|
bls _081195B4
|
||||||
@ -608,7 +608,7 @@ CheckMovementInputAcroBikeBunnyHop: @ 81195E0
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
adds r2, r5, 0
|
adds r2, r5, 0
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
ldrb r1, [r4, 0x5]
|
ldrb r1, [r4, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -661,7 +661,7 @@ _08119668:
|
|||||||
movs r0, 0x6
|
movs r0, 0x6
|
||||||
b _08119676
|
b _08119676
|
||||||
_0811966E:
|
_0811966E:
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x2
|
movs r0, 0x2
|
||||||
strb r0, [r1, 0x2]
|
strb r0, [r1, 0x2]
|
||||||
movs r0, 0x7
|
movs r0, 0x7
|
||||||
@ -693,7 +693,7 @@ CheckMovementInputAcroBikeMovingWheelie: @ 8119688
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
adds r2, r5, 0
|
adds r2, r5, 0
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
ldrb r1, [r4, 0x5]
|
ldrb r1, [r4, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -732,7 +732,7 @@ _081196F6:
|
|||||||
movs r0, 0x4
|
movs r0, 0x4
|
||||||
b _08119750
|
b _08119750
|
||||||
_081196FC:
|
_081196FC:
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x2
|
movs r0, 0x2
|
||||||
strb r0, [r1, 0x2]
|
strb r0, [r1, 0x2]
|
||||||
movs r0, 0xC
|
movs r0, 0xC
|
||||||
@ -770,7 +770,7 @@ _08119736:
|
|||||||
movs r0, 0x5
|
movs r0, 0x5
|
||||||
b _08119750
|
b _08119750
|
||||||
_08119748:
|
_08119748:
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x2
|
movs r0, 0x2
|
||||||
strb r0, [r1, 0x2]
|
strb r0, [r1, 0x2]
|
||||||
movs r0, 0xA
|
movs r0, 0xA
|
||||||
@ -797,7 +797,7 @@ CheckMovementInputAcroBikeUnknownMode5: @ 8119764
|
|||||||
lsrs r4, 16
|
lsrs r4, 16
|
||||||
lsls r5, 16
|
lsls r5, 16
|
||||||
lsrs r5, 16
|
lsrs r5, 16
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r1, [r6, 0x5]
|
ldrb r1, [r6, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -836,7 +836,7 @@ CheckMovementInputAcroBikeUnknownMode6: @ 81197C0
|
|||||||
lsrs r1, 16
|
lsrs r1, 16
|
||||||
lsls r2, 16
|
lsls r2, 16
|
||||||
lsrs r2, 16
|
lsrs r2, 16
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
movs r3, 0
|
movs r3, 0
|
||||||
strb r3, [r4, 0x8]
|
strb r3, [r4, 0x8]
|
||||||
bl CheckMovementInputAcroBike
|
bl CheckMovementInputAcroBike
|
||||||
@ -863,7 +863,7 @@ sub_81197F4: @ 81197F4
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -893,7 +893,7 @@ sub_8119830: @ 8119830
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
adds r6, r5, 0
|
adds r6, r5, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -961,7 +961,7 @@ sub_81198C0: @ 81198C0
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -990,7 +990,7 @@ sub_81198FC: @ 81198FC
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1019,7 +1019,7 @@ sub_8119938: @ 8119938
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1048,7 +1048,7 @@ sub_8119974: @ 8119974
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1077,7 +1077,7 @@ sub_81199B0: @ 81199B0
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1156,7 +1156,7 @@ _08119A50:
|
|||||||
bl sub_81197F4
|
bl sub_81197F4
|
||||||
b _08119A84
|
b _08119A84
|
||||||
_08119A58:
|
_08119A58:
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -1198,7 +1198,7 @@ sub_8119AA4: @ 8119AA4
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
adds r6, r4, 0
|
adds r6, r4, 0
|
||||||
ldr r7, =gUnknown_02037590
|
ldr r7, =gPlayerAvatar
|
||||||
ldrb r1, [r7, 0x5]
|
ldrb r1, [r7, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1267,7 +1267,7 @@ sub_8119B34: @ 8119B34
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
adds r6, r4, 0
|
adds r6, r4, 0
|
||||||
ldr r7, =gUnknown_02037590
|
ldr r7, =gPlayerAvatar
|
||||||
ldrb r1, [r7, 0x5]
|
ldrb r1, [r7, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1336,7 +1336,7 @@ sub_8119BC4: @ 8119BC4
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
adds r6, r4, 0
|
adds r6, r4, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1396,7 +1396,7 @@ sub_8119C3C: @ 8119C3C
|
|||||||
lsrs r3, r0, 16
|
lsrs r3, r0, 16
|
||||||
lsls r1, 16
|
lsls r1, 16
|
||||||
lsrs r2, r1, 16
|
lsrs r2, r1, 16
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
movs r0, 0x4
|
movs r0, 0x4
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -1421,7 +1421,7 @@ sub_8119C64: @ 8119C64
|
|||||||
bl sub_8119DF8
|
bl sub_8119DF8
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r2, r0, 24
|
lsrs r2, r0, 24
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
ldr r0, [r4, 0xC]
|
ldr r0, [r4, 0xC]
|
||||||
movs r1, 0xF
|
movs r1, 0xF
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -1443,7 +1443,7 @@ _08119C9A:
|
|||||||
movs r0, 0xF
|
movs r0, 0xF
|
||||||
adds r2, r5, 0
|
adds r2, r5, 0
|
||||||
ands r2, r0
|
ands r2, r0
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
ldr r0, [r4, 0x10]
|
ldr r0, [r4, 0x10]
|
||||||
movs r1, 0xF
|
movs r1, 0xF
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -1532,7 +1532,7 @@ sub_8119D30: @ 8119D30
|
|||||||
_08119D36:
|
_08119D36:
|
||||||
ldr r0, =gUnknown_085974C0
|
ldr r0, =gUnknown_085974C0
|
||||||
adds r4, r5, r0
|
adds r4, r5, r0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldr r1, [r0, 0xC]
|
ldr r1, [r0, 0xC]
|
||||||
ldr r2, [r0, 0x10]
|
ldr r2, [r0, 0x10]
|
||||||
ldr r0, [r4, 0x8]
|
ldr r0, [r4, 0x8]
|
||||||
@ -1570,7 +1570,7 @@ _08119D7A:
|
|||||||
sub_8119D80: @ 8119D80
|
sub_8119D80: @ 8119D80
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
ldr r3, =gUnknown_02037590
|
ldr r3, =gPlayerAvatar
|
||||||
ldr r2, [r3, 0xC]
|
ldr r2, [r3, 0xC]
|
||||||
lsls r2, 4
|
lsls r2, 4
|
||||||
movs r1, 0xF0
|
movs r1, 0xF0
|
||||||
@ -1604,7 +1604,7 @@ _08119D9C:
|
|||||||
sub_8119DBC: @ 8119DBC
|
sub_8119DBC: @ 8119DBC
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
ldr r3, =gUnknown_02037590
|
ldr r3, =gPlayerAvatar
|
||||||
ldr r2, [r3, 0x10]
|
ldr r2, [r3, 0x10]
|
||||||
lsls r2, 4
|
lsls r2, 4
|
||||||
movs r1, 0xF0
|
movs r1, 0xF0
|
||||||
@ -1681,7 +1681,7 @@ sub_8119E38: @ 8119E38
|
|||||||
adds r6, r0, 0
|
adds r6, r0, 0
|
||||||
lsls r6, 24
|
lsls r6, 24
|
||||||
lsrs r6, 24
|
lsrs r6, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -1922,7 +1922,7 @@ _08119FF2:
|
|||||||
sub_8119FF8: @ 8119FF8
|
sub_8119FF8: @ 8119FF8
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
movs r0, 0x18
|
movs r0, 0x18
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -1966,7 +1966,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 811A044
|
|||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _0811A078
|
beq _0811A078
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1996,7 +1996,7 @@ GetOnOffBike: @ 811A080
|
|||||||
ldr r1, =gUnknown_02037348
|
ldr r1, =gUnknown_02037348
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r1]
|
strb r0, [r1]
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
movs r0, 0x6
|
movs r0, 0x6
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -2026,7 +2026,7 @@ _0811A0C4:
|
|||||||
thumb_func_start sub_811A0D0
|
thumb_func_start sub_811A0D0
|
||||||
sub_811A0D0: @ 811A0D0
|
sub_811A0D0: @ 811A0D0
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
movs r3, 0
|
movs r3, 0
|
||||||
strb r3, [r2, 0x8]
|
strb r3, [r2, 0x8]
|
||||||
strb r3, [r2, 0x9]
|
strb r3, [r2, 0x9]
|
||||||
@ -2064,7 +2064,7 @@ _0811A0FA:
|
|||||||
sub_811A114: @ 811A114
|
sub_811A114: @ 811A114
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
strb r0, [r2, 0xA]
|
strb r0, [r2, 0xA]
|
||||||
lsrs r1, r0, 1
|
lsrs r1, r0, 1
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2075,7 +2075,7 @@ sub_811A114: @ 811A114
|
|||||||
|
|
||||||
thumb_func_start sub_811A128
|
thumb_func_start sub_811A128
|
||||||
sub_811A128: @ 811A128
|
sub_811A128: @ 811A128
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r1, 0xA]
|
strb r0, [r1, 0xA]
|
||||||
strb r0, [r1, 0xB]
|
strb r0, [r1, 0xB]
|
||||||
@ -2091,7 +2091,7 @@ sub_811A138: @ 811A138
|
|||||||
mov r0, sp
|
mov r0, sp
|
||||||
movs r2, 0x6
|
movs r2, 0x6
|
||||||
bl memcpy
|
bl memcpy
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2]
|
ldrb r1, [r2]
|
||||||
movs r0, 0x2
|
movs r0, 0x2
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -2130,7 +2130,7 @@ _0811A182:
|
|||||||
sub_811A188: @ 811A188
|
sub_811A188: @ 811A188
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
ldrb r1, [r5]
|
ldrb r1, [r5]
|
||||||
movs r0, 0x4
|
movs r0, 0x4
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
|
|||||||
@ -271,7 +271,7 @@ _0817982E:
|
|||||||
sub_8179834: @ 8179834
|
sub_8179834: @ 8179834
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -367,7 +367,7 @@ _08179912:
|
|||||||
sub_8179918: @ 8179918
|
sub_8179918: @ 8179918
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
|
|||||||
@ -1082,7 +1082,7 @@ CameraPanningCB_PanAhead: @ 808A360
|
|||||||
b _0808A3FC
|
b _0808A3FC
|
||||||
.pool
|
.pool
|
||||||
_0808A374:
|
_0808A374:
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x3]
|
ldrb r0, [r0, 0x3]
|
||||||
cmp r0, 0x1
|
cmp r0, 0x1
|
||||||
bne _0808A394
|
bne _0808A394
|
||||||
|
|||||||
@ -44,7 +44,7 @@ process_overworld_input: @ 809BF08
|
|||||||
lsls r2, 16
|
lsls r2, 16
|
||||||
lsrs r2, 16
|
lsrs r2, 16
|
||||||
mov r8, r2
|
mov r8, r2
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r6, [r0, 0x3]
|
ldrb r6, [r0, 0x3]
|
||||||
ldrb r0, [r0, 0x2]
|
ldrb r0, [r0, 0x2]
|
||||||
mov r9, r0
|
mov r9, r0
|
||||||
@ -567,7 +567,7 @@ _0809C32E:
|
|||||||
.pool
|
.pool
|
||||||
_0809C33C:
|
_0809C33C:
|
||||||
movs r4, 0
|
movs r4, 0
|
||||||
ldr r1, =gUnknown_02032308
|
ldr r1, =gLinkPlayerMapObjects
|
||||||
_0809C340:
|
_0809C340:
|
||||||
ldrb r0, [r1]
|
ldrb r0, [r1]
|
||||||
cmp r0, 0x1
|
cmp r0, 0x1
|
||||||
@ -1368,7 +1368,7 @@ _0809CA04:
|
|||||||
bl sub_80B215C
|
bl sub_80B215C
|
||||||
bl AdjustFriendship_step
|
bl AdjustFriendship_step
|
||||||
bl sub_81D4998
|
bl sub_81D4998
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
movs r0, 0x40
|
movs r0, 0x40
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
|
|||||||
@ -1989,7 +1989,7 @@ task00_8084310: @ 80B6A24
|
|||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080B6A8A
|
beq _080B6A8A
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -2033,7 +2033,7 @@ mapldr_08084390: @ 80B6AA4
|
|||||||
movs r1, 0
|
movs r1, 0
|
||||||
bl CreateTask
|
bl CreateTask
|
||||||
ldr r4, =gMapObjects
|
ldr r4, =gMapObjects
|
||||||
ldr r3, =gUnknown_02037590
|
ldr r3, =gPlayerAvatar
|
||||||
ldrb r1, [r3, 0x5]
|
ldrb r1, [r3, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2163,7 +2163,7 @@ sub_80B6BCC: @ 80B6BCC
|
|||||||
mov r5, r8
|
mov r5, r8
|
||||||
push {r5,r6}
|
push {r5,r6}
|
||||||
mov r9, r0
|
mov r9, r0
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r0, [r6, 0x5]
|
ldrb r0, [r6, 0x5]
|
||||||
lsls r5, r0, 3
|
lsls r5, r0, 3
|
||||||
adds r5, r0
|
adds r5, r0
|
||||||
@ -2256,7 +2256,7 @@ _080B6C88:
|
|||||||
sub_80B6C90: @ 80B6C90
|
sub_80B6C90: @ 80B6C90
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r0, [r6, 0x4]
|
ldrb r0, [r6, 0x4]
|
||||||
lsls r2, r0, 4
|
lsls r2, r0, 4
|
||||||
adds r2, r0
|
adds r2, r0
|
||||||
@ -2309,7 +2309,7 @@ sub_80B6C90: @ 80B6C90
|
|||||||
sub_80B6D04: @ 80B6D04
|
sub_80B6D04: @ 80B6D04
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2, 0x5]
|
ldrb r1, [r2, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2454,7 +2454,7 @@ _080B6E0E:
|
|||||||
thumb_func_start sub_80B6E18
|
thumb_func_start sub_80B6E18
|
||||||
sub_80B6E18: @ 80B6E18
|
sub_80B6E18: @ 80B6E18
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
bl ScriptContext2_Disable
|
bl ScriptContext2_Disable
|
||||||
@ -2551,7 +2551,7 @@ sub_80B6EC0: @ 80B6EC0
|
|||||||
sub_80B6EE0: @ 80B6EE0
|
sub_80B6EE0: @ 80B6EE0
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2664,7 +2664,7 @@ sub_80B6FA8: @ 80B6FA8
|
|||||||
sub_80B6FB8: @ 80B6FB8
|
sub_80B6FB8: @ 80B6FB8
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x4]
|
ldrb r0, [r0, 0x4]
|
||||||
lsls r4, r0, 4
|
lsls r4, r0, 4
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -2702,7 +2702,7 @@ _080B6FF6:
|
|||||||
sub_80B7004: @ 80B7004
|
sub_80B7004: @ 80B7004
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x4]
|
ldrb r0, [r0, 0x4]
|
||||||
lsls r4, r0, 4
|
lsls r4, r0, 4
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -2828,7 +2828,7 @@ sub_80B7114: @ 80B7114
|
|||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
bl CameraObjectReset2
|
bl CameraObjectReset2
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -2883,7 +2883,7 @@ _080B717E:
|
|||||||
sub_80B7190: @ 80B7190
|
sub_80B7190: @ 80B7190
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x4]
|
ldrb r0, [r0, 0x4]
|
||||||
lsls r4, r0, 4
|
lsls r4, r0, 4
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -2914,7 +2914,7 @@ sub_80B7190: @ 80B7190
|
|||||||
sub_80B71D0: @ 80B71D0
|
sub_80B71D0: @ 80B71D0
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x4]
|
ldrb r1, [r0, 0x4]
|
||||||
lsls r0, r1, 4
|
lsls r0, r1, 4
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2962,7 +2962,7 @@ _080B721E:
|
|||||||
sub_80B7230: @ 80B7230
|
sub_80B7230: @ 80B7230
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x4]
|
ldrb r0, [r0, 0x4]
|
||||||
lsls r4, r0, 4
|
lsls r4, r0, 4
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -2993,7 +2993,7 @@ sub_80B7230: @ 80B7230
|
|||||||
sub_80B7270: @ 80B7270
|
sub_80B7270: @ 80B7270
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x4]
|
ldrb r1, [r0, 0x4]
|
||||||
lsls r0, r1, 4
|
lsls r0, r1, 4
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -3063,7 +3063,7 @@ _080B72EE:
|
|||||||
thumb_func_start sub_80B72F4
|
thumb_func_start sub_80B72F4
|
||||||
sub_80B72F4: @ 80B72F4
|
sub_80B72F4: @ 80B72F4
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -3111,7 +3111,7 @@ oei_waterfall: @ 80B734C
|
|||||||
adds r1, r0
|
adds r1, r0
|
||||||
lsls r1, 3
|
lsls r1, 3
|
||||||
adds r1, r2
|
adds r1, r2
|
||||||
ldr r2, =gUnknown_02038C08
|
ldr r2, =gFieldEffectSpawnParams
|
||||||
ldr r2, [r2]
|
ldr r2, [r2]
|
||||||
strh r2, [r1, 0xA]
|
strh r2, [r1, 0xA]
|
||||||
bl _call_via_r4
|
bl _call_via_r4
|
||||||
@ -3138,7 +3138,7 @@ _080B7396:
|
|||||||
ldrsh r2, [r4, r0]
|
ldrsh r2, [r4, r0]
|
||||||
lsls r2, 2
|
lsls r2, 2
|
||||||
adds r2, r5
|
adds r2, r5
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r1, r0, 3
|
lsls r1, r0, 3
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
@ -3162,7 +3162,7 @@ sub_80B73D0: @ 80B73D0
|
|||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
bl ScriptContext2_Enable
|
bl ScriptContext2_Enable
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
ldrh r0, [r4, 0x8]
|
ldrh r0, [r4, 0x8]
|
||||||
@ -3188,7 +3188,7 @@ waterfall_1_do_anim_probably: @ 80B73F0
|
|||||||
bne _080B7420
|
bne _080B7420
|
||||||
adds r0, r5, 0
|
adds r0, r5, 0
|
||||||
bl FieldObjectClearAnimIfSpecialAnimFinished
|
bl FieldObjectClearAnimIfSpecialAnimFinished
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r2, 0xA
|
movs r2, 0xA
|
||||||
ldrsh r0, [r4, r2]
|
ldrsh r0, [r4, r2]
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -3268,7 +3268,7 @@ _080B748E:
|
|||||||
cmp r4, 0
|
cmp r4, 0
|
||||||
bne _080B74C4
|
bne _080B74C4
|
||||||
bl ScriptContext2_Disable
|
bl ScriptContext2_Disable
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
strb r4, [r0, 0x6]
|
strb r4, [r0, 0x6]
|
||||||
ldr r0, =sub_80B7384
|
ldr r0, =sub_80B7384
|
||||||
bl FindTaskIdByFunc
|
bl FindTaskIdByFunc
|
||||||
@ -3304,7 +3304,7 @@ sub_80B74D0: @ 80B74D0
|
|||||||
adds r1, r0
|
adds r1, r0
|
||||||
lsls r1, 3
|
lsls r1, 3
|
||||||
adds r1, r2
|
adds r1, r2
|
||||||
ldr r3, =gUnknown_02038C08
|
ldr r3, =gFieldEffectSpawnParams
|
||||||
ldr r2, [r3]
|
ldr r2, [r3]
|
||||||
strh r2, [r1, 0x26]
|
strh r2, [r1, 0x26]
|
||||||
ldr r2, [r3, 0x4]
|
ldr r2, [r3, 0x4]
|
||||||
@ -3347,7 +3347,7 @@ _080B751E:
|
|||||||
|
|
||||||
thumb_func_start dive_1_lock
|
thumb_func_start dive_1_lock
|
||||||
dive_1_lock: @ 80B7544
|
dive_1_lock: @ 80B7544
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
movs r1, 0x1
|
movs r1, 0x1
|
||||||
strb r1, [r2, 0x6]
|
strb r1, [r2, 0x6]
|
||||||
ldrh r1, [r0, 0x8]
|
ldrh r1, [r0, 0x8]
|
||||||
@ -3363,7 +3363,7 @@ dive_2_unknown: @ 80B7558
|
|||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
bl ScriptContext2_Enable
|
bl ScriptContext2_Enable
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r2, 0x26
|
movs r2, 0x26
|
||||||
ldrsh r0, [r4, r2]
|
ldrsh r0, [r4, r2]
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -3393,7 +3393,7 @@ dive_3_unknown: @ 80B7580
|
|||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
bne _080B75C4
|
bne _080B75C4
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -3437,7 +3437,7 @@ sub_80B75F0: @ 80B75F0
|
|||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r6, =gUnknown_0855C438
|
ldr r6, =gUnknown_0855C438
|
||||||
ldr r2, =gTasks
|
ldr r2, =gTasks
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
lsls r1, r0, 2
|
lsls r1, r0, 2
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
lsls r1, 3
|
lsls r1, 3
|
||||||
@ -3480,7 +3480,7 @@ sub_80B764C: @ 80B764C
|
|||||||
bl CameraObjectReset2
|
bl CameraObjectReset2
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
bl SetCameraPanningCallback
|
bl SetCameraPanningCallback
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
movs r2, 0x1
|
movs r2, 0x1
|
||||||
strb r2, [r0, 0x6]
|
strb r2, [r0, 0x6]
|
||||||
ldrb r0, [r5, 0x3]
|
ldrb r0, [r5, 0x3]
|
||||||
@ -3536,7 +3536,7 @@ sub_80B76B8: @ 80B76B8
|
|||||||
strh r0, [r2, 0x26]
|
strh r0, [r2, 0x26]
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
strh r0, [r4, 0xE]
|
strh r0, [r4, 0xE]
|
||||||
ldr r3, =gUnknown_02038C08
|
ldr r3, =gFieldEffectSpawnParams
|
||||||
movs r5, 0x10
|
movs r5, 0x10
|
||||||
ldrsh r0, [r1, r5]
|
ldrsh r0, [r1, r5]
|
||||||
str r0, [r3]
|
str r0, [r3]
|
||||||
@ -3767,7 +3767,7 @@ sub_80B7890: @ 80B7890
|
|||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r6, =gUnknown_0855C450
|
ldr r6, =gUnknown_0855C450
|
||||||
ldr r2, =gTasks
|
ldr r2, =gTasks
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
lsls r1, r0, 2
|
lsls r1, r0, 2
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
lsls r1, 3
|
lsls r1, 3
|
||||||
@ -3808,7 +3808,7 @@ sub_80B78EC: @ 80B78EC
|
|||||||
adds r4, r1, 0
|
adds r4, r1, 0
|
||||||
bl CameraObjectReset2
|
bl CameraObjectReset2
|
||||||
bl player_bitmagic
|
bl player_bitmagic
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
ldrb r0, [r4, 0x1]
|
ldrb r0, [r4, 0x1]
|
||||||
@ -3835,7 +3835,7 @@ sub_80B791C: @ 80B791C
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080B795C
|
beq _080B795C
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
ldrsh r0, [r5, r2]
|
ldrsh r0, [r5, r2]
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -3915,7 +3915,7 @@ sub_80B79BC: @ 80B79BC
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080B79E6
|
beq _080B79E6
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
bl ScriptContext2_Disable
|
bl ScriptContext2_Disable
|
||||||
@ -3935,7 +3935,7 @@ _080B79E6:
|
|||||||
thumb_func_start sub_80B79F4
|
thumb_func_start sub_80B79F4
|
||||||
sub_80B79F4: @ 80B79F4
|
sub_80B79F4: @ 80B79F4
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -4016,7 +4016,7 @@ sub_80B7A8C: @ 80B7A8C
|
|||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r6, =gUnknown_0855C460
|
ldr r6, =gUnknown_0855C460
|
||||||
ldr r2, =gTasks
|
ldr r2, =gTasks
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
lsls r1, r0, 2
|
lsls r1, r0, 2
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
lsls r1, 3
|
lsls r1, 3
|
||||||
@ -4057,7 +4057,7 @@ sub_80B7AE8: @ 80B7AE8
|
|||||||
adds r4, r1, 0
|
adds r4, r1, 0
|
||||||
bl player_bitmagic
|
bl player_bitmagic
|
||||||
bl CameraObjectReset2
|
bl CameraObjectReset2
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
ldrb r0, [r4, 0x3]
|
ldrb r0, [r4, 0x3]
|
||||||
@ -4090,7 +4090,7 @@ sub_80B7B18: @ 80B7B18
|
|||||||
ldrsh r0, [r5, r2]
|
ldrsh r0, [r5, r2]
|
||||||
cmp r0, 0x3
|
cmp r0, 0x3
|
||||||
ble _080B7B6C
|
ble _080B7B6C
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
ldrsh r0, [r4, r2]
|
ldrsh r0, [r4, r2]
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -4222,7 +4222,7 @@ _080B7C2C:
|
|||||||
thumb_func_start sub_80B7C48
|
thumb_func_start sub_80B7C48
|
||||||
sub_80B7C48: @ 80B7C48
|
sub_80B7C48: @ 80B7C48
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -4359,7 +4359,7 @@ sub_80B7D34: @ 80B7D34
|
|||||||
bl music_something
|
bl music_something
|
||||||
bl sub_80AF0B4
|
bl sub_80AF0B4
|
||||||
_080B7D60:
|
_080B7D60:
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -4466,7 +4466,7 @@ mapldr_080859D4: @ 80B7E48
|
|||||||
movs r0, 0
|
movs r0, 0
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -4537,7 +4537,7 @@ sub_80B7EE8: @ 80B7EE8
|
|||||||
mov r0, sp
|
mov r0, sp
|
||||||
movs r2, 0x5
|
movs r2, 0x5
|
||||||
bl memcpy
|
bl memcpy
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -4695,7 +4695,7 @@ sub_80B8034: @ 80B8034
|
|||||||
mov r0, sp
|
mov r0, sp
|
||||||
movs r2, 0x5
|
movs r2, 0x5
|
||||||
bl memcpy
|
bl memcpy
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -4765,7 +4765,7 @@ sub_80B80C4: @ 80B80C4
|
|||||||
mov r0, sp
|
mov r0, sp
|
||||||
movs r2, 0x5
|
movs r2, 0x5
|
||||||
bl memcpy
|
bl memcpy
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2, 0x5]
|
ldrb r1, [r2, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -4911,7 +4911,7 @@ mapldr_08085D88: @ 80B8200
|
|||||||
movs r0, 0
|
movs r0, 0
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -4961,7 +4961,7 @@ sub_80B8280: @ 80B8280
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080B82F6
|
beq _080B82F6
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
ldrb r0, [r5, 0x4]
|
ldrb r0, [r5, 0x4]
|
||||||
lsls r2, r0, 4
|
lsls r2, r0, 4
|
||||||
adds r2, r0
|
adds r2, r0
|
||||||
@ -5027,7 +5027,7 @@ sub_80B830C: @ 80B830C
|
|||||||
mov r0, sp
|
mov r0, sp
|
||||||
movs r2, 0x5
|
movs r2, 0x5
|
||||||
bl memcpy
|
bl memcpy
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2, 0x5]
|
ldrb r1, [r2, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -5156,7 +5156,7 @@ sub_80B8410: @ 80B8410
|
|||||||
mov r0, sp
|
mov r0, sp
|
||||||
movs r2, 0x5
|
movs r2, 0x5
|
||||||
bl memcpy
|
bl memcpy
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -5229,7 +5229,7 @@ _080B84BE:
|
|||||||
bl CreateTask
|
bl CreateTask
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r2, =gUnknown_02038C08
|
ldr r2, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r2]
|
ldr r0, [r2]
|
||||||
ldr r1, [r2, 0x4]
|
ldr r1, [r2, 0x4]
|
||||||
ldr r2, [r2, 0x8]
|
ldr r2, [r2, 0x8]
|
||||||
@ -5252,7 +5252,7 @@ _080B84BE:
|
|||||||
thumb_func_start sub_80B84F8
|
thumb_func_start sub_80B84F8
|
||||||
sub_80B84F8: @ 80B84F8
|
sub_80B84F8: @ 80B84F8
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
ldr r5, =gUnknown_02038C08
|
ldr r5, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r5]
|
ldr r0, [r5]
|
||||||
movs r6, 0x80
|
movs r6, 0x80
|
||||||
lsls r6, 24
|
lsls r6, 24
|
||||||
@ -6292,7 +6292,7 @@ sub_80B8D44: @ 80B8D44
|
|||||||
adds r1, r0
|
adds r1, r0
|
||||||
lsls r1, 3
|
lsls r1, 3
|
||||||
adds r1, r2
|
adds r1, r2
|
||||||
ldr r0, =gUnknown_02038C08
|
ldr r0, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r0]
|
ldr r0, [r0]
|
||||||
strh r0, [r1, 0x26]
|
strh r0, [r1, 0x26]
|
||||||
bl sav1_reset_battle_music_maybe
|
bl sav1_reset_battle_music_maybe
|
||||||
@ -6335,7 +6335,7 @@ sub_80B8DB4: @ 80B8DB4
|
|||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
bl ScriptContext2_Enable
|
bl ScriptContext2_Enable
|
||||||
bl player_bitmagic
|
bl player_bitmagic
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
strb r0, [r5, 0x6]
|
strb r0, [r5, 0x6]
|
||||||
movs r0, 0x8
|
movs r0, 0x8
|
||||||
@ -6374,7 +6374,7 @@ sub_80B8DB4: @ 80B8DB4
|
|||||||
sub_80B8E14: @ 80B8E14
|
sub_80B8E14: @ 80B8E14
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -6410,7 +6410,7 @@ _080B8E50:
|
|||||||
sub_80B8E60: @ 80B8E60
|
sub_80B8E60: @ 80B8E60
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -6421,7 +6421,7 @@ sub_80B8E60: @ 80B8E60
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080B8E96
|
beq _080B8E96
|
||||||
ldr r2, =gUnknown_02038C08
|
ldr r2, =gFieldEffectSpawnParams
|
||||||
movs r1, 0x26
|
movs r1, 0x26
|
||||||
ldrsh r0, [r4, r1]
|
ldrsh r0, [r4, r1]
|
||||||
movs r1, 0x80
|
movs r1, 0x80
|
||||||
@ -6449,7 +6449,7 @@ sub_80B8EA8: @ 80B8EA8
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
bne _080B8F12
|
bne _080B8F12
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
ldrb r0, [r5, 0x5]
|
ldrb r0, [r5, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -6473,7 +6473,7 @@ sub_80B8EA8: @ 80B8EA8
|
|||||||
lsrs r1, 24
|
lsrs r1, 24
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
bl FieldObjectSetSpecialAnim
|
bl FieldObjectSetSpecialAnim
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r2, 0xA
|
movs r2, 0xA
|
||||||
ldrsh r0, [r6, r2]
|
ldrsh r0, [r6, r2]
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -6498,7 +6498,7 @@ _080B8F12:
|
|||||||
thumb_func_start sub_80B8F24
|
thumb_func_start sub_80B8F24
|
||||||
sub_80B8F24: @ 80B8F24
|
sub_80B8F24: @ 80B8F24
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
ldrb r1, [r5, 0x5]
|
ldrb r1, [r5, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -6704,7 +6704,7 @@ sub_80B90CC: @ 80B90CC
|
|||||||
strb r0, [r2, 0x5]
|
strb r0, [r2, 0x5]
|
||||||
ldr r0, =sub_80B9128
|
ldr r0, =sub_80B9128
|
||||||
str r0, [r2, 0x1C]
|
str r0, [r2, 0x1C]
|
||||||
ldr r0, =gUnknown_02038C08
|
ldr r0, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r0]
|
ldr r0, [r0]
|
||||||
strh r0, [r2, 0x30]
|
strh r0, [r2, 0x30]
|
||||||
movs r0, 0x9E
|
movs r0, 0x9E
|
||||||
@ -6793,7 +6793,7 @@ sub_80B91A4: @ 80B91A4
|
|||||||
adds r1, r0
|
adds r1, r0
|
||||||
lsls r1, 3
|
lsls r1, 3
|
||||||
adds r1, r2
|
adds r1, r2
|
||||||
ldr r0, =gUnknown_02038C08
|
ldr r0, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r0]
|
ldr r0, [r0]
|
||||||
strh r0, [r1, 0xA]
|
strh r0, [r1, 0xA]
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
@ -6829,7 +6829,7 @@ sub_80B91D4: @ 80B91D4
|
|||||||
sub_80B9204: @ 80B9204
|
sub_80B9204: @ 80B9204
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r1, [r6, 0x5]
|
ldrb r1, [r6, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -6870,7 +6870,7 @@ _080B924C:
|
|||||||
sub_80B925C: @ 80B925C
|
sub_80B925C: @ 80B925C
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -6884,7 +6884,7 @@ sub_80B925C: @ 80B925C
|
|||||||
ldrh r0, [r4, 0x8]
|
ldrh r0, [r4, 0x8]
|
||||||
adds r0, 0x1
|
adds r0, 0x1
|
||||||
strh r0, [r4, 0x8]
|
strh r0, [r4, 0x8]
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r2, 0xA
|
movs r2, 0xA
|
||||||
ldrsh r0, [r4, r2]
|
ldrsh r0, [r4, r2]
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -6906,7 +6906,7 @@ sub_80B92A0: @ 80B92A0
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
bne _080B92E8
|
bne _080B92E8
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -6955,7 +6955,7 @@ sub_80B92F8: @ 80B92F8
|
|||||||
strh r0, [r4, 0xC]
|
strh r0, [r4, 0xC]
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
bl SetPlayerAvatarTransitionFlags
|
bl SetPlayerAvatarTransitionFlags
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -6975,7 +6975,7 @@ _080B932C:
|
|||||||
sub_80B933C: @ 80B933C
|
sub_80B933C: @ 80B933C
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -7023,7 +7023,7 @@ sub_80B9390: @ 80B9390
|
|||||||
asrs r0, 16
|
asrs r0, 16
|
||||||
cmp r0, 0x7
|
cmp r0, 0x7
|
||||||
ble _080B9406
|
ble _080B9406
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -7087,7 +7087,7 @@ sub_80B9418: @ 80B9418
|
|||||||
asrs r0, 16
|
asrs r0, 16
|
||||||
cmp r0, 0x9
|
cmp r0, 0x9
|
||||||
ble _080B9464
|
ble _080B9464
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -7582,7 +7582,7 @@ sub_80B97D4: @ 80B97D4
|
|||||||
sub_80B9804: @ 80B9804
|
sub_80B9804: @ 80B9804
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r1, [r6, 0x5]
|
ldrb r1, [r6, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -7673,7 +7673,7 @@ sub_80B98B8: @ 80B98B8
|
|||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
bne _080B9910
|
bne _080B9910
|
||||||
_080B98D0:
|
_080B98D0:
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -7720,7 +7720,7 @@ sub_80B9924: @ 80B9924
|
|||||||
mov r0, sp
|
mov r0, sp
|
||||||
movs r2, 0x24
|
movs r2, 0x24
|
||||||
bl memcpy
|
bl memcpy
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x4]
|
ldrb r0, [r0, 0x4]
|
||||||
lsls r1, r0, 4
|
lsls r1, r0, 4
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
@ -7760,7 +7760,7 @@ sub_80B9978: @ 80B9978
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080B99DC
|
beq _080B99DC
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r5, r0, 3
|
lsls r5, r0, 3
|
||||||
adds r5, r0
|
adds r5, r0
|
||||||
@ -7810,7 +7810,7 @@ _080B99DC:
|
|||||||
sub_80B99F0: @ 80B99F0
|
sub_80B99F0: @ 80B99F0
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -7872,7 +7872,7 @@ sub_80B9A60: @ 80B9A60
|
|||||||
lsls r0, 16
|
lsls r0, 16
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
bne _080B9ACA
|
bne _080B9ACA
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r1, [r6, 0x5]
|
ldrb r1, [r6, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -7922,7 +7922,7 @@ _080B9ACA:
|
|||||||
sub_80B9ADC: @ 80B9ADC
|
sub_80B9ADC: @ 80B9ADC
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
ldrb r0, [r4]
|
ldrb r0, [r4]
|
||||||
ldrb r1, [r4, 0x4]
|
ldrb r1, [r4, 0x4]
|
||||||
ldrb r2, [r4, 0x8]
|
ldrb r2, [r4, 0x8]
|
||||||
@ -8343,7 +8343,7 @@ _080B9E24:
|
|||||||
sub_80B9E28: @ 80B9E28
|
sub_80B9E28: @ 80B9E28
|
||||||
push {r4-r7,lr}
|
push {r4-r7,lr}
|
||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
ldr r7, =gUnknown_02038C08
|
ldr r7, =gFieldEffectSpawnParams
|
||||||
ldrb r0, [r7]
|
ldrb r0, [r7]
|
||||||
ldrb r1, [r7, 0x4]
|
ldrb r1, [r7, 0x4]
|
||||||
ldrb r2, [r7, 0x8]
|
ldrb r2, [r7, 0x8]
|
||||||
|
|||||||
@ -574,7 +574,7 @@ _0815432E:
|
|||||||
thumb_func_start oei_shadow
|
thumb_func_start oei_shadow
|
||||||
oei_shadow: @ 8154340
|
oei_shadow: @ 8154340
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
ldr r5, =gUnknown_02038C08
|
ldr r5, =gFieldEffectSpawnParams
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
ldrb r1, [r5, 0x4]
|
ldrb r1, [r5, 0x4]
|
||||||
ldrb r2, [r5, 0x8]
|
ldrb r2, [r5, 0x8]
|
||||||
@ -742,7 +742,7 @@ _08154498:
|
|||||||
oei_grass_normal: @ 81544AC
|
oei_grass_normal: @ 81544AC
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
ldr r5, =gUnknown_02038C08
|
ldr r5, =gFieldEffectSpawnParams
|
||||||
ldrh r1, [r5]
|
ldrh r1, [r5]
|
||||||
mov r0, sp
|
mov r0, sp
|
||||||
strh r1, [r0]
|
strh r1, [r0]
|
||||||
@ -827,7 +827,7 @@ unc_grass_normal: @ 8154550
|
|||||||
lsrs r4, r0, 8
|
lsrs r4, r0, 8
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r7, r0, 24
|
lsrs r7, r0, 24
|
||||||
ldr r3, =gUnknown_02037334
|
ldr r3, =gCamera
|
||||||
ldrb r1, [r3]
|
ldrb r1, [r3]
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -951,7 +951,7 @@ _08154648:
|
|||||||
thumb_func_start sub_8154658
|
thumb_func_start sub_8154658
|
||||||
sub_8154658: @ 8154658
|
sub_8154658: @ 8154658
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -1080,7 +1080,7 @@ _0815474C:
|
|||||||
sub_8154758: @ 8154758
|
sub_8154758: @ 8154758
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
ldr r5, =gUnknown_02038C08
|
ldr r5, =gFieldEffectSpawnParams
|
||||||
ldrh r1, [r5]
|
ldrh r1, [r5]
|
||||||
mov r0, sp
|
mov r0, sp
|
||||||
strh r1, [r0]
|
strh r1, [r0]
|
||||||
@ -1166,7 +1166,7 @@ unc_grass_tall: @ 8154800
|
|||||||
lsrs r7, r0, 8
|
lsrs r7, r0, 8
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r6, r0, 24
|
lsrs r6, r0, 24
|
||||||
ldr r3, =gUnknown_02037334
|
ldr r3, =gCamera
|
||||||
ldrb r1, [r3]
|
ldrb r1, [r3]
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -1282,7 +1282,7 @@ _081548EA:
|
|||||||
thumb_func_start sub_81548FC
|
thumb_func_start sub_81548FC
|
||||||
sub_81548FC: @ 81548FC
|
sub_81548FC: @ 81548FC
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -1336,7 +1336,7 @@ _08154958:
|
|||||||
thumb_func_start sub_815496C
|
thumb_func_start sub_815496C
|
||||||
sub_815496C: @ 815496C
|
sub_815496C: @ 815496C
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
ldr r6, =gUnknown_02038C08
|
ldr r6, =gFieldEffectSpawnParams
|
||||||
ldrb r0, [r6]
|
ldrb r0, [r6]
|
||||||
ldrb r1, [r6, 0x4]
|
ldrb r1, [r6, 0x4]
|
||||||
ldrb r2, [r6, 0x8]
|
ldrb r2, [r6, 0x8]
|
||||||
@ -1537,7 +1537,7 @@ _08154AF2:
|
|||||||
thumb_func_start sub_8154B04
|
thumb_func_start sub_8154B04
|
||||||
sub_8154B04: @ 8154B04
|
sub_8154B04: @ 8154B04
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -1591,7 +1591,7 @@ _08154B62:
|
|||||||
thumb_func_start sub_8154B78
|
thumb_func_start sub_8154B78
|
||||||
sub_8154B78: @ 8154B78
|
sub_8154B78: @ 8154B78
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -1646,7 +1646,7 @@ _08154BD8:
|
|||||||
thumb_func_start sub_8154BEC
|
thumb_func_start sub_8154BEC
|
||||||
sub_8154BEC: @ 8154BEC
|
sub_8154BEC: @ 8154BEC
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -1777,7 +1777,7 @@ _08154CE4:
|
|||||||
thumb_func_start sub_8154CEC
|
thumb_func_start sub_8154CEC
|
||||||
sub_8154CEC: @ 8154CEC
|
sub_8154CEC: @ 8154CEC
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
ldr r6, =gUnknown_02038C08
|
ldr r6, =gFieldEffectSpawnParams
|
||||||
ldrb r0, [r6]
|
ldrb r0, [r6]
|
||||||
ldrb r1, [r6, 0x4]
|
ldrb r1, [r6, 0x4]
|
||||||
ldrb r2, [r6, 0x8]
|
ldrb r2, [r6, 0x8]
|
||||||
@ -1922,7 +1922,7 @@ _08154E0A:
|
|||||||
thumb_func_start sub_8154E1C
|
thumb_func_start sub_8154E1C
|
||||||
sub_8154E1C: @ 8154E1C
|
sub_8154E1C: @ 8154E1C
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -1976,7 +1976,7 @@ _08154E78:
|
|||||||
thumb_func_start oei_water_drop_tall
|
thumb_func_start oei_water_drop_tall
|
||||||
oei_water_drop_tall: @ 8154E8C
|
oei_water_drop_tall: @ 8154E8C
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -2030,7 +2030,7 @@ _08154EE8:
|
|||||||
thumb_func_start sub_8154EFC
|
thumb_func_start sub_8154EFC
|
||||||
sub_8154EFC: @ 8154EFC
|
sub_8154EFC: @ 8154EFC
|
||||||
push {r4-r7,lr}
|
push {r4-r7,lr}
|
||||||
ldr r7, =gUnknown_02038C08
|
ldr r7, =gFieldEffectSpawnParams
|
||||||
ldrb r0, [r7]
|
ldrb r0, [r7]
|
||||||
ldrb r1, [r7, 0x4]
|
ldrb r1, [r7, 0x4]
|
||||||
ldrb r2, [r7, 0x8]
|
ldrb r2, [r7, 0x8]
|
||||||
@ -2193,7 +2193,7 @@ oei_ripples: @ 8155054
|
|||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r0, =gFieldEffectObjectTemplatePointers
|
ldr r0, =gFieldEffectObjectTemplatePointers
|
||||||
ldr r0, [r0, 0x14]
|
ldr r0, [r0, 0x14]
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
ldrsh r1, [r4, r2]
|
ldrsh r1, [r4, r2]
|
||||||
movs r3, 0x4
|
movs r3, 0x4
|
||||||
@ -2238,7 +2238,7 @@ _081550A0:
|
|||||||
thumb_func_start sub_81550B4
|
thumb_func_start sub_81550B4
|
||||||
sub_81550B4: @ 81550B4
|
sub_81550B4: @ 81550B4
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
ldr r6, =gUnknown_02038C08
|
ldr r6, =gFieldEffectSpawnParams
|
||||||
ldrb r0, [r6]
|
ldrb r0, [r6]
|
||||||
ldrb r1, [r6, 0x4]
|
ldrb r1, [r6, 0x4]
|
||||||
ldrb r2, [r6, 0x8]
|
ldrb r2, [r6, 0x8]
|
||||||
@ -2393,7 +2393,7 @@ _081551E4:
|
|||||||
thumb_func_start sub_81551F0
|
thumb_func_start sub_81551F0
|
||||||
sub_81551F0: @ 81551F0
|
sub_81551F0: @ 81551F0
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -2445,7 +2445,7 @@ _08155248:
|
|||||||
thumb_func_start sub_815525C
|
thumb_func_start sub_815525C
|
||||||
sub_815525C: @ 815525C
|
sub_815525C: @ 815525C
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -2497,7 +2497,7 @@ _081552B4:
|
|||||||
thumb_func_start sub_81552C8
|
thumb_func_start sub_81552C8
|
||||||
sub_81552C8: @ 81552C8
|
sub_81552C8: @ 81552C8
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -2549,7 +2549,7 @@ _08155320:
|
|||||||
thumb_func_start sub_8155334
|
thumb_func_start sub_8155334
|
||||||
sub_8155334: @ 8155334
|
sub_8155334: @ 8155334
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -2603,7 +2603,7 @@ ash: @ 81553A0
|
|||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
lsls r2, 16
|
lsls r2, 16
|
||||||
lsrs r2, 16
|
lsrs r2, 16
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
lsls r0, 16
|
lsls r0, 16
|
||||||
asrs r0, 16
|
asrs r0, 16
|
||||||
str r0, [r4]
|
str r0, [r4]
|
||||||
@ -2630,7 +2630,7 @@ ash: @ 81553A0
|
|||||||
oei_ash: @ 81553D4
|
oei_ash: @ 81553D4
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
ldr r5, =gUnknown_02038C08
|
ldr r5, =gFieldEffectSpawnParams
|
||||||
ldrh r1, [r5]
|
ldrh r1, [r5]
|
||||||
mov r0, sp
|
mov r0, sp
|
||||||
strh r1, [r0]
|
strh r1, [r0]
|
||||||
@ -2766,7 +2766,7 @@ sub_81554AC: @ 81554AC
|
|||||||
ldrsh r1, [r4, r2]
|
ldrsh r1, [r4, r2]
|
||||||
bl CurrentMapDrawMetatileAt
|
bl CurrentMapDrawMetatileAt
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2809,7 +2809,7 @@ _0815552C:
|
|||||||
thumb_func_start sub_8155534
|
thumb_func_start sub_8155534
|
||||||
sub_8155534: @ 8155534
|
sub_8155534: @ 8155534
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -3261,7 +3261,7 @@ _08155888:
|
|||||||
thumb_func_start sub_8155890
|
thumb_func_start sub_8155890
|
||||||
sub_8155890: @ 8155890
|
sub_8155890: @ 8155890
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -3315,7 +3315,7 @@ _081558EC:
|
|||||||
thumb_func_start sub_8155900
|
thumb_func_start sub_8155900
|
||||||
sub_8155900: @ 8155900
|
sub_8155900: @ 8155900
|
||||||
push {r4-r7,lr}
|
push {r4-r7,lr}
|
||||||
ldr r7, =gUnknown_02038C08
|
ldr r7, =gFieldEffectSpawnParams
|
||||||
ldrb r0, [r7]
|
ldrb r0, [r7]
|
||||||
ldrb r1, [r7, 0x4]
|
ldrb r1, [r7, 0x4]
|
||||||
ldrb r2, [r7, 0x8]
|
ldrb r2, [r7, 0x8]
|
||||||
@ -3505,7 +3505,7 @@ _08155A76:
|
|||||||
thumb_func_start sub_8155A88
|
thumb_func_start sub_8155A88
|
||||||
sub_8155A88: @ 8155A88
|
sub_8155A88: @ 8155A88
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -3586,7 +3586,7 @@ _08155B20:
|
|||||||
thumb_func_start sub_8155B2C
|
thumb_func_start sub_8155B2C
|
||||||
sub_8155B2C: @ 8155B2C
|
sub_8155B2C: @ 8155B2C
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
adds r1, r4, 0x4
|
adds r1, r4, 0x4
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
movs r2, 0x8
|
movs r2, 0x8
|
||||||
@ -3689,7 +3689,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
|
|||||||
lsrs r6, r1, 24
|
lsrs r6, r1, 24
|
||||||
lsls r2, 24
|
lsls r2, 24
|
||||||
lsrs r7, r2, 24
|
lsrs r7, r2, 24
|
||||||
ldr r5, =gUnknown_02038C08
|
ldr r5, =gFieldEffectSpawnParams
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
ldrb r1, [r5, 0x4]
|
ldrb r1, [r5, 0x4]
|
||||||
ldrb r2, [r5, 0x8]
|
ldrb r2, [r5, 0x8]
|
||||||
@ -3950,7 +3950,7 @@ _08155DD8:
|
|||||||
thumb_func_start sub_8155DDC
|
thumb_func_start sub_8155DDC
|
||||||
sub_8155DDC: @ 8155DDC
|
sub_8155DDC: @ 8155DDC
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r4]
|
ldr r0, [r4]
|
||||||
adds r0, 0x7
|
adds r0, 0x7
|
||||||
str r0, [r4]
|
str r0, [r4]
|
||||||
|
|||||||
@ -1166,7 +1166,7 @@ _08096E8C:
|
|||||||
@ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
|
@ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
|
||||||
GroundEffect_SpawnOnTallGrass: @ 8096E90
|
GroundEffect_SpawnOnTallGrass: @ 8096E90
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r3, =gUnknown_02038C08
|
ldr r3, =gFieldEffectSpawnParams
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
ldrsh r1, [r0, r2]
|
ldrsh r1, [r0, r2]
|
||||||
str r1, [r3]
|
str r1, [r3]
|
||||||
@ -1205,7 +1205,7 @@ GroundEffect_SpawnOnTallGrass: @ 8096E90
|
|||||||
@ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
|
@ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
|
||||||
GroundEffect_StepOnTallGrass: @ 8096EDC
|
GroundEffect_StepOnTallGrass: @ 8096EDC
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r3, =gUnknown_02038C08
|
ldr r3, =gFieldEffectSpawnParams
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
ldrsh r1, [r0, r2]
|
ldrsh r1, [r0, r2]
|
||||||
str r1, [r3]
|
str r1, [r3]
|
||||||
@ -1244,7 +1244,7 @@ GroundEffect_StepOnTallGrass: @ 8096EDC
|
|||||||
@ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
|
@ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
|
||||||
GroundEffect_SpawnOnLongGrass: @ 8096F28
|
GroundEffect_SpawnOnLongGrass: @ 8096F28
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r3, =gUnknown_02038C08
|
ldr r3, =gFieldEffectSpawnParams
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
ldrsh r1, [r0, r2]
|
ldrsh r1, [r0, r2]
|
||||||
str r1, [r3]
|
str r1, [r3]
|
||||||
@ -1283,7 +1283,7 @@ GroundEffect_SpawnOnLongGrass: @ 8096F28
|
|||||||
@ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
|
@ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
|
||||||
GroundEffect_StepOnLongGrass: @ 8096F74
|
GroundEffect_StepOnLongGrass: @ 8096F74
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r3, =gUnknown_02038C08
|
ldr r3, =gFieldEffectSpawnParams
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
ldrsh r1, [r0, r2]
|
ldrsh r1, [r0, r2]
|
||||||
str r1, [r3]
|
str r1, [r3]
|
||||||
@ -1413,7 +1413,7 @@ DoTracksGroundEffect_Footprints: @ 8097044
|
|||||||
mov r0, sp
|
mov r0, sp
|
||||||
movs r2, 0x4
|
movs r2, 0x4
|
||||||
bl memcpy
|
bl memcpy
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r2, 0x14
|
movs r2, 0x14
|
||||||
ldrsh r0, [r5, r2]
|
ldrsh r0, [r5, r2]
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -1449,7 +1449,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8097094
|
|||||||
ldr r0, [r4, 0x14]
|
ldr r0, [r4, 0x14]
|
||||||
cmp r1, r0
|
cmp r1, r0
|
||||||
beq _080970D6
|
beq _080970D6
|
||||||
ldr r2, =gUnknown_02038C08
|
ldr r2, =gFieldEffectSpawnParams
|
||||||
movs r1, 0x14
|
movs r1, 0x14
|
||||||
ldrsh r0, [r4, r1]
|
ldrsh r0, [r4, r1]
|
||||||
str r0, [r2]
|
str r0, [r2]
|
||||||
@ -1520,7 +1520,7 @@ GroundEffect_JumpOnTallGrass: @ 8097110
|
|||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
adds r6, r1, 0
|
adds r6, r1, 0
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
ldrsh r0, [r5, r2]
|
ldrsh r0, [r5, r2]
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -1562,7 +1562,7 @@ _0809715A:
|
|||||||
@ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
|
@ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
|
||||||
GroundEffect_JumpOnLongGrass: @ 8097168
|
GroundEffect_JumpOnLongGrass: @ 8097168
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r2, =gUnknown_02038C08
|
ldr r2, =gFieldEffectSpawnParams
|
||||||
movs r3, 0x10
|
movs r3, 0x10
|
||||||
ldrsh r1, [r0, r3]
|
ldrsh r1, [r0, r3]
|
||||||
str r1, [r2]
|
str r1, [r2]
|
||||||
@ -1585,7 +1585,7 @@ GroundEffect_JumpOnLongGrass: @ 8097168
|
|||||||
@ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
|
@ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
|
||||||
GroundEffect_JumpOnShallowWater: @ 8097190
|
GroundEffect_JumpOnShallowWater: @ 8097190
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r3, =gUnknown_02038C08
|
ldr r3, =gFieldEffectSpawnParams
|
||||||
movs r4, 0x10
|
movs r4, 0x10
|
||||||
ldrsh r2, [r0, r4]
|
ldrsh r2, [r0, r4]
|
||||||
str r2, [r3]
|
str r2, [r3]
|
||||||
@ -1611,7 +1611,7 @@ GroundEffect_JumpOnShallowWater: @ 8097190
|
|||||||
@ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
|
@ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
|
||||||
GroundEffect_JumpOnWater: @ 80971C0
|
GroundEffect_JumpOnWater: @ 80971C0
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r3, =gUnknown_02038C08
|
ldr r3, =gFieldEffectSpawnParams
|
||||||
movs r4, 0x10
|
movs r4, 0x10
|
||||||
ldrsh r2, [r0, r4]
|
ldrsh r2, [r0, r4]
|
||||||
str r2, [r3]
|
str r2, [r3]
|
||||||
@ -1637,7 +1637,7 @@ GroundEffect_JumpOnWater: @ 80971C0
|
|||||||
@ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
|
@ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
|
||||||
GroundEffect_JumpLandingDust: @ 80971F0
|
GroundEffect_JumpLandingDust: @ 80971F0
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r3, =gUnknown_02038C08
|
ldr r3, =gFieldEffectSpawnParams
|
||||||
movs r4, 0x10
|
movs r4, 0x10
|
||||||
ldrsh r2, [r0, r4]
|
ldrsh r2, [r0, r4]
|
||||||
str r2, [r3]
|
str r2, [r3]
|
||||||
@ -1685,7 +1685,7 @@ GroundEffect_HotSprings: @ 8097230
|
|||||||
@ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
|
@ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
|
||||||
GroundEffect_Seaweed: @ 8097240
|
GroundEffect_Seaweed: @ 8097240
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r2, =gUnknown_02038C08
|
ldr r2, =gFieldEffectSpawnParams
|
||||||
movs r3, 0x10
|
movs r3, 0x10
|
||||||
ldrsh r1, [r0, r3]
|
ldrsh r1, [r0, r3]
|
||||||
str r1, [r2]
|
str r1, [r2]
|
||||||
|
|||||||
20270
asm/field_map_obj.s
20270
asm/field_map_obj.s
File diff suppressed because it is too large
Load Diff
@ -43,7 +43,7 @@ player_step: @ 808A9C0
|
|||||||
lsrs r7, r1, 16
|
lsrs r7, r1, 16
|
||||||
lsls r2, 16
|
lsls r2, 16
|
||||||
lsrs r6, r2, 16
|
lsrs r6, r2, 16
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
ldrb r1, [r4, 0x5]
|
ldrb r1, [r4, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -153,7 +153,7 @@ npc_clear_strange_bits: @ 808AA9C
|
|||||||
adds r2, 0x2
|
adds r2, 0x2
|
||||||
ands r1, r2
|
ands r1, r2
|
||||||
strb r1, [r0, 0x1]
|
strb r1, [r0, 0x1]
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2]
|
ldrb r1, [r2]
|
||||||
movs r0, 0x7F
|
movs r0, 0x7F
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -172,7 +172,7 @@ MovePlayerAvatarUsingKeypadInput: @ 808AAC0
|
|||||||
lsrs r4, r1, 16
|
lsrs r4, r1, 16
|
||||||
lsls r2, 16
|
lsls r2, 16
|
||||||
lsrs r2, 16
|
lsrs r2, 16
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
movs r0, 0x6
|
movs r0, 0x6
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -197,7 +197,7 @@ _0808AAF0:
|
|||||||
@ void PlayerAllowForcedMovementIfMovingSameDirection()
|
@ void PlayerAllowForcedMovementIfMovingSameDirection()
|
||||||
PlayerAllowForcedMovementIfMovingSameDirection: @ 808AAF8
|
PlayerAllowForcedMovementIfMovingSameDirection: @ 808AAF8
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r0, [r2, 0x2]
|
ldrb r0, [r2, 0x2]
|
||||||
cmp r0, 0x2
|
cmp r0, 0x2
|
||||||
bne _0808AB0A
|
bne _0808AB0A
|
||||||
@ -234,7 +234,7 @@ TryDoMetatileBehaviorForcedMovment: @ 808AB14
|
|||||||
@ u8 GetForcedMovementByMetatileBehavior()
|
@ u8 GetForcedMovementByMetatileBehavior()
|
||||||
GetForcedMovementByMetatileBehavior: @ 808AB38
|
GetForcedMovementByMetatileBehavior: @ 808AB38
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
ldr r3, =gUnknown_02037590
|
ldr r3, =gPlayerAvatar
|
||||||
ldrb r1, [r3]
|
ldrb r1, [r3]
|
||||||
movs r0, 0x20
|
movs r0, 0x20
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -280,7 +280,7 @@ _0808AB8C:
|
|||||||
thumb_func_start ForcedMovement_None
|
thumb_func_start ForcedMovement_None
|
||||||
ForcedMovement_None: @ 808AB94
|
ForcedMovement_None: @ 808AB94
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
ldrb r1, [r4]
|
ldrb r1, [r4]
|
||||||
movs r0, 0x40
|
movs r0, 0x40
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -325,7 +325,7 @@ DoForcedMovement: @ 808ABE0
|
|||||||
mov r9, r1
|
mov r9, r1
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
adds r0, r5, 0
|
adds r0, r5, 0
|
||||||
bl CheckForPlayerAvatarCollision
|
bl CheckForPlayerAvatarCollision
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
@ -381,7 +381,7 @@ _0808AC48:
|
|||||||
DoForcedMovementInCurrentDirection: @ 808AC58
|
DoForcedMovementInCurrentDirection: @ 808AC58
|
||||||
push {lr}
|
push {lr}
|
||||||
adds r1, r0, 0
|
adds r1, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r2, [r0, 0x5]
|
ldrb r2, [r0, 0x5]
|
||||||
lsls r0, r2, 3
|
lsls r0, r2, 3
|
||||||
adds r0, r2
|
adds r0, r2
|
||||||
@ -523,7 +523,7 @@ ForcedMovement_Slide: @ 808AD60
|
|||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r3, [r2, 0x5]
|
ldrb r3, [r2, 0x5]
|
||||||
lsls r2, r3, 3
|
lsls r2, r3, 3
|
||||||
adds r2, r3
|
adds r2, r3
|
||||||
@ -618,7 +618,7 @@ ForcedMovement_0xBC: @ 808AE04
|
|||||||
thumb_func_start ForcedMovement_MuddySlope
|
thumb_func_start ForcedMovement_MuddySlope
|
||||||
ForcedMovement_MuddySlope: @ 808AE10
|
ForcedMovement_MuddySlope: @ 808AE10
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -691,7 +691,7 @@ CheckMovementInputNotOnBike: @ 808AE98
|
|||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
cmp r4, 0
|
cmp r4, 0
|
||||||
bne _0808AEB0
|
bne _0808AEB0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
strb r4, [r0, 0x2]
|
strb r4, [r0, 0x2]
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
b _0808AED2
|
b _0808AED2
|
||||||
@ -702,7 +702,7 @@ _0808AEB0:
|
|||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
cmp r4, r0
|
cmp r4, r0
|
||||||
beq _0808AECC
|
beq _0808AECC
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r0, [r1, 0x2]
|
ldrb r0, [r1, 0x2]
|
||||||
cmp r0, 0x2
|
cmp r0, 0x2
|
||||||
beq _0808AECC
|
beq _0808AECC
|
||||||
@ -710,7 +710,7 @@ _0808AEB0:
|
|||||||
b _0808AED0
|
b _0808AED0
|
||||||
.pool
|
.pool
|
||||||
_0808AECC:
|
_0808AECC:
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x2
|
movs r0, 0x2
|
||||||
_0808AED0:
|
_0808AED0:
|
||||||
strb r0, [r1, 0x2]
|
strb r0, [r1, 0x2]
|
||||||
@ -784,7 +784,7 @@ _0808AF3C:
|
|||||||
bl PlayerNotOnBikeCollide
|
bl PlayerNotOnBikeCollide
|
||||||
b _0808AFB6
|
b _0808AFB6
|
||||||
_0808AF4E:
|
_0808AF4E:
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
ldrb r1, [r4]
|
ldrb r1, [r4]
|
||||||
movs r0, 0x8
|
movs r0, 0x8
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -843,7 +843,7 @@ CheckForPlayerAvatarCollision: @ 808AFBC
|
|||||||
adds r6, r0, 0
|
adds r6, r0, 0
|
||||||
lsls r6, 24
|
lsls r6, 24
|
||||||
lsrs r6, 24
|
lsrs r6, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -894,7 +894,7 @@ sub_808B028: @ 808B028
|
|||||||
adds r6, r0, 0
|
adds r6, r0, 0
|
||||||
lsls r6, 24
|
lsls r6, 24
|
||||||
lsrs r6, 24
|
lsrs r6, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -1102,7 +1102,7 @@ sub_808B1BC: @ 808B1BC
|
|||||||
lsrs r4, r1, 16
|
lsrs r4, r1, 16
|
||||||
lsls r2, 24
|
lsls r2, 24
|
||||||
lsrs r6, r2, 24
|
lsrs r6, r2, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
movs r0, 0x8
|
movs r0, 0x8
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -1285,7 +1285,7 @@ IsPlayerCollidingWithFarawayIslandMew: @ 808B324
|
|||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r2, [r1, 0x5]
|
ldrb r2, [r1, 0x5]
|
||||||
lsls r1, r2, 3
|
lsls r1, r2, 3
|
||||||
adds r1, r2
|
adds r1, r2
|
||||||
@ -1369,7 +1369,7 @@ SetPlayerAvatarTransitionFlags: @ 808B3CC
|
|||||||
push {lr}
|
push {lr}
|
||||||
lsls r0, 16
|
lsls r0, 16
|
||||||
lsrs r0, 16
|
lsrs r0, 16
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2, 0x1]
|
ldrb r1, [r2, 0x1]
|
||||||
orrs r0, r1
|
orrs r0, r1
|
||||||
strb r0, [r2, 0x1]
|
strb r0, [r2, 0x1]
|
||||||
@ -1383,7 +1383,7 @@ SetPlayerAvatarTransitionFlags: @ 808B3CC
|
|||||||
@ void DoPlayerAvatarTransition()
|
@ void DoPlayerAvatarTransition()
|
||||||
DoPlayerAvatarTransition: @ 808B3E8
|
DoPlayerAvatarTransition: @ 808B3E8
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r4, [r0, 0x1]
|
ldrb r4, [r0, 0x1]
|
||||||
cmp r4, 0
|
cmp r4, 0
|
||||||
beq _0808B428
|
beq _0808B428
|
||||||
@ -1396,7 +1396,7 @@ _0808B3F4:
|
|||||||
ldr r0, =gUnknown_084974B8
|
ldr r0, =gUnknown_084974B8
|
||||||
lsls r2, r5, 2
|
lsls r2, r5, 2
|
||||||
adds r2, r0
|
adds r2, r0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1412,7 +1412,7 @@ _0808B416:
|
|||||||
lsrs r4, 1
|
lsrs r4, 1
|
||||||
cmp r5, 0x7
|
cmp r5, 0x7
|
||||||
bls _0808B3F4
|
bls _0808B3F4
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r1, 0x1]
|
strb r0, [r1, 0x1]
|
||||||
_0808B428:
|
_0808B428:
|
||||||
@ -1522,14 +1522,14 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
|
|||||||
bl FieldObjectTurn
|
bl FieldObjectTurn
|
||||||
movs r0, 0x8
|
movs r0, 0x8
|
||||||
bl SetPlayerAvatarStateMask
|
bl SetPlayerAvatarStateMask
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
ldrsh r0, [r4, r2]
|
ldrsh r0, [r4, r2]
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
movs r2, 0x12
|
movs r2, 0x12
|
||||||
ldrsh r0, [r4, r2]
|
ldrsh r0, [r4, r2]
|
||||||
str r0, [r1, 0x4]
|
str r0, [r1, 0x4]
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
str r0, [r1, 0x8]
|
str r0, [r1, 0x8]
|
||||||
movs r0, 0x8
|
movs r0, 0x8
|
||||||
@ -1574,7 +1574,7 @@ PlayerAvatarTransition_Underwater: @ 808B534
|
|||||||
thumb_func_start PlayerAvatarTransition_ReturnToField
|
thumb_func_start PlayerAvatarTransition_ReturnToField
|
||||||
@ void PlayerAvatarTransition_ReturnToField(struct npc_state *fieldObject)
|
@ void PlayerAvatarTransition_ReturnToField(struct npc_state *fieldObject)
|
||||||
PlayerAvatarTransition_ReturnToField: @ 808B568
|
PlayerAvatarTransition_ReturnToField: @ 808B568
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2]
|
ldrb r1, [r2]
|
||||||
movs r0, 0x20
|
movs r0, 0x20
|
||||||
orrs r0, r1
|
orrs r0, r1
|
||||||
@ -1586,7 +1586,7 @@ PlayerAvatarTransition_ReturnToField: @ 808B568
|
|||||||
thumb_func_start sub_808B578
|
thumb_func_start sub_808B578
|
||||||
sub_808B578: @ 808B578
|
sub_808B578: @ 808B578
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r4, 0x3]
|
strb r0, [r4, 0x3]
|
||||||
bl PlayerIsAnimActive
|
bl PlayerIsAnimActive
|
||||||
@ -1622,7 +1622,7 @@ _0808B5B6:
|
|||||||
player_is_anim_in_certain_ranges: @ 808B5BC
|
player_is_anim_in_certain_ranges: @ 808B5BC
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1673,7 +1673,7 @@ sub_808B618: @ 808B618
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _0808B634
|
beq _0808B634
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x2]
|
ldrb r0, [r0, 0x2]
|
||||||
cmp r0, 0x1
|
cmp r0, 0x1
|
||||||
beq _0808B634
|
beq _0808B634
|
||||||
@ -1691,7 +1691,7 @@ _0808B636:
|
|||||||
@ bool8 PlayerIsAnimActive()
|
@ bool8 PlayerIsAnimActive()
|
||||||
PlayerIsAnimActive: @ 808B63C
|
PlayerIsAnimActive: @ 808B63C
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1710,7 +1710,7 @@ PlayerIsAnimActive: @ 808B63C
|
|||||||
@ bool8 PlayerCheckIfAnimFinishedOrInactive()
|
@ bool8 PlayerCheckIfAnimFinishedOrInactive()
|
||||||
PlayerCheckIfAnimFinishedOrInactive: @ 808B660
|
PlayerCheckIfAnimFinishedOrInactive: @ 808B660
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1728,7 +1728,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660
|
|||||||
thumb_func_start player_set_x22
|
thumb_func_start player_set_x22
|
||||||
player_set_x22: @ 808B684
|
player_set_x22: @ 808B684
|
||||||
ldr r3, =gMapObjects
|
ldr r3, =gMapObjects
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r2, [r1, 0x5]
|
ldrb r2, [r1, 0x5]
|
||||||
lsls r1, r2, 3
|
lsls r1, r2, 3
|
||||||
adds r1, r2
|
adds r1, r2
|
||||||
@ -1743,7 +1743,7 @@ player_set_x22: @ 808B684
|
|||||||
thumb_func_start player_get_x22
|
thumb_func_start player_get_x22
|
||||||
player_get_x22: @ 808B6A0
|
player_get_x22: @ 808B6A0
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1761,7 +1761,7 @@ sub_808B6BC: @ 808B6BC
|
|||||||
adds r1, r0, 0
|
adds r1, r0, 0
|
||||||
lsls r1, 24
|
lsls r1, 24
|
||||||
lsrs r1, 24
|
lsrs r1, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r2, [r0, 0x5]
|
ldrb r2, [r0, 0x5]
|
||||||
lsls r0, r2, 3
|
lsls r0, r2, 3
|
||||||
adds r0, r2
|
adds r0, r2
|
||||||
@ -1788,7 +1788,7 @@ player_npc_set_state_and_x22_etc: @ 808B6E4
|
|||||||
bne _0808B712
|
bne _0808B712
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
bl player_set_x22
|
bl player_set_x22
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2002,7 +2002,7 @@ PlayerJumpLedge: @ 808B840
|
|||||||
thumb_func_start sub_808B864
|
thumb_func_start sub_808B864
|
||||||
sub_808B864: @ 808B864
|
sub_808B864: @ 808B864
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
ldrb r0, [r4, 0x3]
|
ldrb r0, [r4, 0x3]
|
||||||
cmp r0, 0x2
|
cmp r0, 0x2
|
||||||
beq _0808B872
|
beq _0808B872
|
||||||
@ -2220,7 +2220,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2276,7 +2276,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
|
|||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
adds r5, r1, 0
|
adds r5, r1, 0
|
||||||
ldr r3, =gMapObjects
|
ldr r3, =gMapObjects
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2, 0x5]
|
ldrb r1, [r2, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2308,7 +2308,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
|
|||||||
PlayerGetDestCoords: @ 808BAAC
|
PlayerGetDestCoords: @ 808BAAC
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
ldr r5, =gMapObjects
|
ldr r5, =gMapObjects
|
||||||
ldr r4, =gUnknown_02037590
|
ldr r4, =gPlayerAvatar
|
||||||
ldrb r3, [r4, 0x5]
|
ldrb r3, [r4, 0x5]
|
||||||
lsls r2, r3, 3
|
lsls r2, r3, 3
|
||||||
adds r2, r3
|
adds r2, r3
|
||||||
@ -2334,7 +2334,7 @@ plaer_get_pos_including_state_based_drift: @ 808BADC
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
adds r5, r1, 0
|
adds r5, r1, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2466,7 +2466,7 @@ _0808BC30:
|
|||||||
@ u8 player_get_direction_lower_nybble()
|
@ u8 player_get_direction_lower_nybble()
|
||||||
player_get_direction_lower_nybble: @ 808BC38
|
player_get_direction_lower_nybble: @ 808BC38
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2483,7 +2483,7 @@ player_get_direction_lower_nybble: @ 808BC38
|
|||||||
@ u8 player_get_direction_upper_nybble()
|
@ u8 player_get_direction_upper_nybble()
|
||||||
player_get_direction_upper_nybble: @ 808BC58
|
player_get_direction_upper_nybble: @ 808BC58
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2499,7 +2499,7 @@ player_get_direction_upper_nybble: @ 808BC58
|
|||||||
@ u8 PlayerGetZCoord()
|
@ u8 PlayerGetZCoord()
|
||||||
PlayerGetZCoord: @ 808BC74
|
PlayerGetZCoord: @ 808BC74
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2516,7 +2516,7 @@ sub_808BC90: @ 808BC90
|
|||||||
push {lr}
|
push {lr}
|
||||||
adds r3, r0, 0
|
adds r3, r0, 0
|
||||||
adds r2, r1, 0
|
adds r2, r1, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2537,7 +2537,7 @@ sub_808BC90: @ 808BC90
|
|||||||
thumb_func_start TestPlayerAvatarFlags
|
thumb_func_start TestPlayerAvatarFlags
|
||||||
@ u32 TestPlayerAvatarFlags(u32 mask)
|
@ u32 TestPlayerAvatarFlags(u32 mask)
|
||||||
TestPlayerAvatarFlags: @ 808BCC0
|
TestPlayerAvatarFlags: @ 808BCC0
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r1, [r1]
|
ldrb r1, [r1]
|
||||||
ands r1, r0
|
ands r1, r0
|
||||||
adds r0, r1, 0
|
adds r0, r1, 0
|
||||||
@ -2547,7 +2547,7 @@ TestPlayerAvatarFlags: @ 808BCC0
|
|||||||
|
|
||||||
thumb_func_start sub_808BCD0
|
thumb_func_start sub_808BCD0
|
||||||
sub_808BCD0: @ 808BCD0
|
sub_808BCD0: @ 808BCD0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
bx lr
|
bx lr
|
||||||
.pool
|
.pool
|
||||||
@ -2556,7 +2556,7 @@ sub_808BCD0: @ 808BCD0
|
|||||||
thumb_func_start GetPlayerAvatarObjectId
|
thumb_func_start GetPlayerAvatarObjectId
|
||||||
@ u8 GetPlayerAvatarObjectId()
|
@ u8 GetPlayerAvatarObjectId()
|
||||||
GetPlayerAvatarObjectId: @ 808BCDC
|
GetPlayerAvatarObjectId: @ 808BCDC
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x4]
|
ldrb r0, [r0, 0x4]
|
||||||
bx lr
|
bx lr
|
||||||
.pool
|
.pool
|
||||||
@ -2573,7 +2573,7 @@ sub_808BCE8: @ 808BCE8
|
|||||||
thumb_func_start sub_808BCF4
|
thumb_func_start sub_808BCF4
|
||||||
sub_808BCF4: @ 808BCF4
|
sub_808BCF4: @ 808BCF4
|
||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -2659,7 +2659,7 @@ GetPlayerAvatarGraphicsIdByStateId: @ 808BD8C
|
|||||||
push {lr}
|
push {lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r1, [r1, 0x7]
|
ldrb r1, [r1, 0x7]
|
||||||
bl GetPlayerAvatarGraphicsIdByStateIdAndGender
|
bl GetPlayerAvatarGraphicsIdByStateIdAndGender
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
@ -2804,7 +2804,7 @@ _0808BE70:
|
|||||||
IsPlayerFacingSurfableFishableWater: @ 808BE74
|
IsPlayerFacingSurfableFishableWater: @ 808BE74
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -2871,7 +2871,7 @@ _0808BEF6:
|
|||||||
@ void ClearPlayerAvatarInfo()
|
@ void ClearPlayerAvatarInfo()
|
||||||
ClearPlayerAvatarInfo: @ 808BF00
|
ClearPlayerAvatarInfo: @ 808BF00
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
movs r1, 0
|
movs r1, 0
|
||||||
movs r2, 0x24
|
movs r2, 0x24
|
||||||
bl memset
|
bl memset
|
||||||
@ -2885,7 +2885,7 @@ ClearPlayerAvatarInfo: @ 808BF00
|
|||||||
SetPlayerAvatarStateMask: @ 808BF14
|
SetPlayerAvatarStateMask: @ 808BF14
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r3, =gUnknown_02037590
|
ldr r3, =gPlayerAvatar
|
||||||
ldrb r2, [r3]
|
ldrb r2, [r3]
|
||||||
movs r1, 0xE0
|
movs r1, 0xE0
|
||||||
ands r1, r2
|
ands r1, r2
|
||||||
@ -2937,7 +2937,7 @@ _0808BF64:
|
|||||||
@ u8 GetPlayerAvatarGraphicsIdByCurrentState()
|
@ u8 GetPlayerAvatarGraphicsIdByCurrentState()
|
||||||
GetPlayerAvatarGraphicsIdByCurrentState: @ 808BF6C
|
GetPlayerAvatarGraphicsIdByCurrentState: @ 808BF6C
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r5, [r0]
|
ldrb r5, [r0]
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
ldr r3, =gUnknown_0849750C
|
ldr r3, =gUnknown_0849750C
|
||||||
@ -2980,7 +2980,7 @@ SetPlayerAvatarExtraStateTransition: @ 808BFB0
|
|||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
lsls r4, 24
|
lsls r4, 24
|
||||||
lsrs r4, 24
|
lsrs r4, 24
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
ldrb r1, [r5, 0x7]
|
ldrb r1, [r5, 0x7]
|
||||||
bl GetPlayerAvatarStateTransitionByGraphicsId
|
bl GetPlayerAvatarStateTransitionByGraphicsId
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
@ -3072,7 +3072,7 @@ InitPlayerAvatar: @ 808BFE0
|
|||||||
mov r1, r9
|
mov r1, r9
|
||||||
bl FieldObjectTurn
|
bl FieldObjectTurn
|
||||||
bl ClearPlayerAvatarInfo
|
bl ClearPlayerAvatarInfo
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
strb r6, [r0, 0x2]
|
strb r6, [r0, 0x2]
|
||||||
strb r6, [r0, 0x3]
|
strb r6, [r0, 0x3]
|
||||||
strb r5, [r0, 0x5]
|
strb r5, [r0, 0x5]
|
||||||
@ -3098,7 +3098,7 @@ sub_808C0A8: @ 808C0A8
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r6, =gMapObjects
|
ldr r6, =gMapObjects
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
ldrb r0, [r5, 0x5]
|
ldrb r0, [r5, 0x5]
|
||||||
lsls r1, r0, 3
|
lsls r1, r0, 3
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
@ -3147,7 +3147,7 @@ _0808C100:
|
|||||||
thumb_func_start sub_808C114
|
thumb_func_start sub_808C114
|
||||||
sub_808C114: @ 808C114
|
sub_808C114: @ 808C114
|
||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
ldrb r0, [r5, 0x5]
|
ldrb r0, [r5, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -3181,7 +3181,7 @@ sub_808C15C: @ 808C15C
|
|||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
lsls r5, 24
|
lsls r5, 24
|
||||||
lsrs r5, 24
|
lsrs r5, 24
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r0, [r6, 0x5]
|
ldrb r0, [r6, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -3222,7 +3222,7 @@ sub_808C1B4: @ 808C1B4
|
|||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
lsls r5, 24
|
lsls r5, 24
|
||||||
lsrs r5, 24
|
lsrs r5, 24
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r0, [r6, 0x5]
|
ldrb r0, [r6, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -3271,7 +3271,7 @@ sub_808C228: @ 808C228
|
|||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
lsls r5, 24
|
lsls r5, 24
|
||||||
lsrs r5, 24
|
lsrs r5, 24
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r0, [r6, 0x5]
|
ldrb r0, [r6, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -3424,7 +3424,7 @@ _0808C360:
|
|||||||
ldrsh r3, [r4, r0]
|
ldrsh r3, [r4, r0]
|
||||||
lsls r3, 2
|
lsls r3, 2
|
||||||
adds r3, r6
|
adds r3, r6
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r1, r0, 3
|
lsls r1, r0, 3
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
@ -3453,7 +3453,7 @@ sub_808C3A4: @ 808C3A4
|
|||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
bl ScriptContext2_Enable
|
bl ScriptContext2_Enable
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
ldrh r0, [r4, 0x8]
|
ldrh r0, [r4, 0x8]
|
||||||
@ -3517,7 +3517,7 @@ _0808C3F0:
|
|||||||
lsrs r1, 24
|
lsrs r1, 24
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
bl FieldObjectSetSpecialAnim
|
bl FieldObjectSetSpecialAnim
|
||||||
ldr r2, =gUnknown_02038C08
|
ldr r2, =gFieldEffectSpawnParams
|
||||||
movs r1, 0x10
|
movs r1, 0x10
|
||||||
ldrsh r0, [r4, r1]
|
ldrsh r0, [r4, r1]
|
||||||
str r0, [r2]
|
str r0, [r2]
|
||||||
@ -3571,7 +3571,7 @@ sub_808C484: @ 808C484
|
|||||||
bl FieldObjectClearAnimIfSpecialAnimFinished
|
bl FieldObjectClearAnimIfSpecialAnimFinished
|
||||||
adds r0, r5, 0
|
adds r0, r5, 0
|
||||||
bl FieldObjectClearAnimIfSpecialAnimFinished
|
bl FieldObjectClearAnimIfSpecialAnimFinished
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
bl ScriptContext2_Disable
|
bl ScriptContext2_Disable
|
||||||
@ -3620,7 +3620,7 @@ _0808C50A:
|
|||||||
ldrsh r2, [r4, r0]
|
ldrsh r2, [r4, r0]
|
||||||
lsls r2, 2
|
lsls r2, 2
|
||||||
adds r2, r5
|
adds r2, r5
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r1, r0, 3
|
lsls r1, r0, 3
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
@ -3644,7 +3644,7 @@ sub_808C544: @ 808C544
|
|||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
adds r6, r0, 0
|
adds r6, r0, 0
|
||||||
adds r4, r1, 0
|
adds r4, r1, 0
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
strb r0, [r5, 0x6]
|
strb r0, [r5, 0x6]
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
@ -3721,7 +3721,7 @@ _0808C5E2:
|
|||||||
ldrsh r2, [r4, r0]
|
ldrsh r2, [r4, r0]
|
||||||
lsls r2, 2
|
lsls r2, 2
|
||||||
adds r2, r5
|
adds r2, r5
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r1, r0, 3
|
lsls r1, r0, 3
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
@ -3749,7 +3749,7 @@ sub_808C61C: @ 808C61C
|
|||||||
ldrb r1, [r1, 0x18]
|
ldrb r1, [r1, 0x18]
|
||||||
lsrs r1, 4
|
lsrs r1, 4
|
||||||
strh r1, [r0, 0xA]
|
strh r1, [r0, 0xA]
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
bl ScriptContext2_Enable
|
bl ScriptContext2_Enable
|
||||||
@ -3873,7 +3873,7 @@ sub_808C6FC: @ 808C6FC
|
|||||||
adds r0, r5, 0
|
adds r0, r5, 0
|
||||||
bl FieldObjectSetSpecialAnim
|
bl FieldObjectSetSpecialAnim
|
||||||
bl ScriptContext2_Disable
|
bl ScriptContext2_Disable
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
ldr r0, =sub_808C5D0
|
ldr r0, =sub_808C5D0
|
||||||
@ -3898,7 +3898,7 @@ sub_808C750: @ 808C750
|
|||||||
bl ScriptContext2_Enable
|
bl ScriptContext2_Enable
|
||||||
bl sav1_reset_battle_music_maybe
|
bl sav1_reset_battle_music_maybe
|
||||||
bl sub_8085898
|
bl sub_8085898
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2]
|
ldrb r1, [r2]
|
||||||
movs r0, 0xF7
|
movs r0, 0xF7
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -3931,7 +3931,7 @@ taskFF_0805D1D4: @ 808C7A8
|
|||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r6, r0, 24
|
lsrs r6, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -3978,7 +3978,7 @@ sub_808C814: @ 808C814
|
|||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
ldr r6, =gUnknown_02037590
|
ldr r6, =gPlayerAvatar
|
||||||
ldrb r1, [r6, 0x5]
|
ldrb r1, [r6, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -4083,7 +4083,7 @@ fish0: @ 808C8F8
|
|||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
bl ScriptContext2_Enable
|
bl ScriptContext2_Enable
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
ldrh r0, [r4, 0x8]
|
ldrh r0, [r4, 0x8]
|
||||||
@ -4128,7 +4128,7 @@ fish1: @ 808C918
|
|||||||
adds r1, r0
|
adds r1, r0
|
||||||
strh r1, [r5, 0x22]
|
strh r1, [r5, 0x22]
|
||||||
ldr r3, =gMapObjects
|
ldr r3, =gMapObjects
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2, 0x5]
|
ldrb r1, [r2, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -4366,7 +4366,7 @@ _0808CB30:
|
|||||||
_0808CB32:
|
_0808CB32:
|
||||||
cmp r6, 0x1
|
cmp r6, 0x1
|
||||||
bne _0808CB5C
|
bne _0808CB5C
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x4]
|
ldrb r0, [r0, 0x4]
|
||||||
lsls r4, r0, 4
|
lsls r4, r0, 4
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -4574,7 +4574,7 @@ _0808CCBC:
|
|||||||
lsrs r6, r0, 16
|
lsrs r6, r0, 16
|
||||||
cmp r6, 0
|
cmp r6, 0
|
||||||
bne _0808CD50
|
bne _0808CD50
|
||||||
ldr r7, =gUnknown_02037590
|
ldr r7, =gPlayerAvatar
|
||||||
ldrb r0, [r7, 0x5]
|
ldrb r0, [r7, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -4633,7 +4633,7 @@ _0808CD50:
|
|||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _0808CD80
|
beq _0808CD80
|
||||||
_0808CD58:
|
_0808CD58:
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
bl ScriptContext2_Disable
|
bl ScriptContext2_Disable
|
||||||
@ -4664,7 +4664,7 @@ fishB: @ 808CD94
|
|||||||
sub sp, 0x10
|
sub sp, 0x10
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
bl sub_808CF78
|
bl sub_808CF78
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x4]
|
ldrb r0, [r0, 0x4]
|
||||||
lsls r4, r0, 4
|
lsls r4, r0, 4
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -4712,7 +4712,7 @@ fishC: @ 808CE04
|
|||||||
sub sp, 0x10
|
sub sp, 0x10
|
||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
bl sub_808CF78
|
bl sub_808CF78
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x4]
|
ldrb r0, [r0, 0x4]
|
||||||
lsls r4, r0, 4
|
lsls r4, r0, 4
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -4777,7 +4777,7 @@ fishE: @ 808CE8C
|
|||||||
adds r6, r0, 0
|
adds r6, r0, 0
|
||||||
bl sub_808CF78
|
bl sub_808CF78
|
||||||
ldr r7, =gSprites
|
ldr r7, =gSprites
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
ldrb r0, [r5, 0x4]
|
ldrb r0, [r5, 0x4]
|
||||||
lsls r1, r0, 4
|
lsls r1, r0, 4
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
@ -4855,7 +4855,7 @@ fishF: @ 808CF2C
|
|||||||
lsrs r1, r0, 16
|
lsrs r1, r0, 16
|
||||||
cmp r1, 0
|
cmp r1, 0
|
||||||
bne _0808CF68
|
bne _0808CF68
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
strb r1, [r0, 0x6]
|
strb r1, [r0, 0x6]
|
||||||
bl ScriptContext2_Disable
|
bl ScriptContext2_Disable
|
||||||
bl sub_809757C
|
bl sub_809757C
|
||||||
@ -4879,7 +4879,7 @@ _0808CF68:
|
|||||||
thumb_func_start sub_808CF78
|
thumb_func_start sub_808CF78
|
||||||
sub_808CF78: @ 808CF78
|
sub_808CF78: @ 808CF78
|
||||||
push {r4-r7,lr}
|
push {r4-r7,lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x4]
|
ldrb r1, [r0, 0x4]
|
||||||
lsls r0, r1, 4
|
lsls r0, r1, 4
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -4978,7 +4978,7 @@ _0808D02A:
|
|||||||
movs r0, 0x8
|
movs r0, 0x8
|
||||||
strh r0, [r4, 0x26]
|
strh r0, [r4, 0x26]
|
||||||
_0808D03A:
|
_0808D03A:
|
||||||
ldr r3, =gUnknown_02037590
|
ldr r3, =gPlayerAvatar
|
||||||
ldrb r1, [r3]
|
ldrb r1, [r3]
|
||||||
movs r0, 0x8
|
movs r0, 0x8
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
@ -5032,7 +5032,7 @@ sub_808D094: @ 808D094
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
adds r2, r0, 0
|
adds r2, r0, 0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -5212,7 +5212,7 @@ sub_808D1FC: @ 808D1FC
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
mov r8, r0
|
mov r8, r0
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
|
|||||||
@ -1858,7 +1858,7 @@ _0809E6F8:
|
|||||||
cmp r6, 0xD
|
cmp r6, 0xD
|
||||||
ble _0809E6F8
|
ble _0809E6F8
|
||||||
_0809E708:
|
_0809E708:
|
||||||
ldr r2, =gUnknown_02037334
|
ldr r2, =gCamera
|
||||||
ldrb r1, [r2]
|
ldrb r1, [r2]
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
|
|||||||
@ -1508,12 +1508,12 @@ CameraMove: @ 808887C
|
|||||||
push {r5-r7}
|
push {r5-r7}
|
||||||
mov r10, r0
|
mov r10, r0
|
||||||
mov r9, r1
|
mov r9, r1
|
||||||
ldr r1, =gUnknown_02037334
|
ldr r1, =gCamera
|
||||||
ldrb r0, [r1]
|
ldrb r0, [r1]
|
||||||
movs r1, 0x2
|
movs r1, 0x2
|
||||||
negs r1, r1
|
negs r1, r1
|
||||||
ands r1, r0
|
ands r1, r0
|
||||||
ldr r2, =gUnknown_02037334
|
ldr r2, =gCamera
|
||||||
strb r1, [r2]
|
strb r1, [r2]
|
||||||
mov r0, r10
|
mov r0, r10
|
||||||
mov r1, r9
|
mov r1, r9
|
||||||
@ -1556,23 +1556,23 @@ _080888C4:
|
|||||||
ldrb r0, [r4, 0x8]
|
ldrb r0, [r4, 0x8]
|
||||||
ldrb r1, [r4, 0x9]
|
ldrb r1, [r4, 0x9]
|
||||||
bl mliX_load_map
|
bl mliX_load_map
|
||||||
ldr r1, =gUnknown_02037334
|
ldr r1, =gCamera
|
||||||
ldrb r0, [r1]
|
ldrb r0, [r1]
|
||||||
movs r1, 0x1
|
movs r1, 0x1
|
||||||
orrs r0, r1
|
orrs r0, r1
|
||||||
ldr r2, =gUnknown_02037334
|
ldr r2, =gCamera
|
||||||
strb r0, [r2]
|
strb r0, [r2]
|
||||||
ldr r0, =gSaveBlock1Ptr
|
ldr r0, =gSaveBlock1Ptr
|
||||||
ldr r1, [r0]
|
ldr r1, [r0]
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
ldrsh r0, [r1, r2]
|
ldrsh r0, [r1, r2]
|
||||||
subs r5, r0
|
subs r5, r0
|
||||||
ldr r0, =gUnknown_02037334
|
ldr r0, =gCamera
|
||||||
str r5, [r0, 0x4]
|
str r5, [r0, 0x4]
|
||||||
movs r2, 0x2
|
movs r2, 0x2
|
||||||
ldrsh r0, [r1, r2]
|
ldrsh r0, [r1, r2]
|
||||||
subs r6, r0
|
subs r6, r0
|
||||||
ldr r0, =gUnknown_02037334
|
ldr r0, =gCamera
|
||||||
str r6, [r0, 0x8]
|
str r6, [r0, 0x8]
|
||||||
ldrh r0, [r1]
|
ldrh r0, [r1]
|
||||||
add r0, r10
|
add r0, r10
|
||||||
@ -1583,7 +1583,7 @@ _080888C4:
|
|||||||
mov r0, r8
|
mov r0, r8
|
||||||
bl sub_80885C4
|
bl sub_80885C4
|
||||||
_08088932:
|
_08088932:
|
||||||
ldr r0, =gUnknown_02037334
|
ldr r0, =gCamera
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
lsls r0, 31
|
lsls r0, 31
|
||||||
lsrs r0, 31
|
lsrs r0, 31
|
||||||
|
|||||||
@ -480,13 +480,13 @@ sub_80F9F5C: @ 80F9F5C
|
|||||||
thumb_func_start sub_80F9F78
|
thumb_func_start sub_80F9F78
|
||||||
sub_80F9F78: @ 80F9F78
|
sub_80F9F78: @ 80F9F78
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
movs r0, 0x6
|
movs r0, 0x6
|
||||||
ands r0, r1
|
ands r0, r1
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080F9FC0
|
beq _080F9FC0
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r1, 0x4]
|
ldr r0, [r1, 0x4]
|
||||||
cmp r0, 0x2
|
cmp r0, 0x2
|
||||||
beq _080F9FAE
|
beq _080F9FAE
|
||||||
@ -517,7 +517,7 @@ _080F9FB6:
|
|||||||
movs r0, 0x18
|
movs r0, 0x18
|
||||||
b _080F9FFC
|
b _080F9FFC
|
||||||
_080F9FC0:
|
_080F9FC0:
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r1, 0x4]
|
ldr r0, [r1, 0x4]
|
||||||
cmp r0, 0x2
|
cmp r0, 0x2
|
||||||
beq _080F9FEA
|
beq _080F9FEA
|
||||||
@ -643,7 +643,7 @@ _080FA0C4:
|
|||||||
sub_80FA0DC: @ 80FA0DC
|
sub_80FA0DC: @ 80FA0DC
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -692,7 +692,7 @@ sub_80FA13C: @ 80FA13C
|
|||||||
bl sub_80F9F78
|
bl sub_80F9F78
|
||||||
ldr r0, =gUnknown_0858E600
|
ldr r0, =gUnknown_0858E600
|
||||||
ldr r3, =gSprites
|
ldr r3, =gSprites
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r1, [r1, 0x4]
|
ldrb r1, [r1, 0x4]
|
||||||
lsls r2, r1, 4
|
lsls r2, r1, 4
|
||||||
adds r2, r1
|
adds r2, r1
|
||||||
@ -701,7 +701,7 @@ sub_80FA13C: @ 80FA13C
|
|||||||
ldrh r1, [r2, 0x2]
|
ldrh r1, [r2, 0x2]
|
||||||
lsls r1, 23
|
lsls r1, 23
|
||||||
lsrs r1, 23
|
lsrs r1, 23
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
ldr r3, [r4, 0x14]
|
ldr r3, [r4, 0x14]
|
||||||
adds r1, r3
|
adds r1, r3
|
||||||
lsls r1, 16
|
lsls r1, 16
|
||||||
@ -778,7 +778,7 @@ sub_80FA1D8: @ 80FA1D8
|
|||||||
sub_80FA1E8: @ 80FA1E8
|
sub_80FA1E8: @ 80FA1E8
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -836,20 +836,20 @@ sub_80FA248: @ 80FA248
|
|||||||
ands r2, r0
|
ands r2, r0
|
||||||
cmp r2, 0x96
|
cmp r2, 0x96
|
||||||
bne _080FA26A
|
bne _080FA26A
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
str r0, [r1, 0x1C]
|
str r0, [r1, 0x1C]
|
||||||
_080FA26A:
|
_080FA26A:
|
||||||
cmp r2, 0x9C
|
cmp r2, 0x9C
|
||||||
bne _080FA274
|
bne _080FA274
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
movs r0, 0x2
|
movs r0, 0x2
|
||||||
str r0, [r1, 0x1C]
|
str r0, [r1, 0x1C]
|
||||||
_080FA274:
|
_080FA274:
|
||||||
bl sub_80F9F78
|
bl sub_80F9F78
|
||||||
ldr r0, =gUnknown_0858E618
|
ldr r0, =gUnknown_0858E618
|
||||||
ldr r3, =gSprites
|
ldr r3, =gSprites
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r1, [r1, 0x4]
|
ldrb r1, [r1, 0x4]
|
||||||
lsls r2, r1, 4
|
lsls r2, r1, 4
|
||||||
adds r2, r1
|
adds r2, r1
|
||||||
@ -858,7 +858,7 @@ _080FA274:
|
|||||||
ldrh r1, [r2, 0x2]
|
ldrh r1, [r2, 0x2]
|
||||||
lsls r1, 23
|
lsls r1, 23
|
||||||
lsrs r1, 23
|
lsrs r1, 23
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
ldr r3, [r4, 0x14]
|
ldr r3, [r4, 0x14]
|
||||||
adds r1, r3
|
adds r1, r3
|
||||||
lsls r1, 16
|
lsls r1, 16
|
||||||
@ -891,7 +891,7 @@ sub_80FA2D8: @ 80FA2D8
|
|||||||
adds r4, r0, 0
|
adds r4, r0, 0
|
||||||
movs r0, 0x9B
|
movs r0, 0x9B
|
||||||
bl PlaySE
|
bl PlaySE
|
||||||
ldr r0, =gUnknown_02038C08
|
ldr r0, =gFieldEffectSpawnParams
|
||||||
ldr r1, [r0, 0x1C]
|
ldr r1, [r0, 0x1C]
|
||||||
adds r2, r4, 0
|
adds r2, r4, 0
|
||||||
adds r2, 0x2A
|
adds r2, 0x2A
|
||||||
@ -917,7 +917,7 @@ sub_80FA304: @ 80FA304
|
|||||||
asrs r0, 16
|
asrs r0, 16
|
||||||
cmp r0, 0x27
|
cmp r0, 0x27
|
||||||
ble _080FA32E
|
ble _080FA32E
|
||||||
ldr r0, =gUnknown_02038C08
|
ldr r0, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r0, 0x1C]
|
ldr r0, [r0, 0x1C]
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080FA322
|
beq _080FA322
|
||||||
@ -951,7 +951,7 @@ sub_80FA33C: @ 80FA33C
|
|||||||
sub_80FA34C: @ 80FA34C
|
sub_80FA34C: @ 80FA34C
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -1000,7 +1000,7 @@ sub_80FA3AC: @ 80FA3AC
|
|||||||
bl sub_80F9F78
|
bl sub_80F9F78
|
||||||
ldr r0, =gUnknown_0858E630
|
ldr r0, =gUnknown_0858E630
|
||||||
ldr r3, =gSprites
|
ldr r3, =gSprites
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r1, [r1, 0x4]
|
ldrb r1, [r1, 0x4]
|
||||||
lsls r2, r1, 4
|
lsls r2, r1, 4
|
||||||
adds r2, r1
|
adds r2, r1
|
||||||
@ -1009,7 +1009,7 @@ sub_80FA3AC: @ 80FA3AC
|
|||||||
ldrh r1, [r2, 0x2]
|
ldrh r1, [r2, 0x2]
|
||||||
lsls r1, 23
|
lsls r1, 23
|
||||||
lsrs r1, 23
|
lsrs r1, 23
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
ldr r3, [r4, 0x14]
|
ldr r3, [r4, 0x14]
|
||||||
adds r1, r3
|
adds r1, r3
|
||||||
lsls r1, 16
|
lsls r1, 16
|
||||||
@ -1723,7 +1723,7 @@ sub_80FA9D0: @ 80FA9D0
|
|||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
sub sp, 0x4
|
sub sp, 0x4
|
||||||
ldr r3, =gMapObjects
|
ldr r3, =gMapObjects
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2, 0x5]
|
ldrb r1, [r2, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1807,7 +1807,7 @@ sub_80FAA7C: @ 80FAA7C
|
|||||||
mov r0, sp
|
mov r0, sp
|
||||||
adds r1, r4, 0
|
adds r1, r4, 0
|
||||||
bl GetXYCoordsOneStepInFrontOfPlayer
|
bl GetXYCoordsOneStepInFrontOfPlayer
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
mov r0, sp
|
mov r0, sp
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
ldrsh r0, [r0, r2]
|
ldrsh r0, [r0, r2]
|
||||||
@ -1835,7 +1835,7 @@ _080FAABC:
|
|||||||
_080FAAC6:
|
_080FAAC6:
|
||||||
ldr r0, =gUnknown_0858E68C
|
ldr r0, =gUnknown_0858E68C
|
||||||
ldr r3, =gSprites
|
ldr r3, =gSprites
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r1, [r1, 0x4]
|
ldrb r1, [r1, 0x4]
|
||||||
lsls r2, r1, 4
|
lsls r2, r1, 4
|
||||||
adds r2, r1
|
adds r2, r1
|
||||||
@ -1857,7 +1857,7 @@ _080FAAC6:
|
|||||||
_080FAAFC:
|
_080FAAFC:
|
||||||
ldr r0, =gUnknown_0858E68C
|
ldr r0, =gUnknown_0858E68C
|
||||||
ldr r3, =gSprites
|
ldr r3, =gSprites
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r1, [r1, 0x4]
|
ldrb r1, [r1, 0x4]
|
||||||
lsls r2, r1, 4
|
lsls r2, r1, 4
|
||||||
adds r2, r1
|
adds r2, r1
|
||||||
@ -1876,7 +1876,7 @@ _080FAAFC:
|
|||||||
_080FAB2C:
|
_080FAB2C:
|
||||||
ldr r0, =gUnknown_0858E68C
|
ldr r0, =gUnknown_0858E68C
|
||||||
ldr r3, =gSprites
|
ldr r3, =gSprites
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r1, [r1, 0x4]
|
ldrb r1, [r1, 0x4]
|
||||||
lsls r2, r1, 4
|
lsls r2, r1, 4
|
||||||
adds r2, r1
|
adds r2, r1
|
||||||
@ -1898,7 +1898,7 @@ _080FAB4C:
|
|||||||
_080FAB64:
|
_080FAB64:
|
||||||
ldr r0, =gUnknown_0858E68C
|
ldr r0, =gUnknown_0858E68C
|
||||||
ldr r3, =gSprites
|
ldr r3, =gSprites
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r1, [r1, 0x4]
|
ldrb r1, [r1, 0x4]
|
||||||
lsls r2, r1, 4
|
lsls r2, r1, 4
|
||||||
adds r2, r1
|
adds r2, r1
|
||||||
@ -1930,7 +1930,7 @@ door_restore_tilemap: @ 80FABA4
|
|||||||
adds r5, r0, 0
|
adds r5, r0, 0
|
||||||
movs r0, 0x83
|
movs r0, 0x83
|
||||||
bl PlaySE
|
bl PlaySE
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r4, 0x14]
|
ldr r0, [r4, 0x14]
|
||||||
ldr r1, [r4, 0x18]
|
ldr r1, [r4, 0x18]
|
||||||
subs r1, 0x1
|
subs r1, 0x1
|
||||||
@ -1953,7 +1953,7 @@ _080FABDC:
|
|||||||
lsls r2, 2
|
lsls r2, 2
|
||||||
bl MapGridSetMetatileIdAt
|
bl MapGridSetMetatileIdAt
|
||||||
_080FABEA:
|
_080FABEA:
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r4, 0x14]
|
ldr r0, [r4, 0x14]
|
||||||
ldr r1, [r4, 0x18]
|
ldr r1, [r4, 0x18]
|
||||||
ldr r2, =0x0000020a
|
ldr r2, =0x0000020a
|
||||||
@ -1988,7 +1988,7 @@ sub_80FAC24: @ 80FAC24
|
|||||||
strh r0, [r5, 0x2E]
|
strh r0, [r5, 0x2E]
|
||||||
b _080FAC54
|
b _080FAC54
|
||||||
_080FAC38:
|
_080FAC38:
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
ldr r0, [r4, 0x14]
|
ldr r0, [r4, 0x14]
|
||||||
ldr r1, [r4, 0x18]
|
ldr r1, [r4, 0x18]
|
||||||
ldr r2, =0x00000e8c
|
ldr r2, =0x00000e8c
|
||||||
@ -2307,7 +2307,7 @@ sub_80FAEF0: @ 80FAEF0
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2357,7 +2357,7 @@ sub_80FAF64: @ 80FAF64
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
|
|||||||
@ -385,7 +385,7 @@ hm2_ruin_valley: @ 80D3A50
|
|||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
bl FieldEffectStart
|
bl FieldEffectStart
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -421,7 +421,7 @@ sub_80D3A6C: @ 80D3A6C
|
|||||||
sub_80D3A9C: @ 80D3A9C
|
sub_80D3A9C: @ 80D3A9C
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -542,7 +542,7 @@ _080D3B64:
|
|||||||
movs r6, 0
|
movs r6, 0
|
||||||
ldr r5, =gSprites
|
ldr r5, =gSprites
|
||||||
_080D3BA0:
|
_080D3BA0:
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x4]
|
ldrb r1, [r0, 0x4]
|
||||||
lsls r0, r1, 4
|
lsls r0, r1, 4
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
|
|||||||
@ -115,7 +115,7 @@ sub_80B46D8: @ 80B46D8
|
|||||||
orrs r3, r4
|
orrs r3, r4
|
||||||
mov r4, r12
|
mov r4, r12
|
||||||
strb r3, [r4]
|
strb r3, [r4]
|
||||||
ldr r4, =gUnknown_02038C08
|
ldr r4, =gFieldEffectSpawnParams
|
||||||
ldr r3, [r4]
|
ldr r3, [r4]
|
||||||
strh r3, [r0, 0x2E]
|
strh r3, [r0, 0x2E]
|
||||||
ldr r3, [r4, 0x4]
|
ldr r3, [r4, 0x4]
|
||||||
@ -296,7 +296,7 @@ sub_80B4808: @ 80B4808
|
|||||||
b _080B489E
|
b _080B489E
|
||||||
.pool
|
.pool
|
||||||
_080B4870:
|
_080B4870:
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
|
|||||||
@ -235,7 +235,7 @@ sub_81BE808: @ 81BE808
|
|||||||
ldrh r1, [r0, 0x26]
|
ldrh r1, [r0, 0x26]
|
||||||
adds r1, 0x4
|
adds r1, 0x4
|
||||||
strh r1, [r0, 0x26]
|
strh r1, [r0, 0x26]
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r1, r0, 3
|
lsls r1, r0, 3
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
|
|||||||
@ -40,7 +40,7 @@ _08145DF2:
|
|||||||
sub_8145E0C: @ 8145E0C
|
sub_8145E0C: @ 8145E0C
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -66,7 +66,7 @@ sub_8145E2C: @ 8145E2C
|
|||||||
lsrs r0, r2, 16
|
lsrs r0, r2, 16
|
||||||
strh r0, [r1, 0x18]
|
strh r0, [r1, 0x18]
|
||||||
strh r2, [r1, 0x1A]
|
strh r2, [r1, 0x1A]
|
||||||
ldr r0, =gUnknown_02038C08
|
ldr r0, =gFieldEffectSpawnParams
|
||||||
ldr r1, [r0]
|
ldr r1, [r0]
|
||||||
movs r0, 0x64
|
movs r0, 0x64
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
|
|||||||
@ -24,7 +24,7 @@ hm2_sweet_scent: @ 8159F10
|
|||||||
movs r0, 0x33
|
movs r0, 0x33
|
||||||
bl FieldEffectStart
|
bl FieldEffectStart
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -217,4 +217,4 @@ _0815A0BE:
|
|||||||
thumb_func_end sub_815A090
|
thumb_func_end sub_815A090
|
||||||
|
|
||||||
.align 2, 0 @ Don't pad with nop.
|
.align 2, 0 @ Don't pad with nop.
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,7 @@ hm_teleport_run_dp02scr: @ 817C8FC
|
|||||||
movs r0, 0x3F
|
movs r0, 0x3F
|
||||||
bl FieldEffectStart
|
bl FieldEffectStart
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
|
|||||||
@ -27235,7 +27235,7 @@ sub_8017940: @ 8017940
|
|||||||
ldrsh r0, [r4, r1]
|
ldrsh r0, [r4, r1]
|
||||||
cmp r0, 0x8
|
cmp r0, 0x8
|
||||||
bne _08017978
|
bne _08017978
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x3]
|
ldrb r0, [r0, 0x3]
|
||||||
cmp r0, 0x2
|
cmp r0, 0x2
|
||||||
beq _0801796E
|
beq _0801796E
|
||||||
@ -31141,7 +31141,7 @@ bgid_upload_textbox_1: @ 8019938
|
|||||||
thumb_func_start is_walking_or_running
|
thumb_func_start is_walking_or_running
|
||||||
is_walking_or_running: @ 8019958
|
is_walking_or_running: @ 8019958
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x3]
|
ldrb r0, [r0, 0x3]
|
||||||
cmp r0, 0x2
|
cmp r0, 0x2
|
||||||
beq _08019966
|
beq _08019966
|
||||||
|
|||||||
@ -97,7 +97,7 @@ _0809749A:
|
|||||||
lsls r0, 31
|
lsls r0, 31
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080974B8
|
beq _080974B8
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
cmp r4, r0
|
cmp r4, r0
|
||||||
beq _080974B8
|
beq _080974B8
|
||||||
@ -133,7 +133,7 @@ _080974DA:
|
|||||||
lsls r0, 31
|
lsls r0, 31
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080974FC
|
beq _080974FC
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
cmp r4, r0
|
cmp r4, r0
|
||||||
beq _080974FC
|
beq _080974FC
|
||||||
@ -769,16 +769,16 @@ _08097964:
|
|||||||
.pool
|
.pool
|
||||||
thumb_func_end sub_80978E4
|
thumb_func_end sub_80978E4
|
||||||
|
|
||||||
thumb_func_start sub_8097978
|
thumb_func_start SetFieldObjectStepTimer
|
||||||
@ void sub_8097978(struct obj *object, u16 a2)
|
@ void SetFieldObjectStepTimer(struct obj *object, u16 a2)
|
||||||
sub_8097978: @ 8097978
|
SetFieldObjectStepTimer: @ 8097978
|
||||||
strh r1, [r0, 0x34]
|
strh r1, [r0, 0x34]
|
||||||
bx lr
|
bx lr
|
||||||
thumb_func_end sub_8097978
|
thumb_func_end SetFieldObjectStepTimer
|
||||||
|
|
||||||
thumb_func_start sub_809797C
|
thumb_func_start RunFieldObjectStepTimer
|
||||||
@ bool8 sub_809797C(struct obj *object)
|
@ bool8 RunFieldObjectStepTimer(struct obj *object)
|
||||||
sub_809797C: @ 809797C
|
RunFieldObjectStepTimer: @ 809797C
|
||||||
push {lr}
|
push {lr}
|
||||||
ldrh r1, [r0, 0x34]
|
ldrh r1, [r0, 0x34]
|
||||||
subs r1, 0x1
|
subs r1, 0x1
|
||||||
@ -793,7 +793,7 @@ _0809798E:
|
|||||||
_08097990:
|
_08097990:
|
||||||
pop {r1}
|
pop {r1}
|
||||||
bx r1
|
bx r1
|
||||||
thumb_func_end sub_809797C
|
thumb_func_end RunFieldObjectStepTimer
|
||||||
|
|
||||||
thumb_func_start obj_anim_image_set_and_seek
|
thumb_func_start obj_anim_image_set_and_seek
|
||||||
obj_anim_image_set_and_seek: @ 8097994
|
obj_anim_image_set_and_seek: @ 8097994
|
||||||
@ -1396,7 +1396,7 @@ oe_exec_and_other_stuff: @ 8097DD0
|
|||||||
adds r0, r1, 0
|
adds r0, r1, 0
|
||||||
lsls r4, 24
|
lsls r4, 24
|
||||||
lsrs r4, 24
|
lsrs r4, 24
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
adds r2, r1, 0x4
|
adds r2, r1, 0x4
|
||||||
adds r3, r1, 0
|
adds r3, r1, 0
|
||||||
adds r3, 0x8
|
adds r3, 0x8
|
||||||
@ -1434,7 +1434,7 @@ DoRippleFieldEffect: @ 8097E14
|
|||||||
adds r4, r1, 0
|
adds r4, r1, 0
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
bl GetFieldObjectGraphicsInfo
|
bl GetFieldObjectGraphicsInfo
|
||||||
ldr r2, =gUnknown_02038C08
|
ldr r2, =gFieldEffectSpawnParams
|
||||||
movs r3, 0x20
|
movs r3, 0x20
|
||||||
ldrsh r1, [r4, r3]
|
ldrsh r1, [r4, r3]
|
||||||
str r1, [r2]
|
str r1, [r2]
|
||||||
@ -1771,7 +1771,7 @@ _08098082:
|
|||||||
lsls r0, 31
|
lsls r0, 31
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080980A8
|
beq _080980A8
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
cmp r4, r0
|
cmp r4, r0
|
||||||
beq _080980A8
|
beq _080980A8
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
thumb_func_start walkrun_is_standing_still
|
thumb_func_start walkrun_is_standing_still
|
||||||
walkrun_is_standing_still: @ 8098388
|
walkrun_is_standing_still: @ 8098388
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x3]
|
ldrb r0, [r0, 0x3]
|
||||||
cmp r0, 0x1
|
cmp r0, 0x1
|
||||||
beq _0809839C
|
beq _0809839C
|
||||||
|
|||||||
@ -10051,7 +10051,7 @@ task_launch_hm_phase_2: @ 81B5750
|
|||||||
cmp r0, 0x1
|
cmp r0, 0x1
|
||||||
bne _081B577C
|
bne _081B577C
|
||||||
bl brm_get_selected_species
|
bl brm_get_selected_species
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 16
|
lsls r0, 16
|
||||||
lsrs r0, 16
|
lsrs r0, 16
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -10135,7 +10135,7 @@ _081B57FE:
|
|||||||
hm_surf_run_dp02scr: @ 81B5804
|
hm_surf_run_dp02scr: @ 81B5804
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -10239,7 +10239,7 @@ sub_81B58A8: @ 81B58A8
|
|||||||
hm2_waterfall: @ 81B58D4
|
hm2_waterfall: @ 81B58D4
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -10299,7 +10299,7 @@ _081B594E:
|
|||||||
sub_81B5958: @ 81B5958
|
sub_81B5958: @ 81B5958
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -10314,7 +10314,7 @@ sub_81B5958: @ 81B5958
|
|||||||
sub_81B5974: @ 81B5974
|
sub_81B5974: @ 81B5974
|
||||||
push {lr}
|
push {lr}
|
||||||
bl sub_809D1E8
|
bl sub_809D1E8
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1, 0x4]
|
str r0, [r1, 0x4]
|
||||||
|
|||||||
@ -26636,7 +26636,7 @@ sub_81D427C: @ 81D427C
|
|||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
adds r5, r1, r2
|
adds r5, r1, r2
|
||||||
ldr r4, =gUnknown_030012F8
|
ldr r4, =gUnknown_030012F8
|
||||||
ldr r3, =gUnknown_02037590
|
ldr r3, =gPlayerAvatar
|
||||||
ldrb r1, [r3, 0x5]
|
ldrb r1, [r3, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -26672,7 +26672,7 @@ _081D42CA:
|
|||||||
cmp r0, 0x3
|
cmp r0, 0x3
|
||||||
bls _081D42CA
|
bls _081D42CA
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -26730,7 +26730,7 @@ _081D4360:
|
|||||||
ldr r6, =gMapObjects
|
ldr r6, =gMapObjects
|
||||||
mov r10, r6
|
mov r10, r6
|
||||||
_081D4368:
|
_081D4368:
|
||||||
ldr r3, =gUnknown_02037590
|
ldr r3, =gPlayerAvatar
|
||||||
ldrb r1, [r3, 0x5]
|
ldrb r1, [r3, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -26837,7 +26837,7 @@ _081D4410:
|
|||||||
beq _081D4446
|
beq _081D4446
|
||||||
b _081D45AA
|
b _081D45AA
|
||||||
_081D4446:
|
_081D4446:
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -26879,7 +26879,7 @@ _081D4488:
|
|||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
bne _081D4538
|
bne _081D4538
|
||||||
_081D449E:
|
_081D449E:
|
||||||
ldr r2, =gUnknown_02037590
|
ldr r2, =gPlayerAvatar
|
||||||
ldrb r1, [r2, 0x5]
|
ldrb r1, [r2, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -26983,7 +26983,7 @@ _081D4540:
|
|||||||
beq _081D4576
|
beq _081D4576
|
||||||
b _081D447C
|
b _081D447C
|
||||||
_081D4576:
|
_081D4576:
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -27152,7 +27152,7 @@ _081D46D0:
|
|||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
bne _081D476E
|
bne _081D476E
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -27177,7 +27177,7 @@ _081D46D0:
|
|||||||
b _081D447C
|
b _081D447C
|
||||||
_081D470C:
|
_081D470C:
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -27231,7 +27231,7 @@ _081D476E:
|
|||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
bne _081D480C
|
bne _081D480C
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -27256,7 +27256,7 @@ _081D476E:
|
|||||||
b _081D45AA
|
b _081D45AA
|
||||||
_081D47AA:
|
_081D47AA:
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -27327,7 +27327,7 @@ sub_81D4834: @ 81D4834
|
|||||||
lsls r1, 16
|
lsls r1, 16
|
||||||
lsrs r4, r1, 16
|
lsrs r4, r1, 16
|
||||||
ldr r3, =gMapObjects
|
ldr r3, =gMapObjects
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
ldrb r2, [r1, 0x5]
|
ldrb r2, [r1, 0x5]
|
||||||
lsls r1, r2, 3
|
lsls r1, r2, 3
|
||||||
adds r1, r2
|
adds r1, r2
|
||||||
|
|||||||
@ -232,7 +232,7 @@ sub_80FB768: @ 80FB768
|
|||||||
push {lr}
|
push {lr}
|
||||||
bl sub_80FB6EC
|
bl sub_80FB6EC
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
|
|||||||
30
asm/rom4.s
30
asm/rom4.s
@ -4396,7 +4396,7 @@ sub_8086A68: @ 8086A68
|
|||||||
sub_8086A80: @ 8086A80
|
sub_8086A80: @ 8086A80
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r2, =gMapObjects
|
ldr r2, =gMapObjects
|
||||||
ldr r3, =gUnknown_02037590
|
ldr r3, =gPlayerAvatar
|
||||||
ldrb r1, [r3, 0x5]
|
ldrb r1, [r3, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -5480,7 +5480,7 @@ sub_80872D8: @ 80872D8
|
|||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
_080872EA:
|
_080872EA:
|
||||||
strb r0, [r6, 0x1]
|
strb r0, [r6, 0x1]
|
||||||
ldr r1, =gUnknown_02032308
|
ldr r1, =gLinkPlayerMapObjects
|
||||||
lsls r0, r4, 2
|
lsls r0, r4, 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldrb r0, [r0, 0x3]
|
ldrb r0, [r0, 0x3]
|
||||||
@ -5977,7 +5977,7 @@ sub_80876C4: @ 80876C4
|
|||||||
thumb_func_start strange_npc_table_clear
|
thumb_func_start strange_npc_table_clear
|
||||||
strange_npc_table_clear: @ 80876CC
|
strange_npc_table_clear: @ 80876CC
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r0, =gUnknown_02032308
|
ldr r0, =gLinkPlayerMapObjects
|
||||||
movs r1, 0
|
movs r1, 0
|
||||||
movs r2, 0x10
|
movs r2, 0x10
|
||||||
bl memset
|
bl memset
|
||||||
@ -6025,7 +6025,7 @@ sub_80876F0: @ 80876F0
|
|||||||
lsls r6, 24
|
lsls r6, 24
|
||||||
lsrs r6, 24
|
lsrs r6, 24
|
||||||
lsls r4, r7, 2
|
lsls r4, r7, 2
|
||||||
ldr r0, =gUnknown_02032308
|
ldr r0, =gLinkPlayerMapObjects
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
lsls r5, r6, 3
|
lsls r5, r6, 3
|
||||||
adds r5, r6
|
adds r5, r6
|
||||||
@ -6118,7 +6118,7 @@ sub_80877DC: @ 80877DC
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsls r1, 24
|
lsls r1, 24
|
||||||
lsrs r2, r1, 24
|
lsrs r2, r1, 24
|
||||||
ldr r1, =gUnknown_02032308
|
ldr r1, =gLinkPlayerMapObjects
|
||||||
lsrs r0, 22
|
lsrs r0, 22
|
||||||
adds r1, r0, r1
|
adds r1, r0, r1
|
||||||
ldrb r0, [r1]
|
ldrb r0, [r1]
|
||||||
@ -6142,7 +6142,7 @@ sub_808780C: @ 808780C
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 22
|
lsrs r0, 22
|
||||||
ldr r1, =gUnknown_02032308
|
ldr r1, =gLinkPlayerMapObjects
|
||||||
adds r5, r0, r1
|
adds r5, r0, r1
|
||||||
ldrb r1, [r5, 0x2]
|
ldrb r1, [r5, 0x2]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
@ -6176,7 +6176,7 @@ _08087838:
|
|||||||
thumb_func_start sub_8087858
|
thumb_func_start sub_8087858
|
||||||
sub_8087858: @ 8087858
|
sub_8087858: @ 8087858
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
ldr r1, =gUnknown_02032308
|
ldr r1, =gLinkPlayerMapObjects
|
||||||
lsrs r0, 22
|
lsrs r0, 22
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldrb r1, [r0, 0x2]
|
ldrb r1, [r0, 0x2]
|
||||||
@ -6193,7 +6193,7 @@ sub_8087858: @ 8087858
|
|||||||
thumb_func_start sub_8087878
|
thumb_func_start sub_8087878
|
||||||
sub_8087878: @ 8087878
|
sub_8087878: @ 8087878
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
ldr r3, =gUnknown_02032308
|
ldr r3, =gLinkPlayerMapObjects
|
||||||
lsrs r0, 22
|
lsrs r0, 22
|
||||||
adds r0, r3
|
adds r0, r3
|
||||||
ldrb r3, [r0, 0x2]
|
ldrb r3, [r0, 0x2]
|
||||||
@ -6213,7 +6213,7 @@ sub_8087878: @ 8087878
|
|||||||
thumb_func_start sub_80878A0
|
thumb_func_start sub_80878A0
|
||||||
sub_80878A0: @ 80878A0
|
sub_80878A0: @ 80878A0
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
ldr r1, =gUnknown_02032308
|
ldr r1, =gLinkPlayerMapObjects
|
||||||
lsrs r0, 22
|
lsrs r0, 22
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldrb r1, [r0, 0x2]
|
ldrb r1, [r0, 0x2]
|
||||||
@ -6230,7 +6230,7 @@ sub_80878A0: @ 80878A0
|
|||||||
thumb_func_start sub_80878C0
|
thumb_func_start sub_80878C0
|
||||||
sub_80878C0: @ 80878C0
|
sub_80878C0: @ 80878C0
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
ldr r1, =gUnknown_02032308
|
ldr r1, =gLinkPlayerMapObjects
|
||||||
lsrs r0, 22
|
lsrs r0, 22
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldrb r1, [r0, 0x2]
|
ldrb r1, [r0, 0x2]
|
||||||
@ -6249,7 +6249,7 @@ sub_80878C0: @ 80878C0
|
|||||||
thumb_func_start sub_80878E4
|
thumb_func_start sub_80878E4
|
||||||
sub_80878E4: @ 80878E4
|
sub_80878E4: @ 80878E4
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
ldr r1, =gUnknown_02032308
|
ldr r1, =gLinkPlayerMapObjects
|
||||||
lsrs r0, 22
|
lsrs r0, 22
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldrb r1, [r0, 0x2]
|
ldrb r1, [r0, 0x2]
|
||||||
@ -6271,7 +6271,7 @@ sub_80878E4: @ 80878E4
|
|||||||
sub_808790C: @ 808790C
|
sub_808790C: @ 808790C
|
||||||
push {r4-r6,lr}
|
push {r4-r6,lr}
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
ldr r5, =gUnknown_02032308
|
ldr r5, =gLinkPlayerMapObjects
|
||||||
lsls r0, 16
|
lsls r0, 16
|
||||||
asrs r4, r0, 16
|
asrs r4, r0, 16
|
||||||
lsls r1, 16
|
lsls r1, 16
|
||||||
@ -6326,7 +6326,7 @@ sub_808796C: @ 808796C
|
|||||||
lsrs r3, r1, 24
|
lsrs r3, r1, 24
|
||||||
adds r2, r3, 0
|
adds r2, r3, 0
|
||||||
lsrs r0, 22
|
lsrs r0, 22
|
||||||
ldr r1, =gUnknown_02032308
|
ldr r1, =gLinkPlayerMapObjects
|
||||||
adds r5, r0, r1
|
adds r5, r0, r1
|
||||||
ldrb r1, [r5, 0x2]
|
ldrb r1, [r5, 0x2]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
@ -6654,7 +6654,7 @@ sub_8087BCC: @ 8087BCC
|
|||||||
lsls r1, 24
|
lsls r1, 24
|
||||||
lsrs r3, r1, 24
|
lsrs r3, r1, 24
|
||||||
lsls r2, r5, 2
|
lsls r2, r5, 2
|
||||||
ldr r0, =gUnknown_02032308
|
ldr r0, =gLinkPlayerMapObjects
|
||||||
adds r2, r0
|
adds r2, r0
|
||||||
ldrb r1, [r2, 0x2]
|
ldrb r1, [r2, 0x2]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
@ -6742,7 +6742,7 @@ sub_8087C8C: @ 8087C8C
|
|||||||
movs r0, 0x2E
|
movs r0, 0x2E
|
||||||
ldrsh r4, [r5, r0]
|
ldrsh r4, [r5, r0]
|
||||||
lsls r4, 2
|
lsls r4, 2
|
||||||
ldr r0, =gUnknown_02032308
|
ldr r0, =gLinkPlayerMapObjects
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
ldrb r1, [r4, 0x2]
|
ldrb r1, [r4, 0x2]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
|
|||||||
18
asm/rom6.s
18
asm/rom6.s
@ -68,7 +68,7 @@ task08_080C9820: @ 813549C
|
|||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
adds r6, r5, 0
|
adds r6, r5, 0
|
||||||
bl ScriptContext2_Enable
|
bl ScriptContext2_Enable
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
ldrb r1, [r1, 0x5]
|
ldrb r1, [r1, 0x5]
|
||||||
@ -127,7 +127,7 @@ sub_813552C: @ 813552C
|
|||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -167,7 +167,7 @@ sub_8135578: @ 8135578
|
|||||||
cmp r4, 0
|
cmp r4, 0
|
||||||
bne _081355FC
|
bne _081355FC
|
||||||
bl player_get_direction_lower_nybble
|
bl player_get_direction_lower_nybble
|
||||||
ldr r6, =gUnknown_02038C08
|
ldr r6, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r6, 0x4]
|
str r0, [r6, 0x4]
|
||||||
@ -191,7 +191,7 @@ _081355B0:
|
|||||||
movs r0, 0x3
|
movs r0, 0x3
|
||||||
str r0, [r6, 0x8]
|
str r0, [r6, 0x8]
|
||||||
_081355B8:
|
_081355B8:
|
||||||
ldr r5, =gUnknown_02037590
|
ldr r5, =gPlayerAvatar
|
||||||
ldrb r0, [r5, 0x5]
|
ldrb r0, [r5, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -244,7 +244,7 @@ sub_813561C: @ 813561C
|
|||||||
ldrh r0, [r0, 0x1A]
|
ldrh r0, [r0, 0x1A]
|
||||||
orrs r1, r0
|
orrs r1, r0
|
||||||
bl _call_via_r1
|
bl _call_via_r1
|
||||||
ldr r1, =gUnknown_02037590
|
ldr r1, =gPlayerAvatar
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r1, 0x6]
|
strb r0, [r1, 0x6]
|
||||||
adds r0, r4, 0
|
adds r0, r4, 0
|
||||||
@ -303,7 +303,7 @@ _081356AC:
|
|||||||
sub_81356C4: @ 81356C4
|
sub_81356C4: @ 81356C4
|
||||||
push {lr}
|
push {lr}
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -380,7 +380,7 @@ hm2_dig: @ 8135760
|
|||||||
movs r0, 0x26
|
movs r0, 0x26
|
||||||
bl FieldEffectStart
|
bl FieldEffectStart
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -3381,7 +3381,7 @@ hm2_flash: @ 8137178
|
|||||||
lsls r4, 24
|
lsls r4, 24
|
||||||
lsrs r4, 24
|
lsrs r4, 24
|
||||||
bl brm_get_pokemon_selection
|
bl brm_get_pokemon_selection
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
str r0, [r1]
|
str r0, [r1]
|
||||||
@ -11039,7 +11039,7 @@ _0813B0F8:
|
|||||||
ldr r0, =sub_813B160
|
ldr r0, =sub_813B160
|
||||||
movs r1, 0x8
|
movs r1, 0x8
|
||||||
bl CreateTask
|
bl CreateTask
|
||||||
ldr r3, =gUnknown_02038C08
|
ldr r3, =gFieldEffectSpawnParams
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
str r0, [r3]
|
str r0, [r3]
|
||||||
movs r0, 0x3A
|
movs r0, 0x3A
|
||||||
|
|||||||
@ -4874,7 +4874,7 @@ s9D_set_HM_animation_data: @ 809B7F4
|
|||||||
lsls r0, 16
|
lsls r0, 16
|
||||||
lsrs r0, 16
|
lsrs r0, 16
|
||||||
bl VarGet
|
bl VarGet
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
lsls r4, 2
|
lsls r4, 2
|
||||||
adds r4, r1
|
adds r4, r1
|
||||||
lsls r0, 16
|
lsls r0, 16
|
||||||
|
|||||||
@ -751,7 +751,7 @@ sub_80E90C8: @ 80E90C8
|
|||||||
push {r4,lr}
|
push {r4,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
|
|||||||
@ -734,7 +734,7 @@ sub_80B417C: @ 80B417C
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
adds r5, r1, 0
|
adds r5, r1, 0
|
||||||
adds r4, r2, 0
|
adds r4, r2, 0
|
||||||
ldr r1, =gUnknown_02038C08
|
ldr r1, =gFieldEffectSpawnParams
|
||||||
adds r2, r1, 0x4
|
adds r2, r1, 0x4
|
||||||
adds r3, r1, 0
|
adds r3, r1, 0
|
||||||
adds r3, 0x8
|
adds r3, 0x8
|
||||||
@ -882,7 +882,7 @@ _080B427A:
|
|||||||
bl sub_808F23C
|
bl sub_808F23C
|
||||||
adds r0, r5, 0
|
adds r0, r5, 0
|
||||||
bl sub_808F208
|
bl sub_808F208
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -901,7 +901,7 @@ _080B427A:
|
|||||||
beq _080B4308
|
beq _080B4308
|
||||||
_080B42D2:
|
_080B42D2:
|
||||||
bl sub_808BCE8
|
bl sub_808BCE8
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r0, [r0, 0x5]
|
ldrb r0, [r0, 0x5]
|
||||||
lsls r4, r0, 3
|
lsls r4, r0, 3
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
@ -936,7 +936,7 @@ sub_80B4318: @ 80B4318
|
|||||||
push {r4,r5,lr}
|
push {r4,r5,lr}
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r5, r0, 24
|
lsrs r5, r0, 24
|
||||||
ldr r0, =gUnknown_02037590
|
ldr r0, =gPlayerAvatar
|
||||||
ldrb r1, [r0, 0x5]
|
ldrb r1, [r0, 0x5]
|
||||||
lsls r0, r1, 3
|
lsls r0, r1, 3
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -1050,7 +1050,7 @@ sub_80B43E0: @ 80B43E0
|
|||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq _080B4426
|
beq _080B4426
|
||||||
ldr r2, =gUnknown_02038C08
|
ldr r2, =gFieldEffectSpawnParams
|
||||||
movs r1, 0x10
|
movs r1, 0x10
|
||||||
ldrsh r0, [r4, r1]
|
ldrsh r0, [r4, r1]
|
||||||
str r0, [r2]
|
str r0, [r2]
|
||||||
|
|||||||
585
data/data3_a0_A.s
Normal file
585
data/data3_a0_A.s
Normal file
@ -0,0 +1,585 @@
|
|||||||
|
@ the third big chunk of data
|
||||||
|
|
||||||
|
.include "asm/macros.inc"
|
||||||
|
.include "constants/constants.inc"
|
||||||
|
|
||||||
|
.section .rodata
|
||||||
|
|
||||||
|
gUnknown_0832C0D0:: @ 832C0D0
|
||||||
|
.incbin "baserom.gba", 0x32c0d0, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C0D8:: @ 832C0D8
|
||||||
|
.incbin "baserom.gba", 0x32c0d8, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C0E0:: @ 832C0E0
|
||||||
|
.incbin "baserom.gba", 0x32c0e0, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C0E8:: @ 832C0E8
|
||||||
|
.incbin "baserom.gba", 0x32c0e8, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C0F0:: @ 832C0F0
|
||||||
|
.incbin "baserom.gba", 0x32c0f0, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C0F8:: @ 832C0F8
|
||||||
|
.incbin "baserom.gba", 0x32c0f8, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C100:: @ 832C100
|
||||||
|
.incbin "baserom.gba", 0x32c100, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C108:: @ 832C108
|
||||||
|
.incbin "baserom.gba", 0x32c108, 0x20
|
||||||
|
|
||||||
|
gUnknown_0832C128:: @ 832C128
|
||||||
|
.incbin "baserom.gba", 0x32c128, 0x18
|
||||||
|
|
||||||
|
gUnknown_0832C140:: @ 832C140
|
||||||
|
.incbin "baserom.gba", 0x32c140, 0x30
|
||||||
|
|
||||||
|
gUnknown_0832C170:: @ 832C170
|
||||||
|
.incbin "baserom.gba", 0x32c170, 0x30
|
||||||
|
|
||||||
|
gUnknown_0832C1A0:: @ 832C1A0
|
||||||
|
.incbin "baserom.gba", 0x32c1a0, 0x20
|
||||||
|
|
||||||
|
gUnknown_0832C1C0:: @ 832C1C0
|
||||||
|
.incbin "baserom.gba", 0x32c1c0, 0xcc
|
||||||
|
|
||||||
|
gUnknown_0832C28C:: @ 832C28C
|
||||||
|
.incbin "baserom.gba", 0x32c28c, 0x38
|
||||||
|
|
||||||
|
gUnknown_0832C2C4:: @ 832C2C4
|
||||||
|
.incbin "baserom.gba", 0x32c2c4, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C2CC:: @ 832C2CC
|
||||||
|
.incbin "baserom.gba", 0x32c2cc, 0x68
|
||||||
|
|
||||||
|
gUnknown_0832C334:: @ 832C334
|
||||||
|
.incbin "baserom.gba", 0x32c334, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C33C:: @ 832C33C
|
||||||
|
.incbin "baserom.gba", 0x32c33c, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C344:: @ 832C344
|
||||||
|
.incbin "baserom.gba", 0x32c344, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C34C:: @ 832C34C
|
||||||
|
.incbin "baserom.gba", 0x32c34c, 0x18
|
||||||
|
|
||||||
|
gUnknown_0832C364:: @ 832C364
|
||||||
|
.incbin "baserom.gba", 0x32c364, 0x30
|
||||||
|
|
||||||
|
gUnknown_0832C394:: @ 832C394
|
||||||
|
.incbin "baserom.gba", 0x32c394, 0x30
|
||||||
|
|
||||||
|
gUnknown_0832C3C4:: @ 832C3C4
|
||||||
|
.incbin "baserom.gba", 0x32c3c4, 0x14
|
||||||
|
|
||||||
|
gUnknown_0832C3D8:: @ 832C3D8
|
||||||
|
.incbin "baserom.gba", 0x32c3d8, 0x14
|
||||||
|
|
||||||
|
gUnknown_0832C3EC:: @ 832C3EC
|
||||||
|
.incbin "baserom.gba", 0x32c3ec, 0xc
|
||||||
|
|
||||||
|
gUnknown_0832C3F8:: @ 832C3F8
|
||||||
|
.incbin "baserom.gba", 0x32c3f8, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832C400:: @ 832C400
|
||||||
|
.incbin "baserom.gba", 0x32c400, 0x60
|
||||||
|
|
||||||
|
gUnknown_0832C460:: @ 832C460
|
||||||
|
.incbin "baserom.gba", 0x32c460, 0x128
|
||||||
|
|
||||||
|
gUnknown_0832C588:: @ 832C588
|
||||||
|
.incbin "baserom.gba", 0x32c588, 0x138
|
||||||
|
|
||||||
|
gUnknown_0832C6C0:: @ 832C6C0
|
||||||
|
.incbin "baserom.gba", 0x32c6c0, 0x1fe
|
||||||
|
|
||||||
|
gUnknown_0832C8BE:: @ 832C8BE
|
||||||
|
.incbin "baserom.gba", 0x32c8be, 0x1fe
|
||||||
|
|
||||||
|
gUnknown_0832CABC:: @ 832CABC
|
||||||
|
.incbin "baserom.gba", 0x32cabc, 0x800
|
||||||
|
|
||||||
|
gUnknown_0832D2BC:: @ 832D2BC
|
||||||
|
.incbin "baserom.gba", 0x32d2bc, 0x800
|
||||||
|
|
||||||
|
gUnknown_0832DABC:: @ 832DABC
|
||||||
|
.incbin "baserom.gba", 0x32dabc, 0xb
|
||||||
|
|
||||||
|
gUnknown_0832DAC7:: @ 832DAC7
|
||||||
|
.incbin "baserom.gba", 0x32dac7, 0x2
|
||||||
|
|
||||||
|
gUnknown_0832DAC9:: @ 832DAC9
|
||||||
|
.incbin "baserom.gba", 0x32dac9, 0x2
|
||||||
|
|
||||||
|
gUnknown_0832DACB:: @ 832DACB
|
||||||
|
.incbin "baserom.gba", 0x32dacb, 0x7
|
||||||
|
|
||||||
|
gUnknown_0832DAD2:: @ 832DAD2
|
||||||
|
.incbin "baserom.gba", 0x32dad2, 0xd
|
||||||
|
|
||||||
|
gUnknown_0832DADF:: @ 832DADF
|
||||||
|
.incbin "baserom.gba", 0x32dadf, 0x6
|
||||||
|
|
||||||
|
gUnknown_0832DAE5:: @ 832DAE5
|
||||||
|
.incbin "baserom.gba", 0x32dae5, 0x157
|
||||||
|
|
||||||
|
gUnknown_0832DC3C:: @ 832DC3C
|
||||||
|
.incbin "baserom.gba", 0x32dc3c, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832DC44:: @ 832DC44
|
||||||
|
.incbin "baserom.gba", 0x32dc44, 0x50
|
||||||
|
|
||||||
|
gUnknown_0832DC94:: @ 832DC94
|
||||||
|
.incbin "baserom.gba", 0x32dc94, 0x18
|
||||||
|
|
||||||
|
gUnknown_0832DCAC:: @ 832DCAC
|
||||||
|
.incbin "baserom.gba", 0x32dcac, 0x38
|
||||||
|
|
||||||
|
gUnknown_0832DCE4:: @ 832DCE4
|
||||||
|
.incbin "baserom.gba", 0x32dce4, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832DCEC:: @ 832DCEC
|
||||||
|
.incbin "baserom.gba", 0x32dcec, 0x138
|
||||||
|
|
||||||
|
gUnknown_0832DE24:: @ 832DE24
|
||||||
|
.incbin "baserom.gba", 0x32de24, 0x1a
|
||||||
|
|
||||||
|
gUnknown_0832DE3E:: @ 832DE3E
|
||||||
|
.incbin "baserom.gba", 0x32de3e, 0x18
|
||||||
|
|
||||||
|
gUnknown_0832DE56:: @ 832DE56
|
||||||
|
.incbin "baserom.gba", 0x32de56, 0x3e
|
||||||
|
|
||||||
|
gUnknown_0832DE94:: @ 832DE94
|
||||||
|
.incbin "baserom.gba", 0x32de94, 0x18
|
||||||
|
|
||||||
|
gUnknown_0832DEAC:: @ 832DEAC
|
||||||
|
.incbin "baserom.gba", 0x32deac, 0x10
|
||||||
|
|
||||||
|
gUnknown_0832DEBC:: @ 832DEBC
|
||||||
|
.incbin "baserom.gba", 0x32debc, 0x24
|
||||||
|
|
||||||
|
gUnknown_0832DEE0:: @ 832DEE0
|
||||||
|
.incbin "baserom.gba", 0x32dee0, 0x4
|
||||||
|
|
||||||
|
gUnknown_0832DEE4:: @ 832DEE4
|
||||||
|
.incbin "baserom.gba", 0x32dee4, 0x10
|
||||||
|
|
||||||
|
gUnknown_0832DEF4:: @ 832DEF4
|
||||||
|
.incbin "baserom.gba", 0x32def4, 0x98
|
||||||
|
|
||||||
|
gUnknown_0832DF8C:: @ 832DF8C
|
||||||
|
.incbin "baserom.gba", 0x32df8c, 0x8
|
||||||
|
|
||||||
|
gUnknown_0832DF94:: @ 832DF94
|
||||||
|
.incbin "baserom.gba", 0x32df94, 0x5
|
||||||
|
|
||||||
|
gUnknown_0832DF99:: @ 832DF99
|
||||||
|
.incbin "baserom.gba", 0x32df99, 0x2027
|
||||||
|
|
||||||
|
gUnknown_0832FFC0:: @ 832FFC0
|
||||||
|
.incbin "baserom.gba", 0x32ffc0, 0x1fa0
|
||||||
|
|
||||||
|
gUnknown_08331F60:: @ 8331F60
|
||||||
|
.incbin "baserom.gba", 0x331f60, 0x1000
|
||||||
|
|
||||||
|
gUnknown_08332F60:: @ 8332F60
|
||||||
|
.incbin "baserom.gba", 0x332f60, 0x2840
|
||||||
|
|
||||||
|
gUnknown_083357A0:: @ 83357A0
|
||||||
|
.incbin "baserom.gba", 0x3357a0, 0x100
|
||||||
|
|
||||||
|
gUnknown_083358A0:: @ 83358A0
|
||||||
|
.incbin "baserom.gba", 0x3358a0, 0x100
|
||||||
|
|
||||||
|
gUnknown_083359A0:: @ 83359A0
|
||||||
|
.incbin "baserom.gba", 0x3359a0, 0x1000
|
||||||
|
|
||||||
|
gUnknown_083369A0:: @ 83369A0
|
||||||
|
.incbin "baserom.gba", 0x3369a0, 0x1000
|
||||||
|
|
||||||
|
gUnknown_083379A0:: @ 83379A0
|
||||||
|
.incbin "baserom.gba", 0x3379a0, 0x100
|
||||||
|
|
||||||
|
gUnknown_08337AA0:: @ 8337AA0
|
||||||
|
.incbin "baserom.gba", 0x337aa0, 0x200
|
||||||
|
|
||||||
|
gUnknown_08337CA0:: @ 8337CA0
|
||||||
|
.incbin "baserom.gba", 0x337ca0, 0x200
|
||||||
|
|
||||||
|
gUnknown_08337EA0:: @ 8337EA0
|
||||||
|
.incbin "baserom.gba", 0x337ea0, 0x20
|
||||||
|
|
||||||
|
gUnknown_08337EC0:: @ 8337EC0
|
||||||
|
.incbin "baserom.gba", 0x337ec0, 0x690
|
||||||
|
|
||||||
|
gUnknown_08338550:: @ 8338550
|
||||||
|
.incbin "baserom.gba", 0x338550, 0x7c8
|
||||||
|
|
||||||
|
gUnknown_08338D18:: @ 8338D18
|
||||||
|
.incbin "baserom.gba", 0x338d18, 0x8
|
||||||
|
|
||||||
|
gUnknown_08338D20:: @ 8338D20
|
||||||
|
.incbin "baserom.gba", 0x338d20, 0x8
|
||||||
|
|
||||||
|
gUnknown_08338D28:: @ 8338D28
|
||||||
|
.incbin "baserom.gba", 0x338d28, 0x48
|
||||||
|
|
||||||
|
gUnknown_08338D70:: @ 8338D70
|
||||||
|
.incbin "baserom.gba", 0x338d70, 0x8
|
||||||
|
|
||||||
|
gUnknown_08338D78:: @ 8338D78
|
||||||
|
.incbin "baserom.gba", 0x338d78, 0x8
|
||||||
|
|
||||||
|
gUnknown_08338D80:: @ 8338D80
|
||||||
|
.incbin "baserom.gba", 0x338d80, 0x8
|
||||||
|
|
||||||
|
gUnknown_08338D88:: @ 8338D88
|
||||||
|
.incbin "baserom.gba", 0x338d88, 0x38
|
||||||
|
|
||||||
|
gUnknown_08338DC0:: @ 8338DC0
|
||||||
|
.incbin "baserom.gba", 0x338dc0, 0x8
|
||||||
|
|
||||||
|
gUnknown_08338DC8:: @ 8338DC8
|
||||||
|
.incbin "baserom.gba", 0x338dc8, 0x2c
|
||||||
|
|
||||||
|
gUnknown_08338DF4:: @ 8338DF4
|
||||||
|
.incbin "baserom.gba", 0x338df4, 0x8
|
||||||
|
|
||||||
|
gUnknown_08338DFC:: @ 8338DFC
|
||||||
|
.incbin "baserom.gba", 0x338dfc, 0x70
|
||||||
|
|
||||||
|
gUnknown_08338E6C:: @ 8338E6C
|
||||||
|
.incbin "baserom.gba", 0x338e6c, 0x8
|
||||||
|
|
||||||
|
gUnknown_08338E74:: @ 8338E74
|
||||||
|
.incbin "baserom.gba", 0x338e74, 0x18
|
||||||
|
|
||||||
|
gUnknown_08338E8C:: @ 8338E8C
|
||||||
|
.incbin "baserom.gba", 0x338e8c, 0x18
|
||||||
|
|
||||||
|
gUnknown_08338EA4:: @ 8338EA4
|
||||||
|
.incbin "baserom.gba", 0x338ea4, 0x28
|
||||||
|
|
||||||
|
gUnknown_08338ECC:: @ 8338ECC
|
||||||
|
.incbin "baserom.gba", 0x338ecc, 0x4
|
||||||
|
|
||||||
|
gUnknown_08338ED0:: @ 8338ED0
|
||||||
|
.incbin "baserom.gba", 0x338ed0, 0xf0
|
||||||
|
|
||||||
|
gUnknown_08338FC0:: @ 8338FC0
|
||||||
|
.incbin "baserom.gba", 0x338fc0, 0x3c
|
||||||
|
|
||||||
|
gUnknown_08338FFC:: @ 8338FFC
|
||||||
|
.incbin "baserom.gba", 0x338ffc, 0x10
|
||||||
|
|
||||||
|
gUnknown_0833900C:: @ 833900C
|
||||||
|
.incbin "baserom.gba", 0x33900c, 0x8
|
||||||
|
|
||||||
|
gUnknown_08339014:: @ 8339014
|
||||||
|
.incbin "baserom.gba", 0x339014, 0x10
|
||||||
|
|
||||||
|
gUnknown_08339024:: @ 8339024
|
||||||
|
.incbin "baserom.gba", 0x339024, 0x6c
|
||||||
|
|
||||||
|
gUnknown_08339090:: @ 8339090
|
||||||
|
.incbin "baserom.gba", 0x339090, 0x44
|
||||||
|
|
||||||
|
gUnknown_083390D4:: @ 83390D4
|
||||||
|
.incbin "baserom.gba", 0x3390d4, 0x20
|
||||||
|
|
||||||
|
gUnknown_083390F4:: @ 83390F4
|
||||||
|
.incbin "baserom.gba", 0x3390f4, 0x400
|
||||||
|
|
||||||
|
gUnknown_083394F4:: @ 83394F4
|
||||||
|
.incbin "baserom.gba", 0x3394f4, 0x246
|
||||||
|
|
||||||
|
gUnknown_0833973A:: @ 833973A
|
||||||
|
.incbin "baserom.gba", 0x33973a, 0x61
|
||||||
|
|
||||||
|
gUnknown_0833979B:: @ 833979B
|
||||||
|
.incbin "baserom.gba", 0x33979b, 0x2
|
||||||
|
|
||||||
|
gUnknown_0833979D:: @ 833979D
|
||||||
|
.incbin "baserom.gba", 0x33979d, 0x33
|
||||||
|
|
||||||
|
gUnknown_083397D0:: @ 83397D0
|
||||||
|
.incbin "baserom.gba", 0x3397d0, 0x4a
|
||||||
|
|
||||||
|
gUnknown_0833981A:: @ 833981A
|
||||||
|
.incbin "baserom.gba", 0x33981a, 0x17
|
||||||
|
|
||||||
|
gUnknown_08339831:: @ 8339831
|
||||||
|
.incbin "baserom.gba", 0x339831, 0x27
|
||||||
|
|
||||||
|
gUnknown_08339858:: @ 8339858
|
||||||
|
.incbin "baserom.gba", 0x339858, 0x3e
|
||||||
|
|
||||||
|
gUnknown_08339896:: @ 8339896
|
||||||
|
.incbin "baserom.gba", 0x339896, 0x1a
|
||||||
|
|
||||||
|
gUnknown_083398B0:: @ 83398B0
|
||||||
|
.incbin "baserom.gba", 0x3398b0, 0x2d
|
||||||
|
|
||||||
|
gUnknown_083398DD:: @ 83398DD
|
||||||
|
.incbin "baserom.gba", 0x3398dd, 0x18
|
||||||
|
|
||||||
|
gUnknown_083398F5:: @ 83398F5
|
||||||
|
.incbin "baserom.gba", 0x3398f5, 0x1f
|
||||||
|
|
||||||
|
gUnknown_08339914:: @ 8339914
|
||||||
|
.incbin "baserom.gba", 0x339914, 0x7
|
||||||
|
|
||||||
|
gUnknown_0833991B:: @ 833991B
|
||||||
|
.incbin "baserom.gba", 0x33991b, 0x6
|
||||||
|
|
||||||
|
gUnknown_08339921:: @ 8339921
|
||||||
|
.incbin "baserom.gba", 0x339921, 0x7
|
||||||
|
|
||||||
|
gUnknown_08339928:: @ 8339928
|
||||||
|
.incbin "baserom.gba", 0x339928, 0x6
|
||||||
|
|
||||||
|
gUnknown_0833992E:: @ 833992E
|
||||||
|
.incbin "baserom.gba", 0x33992e, 0xe
|
||||||
|
|
||||||
|
gUnknown_0833993C:: @ 833993C
|
||||||
|
.incbin "baserom.gba", 0x33993c, 0x5
|
||||||
|
|
||||||
|
gUnknown_08339941:: @ 8339941
|
||||||
|
.incbin "baserom.gba", 0x339941, 0x2
|
||||||
|
|
||||||
|
gUnknown_08339943:: @ 8339943
|
||||||
|
.incbin "baserom.gba", 0x339943, 0x4
|
||||||
|
|
||||||
|
gUnknown_08339947:: @ 8339947
|
||||||
|
.incbin "baserom.gba", 0x339947, 0x8
|
||||||
|
|
||||||
|
gUnknown_0833994F:: @ 833994F
|
||||||
|
.incbin "baserom.gba", 0x33994f, 0xe
|
||||||
|
|
||||||
|
gUnknown_0833995D:: @ 833995D
|
||||||
|
.incbin "baserom.gba", 0x33995d, 0x13
|
||||||
|
|
||||||
|
gUnknown_08339970:: @ 8339970
|
||||||
|
.incbin "baserom.gba", 0x339970, 0x4
|
||||||
|
|
||||||
|
gUnknown_08339974:: @ 8339974
|
||||||
|
.incbin "baserom.gba", 0x339974, 0xc
|
||||||
|
|
||||||
|
gUnknown_08339980:: @ 8339980
|
||||||
|
.incbin "baserom.gba", 0x339980, 0x38
|
||||||
|
|
||||||
|
gUnknown_083399B8:: @ 83399B8
|
||||||
|
.incbin "baserom.gba", 0x3399b8, 0x8
|
||||||
|
|
||||||
|
gUnknown_083399C0:: @ 83399C0
|
||||||
|
.incbin "baserom.gba", 0x3399c0, 0x8
|
||||||
|
|
||||||
|
gUnknown_083399C8:: @ 83399C8
|
||||||
|
.incbin "baserom.gba", 0x3399c8, 0x8
|
||||||
|
|
||||||
|
gUnknown_083399D0:: @ 83399D0
|
||||||
|
.incbin "baserom.gba", 0x3399d0, 0xc
|
||||||
|
|
||||||
|
gUnknown_083399DC:: @ 83399DC
|
||||||
|
.incbin "baserom.gba", 0x3399dc, 0x8
|
||||||
|
|
||||||
|
gUnknown_083399E4:: @ 83399E4
|
||||||
|
.incbin "baserom.gba", 0x3399e4, 0x3
|
||||||
|
|
||||||
|
gUnknown_083399E7:: @ 83399E7
|
||||||
|
.incbin "baserom.gba", 0x3399e7, 0x5
|
||||||
|
|
||||||
|
gUnknown_083399EC:: @ 83399EC
|
||||||
|
.incbin "baserom.gba", 0x3399ec, 0xd4
|
||||||
|
|
||||||
|
gUnknown_08339AC0:: @ 8339AC0
|
||||||
|
.incbin "baserom.gba", 0x339ac0, 0x8
|
||||||
|
|
||||||
|
gUnknown_08339AC8:: @ 8339AC8
|
||||||
|
.incbin "baserom.gba", 0x339ac8, 0x8
|
||||||
|
|
||||||
|
gUnknown_08339AD0:: @ 8339AD0
|
||||||
|
.incbin "baserom.gba", 0x339ad0, 0x8
|
||||||
|
|
||||||
|
gUnknown_08339AD8:: @ 8339AD8
|
||||||
|
.incbin "baserom.gba", 0x339ad8, 0x60
|
||||||
|
|
||||||
|
gUnknown_08339B38:: @ 8339B38
|
||||||
|
.incbin "baserom.gba", 0x339b38, 0x8
|
||||||
|
|
||||||
|
gUnknown_08339B40:: @ 8339B40
|
||||||
|
.incbin "baserom.gba", 0x339b40, 0x98
|
||||||
|
|
||||||
|
gUnknown_08339BD8:: @ 8339BD8
|
||||||
|
.incbin "baserom.gba", 0x339bd8, 0x8
|
||||||
|
|
||||||
|
gUnknown_08339BE0:: @ 8339BE0
|
||||||
|
.incbin "baserom.gba", 0x339be0, 0x44
|
||||||
|
|
||||||
|
gUnknown_08339C24:: @ 8339C24
|
||||||
|
.incbin "baserom.gba", 0x339c24, 0x8
|
||||||
|
|
||||||
|
gUnknown_08339C2C:: @ 8339C2C
|
||||||
|
.incbin "baserom.gba", 0x339c2c, 0x2c
|
||||||
|
|
||||||
|
gUnknown_08339C58:: @ 8339C58
|
||||||
|
.incbin "baserom.gba", 0x339c58, 0x8
|
||||||
|
|
||||||
|
gUnknown_08339C60:: @ 8339C60
|
||||||
|
.incbin "baserom.gba", 0x339c60, 0x18
|
||||||
|
|
||||||
|
gUnknown_08339C78:: @ 8339C78
|
||||||
|
.incbin "baserom.gba", 0x339c78, 0x28
|
||||||
|
|
||||||
|
gUnknown_08339CA0:: @ 8339CA0
|
||||||
|
.incbin "baserom.gba", 0x339ca0, 0x1e
|
||||||
|
|
||||||
|
gUnknown_08339CBE:: @ 8339CBE
|
||||||
|
.incbin "baserom.gba", 0x339cbe, 0x5
|
||||||
|
|
||||||
|
gUnknown_08339CC3:: @ 8339CC3
|
||||||
|
.incbin "baserom.gba", 0x339cc3, 0x5
|
||||||
|
|
||||||
|
gUnknown_08339CC8:: @ 8339CC8
|
||||||
|
.incbin "baserom.gba", 0x339cc8, 0x4c
|
||||||
|
|
||||||
|
gUnknown_08339D14:: @ 8339D14
|
||||||
|
.incbin "baserom.gba", 0x339d14, 0x8
|
||||||
|
|
||||||
|
gContestWinnerPicDummy:: @ 8339D1C
|
||||||
|
.incbin "baserom.gba", 0x339d1c, 0x20
|
||||||
|
|
||||||
|
gUnknown_08339D3C:: @ 8339D3C
|
||||||
|
.incbin "baserom.gba", 0x339d3c, 0x28
|
||||||
|
|
||||||
|
gUnknown_08339D64:: @ 8339D64
|
||||||
|
.incbin "baserom.gba", 0x339d64, 0x48
|
||||||
|
|
||||||
|
gUnknown_08339DAC:: @ 8339DAC
|
||||||
|
.incbin "baserom.gba", 0x339dac, 0x10
|
||||||
|
|
||||||
|
gUnknown_08339DBC:: @ 8339DBC
|
||||||
|
.incbin "baserom.gba", 0x339dbc, 0xc
|
||||||
|
|
||||||
|
gUnknown_08339DC8:: @ 8339DC8
|
||||||
|
.incbin "baserom.gba", 0x339dc8, 0xc
|
||||||
|
|
||||||
|
gUnknown_08339DD4:: @ 8339DD4
|
||||||
|
.incbin "baserom.gba", 0x339dd4, 0x2c
|
||||||
|
|
||||||
|
gUnknown_08339E00:: @ 8339E00
|
||||||
|
.incbin "baserom.gba", 0x339e00, 0x8
|
||||||
|
|
||||||
|
@ 8339E08
|
||||||
|
.include "data/tilesets/tileset_graphics.inc"
|
||||||
|
|
||||||
|
@ 83960F0
|
||||||
|
.include "data/tilesets/metatiles.inc"
|
||||||
|
|
||||||
|
@ 83DF704
|
||||||
|
.include "data/tilesets/tilesets.inc"
|
||||||
|
|
||||||
|
@ 83DFE14
|
||||||
|
.incbin "baserom.gba", 0x3dfe14, 0xa1fc0
|
||||||
|
|
||||||
|
gUnknown_08481DD4:: @ 8481DD4
|
||||||
|
.incbin "baserom.gba", 0x481dd4, 0x47a4
|
||||||
|
|
||||||
|
gUnknown_08486578:: @ 8486578
|
||||||
|
.incbin "baserom.gba", 0x486578, 0x980
|
||||||
|
|
||||||
|
gUnknown_08486EF8:: @ 8486EF8
|
||||||
|
.incbin "baserom.gba", 0x486ef8, 0x4
|
||||||
|
|
||||||
|
gUnknown_08486EFC:: @ 8486EFC
|
||||||
|
.incbin "baserom.gba", 0x486efc, 0x10090
|
||||||
|
|
||||||
|
gUnknown_08496F8C:: @ 8496F8C
|
||||||
|
.incbin "baserom.gba", 0x496f8c, 0x14
|
||||||
|
|
||||||
|
gUnknown_08496FA0:: @ 8496FA0
|
||||||
|
.incbin "baserom.gba", 0x496fa0, 0x14
|
||||||
|
|
||||||
|
gUnknown_08496FB4:: @ 8496FB4
|
||||||
|
.incbin "baserom.gba", 0x496fb4, 0x1c0
|
||||||
|
|
||||||
|
gUnknown_08497174:: @ 8497174
|
||||||
|
.incbin "baserom.gba", 0x497174, 0x288
|
||||||
|
|
||||||
|
gUnknown_084973FC:: @ 84973FC
|
||||||
|
.incbin "baserom.gba", 0x4973fc, 0x48
|
||||||
|
|
||||||
|
gUnknown_08497444:: @ 8497444
|
||||||
|
.incbin "baserom.gba", 0x497444, 0x4c
|
||||||
|
|
||||||
|
gUnknown_08497490:: @ 8497490
|
||||||
|
.incbin "baserom.gba", 0x497490, 0xc
|
||||||
|
|
||||||
|
gUnknown_0849749C:: @ 849749C
|
||||||
|
.incbin "baserom.gba", 0x49749c, 0x14
|
||||||
|
|
||||||
|
gUnknown_084974B0:: @ 84974B0
|
||||||
|
.incbin "baserom.gba", 0x4974b0, 0x8
|
||||||
|
|
||||||
|
gUnknown_084974B8:: @ 84974B8
|
||||||
|
.incbin "baserom.gba", 0x4974b8, 0x20
|
||||||
|
|
||||||
|
gUnknown_084974D8:: @ 84974D8
|
||||||
|
.incbin "baserom.gba", 0x4974d8, 0x10
|
||||||
|
|
||||||
|
gUnknown_084974E8:: @ 84974E8
|
||||||
|
.incbin "baserom.gba", 0x4974e8, 0x10
|
||||||
|
|
||||||
|
gUnknown_084974F8:: @ 84974F8
|
||||||
|
.incbin "baserom.gba", 0x4974f8, 0x10
|
||||||
|
|
||||||
|
gUnknown_08497508:: @ 8497508
|
||||||
|
.incbin "baserom.gba", 0x497508, 0x2
|
||||||
|
|
||||||
|
gUnknown_0849750A:: @ 849750A
|
||||||
|
.incbin "baserom.gba", 0x49750a, 0x2
|
||||||
|
|
||||||
|
gUnknown_0849750C:: @ 849750C
|
||||||
|
.incbin "baserom.gba", 0x49750c, 0x14
|
||||||
|
|
||||||
|
gUnknown_08497520:: @ 8497520
|
||||||
|
.incbin "baserom.gba", 0x497520, 0x10
|
||||||
|
|
||||||
|
gUnknown_08497530:: @ 8497530
|
||||||
|
.incbin "baserom.gba", 0x497530, 0xc
|
||||||
|
|
||||||
|
gUnknown_0849753C:: @ 849753C
|
||||||
|
.incbin "baserom.gba", 0x49753c, 0x4
|
||||||
|
|
||||||
|
gUnknown_08497540:: @ 8497540
|
||||||
|
.incbin "baserom.gba", 0x497540, 0x10
|
||||||
|
|
||||||
|
gUnknown_08497550:: @ 8497550
|
||||||
|
.incbin "baserom.gba", 0x497550, 0x4
|
||||||
|
|
||||||
|
gUnknown_08497554:: @ 8497554
|
||||||
|
.incbin "baserom.gba", 0x497554, 0x8
|
||||||
|
|
||||||
|
gUnknown_0849755C:: @ 849755C
|
||||||
|
.incbin "baserom.gba", 0x49755c, 0x40
|
||||||
|
|
||||||
|
gUnknown_0849759C:: @ 849759C
|
||||||
|
.incbin "baserom.gba", 0x49759c, 0x6
|
||||||
|
|
||||||
|
gUnknown_084975A2:: @ 84975A2
|
||||||
|
.incbin "baserom.gba", 0x4975a2, 0x6
|
||||||
|
|
||||||
|
gUnknown_084975A8:: @ 84975A8
|
||||||
|
.incbin "baserom.gba", 0x4975a8, 0x2
|
||||||
|
|
||||||
|
gUnknown_084975AA:: @ 84975AA
|
||||||
|
.incbin "baserom.gba", 0x4975aa, 0x6
|
||||||
|
|
||||||
|
gUnknown_084975B0:: @ 84975B0
|
||||||
|
.incbin "baserom.gba", 0x4975b0, 0xc
|
||||||
|
|
||||||
|
gUnknown_084975BC:: @ 84975BC
|
||||||
|
.incbin "baserom.gba", 0x4975bc, 0x8
|
||||||
File diff suppressed because it is too large
Load Diff
1903
data/field_map_obj.s
Normal file
1903
data/field_map_obj.s
Normal file
File diff suppressed because it is too large
Load Diff
@ -11,6 +11,12 @@ enum
|
|||||||
BERRY_FIRMNESS_SUPER_HARD,
|
BERRY_FIRMNESS_SUPER_HARD,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define NUM_BERRIES 44
|
||||||
|
|
||||||
|
extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[NUM_BERRIES];
|
||||||
|
extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[NUM_BERRIES];
|
||||||
|
extern const u8 *const gBerryTreePaletteSlotTablePointers[NUM_BERRIES];
|
||||||
|
|
||||||
void ClearEnigmaBerries(void);
|
void ClearEnigmaBerries(void);
|
||||||
void SetEnigmaBerry(u8 *src);
|
void SetEnigmaBerry(u8 *src);
|
||||||
u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
|
u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
|
||||||
|
|||||||
11
include/event_scripts.h
Executable file
11
include/event_scripts.h
Executable file
@ -0,0 +1,11 @@
|
|||||||
|
//
|
||||||
|
// Created by scott on 9/12/2017.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef GUARD_EVENT_SCRIPTS_H
|
||||||
|
#define GUARD_EVENT_SCRIPTS_H
|
||||||
|
|
||||||
|
extern const u8 gUnknown_082766A2[];
|
||||||
|
extern const u8 gUnknown_082766A6[];
|
||||||
|
|
||||||
|
#endif //GUARD_EVENT_SCRIPTS_H
|
||||||
25
include/field_camera.h
Normal file
25
include/field_camera.h
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
#ifndef GUARD_FIELD_CAMERA_H
|
||||||
|
#define GUARD_FIELD_CAMERA_H
|
||||||
|
|
||||||
|
// Exported type declarations
|
||||||
|
|
||||||
|
struct CameraObject
|
||||||
|
{
|
||||||
|
void (*callback)(struct CameraObject *);
|
||||||
|
u32 unk4;
|
||||||
|
s32 unk8;
|
||||||
|
s32 unkC;
|
||||||
|
s32 x;
|
||||||
|
s32 y;
|
||||||
|
};
|
||||||
|
|
||||||
|
extern struct CameraObject gUnknown_03005DD0;
|
||||||
|
|
||||||
|
// Exported RAM declarations
|
||||||
|
|
||||||
|
extern u16 gUnknown_03005DEC;
|
||||||
|
extern u16 gUnknown_03005DE8;
|
||||||
|
|
||||||
|
// Exported ROM declarations
|
||||||
|
|
||||||
|
#endif //GUARD_FIELD_CAMERA_H
|
||||||
80
include/field_effect.h
Normal file
80
include/field_effect.h
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
//
|
||||||
|
// Created by Scott Norton on 9/15/17.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef GUARD_FIELD_EFFECTS_H
|
||||||
|
#define GUARD_FIELD_EFFECTS_H
|
||||||
|
|
||||||
|
enum FieldEffectScriptIdx
|
||||||
|
{
|
||||||
|
FLDEFF_EXCLAMATION_MARK_ICON_1,
|
||||||
|
FLDEFF_USE_CUT_ON_GRASS,
|
||||||
|
FLDEFF_USE_CUT_ON_TREE,
|
||||||
|
FLDEFF_SHADOW,
|
||||||
|
FLDEFF_TALL_GRASS,
|
||||||
|
FLDEFF_RIPPLE,
|
||||||
|
FLDEFF_FIELD_MOVE_SHOW_MON,
|
||||||
|
FLDEFF_ASH,
|
||||||
|
FLDEFF_SURF_BLOB,
|
||||||
|
FLDEFF_USE_SURF,
|
||||||
|
FLDEFF_DUST,
|
||||||
|
FLDEFF_USE_SECRET_POWER_CAVE,
|
||||||
|
FLDEFF_JUMP_TALL_GRASS,
|
||||||
|
FLDEFF_SAND_FOOTPRINTS,
|
||||||
|
FLDEFF_JUMP_BIG_SPLASH,
|
||||||
|
FLDEFF_SPLASH,
|
||||||
|
FLDEFF_JUMP_SMALL_SPLASH,
|
||||||
|
FLDEFF_LONG_GRASS,
|
||||||
|
FLDEFF_JUMP_LONG_GRASS,
|
||||||
|
FLDEFF_UNKNOWN_19,
|
||||||
|
FLDEFF_UNKNOWN_20,
|
||||||
|
FLDEFF_UNKNOWN_21,
|
||||||
|
FLDEFF_UNKNOWN_22,
|
||||||
|
FLDEFF_BERRY_TREE_GROWTH_SPARKLE,
|
||||||
|
FLDEFF_DEEP_SAND_FOOTPRINTS,
|
||||||
|
FLDEFF_POKECENTER_HEAL,
|
||||||
|
FLDEFF_USE_SECRET_POWER_TREE,
|
||||||
|
FLDEFF_USE_SECRET_POWER_SHRUB,
|
||||||
|
FLDEFF_TREE_DISGUISE,
|
||||||
|
FLDEFF_MOUNTAIN_DISGUISE,
|
||||||
|
FLDEFF_NPCFLY_OUT,
|
||||||
|
FLDEFF_USE_FLY,
|
||||||
|
FLDEFF_FLY_IN,
|
||||||
|
FLDEFF_EXCLAMATION_MARK_ICON_2,
|
||||||
|
FLDEFF_FEET_IN_FLOWING_WATER,
|
||||||
|
FLDEFF_BIKE_TIRE_TRACKS,
|
||||||
|
FLDEFF_SAND_DISGUISE,
|
||||||
|
FLDEFF_USE_ROCK_SMASH,
|
||||||
|
FLDEFF_USE_DIG,
|
||||||
|
FLDEFF_SAND_PILE,
|
||||||
|
FLDEFF_USE_STRENGTH,
|
||||||
|
FLDEFF_SHORT_GRASS,
|
||||||
|
FLDEFF_HOT_SPRINGS_WATER,
|
||||||
|
FLDEFF_USE_WATERFALL,
|
||||||
|
FLDEFF_USE_DIVE,
|
||||||
|
FLDEFF_POKEBALL,
|
||||||
|
FLDEFF_HEART_ICON,
|
||||||
|
FLDEFF_NOP_47,
|
||||||
|
FLDEFF_NOP_48,
|
||||||
|
FLDEFF_POP_OUT_OF_ASH,
|
||||||
|
FLDEFF_LAVARIDGE_GYM_WARP,
|
||||||
|
FLDEFF_SWEET_SCENT,
|
||||||
|
FLDEFF_SAND_PILLAR,
|
||||||
|
FLDEFF_BUBBLES,
|
||||||
|
FLDEFF_SPARKLE,
|
||||||
|
FLDEFF_SECRET_POWER_CAVE,
|
||||||
|
FLDEFF_SECRET_POWER_TREE,
|
||||||
|
FLDEFF_SECRET_POWER_SHRUB,
|
||||||
|
FLDEFF_CUT_GRASS,
|
||||||
|
FLDEFF_FIELD_MOVE_SHOW_MON_INIT,
|
||||||
|
FLDEFF_USE_FLY_ANCIENT_TOMB,
|
||||||
|
FLDEFF_PCTURN_ON,
|
||||||
|
FLDEFF_HALL_OF_FAME_RECORD,
|
||||||
|
FLDEFF_USE_TELEPORT
|
||||||
|
};
|
||||||
|
|
||||||
|
extern u32 gFieldEffectSpawnParams[8];
|
||||||
|
|
||||||
|
u8 FieldEffectStart(u8);
|
||||||
|
|
||||||
|
#endif //GUARD_FIELD_EFFECTS_H
|
||||||
16
include/field_effect_helpers.h
Normal file
16
include/field_effect_helpers.h
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
//
|
||||||
|
// Created by scott on 9/7/2017.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef GUARD_FIELD_EFFECT_HELPERS_H
|
||||||
|
#define GUARD_FIELD_EFFECT_HELPERS_H
|
||||||
|
|
||||||
|
// Exported type declarations
|
||||||
|
|
||||||
|
// Exported RAM declarations
|
||||||
|
|
||||||
|
// Exported ROM declarations
|
||||||
|
u8 sub_8154228(void);
|
||||||
|
bool8 sub_8155DA0(struct MapObject *);
|
||||||
|
|
||||||
|
#endif //GUARD_FIELD_EFFECT_HELPERS_H
|
||||||
22
include/field_ground_effect.h
Normal file
22
include/field_ground_effect.h
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
//
|
||||||
|
// Created by scott on 9/6/2017.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef GUARD_FIELD_GROUND_EFFECT_H
|
||||||
|
#define GUARD_FIELD_GROUND_EFFECT_H
|
||||||
|
|
||||||
|
// Exported type declarations
|
||||||
|
|
||||||
|
// Exported RAM declarations
|
||||||
|
|
||||||
|
// Exported ROM declarations
|
||||||
|
void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
|
||||||
|
void InitObjectPriorityByZCoord(struct Sprite *, u8);
|
||||||
|
bool8 IsZCoordMismatchAt(u8, s16, s16);
|
||||||
|
bool8 AreZCoordsCompatible(u8, u8);
|
||||||
|
void FieldObjectUpdateSubpriority(struct MapObject *, struct Sprite *);
|
||||||
|
void DoGroundEffects_OnSpawn(struct MapObject *, struct Sprite *);
|
||||||
|
void DoGroundEffects_OnBeginStep(struct MapObject *, struct Sprite *);
|
||||||
|
void DoGroundEffects_OnFinishStep(struct MapObject *, struct Sprite *);
|
||||||
|
|
||||||
|
#endif //GUARD_FIELD_GROUND_EFFECT_H
|
||||||
79
include/field_map_obj.h
Executable file
79
include/field_map_obj.h
Executable file
@ -0,0 +1,79 @@
|
|||||||
|
#ifndef GUARD_FIELD_MAP_OBJ_H
|
||||||
|
#define GUARD_FIELD_MAP_OBJ_H
|
||||||
|
|
||||||
|
#define NUM_OBJECT_GRAPHICS_INFO 239
|
||||||
|
#define SPRITE_VAR 240
|
||||||
|
|
||||||
|
// Exported struct declarations
|
||||||
|
|
||||||
|
enum SpinnerRunnerFollowPatterns {
|
||||||
|
RUNFOLLOW_ANY,
|
||||||
|
RUNFOLLOW_NORTH_SOUTH,
|
||||||
|
RUNFOLLOW_EAST_WEST,
|
||||||
|
RUNFOLLOW_NORTH_WEST,
|
||||||
|
RUNFOLLOW_NORTH_EAST,
|
||||||
|
RUNFOLLOW_SOUTH_WEST,
|
||||||
|
RUNFOLLOW_SOUTH_EAST,
|
||||||
|
RUNFOLLOW_NORTH_SOUTH_WEST,
|
||||||
|
RUNFOLLOW_NORTH_SOUTH_EAST,
|
||||||
|
RUNFOLLOW_NORTH_EAST_WEST,
|
||||||
|
RUNFOLLOW_SOUTH_EAST_WEST
|
||||||
|
};
|
||||||
|
|
||||||
|
// Exported RAM declarations
|
||||||
|
|
||||||
|
// Exported ROM declarations
|
||||||
|
|
||||||
|
void sub_808D438(void);
|
||||||
|
u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8);
|
||||||
|
bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
|
||||||
|
u8 GetFieldObjectIdByXY(s16, s16);
|
||||||
|
void FieldObjectSetDirection(struct MapObject *, u8);
|
||||||
|
u8 sub_808D4F4(void);
|
||||||
|
void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
|
||||||
|
void npc_load_two_palettes__no_record(u16, u8);
|
||||||
|
void npc_load_two_palettes__and_record(u16, u8);
|
||||||
|
void pal_patch_for_npc(u16, u8);
|
||||||
|
void sub_808E16C(s16, s16);
|
||||||
|
void sub_8092FF0(s16, s16, s16 *, s16 *);
|
||||||
|
u8 FieldObjectDirectionToImageAnimId(u8);
|
||||||
|
void sub_80930E0(s16 *, s16 *, s16, s16);
|
||||||
|
void FieldObjectClearAnim(struct MapObject *);
|
||||||
|
void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);
|
||||||
|
void SpawnFieldObjectsInView(s16, s16);
|
||||||
|
u8 sprite_new(u8, u8, s16, s16, u8, u8);
|
||||||
|
u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8);
|
||||||
|
u8 show_sprite(u8, u8, u8);
|
||||||
|
u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
|
||||||
|
u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
|
||||||
|
void sub_8093038(s16, s16, s16 *, s16 *);
|
||||||
|
void CameraObjectReset1(void);
|
||||||
|
void FieldObjectSetGraphicsId(struct MapObject *, u8);
|
||||||
|
void FieldObjectTurn(struct MapObject *, u8);
|
||||||
|
void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
|
||||||
|
const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
|
||||||
|
void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
|
||||||
|
void gpu_pal_allocator_reset__manage_upper_four(void);
|
||||||
|
void sub_808E82C(u8, u8, u8, s16, s16);
|
||||||
|
void sub_808E7E4(u8, u8, u8);
|
||||||
|
void sub_808E78C(u8, u8, u8, u8);
|
||||||
|
void sub_808E75C(s16, s16);
|
||||||
|
void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
|
||||||
|
void npc_coords_shift(struct MapObject *, s16, s16);
|
||||||
|
void sub_808EB08(struct MapObject *, s16, s16);
|
||||||
|
void sub_808F254(u8, u8, u8);
|
||||||
|
void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *));
|
||||||
|
u8 GetOppositeDirection(u8);
|
||||||
|
u8 GetStepInPlaceDelay4AnimId(u32);
|
||||||
|
u8 GetStepInPlaceDelay8AnimId(u32);
|
||||||
|
u8 GetStepInPlaceDelay16AnimId(u32);
|
||||||
|
u8 GetStepInPlaceDelay32AnimId(u32);
|
||||||
|
u8 npc_block_way(struct MapObject *, s16, s16, u32);
|
||||||
|
void MoveCoords(u8, s16 *, s16 *);
|
||||||
|
bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
|
||||||
|
|
||||||
|
// Exported data declarations
|
||||||
|
|
||||||
|
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
|
||||||
|
|
||||||
|
#endif //GUARD_FIELD_MAP_OBJ_H
|
||||||
17
include/field_player_avatar.h
Normal file
17
include/field_player_avatar.h
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
//
|
||||||
|
// Created by Scott Norton on 9/6/17.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef GUARD_FIELD_PLAYER_AVATAR_H
|
||||||
|
#define GUARD_FIELD_PLAYER_AVATAR_H
|
||||||
|
|
||||||
|
void ClearPlayerAvatarInfo(void);
|
||||||
|
void SetPlayerAvatarExtraStateTransition(u8, u8);
|
||||||
|
u8 GetPlayerAvatarGenderByGraphicsId(u8);
|
||||||
|
bool8 TestPlayerAvatarFlags(u8);
|
||||||
|
void PlayerGetDestCoords(s16 *, s16 *);
|
||||||
|
u8 player_get_direction_lower_nybble(void);
|
||||||
|
u8 player_get_direction_upper_nybble(void);
|
||||||
|
u8 player_get_x22(void);
|
||||||
|
|
||||||
|
#endif //GUARD_FIELD_PLAYER_AVATAR_H
|
||||||
@ -1,6 +1,19 @@
|
|||||||
|
//
|
||||||
|
// Created by scott on 9/16/2017.
|
||||||
|
//
|
||||||
|
|
||||||
#ifndef GUARD_FIELDMAP_H
|
#ifndef GUARD_FIELDMAP_H
|
||||||
#define GUARD_FIELDMAP_H
|
#define GUARD_FIELDMAP_H
|
||||||
|
|
||||||
void GetCameraCoords(u16*, u16*);
|
// Exported type declarations
|
||||||
|
|
||||||
#endif // GUARD_FIELDMAP_H
|
// Exported RAM declarations
|
||||||
|
|
||||||
|
// Exported ROM declarations
|
||||||
|
u8 MapGridGetMetatileBehaviorAt(s16, s16);
|
||||||
|
void GetCameraCoords(u16*, u16*);
|
||||||
|
bool8 MapGridIsImpassableAt(s16, s16);
|
||||||
|
s32 GetMapBorderIdAt(s16, s16);
|
||||||
|
bool32 CanCameraMoveInDirection(u8);
|
||||||
|
|
||||||
|
#endif //GUARD_FIELDMAP_H
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
#ifndef GUARD_GLOBAL_FIELDMAP_H
|
#ifndef GUARD_GLOBAL_FIELDMAP_H
|
||||||
#define GUARD_GLOBAL_FIELDMAP_H
|
#define GUARD_GLOBAL_FIELDMAP_H
|
||||||
|
|
||||||
|
#define NUM_FIELD_OBJECTS 16
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
CONNECTION_SOUTH = 1,
|
CONNECTION_SOUTH = 1,
|
||||||
@ -84,7 +86,7 @@ struct MapObjectTemplate
|
|||||||
///*0x0B*/ u8 fillerB[1];
|
///*0x0B*/ u8 fillerB[1];
|
||||||
/*0x0C*/ u16 unkC;
|
/*0x0C*/ u16 unkC;
|
||||||
/*0x0E*/ u16 unkE;
|
/*0x0E*/ u16 unkE;
|
||||||
/*0x10*/ u8 *script;
|
/*0x10*/ const u8 *script;
|
||||||
/*0x14*/ u16 flagId;
|
/*0x14*/ u16 flagId;
|
||||||
/*0x16*/ u8 filler_16[2];
|
/*0x16*/ u8 filler_16[2];
|
||||||
}; /*size = 0x18*/
|
}; /*size = 0x18*/
|
||||||
@ -224,7 +226,13 @@ struct MapObject
|
|||||||
/*0x14*/ struct Coords16 coords3;
|
/*0x14*/ struct Coords16 coords3;
|
||||||
/*0x18*/ u8 mapobj_unk_18:4; //current direction?
|
/*0x18*/ u8 mapobj_unk_18:4; //current direction?
|
||||||
/*0x18*/ u8 placeholder18:4;
|
/*0x18*/ u8 placeholder18:4;
|
||||||
/*0x19*/ u8 mapobj_unk_19;
|
/*0x19*/ union __attribute__((packed)) {
|
||||||
|
u8 as_byte;
|
||||||
|
struct __attribute__((packed)) {
|
||||||
|
u8 x:4;
|
||||||
|
u8 y:4;
|
||||||
|
} __attribute__((aligned (1))) as_nybbles;
|
||||||
|
} __attribute__((aligned (1))) range;
|
||||||
/*0x1A*/ u8 mapobj_unk_1A;
|
/*0x1A*/ u8 mapobj_unk_1A;
|
||||||
/*0x1B*/ u8 mapobj_unk_1B;
|
/*0x1B*/ u8 mapobj_unk_1B;
|
||||||
/*0x1C*/ u8 mapobj_unk_1C;
|
/*0x1C*/ u8 mapobj_unk_1C;
|
||||||
@ -237,68 +245,6 @@ struct MapObject
|
|||||||
/*size = 0x24*/
|
/*size = 0x24*/
|
||||||
};
|
};
|
||||||
|
|
||||||
// THIS IS NEEDED TO MAKE TRAINER_SEE.C MATCH, PLEASE DO NOT REMOVE UNLESS YOU FIX CHECKPATHBETWEENTRAINERANDPLAYER
|
|
||||||
struct MapObject2
|
|
||||||
{
|
|
||||||
/*0x00*/ u32 active:1;
|
|
||||||
u32 mapobj_bit_1:1;
|
|
||||||
u32 mapobj_bit_2:1;
|
|
||||||
u32 mapobj_bit_3:1;
|
|
||||||
u32 mapobj_bit_4:1;
|
|
||||||
u32 mapobj_bit_5:1;
|
|
||||||
u32 mapobj_bit_6:1;
|
|
||||||
u32 mapobj_bit_7:1;
|
|
||||||
/*0x01*/ u32 mapobj_bit_8:1;
|
|
||||||
u32 mapobj_bit_9:1;
|
|
||||||
u32 mapobj_bit_10:1;
|
|
||||||
u32 mapobj_bit_11:1;
|
|
||||||
u32 mapobj_bit_12:1;
|
|
||||||
u32 mapobj_bit_13:1;
|
|
||||||
u32 mapobj_bit_14:1;
|
|
||||||
u32 mapobj_bit_15:1;
|
|
||||||
/*0x02*/ u32 mapobj_bit_16:1;
|
|
||||||
u32 mapobj_bit_17:1;
|
|
||||||
u32 mapobj_bit_18:1;
|
|
||||||
u32 mapobj_bit_19:1;
|
|
||||||
u32 mapobj_bit_20:1;
|
|
||||||
u32 mapobj_bit_21:1;
|
|
||||||
u32 mapobj_bit_22:1;
|
|
||||||
u32 mapobj_bit_23:1;
|
|
||||||
/*0x03*/ u32 mapobj_bit_24:1;
|
|
||||||
u32 mapobj_bit_25:1;
|
|
||||||
u32 mapobj_bit_26:1;
|
|
||||||
u32 mapobj_bit_27:1;
|
|
||||||
u32 mapobj_bit_28:1;
|
|
||||||
u32 mapobj_bit_29:1;
|
|
||||||
u32 mapobj_bit_30:1;
|
|
||||||
u32 mapobj_bit_31:1;
|
|
||||||
/*0x04*/ u8 spriteId;
|
|
||||||
/*0x05*/ u8 graphicsId;
|
|
||||||
/*0x06*/ u8 animPattern;
|
|
||||||
/*0x07*/ u8 trainerType;
|
|
||||||
/*0x08*/ u8 localId;
|
|
||||||
/*0x09*/ u8 mapNum;
|
|
||||||
/*0x0A*/ u8 mapGroup;
|
|
||||||
/*0x0B*/ u8 mapobj_unk_0B_0:4;
|
|
||||||
u8 elevation:4;
|
|
||||||
/*0x0C*/ struct Coords16 coords1;
|
|
||||||
/*0x10*/ struct Coords16 coords2;
|
|
||||||
/*0x14*/ struct Coords16 coords3;
|
|
||||||
/*0x18*/ u8 mapobj_unk_18:4;
|
|
||||||
/*0x18*/ u8 placeholder18:4;
|
|
||||||
/*0x19*/ u8 mapobj_unk_19:4;
|
|
||||||
/*0x19*/ u8 mapobj_unk_19b:4;
|
|
||||||
/*0x1A*/ u8 mapobj_unk_1A;
|
|
||||||
/*0x1B*/ u8 mapobj_unk_1B;
|
|
||||||
/*0x1C*/ u8 mapobj_unk_1C;
|
|
||||||
/*0x1D*/ u8 trainerRange_berryTreeId;
|
|
||||||
/*0x1E*/ u8 mapobj_unk_1E;
|
|
||||||
/*0x1F*/ u8 mapobj_unk_1F;
|
|
||||||
/*0x20*/ u8 mapobj_unk_20;
|
|
||||||
/*0x21*/ u8 mapobj_unk_21;
|
|
||||||
/*size = 0x24*/
|
|
||||||
};
|
|
||||||
|
|
||||||
struct MapObjectGraphicsInfo
|
struct MapObjectGraphicsInfo
|
||||||
{
|
{
|
||||||
/*0x00*/ u16 tileTag;
|
/*0x00*/ u16 tileTag;
|
||||||
@ -376,14 +322,15 @@ struct PlayerAvatar /* 0x202E858 */
|
|||||||
|
|
||||||
struct Camera
|
struct Camera
|
||||||
{
|
{
|
||||||
bool8 field_0:1;
|
bool8 active:1;
|
||||||
s32 x;
|
s32 x;
|
||||||
s32 y;
|
s32 y;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct MapObject gMapObjects[];
|
extern struct MapObject gMapObjects[NUM_FIELD_OBJECTS];
|
||||||
extern u8 gSelectedMapObject;
|
extern u8 gSelectedMapObject;
|
||||||
extern struct MapHeader gMapHeader;
|
extern struct MapHeader gMapHeader;
|
||||||
extern struct PlayerAvatar gPlayerAvatar;
|
extern struct PlayerAvatar gPlayerAvatar;
|
||||||
|
extern struct Camera gCamera;
|
||||||
|
|
||||||
#endif // GUARD_GLOBAL_FIELDMAP_H
|
#endif // GUARD_GLOBAL_FIELDMAP_H
|
||||||
|
|||||||
@ -9,6 +9,12 @@
|
|||||||
|
|
||||||
// to help in decompiling
|
// to help in decompiling
|
||||||
#define asm_comment(x) asm volatile("@ -- " x " -- ")
|
#define asm_comment(x) asm volatile("@ -- " x " -- ")
|
||||||
|
#define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")
|
||||||
|
|
||||||
|
#if defined (__APPLE__) || defined (__CYGWIN__)
|
||||||
|
void memset(void *, int, size_t);
|
||||||
|
void memcpy(void *, const void *, size_t);
|
||||||
|
#endif // __APPLE__
|
||||||
|
|
||||||
#define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
|
#define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
|
||||||
|
|
||||||
@ -753,4 +759,6 @@ struct Bitmap // TODO: Find a better spot for this
|
|||||||
u32 height:16;
|
u32 height:16;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern u8 gReservedSpritePaletteCount;
|
||||||
|
|
||||||
#endif // GUARD_GLOBAL_H
|
#endif // GUARD_GLOBAL_H
|
||||||
|
|||||||
@ -1,6 +1,10 @@
|
|||||||
#ifndef GUARD_MALLOC_H
|
#ifndef GUARD_MALLOC_H
|
||||||
#define GUARD_MALLOC_H
|
#define GUARD_MALLOC_H
|
||||||
|
|
||||||
|
#define malloc Alloc
|
||||||
|
#define calloc AllocZeroed
|
||||||
|
#define free Free
|
||||||
|
|
||||||
void *Alloc(u32 size);
|
void *Alloc(u32 size);
|
||||||
void *AllocZeroed(u32 size);
|
void *AllocZeroed(u32 size);
|
||||||
void Free(void *pointer);
|
void Free(void *pointer);
|
||||||
|
|||||||
32
include/map_obj_8097404.h
Normal file
32
include/map_obj_8097404.h
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
//
|
||||||
|
// Created by scott on 9/7/2017.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef GUARD_MAP_OBJ_8097404_H
|
||||||
|
#define GUARD_MAP_OBJ_8097404_H
|
||||||
|
|
||||||
|
// Exported type declarations
|
||||||
|
|
||||||
|
// Exported RAM declarations
|
||||||
|
extern void *gUnknown_020375B8;
|
||||||
|
|
||||||
|
// Exported ROM declarations
|
||||||
|
void sub_8097AC8(struct Sprite *);
|
||||||
|
void npc_sync_anim_pause_bits(struct MapObject *);
|
||||||
|
void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
|
||||||
|
u8 sub_8097F78(struct MapObject *);
|
||||||
|
bool8 obj_npc_ministep(struct Sprite *sprite);
|
||||||
|
bool8 sub_80976EC(struct Sprite *sprite);
|
||||||
|
void sub_80976DC(struct Sprite *, u8);
|
||||||
|
void sub_809783C(struct Sprite *, u8, u8, u8);
|
||||||
|
void DoShadowFieldEffect(struct MapObject *);
|
||||||
|
u8 sub_809785C(struct Sprite *);
|
||||||
|
u8 sub_80978E4(struct Sprite *);
|
||||||
|
void obj_anim_image_set_and_seek(struct Sprite *, u8, u8);
|
||||||
|
bool8 sub_80979BC(struct Sprite *);
|
||||||
|
void sub_8097750(struct Sprite *);
|
||||||
|
bool8 sub_8097758(struct Sprite *);
|
||||||
|
void sub_8097FA4(struct MapObject *);
|
||||||
|
void sub_8098044(u8);
|
||||||
|
|
||||||
|
#endif //GUARD_MAP_OBJ_8097404_H
|
||||||
@ -1,6 +1,8 @@
|
|||||||
|
|
||||||
#ifndef GUARD_MAUVILLE_OLD_MAN_H
|
#ifndef GUARD_MAUVILLE_OLD_MAN_H
|
||||||
#define GUARD_MAUVILLE_OLD_MAN_H
|
#define GUARD_MAUVILLE_OLD_MAN_H
|
||||||
|
|
||||||
void SetMauvilleOldMan(void);
|
void SetMauvilleOldMan(void);
|
||||||
|
u8 sub_81201C8(void);
|
||||||
|
|
||||||
#endif // GUARD_MAUVILLE_OLD_MAN_H
|
#endif // GUARD_MAUVILLE_OLD_MAN_H
|
||||||
|
|||||||
11
include/metatile_behavior.h
Normal file
11
include/metatile_behavior.h
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
#ifndef GUARD_METATILE_BEHAVIOR_H
|
||||||
|
#define GUARD_METATILE_BEHAVIOR_H
|
||||||
|
|
||||||
|
// Exported type declarations
|
||||||
|
|
||||||
|
// Exported RAM declarations
|
||||||
|
|
||||||
|
// Exported ROM declarations
|
||||||
|
bool8 sub_8088E64(u8);
|
||||||
|
|
||||||
|
#endif //GUARD_METATILE_BEHAVIOR_H
|
||||||
31
include/rom4.h
Normal file
31
include/rom4.h
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
|
||||||
|
#ifndef GUARD_ROM4_H
|
||||||
|
#define GUARD_ROM4_H
|
||||||
|
|
||||||
|
struct UnkPlayerStruct
|
||||||
|
{
|
||||||
|
u8 player_field_0;
|
||||||
|
u8 player_field_1;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct LinkPlayerMapObject
|
||||||
|
{
|
||||||
|
u8 active;
|
||||||
|
u8 linkPlayerId;
|
||||||
|
u8 mapObjId;
|
||||||
|
u8 mode;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct UCoords32
|
||||||
|
{
|
||||||
|
u32 x, y;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
|
||||||
|
|
||||||
|
void strange_npc_table_clear(void);
|
||||||
|
const struct MapHeader *get_mapheader_by_bank_and_number(u8, u8);
|
||||||
|
void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
|
||||||
|
|
||||||
|
#endif //GUARD_ROM4_H
|
||||||
11
include/rom_818CFC8.h
Normal file
11
include/rom_818CFC8.h
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
//
|
||||||
|
// Created by Scott Norton on 9/6/17.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef GUARD_ROM_818CFC8_H
|
||||||
|
#define GUARD_ROM_818CFC8_H
|
||||||
|
|
||||||
|
bool8 InBattlePyramid(void);
|
||||||
|
u8 sub_81AAA40(void);
|
||||||
|
|
||||||
|
#endif //GUARD_ROM_818CFC8_H
|
||||||
12
include/rom_81BE66C.h
Normal file
12
include/rom_81BE66C.h
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
//
|
||||||
|
// Created by Scott Norton on 9/6/17.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef GUARD_ROM_81BE66C_H
|
||||||
|
#define GUARD_ROM_81BE66C_H
|
||||||
|
|
||||||
|
bool32 InTrainerHill(void);
|
||||||
|
bool8 FieldObjectIsFarawayIslandMew(struct MapObject *);
|
||||||
|
u32 sub_81D427C(void);
|
||||||
|
|
||||||
|
#endif //GUARD_ROM_81BE66C_H
|
||||||
@ -240,6 +240,8 @@ struct OamMatrix
|
|||||||
extern const struct OamData gDummyOamData;
|
extern const struct OamData gDummyOamData;
|
||||||
extern const union AnimCmd *const gDummySpriteAnimTable[];
|
extern const union AnimCmd *const gDummySpriteAnimTable[];
|
||||||
extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
|
extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
|
||||||
|
extern s16 gSpriteCoordOffsetX;
|
||||||
|
extern s16 gSpriteCoordOffsetY;
|
||||||
|
|
||||||
extern struct Sprite gSprites[];
|
extern struct Sprite gSprites[];
|
||||||
|
|
||||||
|
|||||||
7
include/trainer_see.h
Normal file
7
include/trainer_see.h
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#ifndef GUARD_TRAINER_SEE_H
|
||||||
|
#define GUARD_TRAINER_SEE_H
|
||||||
|
|
||||||
|
void sub_80B4578(struct MapObject *);
|
||||||
|
void sub_8155D78(struct MapObject *);
|
||||||
|
|
||||||
|
#endif //GUARD_TRAINER_SEE_H
|
||||||
@ -96,7 +96,7 @@ SECTIONS {
|
|||||||
asm/field_camera.o(.text);
|
asm/field_camera.o(.text);
|
||||||
asm/field_door.o(.text);
|
asm/field_door.o(.text);
|
||||||
asm/field_player_avatar.o(.text);
|
asm/field_player_avatar.o(.text);
|
||||||
asm/field_map_obj.o(.text);
|
src/field_map_obj.o(.text);
|
||||||
asm/field_ground_effect.o(.text);
|
asm/field_ground_effect.o(.text);
|
||||||
asm/map_obj_8097404.o(.text);
|
asm/map_obj_8097404.o(.text);
|
||||||
asm/field_message_box.o(.text);
|
asm/field_message_box.o(.text);
|
||||||
@ -341,7 +341,9 @@ SECTIONS {
|
|||||||
src/util.o(.rodata);
|
src/util.o(.rodata);
|
||||||
data/data3.o(.rodata);
|
data/data3.o(.rodata);
|
||||||
src/egg_hatch.o(.rodata);
|
src/egg_hatch.o(.rodata);
|
||||||
data/data3_a0.o(.rodata);
|
data/data3_a0_A.o(.rodata);
|
||||||
|
data/field_map_obj.o(.rodata);
|
||||||
|
data/data3_a0_B.o(.rodata);
|
||||||
src/berry.o(.rodata);
|
src/berry.o(.rodata);
|
||||||
data/data3_a1.o(.rodata);
|
data/data3_a1.o(.rodata);
|
||||||
src/pokemon_size_record.o(.rodata)
|
src/pokemon_size_record.o(.rodata)
|
||||||
|
|||||||
@ -807,7 +807,7 @@ const struct Berry gBerries[] =
|
|||||||
// unused
|
// unused
|
||||||
void ClearEnigmaBerries(void)
|
void ClearEnigmaBerries(void)
|
||||||
{
|
{
|
||||||
CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, sizeof(gSaveBlock1Ptr->enigmaBerry));
|
CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, 52);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetEnigmaBerry(u8 *src)
|
void SetEnigmaBerry(u8 *src)
|
||||||
@ -815,7 +815,7 @@ void SetEnigmaBerry(u8 *src)
|
|||||||
u32 i;
|
u32 i;
|
||||||
u8 *dest = (u8*)&gSaveBlock1Ptr->enigmaBerry;
|
u8 *dest = (u8*)&gSaveBlock1Ptr->enigmaBerry;
|
||||||
|
|
||||||
for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry); i++)
|
for (i = 0; i < 52; i++)
|
||||||
dest[i] = src[i];
|
dest[i] = src[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -827,7 +827,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
|
|||||||
|
|
||||||
dest = (u8*)enigmaBerry;
|
dest = (u8*)enigmaBerry;
|
||||||
checksum = 0;
|
checksum = 0;
|
||||||
for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry) - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++)
|
for (i = 0; i < 52 - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++)
|
||||||
{
|
{
|
||||||
checksum += dest[i];
|
checksum += dest[i];
|
||||||
}
|
}
|
||||||
|
|||||||
5118
src/field_map_obj.c
Executable file
5118
src/field_map_obj.c
Executable file
File diff suppressed because it is too large
Load Diff
@ -38,7 +38,7 @@ void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next
|
|||||||
|
|
||||||
void PutFirstMemBlockHeader(void *block, u32 size)
|
void PutFirstMemBlockHeader(void *block, u32 size)
|
||||||
{
|
{
|
||||||
PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - 16);
|
PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock));
|
||||||
}
|
}
|
||||||
|
|
||||||
void *AllocInternal(void *heapStart, u32 size)
|
void *AllocInternal(void *heapStart, u32 size)
|
||||||
@ -48,6 +48,7 @@ void *AllocInternal(void *heapStart, u32 size)
|
|||||||
struct MemBlock *splitBlock;
|
struct MemBlock *splitBlock;
|
||||||
u32 foundBlockSize;
|
u32 foundBlockSize;
|
||||||
|
|
||||||
|
// Alignment
|
||||||
if (size & 3)
|
if (size & 3)
|
||||||
size = 4 * ((size / 4) + 1);
|
size = 4 * ((size / 4) + 1);
|
||||||
|
|
||||||
@ -58,7 +59,7 @@ void *AllocInternal(void *heapStart, u32 size)
|
|||||||
foundBlockSize = pos->size;
|
foundBlockSize = pos->size;
|
||||||
|
|
||||||
if (foundBlockSize >= size) {
|
if (foundBlockSize >= size) {
|
||||||
if (foundBlockSize - size <= 31) {
|
if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) {
|
||||||
// The block isn't much bigger than the requested size,
|
// The block isn't much bigger than the requested size,
|
||||||
// so just use it.
|
// so just use it.
|
||||||
pos->flag = TRUE;
|
pos->flag = TRUE;
|
||||||
|
|||||||
@ -654,7 +654,7 @@ gUnknown_02032304: @ 2032304
|
|||||||
gUnknown_02032306: @ 2032306
|
gUnknown_02032306: @ 2032306
|
||||||
.space 0x2
|
.space 0x2
|
||||||
|
|
||||||
gUnknown_02032308: @ 2032308
|
gLinkPlayerMapObjects: @ 2032308
|
||||||
.space 0x10
|
.space 0x10
|
||||||
|
|
||||||
gUnknown_02032318: @ 2032318
|
gUnknown_02032318: @ 2032318
|
||||||
@ -663,7 +663,7 @@ gUnknown_02032318: @ 2032318
|
|||||||
gMapHeader: @ 2037318
|
gMapHeader: @ 2037318
|
||||||
.space 0x1C
|
.space 0x1C
|
||||||
|
|
||||||
gUnknown_02037334: @ 2037334
|
gCamera: @ 2037334
|
||||||
.space 0xC
|
.space 0xC
|
||||||
|
|
||||||
gUnknown_02037340: @ 2037340
|
gUnknown_02037340: @ 2037340
|
||||||
@ -678,7 +678,7 @@ gUnknown_0203734C: @ 203734C
|
|||||||
gMapObjects: @ 2037350
|
gMapObjects: @ 2037350
|
||||||
.space 0x240
|
.space 0x240
|
||||||
|
|
||||||
gUnknown_02037590: @ 2037590
|
gPlayerAvatar: @ 2037590
|
||||||
.space 0x14
|
.space 0x14
|
||||||
|
|
||||||
gUnknown_020375A4: @ 20375A4
|
gUnknown_020375A4: @ 20375A4
|
||||||
@ -902,7 +902,7 @@ gUnknown_02038C00: @ 2038C00
|
|||||||
gUnknown_02038C04: @ 2038C04
|
gUnknown_02038C04: @ 2038C04
|
||||||
.space 0x4
|
.space 0x4
|
||||||
|
|
||||||
gUnknown_02038C08: @ 2038C08
|
gFieldEffectSpawnParams: @ 2038C08
|
||||||
.space 0x20
|
.space 0x20
|
||||||
|
|
||||||
gUnknown_02038C28: @ 2038C28
|
gUnknown_02038C28: @ 2038C28
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user