Merge branch 'master' into main-menu-state-machine
This commit is contained in:
Phlosioneer
File diff suppressed because it is too large
Load Diff
2645
asm/easy_chat.s
2645
asm/easy_chat.s
File diff suppressed because it is too large
Load Diff
817
asm/flying.s
817
asm/flying.s
@@ -5,823 +5,6 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_810DE70
|
||||
sub_810DE70: @ 810DE70
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r1, 0
|
||||
bl InitSpritePosToAnimTarget
|
||||
ldrh r0, [r4, 0x22]
|
||||
adds r0, 0x14
|
||||
strh r0, [r4, 0x22]
|
||||
movs r0, 0xBF
|
||||
strh r0, [r4, 0x30]
|
||||
ldr r1, =sub_810DE98
|
||||
str r1, [r4, 0x1C]
|
||||
adds r0, r4, 0
|
||||
bl _call_via_r1
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810DE70
|
||||
|
||||
thumb_func_start sub_810DE98
|
||||
sub_810DE98: @ 810DE98
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r1, 0x30
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r1, 0x20
|
||||
bl Sin
|
||||
strh r0, [r4, 0x24]
|
||||
movs r1, 0x30
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r1, 0x8
|
||||
bl Cos
|
||||
strh r0, [r4, 0x26]
|
||||
ldrh r0, [r4, 0x30]
|
||||
adds r0, 0x5
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
strh r0, [r4, 0x30]
|
||||
ldrh r0, [r4, 0x2E]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x2E]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
cmp r0, 0x47
|
||||
bne _0810DED2
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
_0810DED2:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_810DE98
|
||||
|
||||
thumb_func_start sub_810DED8
|
||||
sub_810DED8: @ 810DED8
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r1, =gTasks
|
||||
lsls r4, r0, 2
|
||||
adds r4, r0
|
||||
lsls r4, 3
|
||||
adds r4, r1
|
||||
ldr r1, =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x2]
|
||||
strh r0, [r4, 0x8]
|
||||
ldrh r0, [r1]
|
||||
strh r0, [r4, 0xA]
|
||||
ldr r0, =0x00002719
|
||||
bl IndexOfSpritePaletteTag
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4, 0xC]
|
||||
ldr r0, =sub_810DF18
|
||||
str r0, [r4]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810DED8
|
||||
|
||||
thumb_func_start sub_810DF18
|
||||
sub_810DF18: @ 810DF18
|
||||
push {r4-r7,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r2, =gTasks
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
lsls r0, 3
|
||||
adds r3, r0, r2
|
||||
ldrh r0, [r3, 0x1C]
|
||||
adds r1, r0, 0x1
|
||||
strh r1, [r3, 0x1C]
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
movs r4, 0xA
|
||||
ldrsh r1, [r3, r4]
|
||||
adds r7, r2, 0
|
||||
cmp r0, r1
|
||||
bne _0810DF76
|
||||
movs r0, 0
|
||||
strh r0, [r3, 0x1C]
|
||||
ldrb r0, [r3, 0xC]
|
||||
ldr r2, =gPlttBufferFaded
|
||||
lsls r0, 4
|
||||
movs r3, 0x84
|
||||
lsls r3, 1
|
||||
adds r1, r0, r3
|
||||
lsls r1, 1
|
||||
adds r1, r2
|
||||
ldrh r6, [r1]
|
||||
movs r4, 0x7
|
||||
mov r12, r0
|
||||
ldr r0, =0x00000107
|
||||
add r0, r12
|
||||
lsls r0, 1
|
||||
adds r3, r0, r2
|
||||
_0810DF5E:
|
||||
ldrh r0, [r3]
|
||||
strh r0, [r1]
|
||||
subs r3, 0x2
|
||||
subs r1, 0x2
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
bgt _0810DF5E
|
||||
ldr r0, =0x00000101
|
||||
add r0, r12
|
||||
lsls r0, 1
|
||||
adds r0, r2
|
||||
strh r6, [r0]
|
||||
_0810DF76:
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
lsls r0, 3
|
||||
adds r0, r7
|
||||
ldrh r1, [r0, 0x8]
|
||||
subs r1, 0x1
|
||||
strh r1, [r0, 0x8]
|
||||
lsls r1, 16
|
||||
cmp r1, 0
|
||||
bne _0810DF90
|
||||
adds r0, r5, 0
|
||||
bl DestroyAnimVisualTask
|
||||
_0810DF90:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810DF18
|
||||
|
||||
thumb_func_start sub_810DFA8
|
||||
sub_810DFA8: @ 810DFA8
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
movs r1, 0x1
|
||||
bl InitSpritePosToAnimAttacker
|
||||
ldr r0, =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810DFC8
|
||||
ldr r1, =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x4]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x4]
|
||||
_0810DFC8:
|
||||
ldr r4, =gBattleAnimArgs
|
||||
ldrh r0, [r4, 0x8]
|
||||
strh r0, [r6, 0x2E]
|
||||
ldrh r0, [r6, 0x20]
|
||||
strh r0, [r6, 0x30]
|
||||
ldr r5, =gBattleAnimTarget
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x2
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4, 0x4]
|
||||
adds r0, r1
|
||||
strh r0, [r6, 0x32]
|
||||
ldrh r0, [r6, 0x22]
|
||||
strh r0, [r6, 0x34]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x3
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldrh r4, [r4, 0x6]
|
||||
adds r0, r4
|
||||
strh r0, [r6, 0x36]
|
||||
adds r0, r6, 0
|
||||
bl InitAnimLinearTranslation
|
||||
ldr r0, =RunStoredCallbackWhenAffineAnimEnds
|
||||
str r0, [r6, 0x1C]
|
||||
ldr r1, =sub_810E028
|
||||
adds r0, r6, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810DFA8
|
||||
|
||||
thumb_func_start sub_810E028
|
||||
sub_810E028: @ 810E028
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl AnimTranslateLinear
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810E03C
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
_0810E03C:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_810E028
|
||||
|
||||
thumb_func_start sub_810E044
|
||||
sub_810E044: @ 810E044
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r4, =gBattleAnimAttacker
|
||||
ldrb r0, [r4]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810E070
|
||||
ldr r1, =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
negs r0, r0
|
||||
strh r0, [r1]
|
||||
ldrh r0, [r1, 0x2]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x2]
|
||||
ldrh r0, [r1, 0x4]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x4]
|
||||
ldrh r0, [r1, 0x6]
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x6]
|
||||
_0810E070:
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810E088
|
||||
ldr r0, =gBattleAnimArgs
|
||||
ldrh r1, [r0, 0x2]
|
||||
negs r1, r1
|
||||
strh r1, [r0, 0x2]
|
||||
ldrh r1, [r0, 0x6]
|
||||
negs r1, r1
|
||||
strh r1, [r0, 0x6]
|
||||
_0810E088:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x20]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r2, =gBattleAnimArgs
|
||||
ldrh r1, [r2]
|
||||
ldrh r3, [r5, 0x20]
|
||||
adds r1, r3
|
||||
strh r1, [r5, 0x20]
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r2, 0x2]
|
||||
adds r0, r1
|
||||
strh r0, [r5, 0x22]
|
||||
ldrh r0, [r2, 0x8]
|
||||
strh r0, [r5, 0x2E]
|
||||
movs r3, 0xC
|
||||
ldrsh r0, [r2, r3]
|
||||
cmp r0, 0
|
||||
bne _0810E0EC
|
||||
ldr r4, =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
b _0810E0FE
|
||||
.pool
|
||||
_0810E0EC:
|
||||
ldr r0, =gBattleAnimTarget
|
||||
ldrb r0, [r0]
|
||||
adds r2, r5, 0
|
||||
adds r2, 0x32
|
||||
adds r3, r5, 0
|
||||
adds r3, 0x36
|
||||
movs r1, 0x1
|
||||
bl SetAverageBattlerPositions
|
||||
_0810E0FE:
|
||||
ldr r4, =gBattleAnimArgs
|
||||
ldrh r0, [r4, 0x4]
|
||||
ldrh r1, [r5, 0x32]
|
||||
adds r0, r1
|
||||
strh r0, [r5, 0x32]
|
||||
ldrh r0, [r4, 0x6]
|
||||
ldrh r3, [r5, 0x36]
|
||||
adds r0, r3
|
||||
strh r0, [r5, 0x36]
|
||||
ldr r0, =StartAnimLinearTranslation
|
||||
str r0, [r5, 0x1C]
|
||||
ldr r1, =DestroyAnimSprite
|
||||
adds r0, r5, 0
|
||||
bl StoreSpriteCallbackInData6
|
||||
ldrb r1, [r4, 0xA]
|
||||
adds r0, r5, 0
|
||||
bl SeekSpriteAnim
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810E044
|
||||
|
||||
thumb_func_start sub_810E13C
|
||||
sub_810E13C: @ 810E13C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r1, 0x1
|
||||
bl InitSpritePosToAnimAttacker
|
||||
ldr r1, =gBattleAnimArgs
|
||||
ldrh r0, [r1, 0x4]
|
||||
strh r0, [r4, 0x2E]
|
||||
ldrh r0, [r1, 0x6]
|
||||
strh r0, [r4, 0x30]
|
||||
ldr r0, =sub_810E184
|
||||
str r0, [r4, 0x1C]
|
||||
movs r0, 0
|
||||
bl GetAnimBattlerSpriteId
|
||||
ldr r2, =gSprites
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 4
|
||||
adds r1, r0
|
||||
lsls r1, 2
|
||||
adds r1, r2
|
||||
adds r1, 0x3E
|
||||
ldrb r0, [r1]
|
||||
movs r2, 0x4
|
||||
orrs r0, r2
|
||||
strb r0, [r1]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810E13C
|
||||
|
||||
thumb_func_start sub_810E184
|
||||
sub_810E184: @ 810E184
|
||||
push {lr}
|
||||
adds r2, r0, 0
|
||||
ldrh r1, [r2, 0x2E]
|
||||
movs r3, 0x2E
|
||||
ldrsh r0, [r2, r3]
|
||||
cmp r0, 0
|
||||
ble _0810E198
|
||||
subs r0, r1, 0x1
|
||||
strh r0, [r2, 0x2E]
|
||||
b _0810E1AA
|
||||
_0810E198:
|
||||
ldrh r0, [r2, 0x30]
|
||||
ldrh r1, [r2, 0x32]
|
||||
adds r0, r1
|
||||
strh r0, [r2, 0x32]
|
||||
lsls r0, 16
|
||||
asrs r0, 24
|
||||
ldrh r1, [r2, 0x26]
|
||||
subs r1, r0
|
||||
strh r1, [r2, 0x26]
|
||||
_0810E1AA:
|
||||
movs r3, 0x22
|
||||
ldrsh r0, [r2, r3]
|
||||
movs r3, 0x26
|
||||
ldrsh r1, [r2, r3]
|
||||
adds r0, r1
|
||||
movs r1, 0x20
|
||||
negs r1, r1
|
||||
cmp r0, r1
|
||||
bge _0810E1C2
|
||||
adds r0, r2, 0
|
||||
bl DestroyAnimSprite
|
||||
_0810E1C2:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_810E184
|
||||
|
||||
thumb_func_start sub_810E1C8
|
||||
sub_810E1C8: @ 810E1C8
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
ldr r0, =gBattleAnimAttacker
|
||||
ldrb r0, [r0]
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810E1F8
|
||||
movs r0, 0x88
|
||||
lsls r0, 1
|
||||
strh r0, [r5, 0x20]
|
||||
ldr r0, =0x0000ffe0
|
||||
strh r0, [r5, 0x22]
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x1
|
||||
bl StartSpriteAffineAnim
|
||||
b _0810E1FE
|
||||
.pool
|
||||
_0810E1F8:
|
||||
ldr r0, =0x0000ffe0
|
||||
strh r0, [r5, 0x20]
|
||||
strh r0, [r5, 0x22]
|
||||
_0810E1FE:
|
||||
ldr r0, =gBattleAnimArgs
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r5, 0x2E]
|
||||
ldrh r0, [r5, 0x20]
|
||||
strh r0, [r5, 0x30]
|
||||
ldr r4, =gBattleAnimTarget
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x2
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x32]
|
||||
ldrh r0, [r5, 0x22]
|
||||
strh r0, [r5, 0x34]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x3
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x36]
|
||||
adds r0, r5, 0
|
||||
bl InitAnimLinearTranslation
|
||||
ldr r0, =sub_810E24C
|
||||
str r0, [r5, 0x1C]
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810E1C8
|
||||
|
||||
thumb_func_start sub_810E24C
|
||||
sub_810E24C: @ 810E24C
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r0, 0x1
|
||||
strh r0, [r4, 0x2E]
|
||||
adds r0, r4, 0
|
||||
bl AnimTranslateLinear
|
||||
ldrh r1, [r4, 0x34]
|
||||
lsrs r0, r1, 8
|
||||
cmp r0, 0xC8
|
||||
bls _0810E274
|
||||
ldrh r0, [r4, 0x24]
|
||||
ldrh r2, [r4, 0x20]
|
||||
adds r0, r2
|
||||
strh r0, [r4, 0x20]
|
||||
movs r0, 0
|
||||
strh r0, [r4, 0x24]
|
||||
movs r0, 0xFF
|
||||
ands r0, r1
|
||||
strh r0, [r4, 0x34]
|
||||
_0810E274:
|
||||
movs r1, 0x20
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x24
|
||||
ldrsh r1, [r4, r2]
|
||||
adds r0, r1
|
||||
adds r0, 0x20
|
||||
movs r1, 0x98
|
||||
lsls r1, 1
|
||||
cmp r0, r1
|
||||
bhi _0810E296
|
||||
movs r1, 0x22
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, 0x26
|
||||
ldrsh r1, [r4, r2]
|
||||
adds r0, r1
|
||||
cmp r0, 0xA0
|
||||
ble _0810E2BC
|
||||
_0810E296:
|
||||
movs r0, 0
|
||||
bl GetAnimBattlerSpriteId
|
||||
ldr r2, =gSprites
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 4
|
||||
adds r1, r0
|
||||
lsls r1, 2
|
||||
adds r1, r2
|
||||
adds r1, 0x3E
|
||||
ldrb r2, [r1]
|
||||
movs r0, 0x5
|
||||
negs r0, r0
|
||||
ands r0, r2
|
||||
strb r0, [r1]
|
||||
adds r0, r4, 0
|
||||
bl DestroyAnimSprite
|
||||
_0810E2BC:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810E24C
|
||||
|
||||
thumb_func_start sub_810E2C8
|
||||
sub_810E2C8: @ 810E2C8
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
ldrh r0, [r4, 0x2E]
|
||||
subs r1, r0, 0x1
|
||||
strh r1, [r4, 0x2E]
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bgt _0810E308
|
||||
ldrb r0, [r4, 0x1]
|
||||
lsls r0, 30
|
||||
lsrs r0, 30
|
||||
movs r1, 0x1
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0810E2FA
|
||||
ldrb r0, [r4, 0x3]
|
||||
lsls r0, 26
|
||||
lsrs r0, 27
|
||||
bl FreeOamMatrix
|
||||
ldrb r1, [r4, 0x1]
|
||||
movs r0, 0x4
|
||||
negs r0, r0
|
||||
ands r0, r1
|
||||
strb r0, [r4, 0x1]
|
||||
_0810E2FA:
|
||||
adds r0, r4, 0
|
||||
bl DestroySprite
|
||||
ldr r1, =gAnimVisualTaskCount
|
||||
ldrb r0, [r1]
|
||||
subs r0, 0x1
|
||||
strb r0, [r1]
|
||||
_0810E308:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810E2C8
|
||||
|
||||
thumb_func_start sub_810E314
|
||||
sub_810E314: @ 810E314
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r7, r0, 0
|
||||
adds r5, r7, 0
|
||||
adds r5, 0x2E
|
||||
ldr r0, =gBattleAnimArgs
|
||||
ldrh r1, [r0, 0xE]
|
||||
movs r0, 0x80
|
||||
lsls r0, 1
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0810E33C
|
||||
ldr r0, =gBattleAnimAttacker
|
||||
b _0810E33E
|
||||
.pool
|
||||
_0810E33C:
|
||||
ldr r0, =gBattleAnimTarget
|
||||
_0810E33E:
|
||||
ldrb r6, [r0]
|
||||
adds r0, r6, 0
|
||||
bl GetBattlerSide
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810E354
|
||||
ldr r1, =gBattleAnimArgs
|
||||
ldrh r0, [r1]
|
||||
negs r0, r0
|
||||
strh r0, [r1]
|
||||
_0810E354:
|
||||
adds r0, r6, 0
|
||||
movs r1, 0
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldr r4, =gBattleAnimArgs
|
||||
lsrs r0, 24
|
||||
ldrh r1, [r4]
|
||||
adds r0, r1
|
||||
strh r0, [r7, 0x20]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x1
|
||||
bl GetBattlerSpriteCoord
|
||||
lsls r0, 24
|
||||
ldrh r1, [r4, 0x2]
|
||||
lsrs r0, 24
|
||||
adds r1, r0, r1
|
||||
strh r1, [r7, 0x22]
|
||||
lsls r1, 8
|
||||
strh r1, [r5, 0x8]
|
||||
ldrh r1, [r4, 0xC]
|
||||
adds r0, r1
|
||||
lsls r0, 1
|
||||
ldrh r2, [r5, 0xE]
|
||||
movs r1, 0x1
|
||||
ands r1, r2
|
||||
orrs r1, r0
|
||||
strh r1, [r5, 0xE]
|
||||
ldrb r0, [r5]
|
||||
movs r2, 0x4
|
||||
mov r8, r2
|
||||
mov r1, r8
|
||||
orrs r0, r1
|
||||
strb r0, [r5]
|
||||
ldrh r0, [r4, 0x4]
|
||||
ldrb r1, [r4, 0x4]
|
||||
strh r1, [r5, 0x2]
|
||||
lsls r0, 16
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0xA]
|
||||
ldrh r0, [r4, 0x6]
|
||||
strh r0, [r5, 0x4]
|
||||
ldrh r0, [r4, 0x8]
|
||||
strh r0, [r5, 0x6]
|
||||
ldrh r0, [r4, 0xA]
|
||||
strh r0, [r5, 0xC]
|
||||
subs r1, 0x40
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
cmp r1, 0x7F
|
||||
bhi _0810E44A
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810E3F0
|
||||
adds r0, r6, 0
|
||||
bl GetBattlerSpriteBGPriority
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r0, 0x1
|
||||
movs r1, 0x3
|
||||
ands r0, r1
|
||||
lsls r0, 2
|
||||
ldrb r2, [r7, 0x5]
|
||||
movs r1, 0xD
|
||||
negs r1, r1
|
||||
ands r1, r2
|
||||
orrs r1, r0
|
||||
strb r1, [r7, 0x5]
|
||||
b _0810E408
|
||||
.pool
|
||||
_0810E3F0:
|
||||
adds r0, r6, 0
|
||||
bl GetBattlerSpriteBGPriority
|
||||
movs r1, 0x3
|
||||
ands r1, r0
|
||||
lsls r1, 2
|
||||
ldrb r2, [r7, 0x5]
|
||||
movs r0, 0xD
|
||||
negs r0, r0
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r7, 0x5]
|
||||
_0810E408:
|
||||
ldrb r1, [r5, 0xE]
|
||||
movs r4, 0x2
|
||||
negs r4, r4
|
||||
adds r0, r4, 0
|
||||
ands r0, r1
|
||||
strb r0, [r5, 0xE]
|
||||
movs r2, 0x4
|
||||
ldrsh r0, [r5, r2]
|
||||
movs r1, 0x80
|
||||
lsls r1, 8
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _0810E4AA
|
||||
adds r3, r7, 0
|
||||
adds r3, 0x3F
|
||||
ldrb r2, [r3]
|
||||
lsls r0, r2, 31
|
||||
lsrs r0, 31
|
||||
movs r1, 0x1
|
||||
eors r1, r0
|
||||
adds r0, r4, 0
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r3]
|
||||
lsls r0, 31
|
||||
lsrs r0, 31
|
||||
adds r1, r7, 0
|
||||
adds r1, 0x2A
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r3]
|
||||
movs r1, 0x4
|
||||
orrs r0, r1
|
||||
b _0810E4A2
|
||||
_0810E44A:
|
||||
adds r0, r6, 0
|
||||
bl GetBattlerSpriteBGPriority
|
||||
movs r1, 0x3
|
||||
ands r1, r0
|
||||
lsls r1, 2
|
||||
ldrb r2, [r7, 0x5]
|
||||
movs r0, 0xD
|
||||
negs r0, r0
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r7, 0x5]
|
||||
ldrb r0, [r5, 0xE]
|
||||
movs r4, 0x1
|
||||
orrs r0, r4
|
||||
strb r0, [r5, 0xE]
|
||||
movs r1, 0x4
|
||||
ldrsh r0, [r5, r1]
|
||||
movs r1, 0x80
|
||||
lsls r1, 8
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0810E4AA
|
||||
adds r3, r7, 0
|
||||
adds r3, 0x3F
|
||||
ldrb r2, [r3]
|
||||
lsls r1, r2, 31
|
||||
lsrs r1, 31
|
||||
movs r0, 0x1
|
||||
eors r1, r0
|
||||
ands r1, r4
|
||||
movs r0, 0x2
|
||||
negs r0, r0
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r3]
|
||||
lsls r0, 31
|
||||
lsrs r0, 31
|
||||
adds r1, r7, 0
|
||||
adds r1, 0x2A
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r3]
|
||||
mov r2, r8
|
||||
orrs r0, r2
|
||||
_0810E4A2:
|
||||
movs r1, 0x11
|
||||
negs r1, r1
|
||||
ands r0, r1
|
||||
strb r0, [r3]
|
||||
_0810E4AA:
|
||||
ldrh r1, [r5, 0x2]
|
||||
lsrs r1, 6
|
||||
lsls r1, 4
|
||||
ldrb r2, [r5]
|
||||
movs r0, 0xF
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r5]
|
||||
ldr r3, =gSineTable
|
||||
ldrh r0, [r5, 0x2]
|
||||
lsls r0, 1
|
||||
adds r0, r3
|
||||
movs r2, 0
|
||||
ldrsh r1, [r0, r2]
|
||||
ldrb r0, [r5, 0xC]
|
||||
muls r0, r1
|
||||
asrs r0, 8
|
||||
strh r0, [r7, 0x24]
|
||||
ldrb r2, [r7, 0x3]
|
||||
lsls r2, 26
|
||||
lsrs r2, 27
|
||||
movs r1, 0x24
|
||||
ldrsh r0, [r7, r1]
|
||||
negs r0, r0
|
||||
asrs r0, 1
|
||||
ldrb r5, [r5, 0xA]
|
||||
adds r0, r5
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
lsls r1, r0, 1
|
||||
adds r1, r3
|
||||
ldrh r4, [r1]
|
||||
ldr r1, =gOamMatrices
|
||||
lsls r2, 3
|
||||
adds r2, r1
|
||||
adds r0, 0x40
|
||||
lsls r0, 1
|
||||
adds r0, r3
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r2, 0x6]
|
||||
strh r0, [r2]
|
||||
strh r4, [r2, 0x2]
|
||||
lsls r0, r4, 16
|
||||
asrs r0, 16
|
||||
negs r0, r0
|
||||
strh r0, [r2, 0x4]
|
||||
ldr r0, =sub_810E520
|
||||
str r0, [r7, 0x1C]
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810E314
|
||||
|
||||
thumb_func_start sub_810E520
|
||||
sub_810E520: @ 810E520
|
||||
push {r4-r7,lr}
|
||||
|
||||
@@ -1341,15 +1341,15 @@
|
||||
.endm
|
||||
|
||||
.macro sethword dst:req, value:req
|
||||
setbyte \dst, \value & 0xFF
|
||||
setbyte \dst + 1, (\value >> 8) & 0xFF
|
||||
setbyte \dst, (\value) & 0xFF
|
||||
setbyte \dst + 1, ((\value) >> 8) & 0xFF
|
||||
.endm
|
||||
|
||||
.macro setword dst:req, value:req
|
||||
setbyte \dst, \value & 0xFF
|
||||
setbyte \dst + 1, (\value >> 8) & 0xFF
|
||||
setbyte \dst + 2, (\value >> 16) & 0xFF
|
||||
setbyte \dst + 3, (\value >> 24) & 0xFF
|
||||
setbyte \dst, (\value) & 0xFF
|
||||
setbyte \dst + 1, ((\value) >> 8) & 0xFF
|
||||
setbyte \dst + 2, ((\value) >> 16) & 0xFF
|
||||
setbyte \dst + 3, ((\value) >> 24) & 0xFF
|
||||
.endm
|
||||
|
||||
.macro copybyte dst:req, src:req
|
||||
|
||||
1680
asm/pokenav.s
1680
asm/pokenav.s
File diff suppressed because it is too large
Load Diff
@@ -8315,6 +8315,11 @@ _0801AFC2:
|
||||
.pool
|
||||
thumb_func_end sub_801AC54
|
||||
|
||||
@void sub_801AFD8() {
|
||||
@ CpuFill32(0, &gSaveBlock1Ptr->field_322C, 219);
|
||||
@ sub_801B180();
|
||||
@ sub_811F8BC();
|
||||
@}
|
||||
thumb_func_start sub_801AFD8
|
||||
sub_801AFD8: @ 801AFD8
|
||||
push {lr}
|
||||
@@ -8367,25 +8372,25 @@ sav1_get_mevent_buffer_2: @ 801B034
|
||||
.pool
|
||||
thumb_func_end sav1_get_mevent_buffer_2
|
||||
|
||||
thumb_func_start sub_801B044
|
||||
sub_801B044: @ 801B044
|
||||
thumb_func_start GetSaveBlock1Field356C
|
||||
GetSaveBlock1Field356C: @ 801B044
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, =0x0000356c
|
||||
adds r0, r1
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_801B044
|
||||
thumb_func_end GetSaveBlock1Field356C
|
||||
|
||||
thumb_func_start sub_801B058
|
||||
sub_801B058: @ 801B058
|
||||
thumb_func_start GetSaveBlock1Field3564
|
||||
GetSaveBlock1Field3564: @ 801B058
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, =0x00003564
|
||||
adds r0, r1
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_801B058
|
||||
thumb_func_end GetSaveBlock1Field3564
|
||||
|
||||
thumb_func_start sub_801B06C
|
||||
sub_801B06C: @ 801B06C
|
||||
@@ -8531,7 +8536,7 @@ sub_801B180: @ 801B180
|
||||
sub sp, 0x4
|
||||
movs r0, 0
|
||||
str r0, [sp]
|
||||
bl sub_801B044
|
||||
bl GetSaveBlock1Field356C
|
||||
adds r1, r0, 0
|
||||
ldr r2, =0x05000001
|
||||
mov r0, sp
|
||||
@@ -13795,7 +13800,7 @@ _0801DB60:
|
||||
sub_801DB68: @ 801DB68
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_801B044
|
||||
bl GetSaveBlock1Field356C
|
||||
adds r5, r0, 0
|
||||
movs r0, 0x3
|
||||
adds r1, r4, 0
|
||||
@@ -13841,7 +13846,7 @@ _0801DBB8:
|
||||
thumb_func_start sub_801DBC0
|
||||
sub_801DBC0: @ 801DBC0
|
||||
push {lr}
|
||||
bl sub_801B044
|
||||
bl GetSaveBlock1Field356C
|
||||
movs r1, 0
|
||||
strb r1, [r0]
|
||||
strb r1, [r0, 0x1]
|
||||
@@ -13858,7 +13863,7 @@ sub_801DBDC: @ 801DBDC
|
||||
ldr r0, =0x0000402e
|
||||
bl GetVarPointer
|
||||
adds r4, r0, 0
|
||||
bl sub_801B044
|
||||
bl GetSaveBlock1Field356C
|
||||
adds r2, r0, 0
|
||||
ldr r0, [r2]
|
||||
lsls r0, 24
|
||||
@@ -13889,7 +13894,7 @@ _0801DC10:
|
||||
sub_801DC20: @ 801DC20
|
||||
push {r4-r6,lr}
|
||||
ldr r6, =gSpecialVar_Result
|
||||
bl sub_801B044
|
||||
bl GetSaveBlock1Field356C
|
||||
adds r4, r0, 0
|
||||
bl IsMysteryEventEnabled
|
||||
cmp r0, 0
|
||||
@@ -27181,7 +27186,7 @@ sub_8024700: @ 8024700
|
||||
adds r0, r5, 0
|
||||
bl sub_8024668
|
||||
adds r1, r0, r4
|
||||
ldr r2, =0x0001869f
|
||||
ldr r2, =0x0001869f @ Note to decompiler: See UNKNOWN_OFFSET
|
||||
cmp r1, r2
|
||||
bhi _08024730
|
||||
adds r0, r5, 0
|
||||
|
||||
Reference in New Issue
Block a user