dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

git commit -m "label sprite for real this time"

Browse Source 
git commit -m
This commit is contained in:
DizzyEggg
2017-09-01 22:29:13 +02:00
parent 0989222de3
commit cb12aaec65
68 changed files with 1281 additions and 1281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_814AEAC.s
+10 -10
View File
@@ -119,7 +119,7 @@ sub_814AF54: @ 814AF54
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
bl dp01_tbl4_exec_completed bl dp01_tbl4_exec_completed
_0814AFA4: _0814AFA4:
pop {r4-r6} pop {r4-r6}
@@ -367,7 +367,7 @@ _0814B136:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
add r0, r10 add r0, r10
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r4, =gUnknown_03005D70 ldr r4, =gUnknown_03005D70
ldrb r0, [r7] ldrb r0, [r7]
mov r1, r8 mov r1, r8
@@ -405,7 +405,7 @@ _0814B1F0:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r5, =gUnknown_03005D70 ldr r5, =gUnknown_03005D70
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r5 adds r0, r1, r5
@@ -582,7 +582,7 @@ sub_814B340: @ 814B340
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
@@ -629,7 +629,7 @@ sub_814B3DC: @ 814B3DC
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
@@ -954,7 +954,7 @@ _0814B6CE:
cmp r0, 0 cmp r0, 0
bne _0814B714 bne _0814B714
adds r0, r3, r5 adds r0, r3, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 2 lsls r0, 2
@@ -3194,7 +3194,7 @@ sub_814CB0C: @ 814CB0C
mov r0, r8 mov r0, r8
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -3370,7 +3370,7 @@ sub_814CC98: @ 814CC98
mov r0, r10 mov r0, r10
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
@@ -3509,7 +3509,7 @@ _0814CE5C:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
@@ -3725,7 +3725,7 @@ _0814D002:
adds r0, r6, 0 adds r0, r6, 0
mov r1, r8 mov r1, r8
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
asm/battle_anim.s
+2 -2
View File
@@ -290,7 +290,7 @@ move_anim_8072740: @ 80A3BFC
adds r4, r0, 0 adds r4, r0, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_020383FE ldr r1, =gUnknown_020383FE
ldrb r0, [r1] ldrb r0, [r1]
subs r0, 0x1 subs r0, 0x1
@@ -621,7 +621,7 @@ _080A3E88:
lsrs r3, 24 lsrs r3, 24
adds r0, r7, 0 adds r0, r7, 0
adds r1, r4, 0 adds r1, r4, 0
bl AddObjectAndAnimateForOneFrame bl CreateSpriteAndAnimate
ldr r1, =gUnknown_020383FE ldr r1, =gUnknown_020383FE
ldrb r0, [r1] ldrb r0, [r1]
adds r0, 0x1 adds r0, 0x1
asm/battle_anim_80FE840.s
+97 -97
View File
@@ -205,7 +205,7 @@ sub_80FE9E4: @ 80FE9E4
cmp r0, 0 cmp r0, 0
beq _080FE9FA beq _080FE9FA
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _080FEA4E b _080FEA4E
_080FE9FA: _080FE9FA:
movs r1, 0x38 movs r1, 0x38
@@ -297,7 +297,7 @@ sub_80FEA58: @ 80FEA58
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl AddObjectAndAnimateForOneFrame bl CreateSpriteAndAnimate
_080FEAB2: _080FEAB2:
movs r1, 0xA movs r1, 0xA
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
@@ -3010,7 +3010,7 @@ _08100028:
movs r3, 0x1A movs r3, 0x1A
ldrsh r2, [r5, r3] ldrsh r2, [r5, r3]
ldrb r3, [r5, 0x10] ldrb r3, [r5, 0x10]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0xC] strh r0, [r5, 0xC]
@@ -3571,7 +3571,7 @@ _081004B6:
cmp r0, 0 cmp r0, 0
beq _081004FC beq _081004FC
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrh r0, [r6, 0x8] ldrh r0, [r6, 0x8]
adds r0, 0x1 adds r0, 0x1
b _081004FA b _081004FA
@@ -3658,7 +3658,7 @@ sub_8100524: @ 8100524
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
ldrb r3, [r6, 0x10] ldrb r3, [r6, 0x10]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -3755,7 +3755,7 @@ sub_81005D4: @ 81005D4
subs r0, 0x1 subs r0, 0x1
strh r0, [r1] strh r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08100636: _08100636:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -3975,7 +3975,7 @@ sub_81007C4: @ 81007C4
.pool .pool
_081007E8: _081007E8:
ldr r0, =0x0000274f ldr r0, =0x0000274f
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 20 lsrs r0, 20
movs r2, 0x80 movs r2, 0x80
@@ -3984,7 +3984,7 @@ _081007E8:
adds r0, r4 adds r0, r4
strh r0, [r5, 0x18] strh r0, [r5, 0x18]
ldr r0, =0x000027b0 ldr r0, =0x000027b0
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 20 lsrs r0, 20
adds r0, r4 adds r0, r4
@@ -4730,14 +4730,14 @@ _08100DE0:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x30 movs r0, 0x30
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_8072740 bl move_anim_8072740
_08100E10: _08100E10:
@@ -4927,7 +4927,7 @@ _08100F84:
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
ldr r0, =0x00002828 ldr r0, =0x00002828
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 20 lsrs r0, 20
movs r1, 0x80 movs r1, 0x80
@@ -7797,7 +7797,7 @@ sub_81025C0: @ 81025C0
mov r2, r8 mov r2, r8
bl sub_80A8048 bl sub_80A8048
ldr r0, =0x000027d2 ldr r0, =0x000027d2
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r4, 0x80 movs r4, 0x80
@@ -7808,7 +7808,7 @@ sub_81025C0: @ 81025C0
orrs r0, r1 orrs r0, r1
mov r10, r0 mov r10, r0
ldr r0, =0x000027d3 ldr r0, =0x000027d3
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r4, r0 lsls r4, r0
@@ -8502,7 +8502,7 @@ sub_8102BE8: @ 8102BE8
mov r9, r0 mov r9, r0
ldr r4, =gUnknown_08593020 ldr r4, =gUnknown_08593020
ldrh r0, [r4] ldrh r0, [r4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0xFF cmp r3, 0xFF
@@ -8630,7 +8630,7 @@ sub_8102CD4: @ 8102CD4
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
ldrh r0, [r0] ldrh r0, [r0]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0xFF cmp r0, 0xFF
@@ -8833,7 +8833,7 @@ _08102E7E:
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
ldrh r0, [r0] ldrh r0, [r0]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0xFF cmp r0, 0xFF
@@ -9050,7 +9050,7 @@ sub_8103028: @ 8103028
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
ldrh r0, [r0] ldrh r0, [r0]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0xFF cmp r0, 0xFF
@@ -10234,7 +10234,7 @@ sub_81039CC: @ 81039CC
subs r1, 0x1 subs r1, 0x1
strh r1, [r0, 0xA] strh r1, [r0, 0xA]
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_081039F6: _081039F6:
pop {r0} pop {r0}
bx r0 bx r0
@@ -10540,7 +10540,7 @@ sub_8103C0C: @ 8103C0C
subs r3, r4 subs r3, r4
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r12, r0 mov r12, r0
@@ -10969,7 +10969,7 @@ sub_8103FE8: @ 8103FE8
bl sub_80A69CC bl sub_80A69CC
ldr r0, =gUnknown_085934A0 ldr r0, =gUnknown_085934A0
ldrh r0, [r0, 0x2] ldrh r0, [r0, 0x2]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 20 lsrs r0, 20
movs r1, 0x80 movs r1, 0x80
@@ -12059,7 +12059,7 @@ _08104844:
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
adds r0, r4, 0 adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
_081048DA: _081048DA:
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
@@ -13547,7 +13547,7 @@ sub_81054E8: @ 81054E8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r0, =0x000027db ldr r0, =0x000027db
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0xFF cmp r0, 0xFF
@@ -14409,7 +14409,7 @@ _08105B9E:
movs r3, 0x26 movs r3, 0x26
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x40 cmp r2, 0x40
@@ -14525,7 +14525,7 @@ sub_8105C48: @ 8105C48
subs r0, 0x1 subs r0, 0x1
strh r0, [r1] strh r0, [r1]
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08105CAA: _08105CAA:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -14540,7 +14540,7 @@ sub_8105CB4: @ 8105CB4
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r0, =0x000027de ldr r0, =0x000027de
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
mov r1, sp mov r1, sp
strb r0, [r1] strb r0, [r1]
movs r4, 0x1 movs r4, 0x1
@@ -14665,7 +14665,7 @@ sub_8105D88: @ 8105D88
lsls r2, 1 lsls r2, 1
adds r2, r0 adds r2, r0
ldrh r0, [r2] ldrh r0, [r2]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 4 lsls r0, 4
ldrb r2, [r5, 0x5] ldrb r2, [r5, 0x5]
movs r1, 0xF movs r1, 0xF
@@ -17135,7 +17135,7 @@ _081071B0:
ldr r0, =gUnknown_08595020 ldr r0, =gUnknown_08595020
adds r1, r4, 0 adds r1, r4, 0
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
_081071F8: _081071F8:
movs r0, 0x8 movs r0, 0x8
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
@@ -17186,7 +17186,7 @@ _08107246:
cmp r0, 0 cmp r0, 0
beq _0810725A beq _0810725A
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810725A: _0810725A:
pop {r0} pop {r0}
bx r0 bx r0
@@ -17372,7 +17372,7 @@ _081073EC:
ldr r0, =sub_8107408 ldr r0, =sub_8107408
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
adds r0, r7, 0 adds r0, r7, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_081073F6: _081073F6:
add sp, 0x4 add sp, 0x4
pop {r3} pop {r3}
@@ -17529,7 +17529,7 @@ sub_8107528: @ 8107528
ldrh r0, [r0] ldrh r0, [r0]
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
ldr r0, =0x0000279c ldr r0, =0x0000279c
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 20 lsrs r0, 20
movs r1, 0x80 movs r1, 0x80
@@ -19396,7 +19396,7 @@ _08108472:
mov r1, r10 mov r1, r10
mov r2, r9 mov r2, r9
ldr r3, [sp, 0x8] ldr r3, [sp, 0x8]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
lsls r6, r5, 16 lsls r6, r5, 16
@@ -19554,7 +19554,7 @@ _0810859A:
subs r0, 0x1 subs r0, 0x1
strh r0, [r1] strh r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_081085BE: _081085BE:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -19754,7 +19754,7 @@ sub_810871C: @ 810871C
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -19835,7 +19835,7 @@ sub_81087C0: @ 81087C0
movs r3, 0x22 movs r3, 0x22
ldrsh r2, [r5, r3] ldrsh r2, [r5, r3]
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
@@ -19877,7 +19877,7 @@ sub_81087C0: @ 81087C0
str r1, [r0] str r1, [r0]
_08108850: _08108850:
adds r0, r5, 0 adds r0, r5, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08108856: _08108856:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -19938,7 +19938,7 @@ sub_810886C: @ 810886C
lsrs r0, 27 lsrs r0, 27
bl rotscale_free_entry bl rotscale_free_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_081088D8: _081088D8:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -20197,7 +20197,7 @@ sub_8108AC0: @ 8108AC0
movs r3, 0x10 movs r3, 0x10
ldrsh r2, [r6, r3] ldrsh r2, [r6, r3]
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -20304,7 +20304,7 @@ _08108BA6:
subs r0, 0x1 subs r0, 0x1
strh r0, [r2, 0x18] strh r0, [r2, 0x18]
adds r0, r5, 0 adds r0, r5, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08108BC6: _08108BC6:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -20405,7 +20405,7 @@ sub_8108C54: @ 8108C54
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08108C8C: _08108C8C:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -20581,7 +20581,7 @@ _08108DE2:
mov r3, r10 mov r3, r10
asrs r2, r3, 16 asrs r2, r3, 16
movs r3, 0x82 movs r3, 0x82
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -20636,7 +20636,7 @@ _08108E58:
mov r3, r10 mov r3, r10
asrs r2, r3, 16 asrs r2, r3, 16
movs r3, 0x82 movs r3, 0x82
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -21862,7 +21862,7 @@ _08109834:
ldr r3, [sp, 0x4] ldr r3, [sp, 0x4]
asrs r2, r3, 16 asrs r2, r3, 16
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x40 cmp r2, 0x40
@@ -21965,7 +21965,7 @@ sub_81098EC: @ 81098EC
subs r0, 0x1 subs r0, 0x1
strh r0, [r1] strh r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08109926: _08109926:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -23382,7 +23382,7 @@ _0810A422:
lsls r0, r1, 1 lsls r0, r1, 1
adds r0, r7 adds r0, r7
ldrh r0, [r0] ldrh r0, [r0]
ldr r3, =gUnknown_02021BC0 ldr r3, =gOamMatrices
lsls r2, 3 lsls r2, 3
adds r2, r3 adds r2, r3
adds r1, 0x40 adds r1, 0x40
@@ -24002,7 +24002,7 @@ _0810A952:
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
adds r0, r7, 0x1 adds r0, r7, 0x1
@@ -24100,7 +24100,7 @@ _0810AA12:
cmp r0, 0xF cmp r0, 0xF
bne _0810AA26 bne _0810AA26
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810AA26: _0810AA26:
pop {r0} pop {r0}
bx r0 bx r0
@@ -24128,7 +24128,7 @@ sub_810AA2C: @ 810AA2C
adds r3, r4, 0 adds r3, r4, 0
adds r3, 0x43 adds r3, 0x43
ldrb r3, [r3] ldrb r3, [r3]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r3, =gSprites ldr r3, =gSprites
@@ -24291,7 +24291,7 @@ sub_810AB78: @ 810AB78
movs r3, 0x26 movs r3, 0x26
ldrsh r2, [r5, r3] ldrsh r2, [r5, r3]
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -24409,7 +24409,7 @@ sub_810AC8C: @ 810AC8C
subs r1, 0x1 subs r1, 0x1
strh r1, [r0, 0x16] strh r1, [r0, 0x16]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810ACB4: _0810ACB4:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -25000,7 +25000,7 @@ sub_810B154: @ 810B154
movs r3, 0x12 movs r3, 0x12
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0x23 movs r3, 0x23
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x40 cmp r2, 0x40
@@ -25104,7 +25104,7 @@ sub_810B1F0: @ 810B1F0
lsrs r0, 27 lsrs r0, 27
bl rotscale_free_entry bl rotscale_free_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810B230: _0810B230:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -25372,7 +25372,7 @@ sub_810B430: @ 810B430
movs r3, 0x16 movs r3, 0x16
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0x23 movs r3, 0x23
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x40 cmp r2, 0x40
@@ -25506,7 +25506,7 @@ sub_810B51C: @ 810B51C
subs r0, 0x1 subs r0, 0x1
strh r0, [r1] strh r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810B552: _0810B552:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -25624,7 +25624,7 @@ sub_810B614: @ 810B614
ldrh r3, [r4, 0x20] ldrh r3, [r4, 0x20]
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -25693,7 +25693,7 @@ sub_810B684: @ 810B684
subs r0, 0x1 subs r0, 0x1
strh r0, [r1] strh r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810B6B8: _0810B6B8:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -27894,7 +27894,7 @@ _0810C8D0:
strb r0, [r4, 0x1] strb r0, [r4, 0x1]
_0810C8FE: _0810C8FE:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_020383FE ldr r1, =gUnknown_020383FE
ldrb r0, [r1] ldrb r0, [r1]
subs r0, 0x1 subs r0, 0x1
@@ -28154,7 +28154,7 @@ _0810CAE2:
movs r2, 0x8 movs r2, 0x8
negs r2, r2 negs r2, r2
movs r3, 0x12 movs r3, 0x12
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0x40 cmp r5, 0x40
@@ -28235,7 +28235,7 @@ _0810CB82:
adds r3, r4, 0 adds r3, r4, 0
adds r3, 0x43 adds r3, 0x43
ldrb r3, [r3] ldrb r3, [r3]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
@@ -28274,7 +28274,7 @@ _0810CBE6:
lsrs r0, 27 lsrs r0, 27
bl rotscale_free_entry bl rotscale_free_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _0810CC32 b _0810CC32
.pool .pool
_0810CC04: _0810CC04:
@@ -28298,7 +28298,7 @@ _0810CC04:
lsrs r0, 27 lsrs r0, 27
bl rotscale_free_entry bl rotscale_free_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810CC32: _0810CC32:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -28337,7 +28337,7 @@ sub_810CC3C: @ 810CC3C
lsrs r0, 27 lsrs r0, 27
bl rotscale_free_entry bl rotscale_free_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810CC7C: _0810CC7C:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -28807,7 +28807,7 @@ _0810D028:
adds r3, 0x1 adds r3, 0x1
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x3C] strh r0, [r5, 0x3C]
@@ -28872,7 +28872,7 @@ sub_810D0B8: @ 810D0B8
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810D0F4: _0810D0F4:
adds r0, r5, 0 adds r0, r5, 0
bl move_anim_8072740 bl move_anim_8072740
@@ -30592,7 +30592,7 @@ sub_810DED8: @ 810DED8
ldrh r0, [r1] ldrh r0, [r1]
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
ldr r0, =0x00002719 ldr r0, =0x00002719
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0xC] strh r0, [r4, 0xC]
@@ -31072,7 +31072,7 @@ sub_810E2C8: @ 810E2C8
strb r0, [r4, 0x1] strb r0, [r4, 0x1]
_0810E2FA: _0810E2FA:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_020383FE ldr r1, =gUnknown_020383FE
ldrb r0, [r1] ldrb r0, [r1]
subs r0, 0x1 subs r0, 0x1
@@ -31314,7 +31314,7 @@ _0810E4AA:
lsls r1, r0, 1 lsls r1, r0, 1
adds r1, r3 adds r1, r3
ldrh r4, [r1] ldrh r4, [r1]
ldr r1, =gUnknown_02021BC0 ldr r1, =gOamMatrices
lsls r2, 3 lsls r2, 3
adds r2, r1 adds r2, r1
adds r0, 0x40 adds r0, 0x40
@@ -31974,7 +31974,7 @@ _0810E97C:
lsls r1, r0, 1 lsls r1, r0, 1
adds r1, r3 adds r1, r3
ldrh r6, [r1] ldrh r6, [r1]
ldr r1, =gUnknown_02021BC0 ldr r1, =gOamMatrices
lsls r2, 3 lsls r2, 3
adds r2, r1 adds r2, r1
adds r0, 0x40 adds r0, 0x40
@@ -32253,7 +32253,7 @@ sub_810EB88: @ 810EB88
mov r0, r8 mov r0, r8
adds r1, r4, 0 adds r1, r4, 0
movs r3, 0x3 movs r3, 0x3
bl AddObjectAndAnimateForOneFrame bl CreateSpriteAndAnimate
_0810EC02: _0810EC02:
ldrh r0, [r7, 0x8] ldrh r0, [r7, 0x8]
adds r0, 0x8 adds r0, 0x8
@@ -32607,7 +32607,7 @@ _0810EE92:
lsrs r1, 27 lsrs r1, 27
movs r0, 0xF4 movs r0, 0xF4
lsls r0, 6 lsls r0, 6
ldr r2, =gUnknown_02021BC0 ldr r2, =gOamMatrices
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
movs r2, 0x6 movs r2, 0x6
@@ -33157,7 +33157,7 @@ _0810F2F2:
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
ldr r0, =gUnknown_0203841E ldr r0, =gUnknown_0203841E
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 20 lsrs r0, 20
movs r1, 0x80 movs r1, 0x80
@@ -33702,7 +33702,7 @@ sub_810F740: @ 810F740
movs r0, 0 movs r0, 0
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
adds r0, r4, 0 adds r0, r4, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
ldr r0, =sub_810F774 ldr r0, =sub_810F774
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4} pop {r4}
@@ -34051,7 +34051,7 @@ _0810FA1A:
movs r3, 0x24 movs r3, 0x24
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
movs r0, 0xC movs r0, 0xC
@@ -34182,7 +34182,7 @@ _0810FB10:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810FB2C: _0810FB2C:
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 16 lsls r0, 16
@@ -34450,7 +34450,7 @@ _0810FD60:
movs r3, 0x20 movs r3, 0x20
ldrsh r2, [r5, r3] ldrsh r2, [r5, r3]
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -34517,7 +34517,7 @@ sub_810FDF0: @ 810FDF0
lsrs r0, 27 lsrs r0, 27
bl rotscale_free_entry bl rotscale_free_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0810FE0E: _0810FE0E:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -34888,7 +34888,7 @@ _08110094:
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
adds r0, r4, 0 adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
ldr r1, =gUnknown_0203841E ldr r1, =gUnknown_0203841E
ldrb r0, [r1] ldrb r0, [r1]
bl obj_id_for_side_relative_to_move bl obj_id_for_side_relative_to_move
@@ -36001,7 +36001,7 @@ _08110A10:
adds r0, r5, 0 adds r0, r5, 0
bl StartObjectImageAnim bl StartObjectImageAnim
adds r0, r5, 0 adds r0, r5, 0
bl AnimateObject bl AnimateSprite
strh r4, [r5, 0x2E] strh r4, [r5, 0x2E]
strh r4, [r5, 0x30] strh r4, [r5, 0x30]
movs r0, 0x4 movs r0, 0x4
@@ -36063,7 +36063,7 @@ sub_8110AB4: @ 8110AB4
ldrb r1, [r4, 0xA] ldrb r1, [r4, 0xA]
bl StartObjectImageAnim bl StartObjectImageAnim
adds r0, r5, 0 adds r0, r5, 0
bl AnimateObject bl AnimateSprite
ldr r0, =gUnknown_02038436 ldr r0, =gUnknown_02038436
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
@@ -36995,7 +36995,7 @@ _08111270:
asrs r2, 16 asrs r2, 16
adds r0, r3, 0 adds r0, r3, 0
movs r3, 0x23 movs r3, 0x23
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x40 cmp r2, 0x40
@@ -37079,7 +37079,7 @@ sub_811131C: @ 811131C
strh r0, [r1, 0x1E] strh r0, [r1, 0x1E]
_08111348: _08111348:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0811134E: _0811134E:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -39213,7 +39213,7 @@ _08112436:
adds r1, r6, 0 adds r1, r6, 0
adds r2, r7, 0 adds r2, r7, 0
movs r3, 0x37 movs r3, 0x37
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
@@ -39304,7 +39304,7 @@ _08112530:
adds r1, r7, 0 adds r1, r7, 0
ldr r2, [sp, 0xC] ldr r2, [sp, 0xC]
movs r3, 0x37 movs r3, 0x37
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
@@ -39534,7 +39534,7 @@ _081126F4:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
@@ -40290,7 +40290,7 @@ _08112D56:
ldrsh r2, [r4, r0] ldrsh r2, [r4, r0]
ldrb r3, [r4, 0x14] ldrb r3, [r4, 0x14]
ldr r0, =gUnknown_08596E30 ldr r0, =gUnknown_08596E30
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x40 cmp r2, 0x40
@@ -40545,7 +40545,7 @@ _08112F08:
subs r0, 0x1 subs r0, 0x1
strh r0, [r1, 0x16] strh r0, [r1, 0x16]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08112F56: _08112F56:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -43447,7 +43447,7 @@ _081147B8:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
mov r0, sp mov r0, sp
bl sub_80A6B30 bl sub_80A6B30
mov r0, sp mov r0, sp
@@ -46058,7 +46058,7 @@ sub_8115CD0: @ 8115CD0
lsls r4, 3 lsls r4, 3
adds r4, r1 adds r4, r1
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x10 adds r0, 0x10
@@ -46171,7 +46171,7 @@ sub_8115D94: @ 8115D94
ldrh r0, [r5] ldrh r0, [r5]
strh r0, [r4, 0x16] strh r0, [r4, 0x16]
ldrh r0, [r5] ldrh r0, [r5]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x10 adds r0, 0x10
@@ -46230,7 +46230,7 @@ _08115E28:
.pool .pool
_08115E4C: _08115E4C:
ldrh r0, [r4, 0x16] ldrh r0, [r4, 0x16]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x10 adds r0, 0x10
@@ -46304,7 +46304,7 @@ sub_8115EB8: @ 8115EB8
lsls r0, 3 lsls r0, 3
adds r0, r1 adds r0, r1
ldrh r0, [r0, 0x16] ldrh r0, [r0, 0x16]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x10 adds r0, 0x10
@@ -46460,7 +46460,7 @@ _08115FF8:
adds r0, r2 adds r0, r2
ldr r0, [r0] ldr r0, [r0]
ldrh r0, [r0, 0x2] ldrh r0, [r0, 0x2]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r1, r6, 0 adds r1, r6, 0
@@ -47435,7 +47435,7 @@ sub_8116848: @ 8116848
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_0203841E ldr r0, =gUnknown_0203841E
ldrh r0, [r0] ldrh r0, [r0]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x10 adds r0, 0x10
@@ -48127,7 +48127,7 @@ _08116DF6:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
mov r0, sp mov r0, sp
bl sub_80A6B30 bl sub_80A6B30
mov r0, sp mov r0, sp
@@ -48791,7 +48791,7 @@ _081173E6:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r1, 0xC movs r1, 0xC
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
cmp r0, 0 cmp r0, 0
@@ -48802,7 +48802,7 @@ _081173E6:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
_0811743A: _0811743A:
movs r1, 0x14 movs r1, 0x14
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
@@ -49730,7 +49730,7 @@ _08117BB2:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r1, 0xC movs r1, 0xC
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
cmp r0, 0 cmp r0, 0
@@ -49741,7 +49741,7 @@ _08117BB2:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
_08117C06: _08117C06:
adds r0, r6, 0 adds r0, r6, 0
bl move_anim_task_del bl move_anim_task_del
asm/battle_anim_8170478.s
+33 -33
View File
@@ -361,14 +361,14 @@ _0817076C:
lsls r0, 2 lsls r0, 2
ldr r6, =gSprites ldr r6, =gSprites
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0xC movs r0, 0xC
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
@@ -580,12 +580,12 @@ sub_817094C: @ 817094C
ldr r0, =0x0000d70a ldr r0, =0x0000d70a
bl FreeObjectPaletteByTag bl FreeObjectPaletteByTag
ldr r0, =0x0000d6ff ldr r0, =0x0000d6ff
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =0x0000d704 ldr r0, =0x0000d704
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsls r4, 4 lsls r4, 4
ldrb r2, [r5, 0x5] ldrb r2, [r5, 0x5]
@@ -682,7 +682,7 @@ sub_8170A38: @ 8170A38
blt _08170AF8 blt _08170AF8
strh r6, [r4, 0x8] strh r6, [r4, 0x8]
ldr r0, =0x0000d709 ldr r0, =0x0000d709
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
movs r3, 0x1C movs r3, 0x1C
@@ -1150,7 +1150,7 @@ sub_8170E04: @ 8170E04
movs r1, 0x20 movs r1, 0x20
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1D movs r3, 0x1D
bl AddObjectToFront bl CreateSprite
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
@@ -1301,7 +1301,7 @@ _08170F54:
movs r2, 0x50 movs r2, 0x50
orrs r5, r2 orrs r5, r2
adds r2, r5, 0 adds r2, r5, 0
bl AddObjectToFront bl CreateSprite
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
@@ -2409,7 +2409,7 @@ _08171880:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
mov r0, r8 mov r0, r8
strh r0, [r6, 0x2E] strh r0, [r6, 0x2E]
ldr r0, =sub_81718D8 ldr r0, =sub_81718D8
@@ -2461,7 +2461,7 @@ _081718F6:
bl SetGpuReg bl SetGpuReg
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
ldrh r0, [r0, 0x2] ldrh r0, [r0, 0x2]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x10 adds r0, 0x10
@@ -2556,7 +2556,7 @@ _081719D8:
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_081719E4: _081719E4:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -2602,7 +2602,7 @@ _08171A26:
ldrsh r2, [r6, r0] ldrsh r2, [r6, r0]
ldr r0, =gUnknown_085E5250 ldr r0, =gUnknown_085E5250
mov r3, r8 mov r3, r8
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -2676,7 +2676,7 @@ sub_8171AAC: @ 8171AAC
cmp r0, 0 cmp r0, 0
beq _08171ADC beq _08171ADC
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08171ADC: _08171ADC:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -2754,7 +2754,7 @@ _08171B36:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl AnimateObject bl AnimateSprite
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r1, [r0] ldrb r1, [r0]
@@ -2990,7 +2990,7 @@ sub_8171D60: @ 8171D60
lsrs r5, r0, 21 lsrs r5, r0, 21
adds r4, r5, r1 adds r4, r5, r1
ldrh r0, [r4, 0x6] ldrh r0, [r4, 0x6]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
lsls r0, 16 lsls r0, 16
ldr r1, =0xffff0000 ldr r1, =0xffff0000
cmp r0, r1 cmp r0, r1
@@ -3131,7 +3131,7 @@ sub_8171E50: @ 8171E50
lsls r0, 3 lsls r0, 3
ldr r4, =gUnknown_085E51F0 ldr r4, =gUnknown_085E51F0
adds r0, r4 adds r0, r4
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r10, r0 mov r10, r0
@@ -3322,7 +3322,7 @@ _0817200A:
ldr r1, [sp] ldr r1, [sp]
ldr r2, [sp, 0x4] ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC] ldr r3, [sp, 0xC]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x40 cmp r6, 0x40
@@ -3440,7 +3440,7 @@ _0817210E:
ldr r1, [sp] ldr r1, [sp]
ldr r2, [sp, 0x4] ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC] ldr r3, [sp, 0xC]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x40 cmp r6, 0x40
@@ -3558,7 +3558,7 @@ _08172212:
ldr r1, [sp] ldr r1, [sp]
ldr r2, [sp, 0x4] ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC] ldr r3, [sp, 0xC]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x40 cmp r6, 0x40
@@ -3674,7 +3674,7 @@ _08172312:
ldr r1, [sp] ldr r1, [sp]
ldr r2, [sp, 0x4] ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC] ldr r3, [sp, 0xC]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x40 cmp r6, 0x40
@@ -3805,7 +3805,7 @@ _08172430:
ldr r1, [sp] ldr r1, [sp]
ldr r2, [sp, 0x4] ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC] ldr r3, [sp, 0xC]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x40 cmp r6, 0x40
@@ -3981,7 +3981,7 @@ _081725A6:
ldr r1, [sp] ldr r1, [sp]
ldr r2, [sp, 0x4] ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC] ldr r3, [sp, 0xC]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x40 cmp r6, 0x40
@@ -4147,7 +4147,7 @@ _08172708:
ldr r1, [sp, 0x4] ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8] ldr r2, [sp, 0x8]
ldr r3, [sp, 0x10] ldr r3, [sp, 0x10]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x40 cmp r6, 0x40
@@ -4281,7 +4281,7 @@ _0817282E:
ldr r1, [sp] ldr r1, [sp]
ldr r2, [sp, 0x4] ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC] ldr r3, [sp, 0xC]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x40 cmp r6, 0x40
@@ -4415,7 +4415,7 @@ sub_8172944: @ 8172944
cmp r0, 0x1 cmp r0, 0x1
bne _081729CA bne _081729CA
adds r0, r7, 0 adds r0, r7, 0
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
b _081729E2 b _081729E2
.pool .pool
_08172970: _08172970:
@@ -4464,12 +4464,12 @@ _081729B4:
ble _081729B4 ble _081729B4
_081729CA: _081729CA:
adds r0, r7, 0 adds r0, r7, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _081729E2 b _081729E2
.pool .pool
_081729DC: _081729DC:
adds r0, r7, 0 adds r0, r7, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_081729E2: _081729E2:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -5129,7 +5129,7 @@ _08172F4E:
cmp r0, 0 cmp r0, 0
beq _08172FC8 beq _08172FC8
ldr r0, =0x000027f9 ldr r0, =0x000027f9
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
cmp r0, r7 cmp r0, r7
@@ -5249,7 +5249,7 @@ _0817303A:
ldr r0, =gUnknown_085CE388 ldr r0, =gUnknown_085CE388
adds r1, r5, 0 adds r1, r5, 0
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
b _081730D6 b _081730D6
@@ -5262,7 +5262,7 @@ _08173074:
ldr r0, =gUnknown_085CE3A0 ldr r0, =gUnknown_085CE3A0
adds r1, r5, 0 adds r1, r5, 0
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r0, =gSprites ldr r0, =gSprites
@@ -5280,7 +5280,7 @@ _081730A8:
ldr r0, =gUnknown_085CE3A0 ldr r0, =gUnknown_085CE3A0
adds r1, r5, 0 adds r1, r5, 0
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r0, =gSprites ldr r0, =gSprites
@@ -5468,7 +5468,7 @@ sub_81731FC: @ 81731FC
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08173246: _08173246:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5519,7 +5519,7 @@ _08173264:
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_081732A6: _081732A6:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5538,7 +5538,7 @@ sub_81732B0: @ 81732B0
ldr r0, =gUnknown_08525CB4 ldr r0, =gUnknown_08525CB4
bl LoadCompressedObjectPaletteUsingHeap bl LoadCompressedObjectPaletteUsingHeap
ldr r0, =0x0000281d ldr r0, =0x0000281d
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_task_del bl move_anim_task_del
pop {r4} pop {r4}
asm/battle_setup.s
+2 -2
View File
@@ -564,7 +564,7 @@ sub_80B0AF8: @ 80B0AF8
bl CpuSet bl CpuSet
movs r0, 0 movs r0, 0
movs r1, 0x80 movs r1, 0x80
bl ResetSpriteRange bl ResetOamRange
ldr r0, =gBattleOutcome ldr r0, =gBattleOutcome
ldrb r0, [r0] ldrb r0, [r0]
bl battle_exit_is_player_defeat bl battle_exit_is_player_defeat
@@ -609,7 +609,7 @@ sub_80B0B6C: @ 80B0B6C
bl CpuSet bl CpuSet
movs r0, 0 movs r0, 0
movs r1, 0x80 movs r1, 0x80
bl ResetSpriteRange bl ResetOamRange
ldr r0, =gBattleOutcome ldr r0, =gBattleOutcome
ldrb r0, [r0] ldrb r0, [r0]
bl battle_exit_is_player_defeat bl battle_exit_is_player_defeat
asm/battle_transition.s
+6 -6
View File
@@ -2175,7 +2175,7 @@ sub_81470D0: @ 81470D0
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r5, r3] ldrsh r2, [r5, r3]
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -2202,7 +2202,7 @@ sub_81470D0: @ 81470D0
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
strh r0, [r4, 0x32] strh r0, [r4, 0x32]
adds r0, r4, 0 adds r0, r4, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
ldrb r1, [r5, 0x8] ldrb r1, [r5, 0x8]
adds r0, r4, 0 adds r0, r4, 0
bl StartObjectRotScalAnim bl StartObjectRotScalAnim
@@ -4378,12 +4378,12 @@ sub_8148218: @ 8148218
movs r1, 0x1 movs r1, 0x1
movs r2, 0x3 movs r2, 0x3
movs r3, 0x3 movs r3, 0x3
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x1 movs r1, 0x1
movs r2, 0x3 movs r2, 0x3
movs r3, 0x3 movs r3, 0x3
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
ldrb r0, [r5, 0x3] ldrb r0, [r5, 0x3]
lsls r0, 26 lsls r0, 26
lsrs r0, 27 lsrs r0, 27
@@ -6736,7 +6736,7 @@ sub_8149628: @ 8149628
movs r4, 0 movs r4, 0
_0814963C: _0814963C:
ldr r0, =sub_8149864 ldr r0, =sub_8149864
bl obj_add_empty_with_callback bl CreateInvisibleSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -7098,7 +7098,7 @@ _0814993E:
adds r0, 0x1 adds r0, 0x1
strh r0, [r1, 0x20] strh r0, [r1, 0x20]
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0814994C: _0814994C:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
asm/berry_blender.s
+18 -18
View File
@@ -489,7 +489,7 @@ _0807FBBE:
ldrb r2, [r5, 0x1] ldrb r2, [r5, 0x1]
ldr r0, =gUnknown_08339AD8 ldr r0, =gUnknown_08339AD8
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x50 adds r1, 0x50
adds r1, r4 adds r1, r4
@@ -651,7 +651,7 @@ sub_807FD08: @ 807FD08
cmp r0, 0x3 cmp r0, 0x3
ble _0807FD50 ble _0807FD50
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _0807FD56 b _0807FD56
_0807FD50: _0807FD50:
movs r0, 0x74 movs r0, 0x74
@@ -1093,7 +1093,7 @@ _08080126:
ldrb r2, [r4, 0x1] ldrb r2, [r4, 0x1]
ldr r0, =gUnknown_08339AD8 ldr r0, =gUnknown_08339AD8
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x54 adds r1, 0x54
adds r1, r5 adds r1, r5
@@ -1515,7 +1515,7 @@ _080804D0:
negs r2, r2 negs r2, r2
movs r1, 0x78 movs r1, 0x78
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
b _080804F8 b _080804F8
.pool .pool
_080804E4: _080804E4:
@@ -2128,7 +2128,7 @@ _08080A0A:
ldrb r2, [r5, 0x1] ldrb r2, [r5, 0x1]
ldr r0, =gUnknown_08339AD8 ldr r0, =gUnknown_08339AD8
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x54 adds r1, 0x54
adds r1, r4 adds r1, r4
@@ -2429,7 +2429,7 @@ _08080CA0:
negs r2, r2 negs r2, r2
movs r1, 0x78 movs r1, 0x78
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
_08080CAE: _08080CAE:
ldr r0, =gUnknown_020322A4 ldr r0, =gUnknown_020322A4
ldr r1, [r0] ldr r1, [r0]
@@ -3120,7 +3120,7 @@ sub_8081288: @ 8081288
subs r2, r1 subs r2, r1
adds r1, r6, 0 adds r1, r6, 0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
adds r2, r1, 0 adds r2, r1, 0
@@ -6402,7 +6402,7 @@ _08082E68:
cmp r0, 0 cmp r0, 0
beq _08082E80 beq _08082E80
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08082E80: _08082E80:
pop {r0} pop {r0}
bx r0 bx r0
@@ -6471,7 +6471,7 @@ _08082EF4:
adds r2, 0x50 adds r2, 0x50
ldr r0, =gUnknown_08339BE0 ldr r0, =gUnknown_08339BE0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -6533,7 +6533,7 @@ sub_8082F68: @ 8082F68
cmp r0, 0 cmp r0, 0
beq _08082F94 beq _08082F94
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08082F94: _08082F94:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -6569,7 +6569,7 @@ _08082FC0:
cmp r0, 0 cmp r0, 0
beq _08082FD4 beq _08082FD4
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08082FD4: _08082FD4:
pop {r0} pop {r0}
bx r0 bx r0
@@ -6667,13 +6667,13 @@ _08083066:
cmp r0, 0x3 cmp r0, 0x3
bne _080830A0 bne _080830A0
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, =gUnknown_08339C60 ldr r0, =gUnknown_08339C60
movs r2, 0x14 movs r2, 0x14
negs r2, r2 negs r2, r2
movs r1, 0x78 movs r1, 0x78
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
b _080830B2 b _080830B2
.pool .pool
_080830A0: _080830A0:
@@ -6753,7 +6753,7 @@ _08083112:
adds r0, 0x1 adds r0, 0x1
strb r0, [r1] strb r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08083130: _08083130:
ldrh r0, [r4, 0x30] ldrh r0, [r4, 0x30]
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
@@ -7261,7 +7261,7 @@ _080834DE:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r6, 0x1 adds r0, r6, 0x1
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
@@ -8063,7 +8063,7 @@ _08083B9A:
movs r1, 0x80 movs r1, 0x80
movs r2, 0x34 movs r2, 0x34
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r7, =gUnknown_020322A4 ldr r7, =gUnknown_020322A4
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x46 adds r1, 0x46
@@ -8093,7 +8093,7 @@ _08083B9A:
movs r1, 0xA0 movs r1, 0xA0
movs r2, 0x34 movs r2, 0x34
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x47 adds r1, 0x47
strb r0, [r1] strb r0, [r1]
@@ -8109,7 +8109,7 @@ _08083B9A:
movs r1, 0xC0 movs r1, 0xC0
movs r2, 0x34 movs r2, 0x34
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x48 adds r1, 0x48
strb r0, [r1] strb r0, [r1]
asm/berry_tag_screen.s
+2 -2
View File
@@ -832,7 +832,7 @@ sub_817836C: @ 817836C
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
bl sub_80D510C bl sub_80D510C
pop {r0} pop {r0}
bx r0 bx r0
@@ -1082,7 +1082,7 @@ _08178598:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
asm/cable_car.s
+7 -7
View File
@@ -1641,7 +1641,7 @@ _08150AE0:
cmp r0, 0xA0 cmp r0, 0xA0
ble _08150AEE ble _08150AEE
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08150AEE: _08150AEE:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1710,7 +1710,7 @@ _08150B5A:
cmp r0, 0x4F cmp r0, 0x4F
bgt _08150B68 bgt _08150B68
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08150B68: _08150B68:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1987,7 +1987,7 @@ _08150DD0:
movs r1, 0xB0 movs r1, 0xB0
movs r2, 0x2B movs r2, 0x2B
movs r3, 0x67 movs r3, 0x67
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r5, =gSprites ldr r5, =gSprites
@@ -2007,7 +2007,7 @@ _08150DD0:
movs r1, 0xC8 movs r1, 0xC8
movs r2, 0x63 movs r2, 0x63
movs r3, 0x65 movs r3, 0x65
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
lsls r0, r6, 4 lsls r0, r6, 4
@@ -2093,7 +2093,7 @@ _08150ED4:
movs r1, 0x68 movs r1, 0x68
movs r2, 0x9 movs r2, 0x9
movs r3, 0x67 movs r3, 0x67
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r5, =gSprites ldr r5, =gSprites
@@ -2113,7 +2113,7 @@ _08150ED4:
movs r1, 0x80 movs r1, 0x80
movs r2, 0x41 movs r2, 0x41
movs r3, 0x65 movs r3, 0x65
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
lsls r0, r6, 4 lsls r0, r6, 4
@@ -2151,7 +2151,7 @@ _08150F3E:
asrs r2, 16 asrs r2, 16
ldr r0, =gUnknown_085CDBCC ldr r0, =gUnknown_085CDBCC
movs r3, 0x68 movs r3, 0x68
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
lsls r0, r6, 4 lsls r0, r6, 4
asm/cable_car_util.s
+2 -2
View File
@@ -448,7 +448,7 @@ sub_81523F4: @ 81523F4
cmp r4, 0 cmp r4, 0
beq _08152430 beq _08152430
ldrh r0, [r4, 0x10] ldrh r0, [r4, 0x10]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
@@ -656,7 +656,7 @@ _08152562:
ldrh r3, [r3, 0x8] ldrh r3, [r3, 0x8]
strh r3, [r5, 0xA] strh r3, [r5, 0xA]
mov r0, r8 mov r0, r8
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 4 lsls r0, 4
ldrb r1, [r5, 0x5] ldrb r1, [r5, 0x5]
movs r4, 0xF movs r4, 0xF
asm/contest.s
+14 -14
View File
@@ -4606,7 +4606,7 @@ _080D9FEC:
adds r0, r6, 0 adds r0, r6, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r6, 0 adds r0, r6, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x14 movs r0, 0x14
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
b _080DA100 b _080DA100
@@ -6661,7 +6661,7 @@ sub_80DB0C4: @ 80DB0C4
movs r1, 0x70 movs r1, 0x70
movs r2, 0x24 movs r2, 0x24
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r4, =gSprites ldr r4, =gSprites
@@ -6696,7 +6696,7 @@ sub_80DB120: @ 80DB120
movs r1, 0x60 movs r1, 0x60
movs r2, 0xA movs r2, 0xA
movs r3, 0x1D movs r3, 0x1D
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -6782,7 +6782,7 @@ _080DB1CC:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x70 movs r1, 0x70
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gSprites ldr r0, =gSprites
@@ -8949,7 +8949,7 @@ _080DC2C8:
ldr r0, =gUnknown_08587AD0 ldr r0, =gUnknown_08587AD0
movs r1, 0xB4 movs r1, 0xB4
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, =gUnknown_02039F34 ldr r1, =gUnknown_02039F34
ldr r1, [r1] ldr r1, [r1]
ldr r2, [r1, 0x14] ldr r2, [r1, 0x14]
@@ -9250,7 +9250,7 @@ _080DC506:
ldrb r2, [r1] ldrb r2, [r1]
movs r1, 0xCC movs r1, 0xCC
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
ldr r1, [r1, 0x14] ldr r1, [r1, 0x14]
lsls r4, r5, 2 lsls r4, r5, 2
@@ -9302,7 +9302,7 @@ sub_80DC594: @ 80DC594
movs r1, 0x1E movs r1, 0x1E
movs r2, 0x2C movs r2, 0x2C
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -9883,7 +9883,7 @@ sub_80DC9EC: @ 80DC9EC
movs r1, 0xB8 movs r1, 0xB8
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x1D movs r3, 0x1D
bl AddObjectToFront bl CreateSprite
mov r9, r0 mov r9, r0
mov r3, r9 mov r3, r9
lsls r3, 24 lsls r3, 24
@@ -9893,7 +9893,7 @@ sub_80DC9EC: @ 80DC9EC
movs r1, 0xF8 movs r1, 0xF8
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x1D movs r3, 0x1D
bl AddObjectToFront bl CreateSprite
mov r8, r0 mov r8, r0
mov r0, r8 mov r0, r8
lsls r0, 24 lsls r0, 24
@@ -10031,9 +10031,9 @@ sub_80DCB78: @ 80DCB78
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r5, 0 adds r0, r5, 0
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -11834,7 +11834,7 @@ sub_80DDA20: @ 80DDA20
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
ldr r0, =0x0000abe2 ldr r0, =0x0000abe2
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0xC] strh r0, [r4, 0xC]
@@ -13418,7 +13418,7 @@ _080DE6AE:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl AnimateObject bl AnimateSprite
ldr r0, [r5] ldr r0, [r5]
ldr r0, [r0, 0x14] ldr r0, [r0, 0x14]
adds r0, r4, r0 adds r0, r4, r0
@@ -13807,7 +13807,7 @@ sub_80DEA20: @ 80DEA20
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
bl sub_80DEA5C bl sub_80DEA5C
pop {r0} pop {r0}
bx r0 bx r0
asm/contest_link_80F57C4.s
+5 -5
View File
@@ -1428,7 +1428,7 @@ _080F64F2:
lsls r1, 1 lsls r1, 1
movs r2, 0x50 movs r2, 0x50
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r5, =gSprites ldr r5, =gSprites
@@ -2155,7 +2155,7 @@ sub_80F6AE8: @ 80F6AE8
movs r1, 0x8 movs r1, 0x8
movs r2, 0x8 movs r2, 0x8
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -2479,7 +2479,7 @@ _080F6DEE:
lsls r1, 1 lsls r1, 1
movs r2, 0x90 movs r2, 0x90
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
adds r1, r5, r4 adds r1, r5, r4
strb r0, [r1] strb r0, [r1]
ldrh r0, [r6] ldrh r0, [r6]
@@ -3577,7 +3577,7 @@ sub_80F7670: @ 80F7670
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x2C movs r2, 0x2C
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -3695,7 +3695,7 @@ _080F77B6:
ble _080F77D6 ble _080F77D6
_080F77C6: _080F77C6:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r5] ldr r0, [r5]
ldr r1, [r0] ldr r1, [r0]
ldrb r0, [r1, 0x7] ldrb r0, [r1, 0x7]
asm/credits.s
+4 -4
View File
@@ -3082,7 +3082,7 @@ sub_8176EE8: @ 8176EE8
cmp r0, 0 cmp r0, 0
beq _08176F04 beq _08176F04
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _08176F88 b _08176F88
.pool .pool
_08176F04: _08176F04:
@@ -3165,7 +3165,7 @@ sub_8176F90: @ 8176F90
cmp r0, 0 cmp r0, 0
beq _08176FAC beq _08176FAC
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _08177048 b _08177048
.pool .pool
_08176FAC: _08176FAC:
@@ -3538,7 +3538,7 @@ sub_8177224: @ 8177224
movs r3, 0x22 movs r3, 0x22
ldrsh r2, [r2, r3] ldrsh r2, [r2, r3]
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -3580,7 +3580,7 @@ sub_81772B8: @ 81772B8
beq _081772EC beq _081772EC
_081772DC: _081772DC:
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _08177380 b _08177380
.pool .pool
_081772EC: _081772EC:
asm/decoration.s
+6 -6
View File
@@ -2938,7 +2938,7 @@ _08128214:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r3 adds r0, r3
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, =gUnknown_03005DD0 ldr r0, =gUnknown_03005DD0
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
strb r0, [r4] strb r0, [r4]
@@ -5105,7 +5105,7 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 8129334
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
b _081293C6 b _081293C6
.pool .pool
_081293B4: _081293B4:
@@ -5192,7 +5192,7 @@ AddDecorationIconObjectFromIconTable: @ 81293D8
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -5321,7 +5321,7 @@ AddDecorationIconObjectFromFieldObject: @ 81294C0
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
adds r0, r4, 0 adds r0, r4, 0
@@ -5881,7 +5881,7 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 81299DC
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r4, 0x4] str r0, [r4, 0x4]
@@ -5929,7 +5929,7 @@ _08129A44:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, =gUnknown_03005DD0 ldr r0, =gUnknown_03005DD0
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
strb r0, [r5] strb r0, [r5]
asm/easy_chat.s
+15 -15
View File
@@ -7755,7 +7755,7 @@ sub_811DEC4: @ 811DEC4
adds r2, r3 adds r2, r3
asrs r2, 16 asrs r2, 16
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_0203A11C ldr r1, =gUnknown_0203A11C
@@ -7876,7 +7876,7 @@ sub_811DFC8: @ 811DFC8
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r5, =gUnknown_0203A11C ldr r5, =gUnknown_0203A11C
@@ -7897,7 +7897,7 @@ sub_811DFC8: @ 811DFC8
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, [r5] ldr r2, [r5]
@@ -7936,7 +7936,7 @@ sub_811E050: @ 811E050
lsls r4, 2 lsls r4, 2
adds r0, r4 adds r0, r4
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r5] ldr r0, [r5]
adds r4, r0, r4 adds r4, r0, r4
movs r6, 0 movs r6, 0
@@ -7945,7 +7945,7 @@ sub_811E050: @ 811E050
lsls r4, 2 lsls r4, 2
adds r0, r4 adds r0, r4
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
str r6, [r0] str r6, [r0]
@@ -8217,7 +8217,7 @@ sub_811E288: @ 811E288
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_0203A11C ldr r1, =gUnknown_0203A11C
@@ -8347,7 +8347,7 @@ sub_811E380: @ 811E380
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _0811E3A2 beq _0811E3A2
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r4] ldr r0, [r4]
movs r1, 0xB9 movs r1, 0xB9
lsls r1, 2 lsls r1, 2
@@ -8368,7 +8368,7 @@ sub_811E3AC: @ 811E3AC
movs r1, 0xD0 movs r1, 0xD0
movs r2, 0x80 movs r2, 0x80
movs r3, 0x6 movs r3, 0x6
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r5, =gUnknown_0203A11C ldr r5, =gUnknown_0203A11C
@@ -8389,7 +8389,7 @@ sub_811E3AC: @ 811E3AC
movs r1, 0xD0 movs r1, 0xD0
movs r2, 0x50 movs r2, 0x50
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, [r5] ldr r2, [r5]
@@ -8552,13 +8552,13 @@ _0811E502:
lsls r4, 2 lsls r4, 2
adds r0, r3, r4 adds r0, r3, r4
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r5] ldr r0, [r5]
movs r1, 0xBA movs r1, 0xBA
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, [r5] ldr r1, [r5]
adds r4, r1, r4 adds r4, r1, r4
str r6, [r4] str r6, [r4]
@@ -8652,7 +8652,7 @@ sub_811E5D4: @ 811E5D4
movs r1, 0x60 movs r1, 0x60
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -8673,7 +8673,7 @@ _0811E602:
movs r1, 0x60 movs r1, 0x60
movs r2, 0x9C movs r2, 0x9C
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -8823,7 +8823,7 @@ sub_811E720: @ 811E720
movs r1, 0xDC movs r1, 0xDC
movs r2, 0x54 movs r2, 0x54
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -8844,7 +8844,7 @@ _0811E74E:
movs r1, 0xDC movs r1, 0xDC
movs r2, 0x9C movs r2, 0x9C
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
asm/egg_hatch.s
+4 -4
View File
@@ -427,7 +427,7 @@ _080716D8:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x4B movs r2, 0x4B
movs r3, 0x6 movs r3, 0x6
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r4, =gSprites ldr r4, =gSprites
@@ -839,7 +839,7 @@ _08071AF4:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x4B movs r2, 0x4B
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
ldr r4, =gUnknown_03000DE0 ldr r4, =gUnknown_03000DE0
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1] strb r0, [r1]
@@ -1561,7 +1561,7 @@ _08072114:
cmp r0, 0 cmp r0, 0
ble _0807213A ble _0807213A
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0807213A: _0807213A:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -1646,7 +1646,7 @@ sub_8072194: @ 8072194
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
asm/evolution_graphics.s
+8 -8
View File
@@ -134,7 +134,7 @@ _0817BB16:
b _0817BB30 b _0817BB30
_0817BB2A: _0817BB2A:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0817BB30: _0817BB30:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -150,7 +150,7 @@ sub_817BB38: @ 817BB38
movs r1, 0x78 movs r1, 0x78
movs r2, 0x58 movs r2, 0x58
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -238,7 +238,7 @@ _0817BBCC:
b _0817BC00 b _0817BC00
_0817BBFA: _0817BBFA:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0817BC00: _0817BC00:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -254,7 +254,7 @@ sub_817BC08: @ 817BC08
movs r1, 0x78 movs r1, 0x78
movs r2, 0x8 movs r2, 0x8
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -328,7 +328,7 @@ sub_817BC70: @ 817BC70
b _0817BCB2 b _0817BCB2
_0817BCAC: _0817BCAC:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0817BCB2: _0817BCB2:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -346,7 +346,7 @@ sub_817BCB8: @ 817BCB8
movs r1, 0x78 movs r1, 0x78
movs r2, 0x38 movs r2, 0x38
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -491,7 +491,7 @@ _0817BDCA:
b _0817BDEA b _0817BDEA
_0817BDE4: _0817BDE4:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0817BDEA: _0817BDEA:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -507,7 +507,7 @@ sub_817BDF0: @ 817BDF0
movs r1, 0x78 movs r1, 0x78
movs r2, 0x38 movs r2, 0x38
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0x40 cmp r4, 0x40
asm/evolution_scene.s
+5 -5
View File
@@ -259,7 +259,7 @@ evolution_cutscene: @ 813DA8C
movs r1, 0x78 movs r1, 0x78
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r1, =gUnknown_0203AB80 ldr r1, =gUnknown_0203AB80
ldr r2, [r1] ldr r2, [r1]
lsls r1, r0, 24 lsls r1, r0, 24
@@ -315,7 +315,7 @@ evolution_cutscene: @ 813DA8C
movs r1, 0x78 movs r1, 0x78
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r1, =gUnknown_0203AB80 ldr r1, =gUnknown_0203AB80
ldr r2, [r1] ldr r2, [r1]
lsls r1, r0, 24 lsls r1, r0, 24
@@ -515,7 +515,7 @@ sub_813DD7C: @ 813DD7C
movs r1, 0x78 movs r1, 0x78
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
mov r2, r8 mov r2, r8
ldr r1, [r2] ldr r1, [r2]
lsls r2, r0, 24 lsls r2, r0, 24
@@ -723,7 +723,7 @@ _0813E0F0:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r1, =gUnknown_0203AB80 ldr r1, =gUnknown_0203AB80
ldr r1, [r1] ldr r1, [r1]
lsls r2, r0, 24 lsls r2, r0, 24
@@ -890,7 +890,7 @@ sub_813E1D4: @ 813E1D4
movs r1, 0x78 movs r1, 0x78
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
mov r1, r9 mov r1, r9
ldr r2, [r1] ldr r2, [r1]
lsls r1, r0, 24 lsls r1, r0, 24
asm/field_camera.s
+1 -1
View File
@@ -819,7 +819,7 @@ InitCameraUpdateCallback: @ 808A134
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
_0808A150: _0808A150:
adds r0, r5, 0 adds r0, r5, 0
bl AddCameraObject bl AddCameraObject
asm/field_effect.s
+36 -36
View File
@@ -188,7 +188,7 @@ FieldEffectScript_LoadTiles: @ 80B5C3C
bl FieldEffectScript_ReadWord bl FieldEffectScript_ReadWord
adds r5, r0, 0 adds r5, r0, 0
ldrh r0, [r5, 0x6] ldrh r0, [r5, 0x6]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
lsls r0, 16 lsls r0, 16
ldr r1, =0xffff0000 ldr r1, =0xffff0000
cmp r0, r1 cmp r0, r1
@@ -214,7 +214,7 @@ FieldEffectScript_LoadFadedPalette: @ 80B5C6C
adds r4, r0, 0 adds r4, r0, 0
bl LoadTaggedObjectPalette bl LoadTaggedObjectPalette
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80ABE18 bl sub_80ABE18
@@ -267,7 +267,7 @@ FieldEffectFreeGraphicsResources: @ 80B5CC8
ldrh r5, [r1] ldrh r5, [r1]
ldrb r4, [r0, 0x5] ldrb r4, [r0, 0x5]
lsrs r4, 4 lsrs r4, 4
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r5, 0 adds r0, r5, 0
bl FieldEffectFreeTilesIfUnused bl FieldEffectFreeTilesIfUnused
adds r0, r4, 0 adds r0, r4, 0
@@ -555,7 +555,7 @@ sub_80B5E6C: @ 80B5E6C
adds r1, r5, 0 adds r1, r5, 0
adds r2, r6, 0 adds r2, r6, 0
mov r3, r9 mov r3, r9
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
add sp, 0x18 add sp, 0x18
@@ -616,7 +616,7 @@ AddNewGameBirchObject: @ 80B5F44
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
adds r3, r6, 0 adds r3, r6, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
pop {r4-r6} pop {r4-r6}
@@ -653,7 +653,7 @@ sub_80B5F84: @ 80B5F84
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
adds r0, 0x10 adds r0, 0x10
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -716,7 +716,7 @@ sub_80B5FE8: @ 80B5FE8
lsrs r4, r0, 16 lsrs r4, r0, 16
mov r1, r8 mov r1, r8
ldrh r0, [r1, 0x4] ldrh r0, [r1, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
adds r0, 0x10 adds r0, 0x10
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1054,7 +1054,7 @@ sub_80B62B4: @ 80B62B4
cmp r0, 0x6 cmp r0, 0x6
ble _080B62E6 ble _080B62E6
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x19 movs r0, 0x19
bl FieldEffectActiveListRemove bl FieldEffectActiveListRemove
ldr r0, =sub_80B61E4 ldr r0, =sub_80B61E4
@@ -1240,7 +1240,7 @@ sub_80B642C: @ 80B642C
cmp r0, 0x6 cmp r0, 0x6
ble _080B645E ble _080B645E
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x3E movs r0, 0x3E
bl FieldEffectActiveListRemove bl FieldEffectActiveListRemove
ldr r0, =sub_80B6330 ldr r0, =sub_80B6330
@@ -1273,7 +1273,7 @@ sub_80B646C: @ 80B646C
lsls r6, 16 lsls r6, 16
lsrs r6, 16 lsrs r6, 16
ldr r0, =sub_80B64C0 ldr r0, =sub_80B64C0
bl obj_add_empty_with_callback bl CreateInvisibleSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -1344,7 +1344,7 @@ _080B64F4:
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -1452,7 +1452,7 @@ _080B65D8:
ldr r3, =0x00001007 ldr r3, =0x00001007
mov r10, r3 mov r10, r3
mov r0, r10 mov r0, r10
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
movs r1, 0x84 movs r1, 0x84
@@ -1475,7 +1475,7 @@ _080B65D8:
mov r0, r8 mov r0, r8
ands r4, r0 ands r4, r0
mov r0, r10 mov r0, r10
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
movs r1, 0x83 movs r1, 0x83
@@ -1494,7 +1494,7 @@ _080B65D8:
mov r3, r8 mov r3, r8
ands r4, r3 ands r4, r3
mov r0, r10 mov r0, r10
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
movs r1, 0x81 movs r1, 0x81
@@ -1512,7 +1512,7 @@ _080B65D8:
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
mov r0, r10 mov r0, r10
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
ldr r3, =0x01050000 ldr r3, =0x01050000
@@ -1529,7 +1529,7 @@ _080B65D8:
adds r3, r4, 0 adds r3, r4, 0
bl sub_80B609C bl sub_80B609C
mov r0, r10 mov r0, r10
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
ldr r1, =0x01030000 ldr r1, =0x01030000
@@ -1593,7 +1593,7 @@ _080B6718:
lsrs r4, 24 lsrs r4, 24
ldr r0, =0x00001007 ldr r0, =0x00001007
mov r8, r0 mov r8, r0
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
movs r1, 0x84 movs r1, 0x84
@@ -1614,7 +1614,7 @@ _080B6718:
adds r3, r4, 0 adds r3, r4, 0
bl sub_80B609C bl sub_80B609C
mov r0, r8 mov r0, r8
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
movs r1, 0x83 movs r1, 0x83
@@ -1626,7 +1626,7 @@ _080B6718:
adds r3, r4, 0 adds r3, r4, 0
bl sub_80B609C bl sub_80B609C
mov r0, r8 mov r0, r8
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
movs r1, 0x81 movs r1, 0x81
@@ -1638,7 +1638,7 @@ _080B6718:
adds r3, r4, 0 adds r3, r4, 0
bl sub_80B609C bl sub_80B609C
mov r0, r8 mov r0, r8
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
ldr r1, =0x01050000 ldr r1, =0x01050000
@@ -1649,7 +1649,7 @@ _080B6718:
adds r3, r4, 0 adds r3, r4, 0
bl sub_80B609C bl sub_80B609C
mov r0, r8 mov r0, r8
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
ldr r1, =0x01030000 ldr r1, =0x01030000
@@ -1755,7 +1755,7 @@ sub_80B6850: @ 80B6850
asrs r2, 16 asrs r2, 16
adds r1, r3, 0 adds r1, r3, 0
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -1839,7 +1839,7 @@ sub_80B68EC: @ 80B68EC
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
lsls r0, r4, 4 lsls r0, r4, 4
@@ -1858,7 +1858,7 @@ _080B6934:
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
_080B6948: _080B6948:
@@ -3949,7 +3949,7 @@ sub_80B79F4: @ 80B79F4
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -4236,7 +4236,7 @@ sub_80B7C48: @ 80B7C48
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -6555,7 +6555,7 @@ sub_80B8F98: @ 80B8F98
negs r2, r2 negs r2, r2
movs r1, 0x78 movs r1, 0x78
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
@@ -6684,7 +6684,7 @@ sub_80B90CC: @ 80B90CC
movs r1, 0x78 movs r1, 0x78
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -7062,7 +7062,7 @@ sub_80B9390: @ 80B9390
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
_080B93FC: _080B93FC:
ldrh r0, [r5, 0x8] ldrh r0, [r5, 0x8]
adds r0, 0x1 adds r0, 0x1
@@ -7169,7 +7169,7 @@ sub_80B94C4: @ 80B94C4
movs r1, 0xFF movs r1, 0xFF
movs r2, 0xB4 movs r2, 0xB4
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -7274,7 +7274,7 @@ sub_80B957C: @ 80B957C
ldr r0, =gUnknown_0855C548 ldr r0, =gUnknown_0855C548
str r0, [r4, 0x10] str r0, [r4, 0x10]
adds r0, r4, 0 adds r0, r4, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl StartObjectRotScalAnim bl StartObjectRotScalAnim
@@ -7338,7 +7338,7 @@ _080B95F6:
lsrs r2, 6 lsrs r2, 6
adds r0, r4, 0 adds r0, r4, 0
movs r3, 0 movs r3, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
_080B9628: _080B9628:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -7426,7 +7426,7 @@ sub_80B96B0: @ 80B96B0
ldr r0, =gUnknown_0855C548 ldr r0, =gUnknown_0855C548
str r0, [r4, 0x10] str r0, [r4, 0x10]
adds r0, r4, 0 adds r0, r4, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl StartObjectRotScalAnim bl StartObjectRotScalAnim
@@ -7849,7 +7849,7 @@ sub_80B9A28: @ 80B9A28
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
@@ -8235,7 +8235,7 @@ _080B9D5A:
asrs r1, r2, 16 asrs r1, r2, 16
asrs r2, r7, 16 asrs r2, r7, 16
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -8333,7 +8333,7 @@ _080B9E02:
ble _080B9E24 ble _080B9E24
_080B9E1E: _080B9E1E:
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080B9E24: _080B9E24:
pop {r0} pop {r0}
bx r0 bx r0
asm/field_effect_helpers.s
+29 -29
View File
@@ -435,7 +435,7 @@ sub_8154228: @ 8154228
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x52 movs r3, 0x52
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r4, r0, 0 adds r4, r0, 0
@@ -602,7 +602,7 @@ oei_shadow: @ 8154340
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x94 movs r3, 0x94
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -763,7 +763,7 @@ oei_grass_normal: @ 81544AC
movs r3, 0 movs r3, 0
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -964,7 +964,7 @@ sub_8154658: @ 8154658
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -1101,7 +1101,7 @@ sub_8154758: @ 8154758
movs r3, 0 movs r3, 0
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -1295,7 +1295,7 @@ sub_81548FC: @ 81548FC
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -1353,7 +1353,7 @@ sub_815496C: @ 815496C
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -1550,7 +1550,7 @@ sub_8154B04: @ 8154B04
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -1604,7 +1604,7 @@ sub_8154B78: @ 8154B78
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
adds r5, r1, 0 adds r5, r1, 0
@@ -1659,7 +1659,7 @@ sub_8154BEC: @ 8154BEC
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
adds r5, r1, 0 adds r5, r1, 0
@@ -1794,7 +1794,7 @@ sub_8154CEC: @ 8154CEC
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0x40 cmp r4, 0x40
@@ -1935,7 +1935,7 @@ sub_8154E1C: @ 8154E1C
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -1989,7 +1989,7 @@ oei_water_drop_tall: @ 8154E8C
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -2047,7 +2047,7 @@ sub_8154EFC: @ 8154EFC
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0x40 cmp r5, 0x40
@@ -2199,7 +2199,7 @@ oei_ripples: @ 8155054
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -2255,7 +2255,7 @@ sub_81550B4: @ 81550B4
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -2406,7 +2406,7 @@ sub_81551F0: @ 81551F0
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -2458,7 +2458,7 @@ sub_815525C: @ 815525C
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -2510,7 +2510,7 @@ sub_81552C8: @ 81552C8
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -2562,7 +2562,7 @@ sub_8155334: @ 8155334
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -2651,7 +2651,7 @@ oei_ash: @ 81553D4
movs r3, 0 movs r3, 0
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r5, 0x8] ldrb r3, [r5, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -2822,7 +2822,7 @@ sub_8155534: @ 8155534
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0x96 movs r3, 0x96
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r5, r0, 0 adds r5, r0, 0
@@ -3194,7 +3194,7 @@ sub_8155800: @ 8155800
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0xFF movs r3, 0xFF
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -3274,7 +3274,7 @@ sub_8155890: @ 8155890
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -3332,7 +3332,7 @@ sub_8155900: @ 8155900
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0x40 cmp r4, 0x40
@@ -3519,7 +3519,7 @@ sub_8155A88: @ 8155A88
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0x52 movs r3, 0x52
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -3599,7 +3599,7 @@ sub_8155B2C: @ 8155B2C
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8] ldrb r3, [r4, 0x8]
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -3711,7 +3711,7 @@ _08155C08:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
mov r1, sp mov r1, sp
strb r0, [r1] strb r0, [r1]
lsls r0, 24 lsls r0, 24
@@ -3970,7 +3970,7 @@ sub_8155DDC: @ 8155DDC
movs r3, 0x4 movs r3, 0x4
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0x52 movs r3, 0x52
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x40 cmp r2, 0x40
asm/field_map_obj.s
+13 -13
View File
@@ -70,7 +70,7 @@ sub_808D450: @ 808D450
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x1F movs r3, 0x1F
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -90,7 +90,7 @@ sub_808D450: @ 808D450
orrs r0, r1 orrs r0, r1
strb r0, [r4, 0x1] strb r0, [r4, 0x1]
adds r0, r4, 0 adds r0, r4, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl StartObjectRotScalAnim bl StartObjectRotScalAnim
@@ -103,7 +103,7 @@ sub_808D450: @ 808D450
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x1F movs r3, 0x1F
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r4, r0, 4 lsls r4, r0, 4
@@ -116,7 +116,7 @@ sub_808D450: @ 808D450
orrs r5, r0 orrs r5, r0
strb r5, [r4, 0x1] strb r5, [r4, 0x1]
adds r0, r4, 0 adds r0, r4, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl StartObjectRotScalAnim bl StartObjectRotScalAnim
@@ -740,7 +740,7 @@ RemoveFieldObjectInternal: @ 808D90C
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
bl RemoveObjectAndFreeTiles bl DestroySprite
add sp, 0x8 add sp, 0x8
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -861,7 +861,7 @@ _0808DA24:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
@@ -1324,7 +1324,7 @@ _0808DDAE:
asrs r2, 16 asrs r2, 16
adds r0, r6, 0 adds r0, r6, 0
mov r3, r9 mov r3, r9
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
adds r0, r6, 0 adds r0, r6, 0
@@ -1420,7 +1420,7 @@ sprite_new: @ 808DE0C
ldrsh r2, [r6, r0] ldrsh r2, [r6, r0]
mov r0, sp mov r0, sp
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x40 cmp r6, 0x40
@@ -1935,7 +1935,7 @@ _0808E27E:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
cmp r7, 0x40 cmp r7, 0x40
@@ -2789,7 +2789,7 @@ sub_808E8F4: @ 808E8F4
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0xFF cmp r0, 0xFF
@@ -3380,7 +3380,7 @@ AddCameraObject: @ 808ED34
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -18054,7 +18054,7 @@ sub_80956C4: @ 80956C4
orrs r0, r1 orrs r0, r1
strb r0, [r4, 0x1] strb r0, [r4, 0x1]
adds r0, r4, 0 adds r0, r4, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
adds r2, r4, 0 adds r2, r4, 0
adds r2, 0x2C adds r2, 0x2C
ldrb r0, [r2] ldrb r0, [r2]
@@ -18090,7 +18090,7 @@ sub_80956F4: @ 80956F4
lsrs r2, 6 lsrs r2, 6
movs r3, 0 movs r3, 0
adds r0, r4, 0 adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
movs r0, 0x1 movs r0, 0x1
pop {r4} pop {r4}
pop {r1} pop {r1}
asm/field_player_avatar.s
+2 -2
View File
@@ -4015,7 +4015,7 @@ sub_808C814: @ 808C814
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
_0808C87A: _0808C87A:
@@ -4887,7 +4887,7 @@ sub_808CF78: @ 808CF78
ldr r1, =gSprites ldr r1, =gSprites
adds r4, r0, r1 adds r4, r0, r1
adds r0, r4, 0 adds r0, r4, 0
bl AnimateObject bl AnimateSprite
movs r0, 0 movs r0, 0
strh r0, [r4, 0x24] strh r0, [r4, 0x24]
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
asm/fldeff_80F9BCC.s
+10 -10
View File
@@ -712,7 +712,7 @@ sub_80FA13C: @ 80FA13C
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0x94 movs r3, 0x94
bl AddObjectToFront bl CreateSprite
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -869,7 +869,7 @@ _080FA274:
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0x94 movs r3, 0x94
bl AddObjectToFront bl CreateSprite
ldr r0, [r4, 0x1C] ldr r0, [r4, 0x1C]
cmp r0, 0x1 cmp r0, 0x1
beq _080FA2B2 beq _080FA2B2
@@ -1020,7 +1020,7 @@ sub_80FA3AC: @ 80FA3AC
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0x94 movs r3, 0x94
bl AddObjectToFront bl CreateSprite
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -1711,7 +1711,7 @@ _080FA9BC:
cmp r0, 0x1F cmp r0, 0x1F
ble _080FA9CA ble _080FA9CA
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080FA9CA: _080FA9CA:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -1754,7 +1754,7 @@ sub_80FA9D0: @ 80FA9D0
movs r3, 0 movs r3, 0
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -1851,7 +1851,7 @@ _080FAAC6:
ldrb r2, [r2] ldrb r2, [r2]
adds r2, 0x20 adds r2, 0x20
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
b _080FAB8C b _080FAB8C
.pool .pool
_080FAAFC: _080FAAFC:
@@ -1892,7 +1892,7 @@ _080FAB2C:
adds r2, 0x10 adds r2, 0x10
_080FAB4C: _080FAB4C:
movs r3, 0x94 movs r3, 0x94
bl AddObjectToFront bl CreateSprite
b _080FAB8C b _080FAB8C
.pool .pool
_080FAB64: _080FAB64:
@@ -1914,7 +1914,7 @@ _080FAB64:
ldrb r2, [r2] ldrb r2, [r2]
adds r2, 0x10 adds r2, 0x10
movs r3, 0x94 movs r3, 0x94
bl AddObjectToFront bl CreateSprite
_080FAB8C: _080FAB8C:
movs r0, 0 movs r0, 0
add sp, 0x4 add sp, 0x4
@@ -2440,7 +2440,7 @@ sub_80FB00C: @ 80FB00C
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x52 movs r3, 0x52
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0x40 cmp r5, 0x40
@@ -2498,7 +2498,7 @@ _080FB07E:
adds r0, r4, 0 adds r0, r4, 0
bl FreeObjectPalette bl FreeObjectPalette
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080FB098: _080FB098:
adds r4, 0x44 adds r4, 0x44
adds r6, 0x44 adds r6, 0x44
asm/fldeff_emotion.s
+3 -3
View File
@@ -12,7 +12,7 @@ oei_exclamation_mark: @ 80B4620
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x53 movs r3, 0x53
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -39,7 +39,7 @@ sub_80B4658: @ 80B4658
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x52 movs r3, 0x52
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -66,7 +66,7 @@ sub_80B4690: @ 80B4690
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x52 movs r3, 0x52
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
asm/front_pic_anim.s
+4 -4
View File
@@ -213,7 +213,7 @@ sub_817F618: @ 817F618
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ObjAffineSet bl ObjAffineSet
ldr r0, =gUnknown_02021BC0 ldr r0, =gOamMatrices
lsls r4, 3 lsls r4, 3
adds r4, r0 adds r4, r0
ldrh r0, [r5] ldrh r0, [r5]
@@ -246,7 +246,7 @@ sub_817F670: @ 817F670
cmp r0, 0x1 cmp r0, 0x1
bne _0817F68E bne _0817F68E
adds r0, r4, 0 adds r0, r4, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
_0817F68E: _0817F68E:
movs r1, 0x30 movs r1, 0x30
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
@@ -269,7 +269,7 @@ _0817F6B0:
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
adds r0, r4, 0 adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
adds r2, r4, 0 adds r2, r4, 0
adds r2, 0x2C adds r2, 0x2C
ldrb r0, [r2] ldrb r0, [r2]
@@ -396,7 +396,7 @@ sub_817F77C: @ 817F77C
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
adds r0, r4, 0 adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
ldr r0, =gUnknown_03001274 ldr r0, =gUnknown_03001274
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
asm/hall_of_fame.s
+2 -2
View File
@@ -3238,7 +3238,7 @@ sub_81751A4: @ 81751A4
cmp r0, 0x78 cmp r0, 0x78
ble _081751BA ble _081751BA
adds r0, r5, 0 adds r0, r5, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _081751F2 b _081751F2
_081751BA: _081751BA:
adds r0, r1, 0x1 adds r0, r1, 0x1
@@ -3301,7 +3301,7 @@ sub_81751FC: @ 81751FC
asrs r2, 16 asrs r2, 16
adds r1, r4, 0 adds r1, r4, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
asm/intro.s
+37 -37
View File
@@ -744,7 +744,7 @@ _0816D2D8:
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldrh r0, [r4] ldrh r0, [r4]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4] strh r0, [r4]
@@ -789,7 +789,7 @@ sub_816D338: @ 816D338
cmp r0, 0xC cmp r0, 0xC
bne _0816D350 bne _0816D350
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0816D350: _0816D350:
pop {r0} pop {r0}
bx r0 bx r0
@@ -860,7 +860,7 @@ task_intro_4: @ 816D354
movs r1, 0x78 movs r1, 0x78
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -1002,13 +1002,13 @@ _0816D51C:
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x80 movs r2, 0x80
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r0, =gUnknown_085E4BA4 ldr r0, =gUnknown_085E4BA4
movs r1, 0x90 movs r1, 0x90
lsls r1, 1 lsls r1, 1
movs r2, 0x6E movs r2, 0x6E
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r0, =gUnknown_0203BCC8 ldr r0, =gUnknown_0203BCC8
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0 cmp r0, 0
@@ -1048,7 +1048,7 @@ _0816D598:
lsls r1, 1 lsls r1, 1
movs r2, 0x50 movs r2, 0x50
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
movs r1, 0x3C movs r1, 0x3C
@@ -1493,7 +1493,7 @@ _0816D96E:
cmp r1, r0 cmp r1, r0
bge _0816D9BA bge _0816D9BA
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _0816D9BA b _0816D9BA
_0816D99C: _0816D99C:
ldrh r0, [r4, 0x34] ldrh r0, [r4, 0x34]
@@ -1726,7 +1726,7 @@ _0816DB42:
cmp r0, r1 cmp r0, r1
bgt _0816DB60 bgt _0816DB60
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _0816DBA4 b _0816DBA4
.pool .pool
_0816DB60: _0816DB60:
@@ -2437,7 +2437,7 @@ _0816E19C:
lsrs r3, 24 lsrs r3, 24
ldr r0, =gUnknown_08596C10 ldr r0, =gUnknown_08596C10
movs r2, 0xA0 movs r2, 0xA0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -3074,7 +3074,7 @@ _0816E6EE:
lsls r3, r5, 24 lsls r3, r5, 24
lsrs r3, 24 lsrs r3, 24
ldr r0, =gUnknown_085E4D14 ldr r0, =gUnknown_085E4D14
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -3128,7 +3128,7 @@ _0816E75E:
lsls r3, r5, 24 lsls r3, r5, 24
lsrs r3, 24 lsrs r3, 24
ldr r0, =gUnknown_085E4D14 ldr r0, =gUnknown_085E4D14
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -3200,7 +3200,7 @@ _0816E7C6:
cmp r0, 0 cmp r0, 0
beq _0816E82A beq _0816E82A
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _0816E82A b _0816E82A
_0816E80A: _0816E80A:
subs r0, r1, 0x1 subs r0, r1, 0x1
@@ -3265,7 +3265,7 @@ _0816E86E:
cmp r0, 0x8C cmp r0, 0x8C
bls _0816E882 bls _0816E882
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0816E882: _0816E882:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -3584,12 +3584,12 @@ _0816EB72:
movs r1, 0xC8 movs r1, 0xC8
movs r2, 0x30 movs r2, 0x30
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xC8 movs r1, 0xC8
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r0, r1, 4 lsls r0, r1, 4
@@ -3603,7 +3603,7 @@ _0816EB72:
movs r1, 0xC8 movs r1, 0xC8
movs r2, 0x70 movs r2, 0x70
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r0, r1, 4 lsls r0, r1, 4
@@ -3631,12 +3631,12 @@ _0816EBE0:
movs r1, 0x28 movs r1, 0x28
movs r2, 0x30 movs r2, 0x30
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x28 movs r1, 0x28
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r0, r1, 4 lsls r0, r1, 4
@@ -3650,7 +3650,7 @@ _0816EBE0:
movs r1, 0x28 movs r1, 0x28
movs r2, 0x70 movs r2, 0x70
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r0, r1, 4 lsls r0, r1, 4
@@ -3771,7 +3771,7 @@ _0816ECDC:
cmp r0, r1 cmp r0, r1
bne _0816ED12 bne _0816ED12
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0816ED12: _0816ED12:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -4099,7 +4099,7 @@ _0816EFB6:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x58 movs r2, 0x58
movs r3, 0xF movs r3, 0xF
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -4554,7 +4554,7 @@ _0816F386:
b _0816F39A b _0816F39A
_0816F394: _0816F394:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0816F39A: _0816F39A:
add sp, 0x4 add sp, 0x4
pop {r4} pop {r4}
@@ -4618,7 +4618,7 @@ sub_816F3A4: @ 816F3A4
movs r1, 0x1 movs r1, 0x1
movs r2, 0x3 movs r2, 0x3
movs r3, 0x2 movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
b _0816F44C b _0816F44C
.pool .pool
_0816F420: _0816F420:
@@ -5042,7 +5042,7 @@ _0816F6E8:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x3 movs r2, 0x3
movs r3, 0x2 movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
_0816F744: _0816F744:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5108,7 +5108,7 @@ _0816F768:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x3 movs r2, 0x3
movs r3, 0x2 movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
_0816F7C4: _0816F7C4:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5153,7 +5153,7 @@ sub_816F7D0: @ 816F7D0
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -5196,7 +5196,7 @@ sub_816F7D0: @ 816F7D0
movs r1, 0 movs r1, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2 movs r1, 0x2
bl StartObjectImageAnim bl StartObjectImageAnim
@@ -5229,7 +5229,7 @@ _0816F8A0:
mov r1, r10 mov r1, r10
mov r2, r8 mov r2, r8
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r5, =gSprites ldr r5, =gSprites
@@ -5262,7 +5262,7 @@ _0816F8A0:
movs r1, 0 movs r1, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
ldr r2, =gUnknown_0202064C ldr r2, =gUnknown_0202064C
adds r4, r2 adds r4, r2
ldr r0, =sub_816F3A4 ldr r0, =sub_816F3A4
@@ -5271,7 +5271,7 @@ _0816F8A0:
mov r1, r10 mov r1, r10
mov r2, r8 mov r2, r8
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r4, r7, 4 lsls r4, r7, 4
@@ -5304,7 +5304,7 @@ _0816F8A0:
movs r1, 0 movs r1, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
ldr r0, =gUnknown_0202064C ldr r0, =gUnknown_0202064C
adds r4, r0 adds r4, r0
ldr r1, =sub_816F3A4 ldr r1, =sub_816F3A4
@@ -5783,7 +5783,7 @@ _0816FD24:
cmp r0, 0 cmp r0, 0
beq _0816FD38 beq _0816FD38
adds r0, r6, 0 adds r0, r6, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0816FD38: _0816FD38:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -5847,7 +5847,7 @@ _0816FD9C:
cmp r0, 0 cmp r0, 0
beq _0816FDB0 beq _0816FDB0
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0816FDB0: _0816FDB0:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5890,7 +5890,7 @@ _0816FDD2:
ldr r0, =gUnknown_085E4F5C ldr r0, =gUnknown_085E4F5C
asrs r2, 16 asrs r2, 16
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
lsls r4, r6, 4 lsls r4, r6, 4
@@ -5948,7 +5948,7 @@ _0816FDD2:
asrs r2, 16 asrs r2, 16
movs r1, 0x78 movs r1, 0x78
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
lsls r0, r6, 4 lsls r0, r6, 4
@@ -6071,7 +6071,7 @@ _0816FF58:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x3 movs r2, 0x3
movs r3, 0x3 movs r3, 0x3
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
adds r2, r4, 0 adds r2, r4, 0
adds r2, 0x3E adds r2, 0x3E
ldrb r1, [r2] ldrb r1, [r2]
@@ -6207,7 +6207,7 @@ _08170056:
movs r1, 0 movs r1, 0
movs r2, 0x3 movs r2, 0x3
movs r3, 0x3 movs r3, 0x3
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
movs r0, 0 movs r0, 0
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
asm/intro_credits_graphics.s
+11 -11
View File
@@ -581,7 +581,7 @@ sub_817B62C: @ 817B62C
cmp r0, 0 cmp r0, 0
beq _0817B64C beq _0817B64C
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _0817B690 b _0817B690
.pool .pool
_0817B64C: _0817B64C:
@@ -654,7 +654,7 @@ _0817B6C2:
ldrb r2, [r6, 0x2] ldrb r2, [r6, 0x2]
ldrb r3, [r6, 0x3] ldrb r3, [r6, 0x3]
ldr r0, =gUnknown_085F504C ldr r0, =gUnknown_085F504C
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r5, r0, 4 lsls r5, r0, 4
@@ -668,7 +668,7 @@ _0817B6C2:
lsrs r2, 6 lsrs r2, 6
adds r0, r4, 0 adds r0, r4, 0
movs r3, 0 movs r3, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
ldrb r3, [r4, 0x5] ldrb r3, [r4, 0x5]
movs r0, 0xC movs r0, 0xC
orrs r3, r0 orrs r3, r0
@@ -841,7 +841,7 @@ sub_817B834: @ 817B834
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
adds r6, r0, 0 adds r6, r0, 0
lsls r6, 24 lsls r6, 24
lsrs r6, 24 lsrs r6, 24
@@ -852,7 +852,7 @@ sub_817B834: @ 817B834
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -881,7 +881,7 @@ sub_817B88C: @ 817B88C
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
adds r6, r0, 0 adds r6, r0, 0
lsls r6, 24 lsls r6, 24
lsrs r6, 24 lsrs r6, 24
@@ -892,7 +892,7 @@ sub_817B88C: @ 817B88C
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -984,7 +984,7 @@ sub_817B948: @ 817B948
adds r1, r2, 0 adds r1, r2, 0
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
adds r6, r0, 0 adds r6, r0, 0
lsls r6, 24 lsls r6, 24
lsrs r6, 24 lsrs r6, 24
@@ -995,7 +995,7 @@ sub_817B948: @ 817B948
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x6 movs r3, 0x6
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r5, =gSprites ldr r5, =gSprites
@@ -1039,7 +1039,7 @@ sub_817B9C4: @ 817B9C4
adds r1, r2, 0 adds r1, r2, 0
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
adds r6, r0, 0 adds r6, r0, 0
lsls r6, 24 lsls r6, 24
lsrs r6, 24 lsrs r6, 24
@@ -1050,7 +1050,7 @@ sub_817B9C4: @ 817B9C4
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x6 movs r3, 0x6
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r5, =gSprites ldr r5, =gSprites
asm/link.s
+49 -49
View File
@@ -9436,7 +9436,7 @@ _0800DFCA:
ldr r0, =gUnknown_082ED5F0 ldr r0, =gUnknown_082ED5F0
adds r1, r3, 0 adds r1, r3, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
@@ -9449,7 +9449,7 @@ _0800DFCA:
strh r0, [r4, 0x3C] strh r0, [r4, 0x3C]
ldr r0, =gUnknown_082ED5E0 ldr r0, =gUnknown_082ED5E0
ldrh r0, [r0, 0x6] ldrh r0, [r0, 0x6]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
strh r0, [r4, 0x3A] strh r0, [r4, 0x3A]
adds r4, 0x3E adds r4, 0x3E
ldrb r0, [r4] ldrb r0, [r4]
@@ -9464,7 +9464,7 @@ _0800E024:
ldr r0, =gUnknown_082ED5F0 ldr r0, =gUnknown_082ED5F0
adds r1, r3, 0 adds r1, r3, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gUnknown_02022B10 ldr r4, =gUnknown_02022B10
strb r0, [r4] strb r0, [r4]
ldr r5, =gSprites ldr r5, =gSprites
@@ -9477,7 +9477,7 @@ _0800E024:
strh r1, [r0, 0x3C] strh r1, [r0, 0x3C]
ldr r0, =gUnknown_082ED5E0 ldr r0, =gUnknown_082ED5E0
ldrh r0, [r0, 0x6] ldrh r0, [r0, 0x6]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
ldrb r2, [r4] ldrb r2, [r4]
lsls r1, r2, 4 lsls r1, r2, 4
adds r1, r2 adds r1, r2
@@ -9523,7 +9523,7 @@ sub_800E084: @ 800E084
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r3, =gMain ldr r3, =gMain
movs r0, 0x84 movs r0, 0x84
lsls r0, 3 lsls r0, 3
@@ -9548,7 +9548,7 @@ sub_800E0E8: @ 800E0E8
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_082ED5E0 ldr r4, =gUnknown_082ED5E0
ldrh r0, [r4, 0x6] ldrh r0, [r4, 0x6]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
lsls r0, 16 lsls r0, 16
ldr r1, =0xffff0000 ldr r1, =0xffff0000
cmp r0, r1 cmp r0, r1
@@ -31907,7 +31907,7 @@ _08019F0C:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x27 cmp r4, 0x27
ble _08019F0C ble _08019F0C
@@ -36617,7 +36617,7 @@ _0801C572:
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x90 movs r2, 0x90
movs r3, 0x8 movs r3, 0x8
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
add r1, r10 add r1, r10
adds r1, r4 adds r1, r4
@@ -36713,7 +36713,7 @@ _0801C65A:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r7 adds r0, r7
bl RemoveObjectAndFreeTiles bl DestroySprite
_0801C678: _0801C678:
ldr r0, [r6] ldr r0, [r6]
movs r2, 0xBF movs r2, 0xBF
@@ -45034,7 +45034,7 @@ sub_80208E8: @ 80208E8
movs r1, 0xA movs r1, 0xA
movs r2, 0x18 movs r2, 0x18
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_02022C8C ldr r1, =gUnknown_02022C8C
@@ -45132,7 +45132,7 @@ sub_80209AC: @ 80209AC
ldr r0, =gUnknown_082F2DF2 ldr r0, =gUnknown_082F2DF2
adds r4, r0 adds r4, r0
movs r0, 0 movs r0, 0
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 4 lsrs r1, 4
@@ -45229,7 +45229,7 @@ sub_8020A68: @ 8020A68
movs r1, 0x4C movs r1, 0x4C
movs r2, 0x98 movs r2, 0x98
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r5, =gUnknown_02022C8C ldr r5, =gUnknown_02022C8C
@@ -45244,7 +45244,7 @@ sub_8020A68: @ 8020A68
movs r1, 0x40 movs r1, 0x40
movs r2, 0x98 movs r2, 0x98
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, [r5] ldr r2, [r5]
@@ -45324,7 +45324,7 @@ sub_8020B20: @ 8020B20
movs r1, 0x8 movs r1, 0x8
movs r2, 0x98 movs r2, 0x98
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r5, =gUnknown_02022C8C ldr r5, =gUnknown_02022C8C
@@ -45339,7 +45339,7 @@ sub_8020B20: @ 8020B20
movs r1, 0x20 movs r1, 0x20
movs r2, 0x98 movs r2, 0x98
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, [r5] ldr r2, [r5]
@@ -46670,7 +46670,7 @@ _0802166E:
adds r0, r5, 0 adds r0, r5, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r5, 0 adds r0, r5, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0802169A: _0802169A:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -48676,7 +48676,7 @@ _08022746:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x58 movs r2, 0x58
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
movs r0, 0xAC movs r0, 0xAC
@@ -48726,7 +48726,7 @@ _080227AA:
asrs r2, 16 asrs r2, 16
ldr r0, =gUnknown_082F4324 ldr r0, =gUnknown_082F4324
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
movs r0, 0xAE movs r0, 0xAE
@@ -48786,7 +48786,7 @@ _08022828:
adds r2, 0x88 adds r2, 0x88
ldr r0, =gUnknown_082F433C ldr r0, =gUnknown_082F433C
movs r3, 0x6 movs r3, 0x6
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
lsls r0, r5, 2 lsls r0, r5, 2
@@ -48835,7 +48835,7 @@ _0802288E:
ldr r0, =gUnknown_082F4354 ldr r0, =gUnknown_082F4354
movs r2, 0x8 movs r2, 0x8
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
lsls r0, r5, 2 lsls r0, r5, 2
@@ -48930,7 +48930,7 @@ _08022996:
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r6, r0 adds r0, r6, r0
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -48950,7 +48950,7 @@ _080229C4:
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r6, r0 adds r0, r6, r0
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -48967,7 +48967,7 @@ _080229E0:
adds r0, r5, r2 adds r0, r5, r2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -48987,7 +48987,7 @@ _080229FC:
cmp r0, 0 cmp r0, 0
beq _08022A18 beq _08022A18
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08022A18: _08022A18:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -60467,7 +60467,7 @@ sub_8028408: @ 8028408
mov r0, sp mov r0, sp
movs r2, 0x88 movs r2, 0x88
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -60697,7 +60697,7 @@ _08028622:
adds r0, r1 adds r0, r1
cmp r0, 0 cmp r0, 0
beq _0802863C beq _0802863C
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
_0802863C: _0802863C:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
@@ -60889,7 +60889,7 @@ _0802878A:
asrs r2, 16 asrs r2, 16
mov r0, sp mov r0, sp
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, =gUnknown_02022CF4 ldr r1, =gUnknown_02022CF4
ldr r1, [r1] ldr r1, [r1]
lsls r2, r4, 1 lsls r2, r4, 1
@@ -60931,7 +60931,7 @@ _080287E8:
adds r0, r1 adds r0, r1
cmp r0, 0 cmp r0, 0
beq _08028806 beq _08028806
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
_08028806: _08028806:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
@@ -61284,7 +61284,7 @@ _08028AB0:
mov r0, sp mov r0, sp
movs r2, 0x8 movs r2, 0x8
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -61316,7 +61316,7 @@ _08028AF0:
mov r0, r9 mov r0, r9
movs r2, 0x31 movs r2, 0x31
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7, 0xC] ldr r1, [r7, 0xC]
b _08028B40 b _08028B40
.pool .pool
@@ -61328,7 +61328,7 @@ _08028B2C:
mov r0, r9 mov r0, r9
movs r2, 0x34 movs r2, 0x34
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
_08028B40: _08028B40:
lsls r0, 24 lsls r0, 24
@@ -61378,7 +61378,7 @@ _08028B86:
adds r0, r1 adds r0, r1
cmp r0, 0 cmp r0, 0
beq _08028BA0 beq _08028BA0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08028BA0: _08028BA0:
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
@@ -61403,7 +61403,7 @@ _08028BB8:
adds r0, r1 adds r0, r1
cmp r0, 0 cmp r0, 0
beq _08028BD2 beq _08028BD2
bl RemoveObjectAndFreeTiles bl DestroySprite
_08028BD2: _08028BD2:
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
@@ -61652,7 +61652,7 @@ _08028D9E:
ldrsh r2, [r2, r0] ldrsh r2, [r2, r0]
mov r0, sp mov r0, sp
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -61761,7 +61761,7 @@ _08028E8A:
adds r0, r1 adds r0, r1
cmp r0, 0 cmp r0, 0
beq _08028EA4 beq _08028EA4
bl RemoveObjectAndFreeTiles bl DestroySprite
_08028EA4: _08028EA4:
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
@@ -68903,10 +68903,10 @@ _0802C98E:
cmp r4, 0x1 cmp r4, 0x1
bls _0802C98E bls _0802C98E
movs r0, 0x5 movs r0, 0x5
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
strb r0, [r6, 0xE] strb r0, [r6, 0xE]
movs r0, 0x6 movs r0, 0x6
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
strb r0, [r6, 0xF] strb r0, [r6, 0xF]
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -69033,7 +69033,7 @@ _0802CA32:
asrs r2, 16 asrs r2, 16
mov r0, sp mov r0, sp
ldr r3, [sp, 0x30] ldr r3, [sp, 0x30]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -69520,7 +69520,7 @@ sub_802CE48: @ 802CE48
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x40 cmp r2, 0x40
@@ -69568,7 +69568,7 @@ _0802CEA6:
movs r3, 0 movs r3, 0
ldrsh r2, [r6, r3] ldrsh r2, [r6, r3]
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r0, r5, 2 lsls r0, r5, 2
@@ -69603,7 +69603,7 @@ _0802CEE8:
movs r3, 0 movs r3, 0
ldrsh r2, [r2, r3] ldrsh r2, [r2, r3]
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r0, r5, 2 lsls r0, r5, 2
@@ -72702,7 +72702,7 @@ _0802E790:
movs r3, 0x14 movs r3, 0x14
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
ldrb r3, [r4, 0xE] ldrb r3, [r4, 0xE]
bl AddObjectToFront bl CreateSprite
lsls r1, r5, 1 lsls r1, r5, 1
adds r1, r4 adds r1, r4
lsls r0, 24 lsls r0, 24
@@ -72860,7 +72860,7 @@ _0802E8E0:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -73263,7 +73263,7 @@ _0802EC08:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
_0802EC3E: _0802EC3E:
ldrh r0, [r5] ldrh r0, [r5]
adds r0, 0x1 adds r0, 0x1
@@ -73282,14 +73282,14 @@ _0802EC4C:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x12 movs r0, 0x12
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrh r0, [r5, 0x4] ldrh r0, [r5, 0x4]
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
ldrh r0, [r5, 0x6] ldrh r0, [r5, 0x6]
@@ -73732,7 +73732,7 @@ sub_802EFA8: @ 802EFA8
adds r1, r2, 0 adds r1, r2, 0
adds r2, r6, 0 adds r2, r6, 0
mov r3, r8 mov r3, r8
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
add sp, 0x18 add sp, 0x18
@@ -73785,7 +73785,7 @@ sub_802EFFC: @ 802EFFC
adds r1, r2, 0 adds r1, r2, 0
adds r2, r5, 0 adds r2, r5, 0
mov r3, r10 mov r3, r10
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r3, r9 mov r3, r9
@@ -73797,7 +73797,7 @@ sub_802EFFC: @ 802EFFC
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
mov r3, r10 mov r3, r10
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r4, r8 mov r4, r8
asm/main_menu.s
+1 -1
View File
@@ -3463,7 +3463,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4
ldr r1, =gUnknown_082FF114 ldr r1, =gUnknown_082FF114
str r1, [r0] str r1, [r0]
adds r0, r5, 0 adds r0, r5, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl StartObjectRotScalAnim bl StartObjectRotScalAnim
asm/map_obj_8097404.s
+1 -1
View File
@@ -1005,7 +1005,7 @@ _08097AF6:
cmp r1, r0 cmp r1, r0
bne _08097B16 bne _08097B16
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08097B16: _08097B16:
adds r5, 0x44 adds r5, 0x44
subs r4, 0x1 subs r4, 0x1
asm/menu_helpers.s
+3 -3
View File
@@ -781,7 +781,7 @@ _08122358:
ldr r0, =gUnknown_0859F524 ldr r0, =gUnknown_0859F524
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
mov r1, r8 mov r1, r8
adds r4, r1, r5 adds r4, r1, r5
strb r0, [r4] strb r0, [r4]
@@ -839,7 +839,7 @@ _081223C0:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r7 adds r0, r7
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
b _081223EC b _081223EC
.pool .pool
_081223DC: _081223DC:
@@ -849,7 +849,7 @@ _081223DC:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r7 adds r0, r7
bl RemoveObjectAndFreeTiles bl DestroySprite
_081223EC: _081223EC:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
asm/mon_markings.s
+10 -10
View File
@@ -279,7 +279,7 @@ _0811FB28:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _0811FB9A beq _0811FB9A
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r6] ldr r0, [r6]
adds r0, 0xC adds r0, 0xC
adds r0, r4 adds r0, r4
@@ -300,7 +300,7 @@ _0811FB52:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _0811FB9A beq _0811FB9A
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x14 adds r0, 0x14
adds r0, r4 adds r0, r4
@@ -316,7 +316,7 @@ _0811FB52:
ldr r0, [r0, 0x24] ldr r0, [r0, 0x24]
cmp r0, 0 cmp r0, 0
beq _0811FB8A beq _0811FB8A
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r4] ldr r0, [r4]
str r7, [r0, 0x24] str r7, [r0, 0x24]
_0811FB8A: _0811FB8A:
@@ -324,7 +324,7 @@ _0811FB8A:
ldr r0, [r0, 0x28] ldr r0, [r0, 0x28]
cmp r0, 0 cmp r0, 0
beq _0811FB9A beq _0811FB9A
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r4] ldr r0, [r4]
str r7, [r0, 0x28] str r7, [r0, 0x28]
_0811FB9A: _0811FB9A:
@@ -555,7 +555,7 @@ _0811FD58:
asrs r1, r2, 16 asrs r1, r2, 16
asrs r2, r7, 16 asrs r2, r7, 16
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -618,7 +618,7 @@ _0811FDC8:
mov r3, r9 mov r3, r9
asrs r1, r3, 16 asrs r1, r3, 16
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -648,7 +648,7 @@ _0811FDEE:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -689,7 +689,7 @@ _0811FDEE:
movs r1, 0x1 movs r1, 0x1
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
b _0811FEAE b _0811FEAE
.pool .pool
_0811FEA8: _0811FEA8:
@@ -707,7 +707,7 @@ _0811FEAE:
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -904,7 +904,7 @@ sub_811FFD4: @ 811FFD4
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
asm/money.s
+2 -2
View File
@@ -374,7 +374,7 @@ AddMoneyLabelObject: @ 80E53AC
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, =gUnknown_02039F99 ldr r1, =gUnknown_02039F99
strb r0, [r1] strb r0, [r1]
pop {r4,r5} pop {r4,r5}
@@ -393,7 +393,7 @@ RemoveMoneyLabelObject: @ 80E53F4
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
asm/naming_screen.s
+16 -16
View File
@@ -1490,7 +1490,7 @@ sub_80E3A74: @ 80E3A74
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
movs r0, 0x4 movs r0, 0x4
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 20 lsrs r0, 20
movs r1, 0x87 movs r1, 0x87
@@ -1500,7 +1500,7 @@ sub_80E3A74: @ 80E3A74
add r6, sp, 0x8 add r6, sp, 0x8
strh r0, [r6] strh r0, [r6]
movs r0, 0x6 movs r0, 0x6
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 20 lsrs r0, 20
adds r0, r5 adds r0, r5
@@ -1508,14 +1508,14 @@ sub_80E3A74: @ 80E3A74
adds r1, 0xA adds r1, 0xA
strh r0, [r1] strh r0, [r1]
movs r0, 0x7 movs r0, 0x7
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 20 lsrs r0, 20
adds r0, r5 adds r0, r5
add r1, sp, 0xC add r1, sp, 0xC
strh r0, [r1] strh r0, [r1]
movs r0, 0x7 movs r0, 0x7
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 20 lsrs r0, 20
ldr r1, =0x00000101 ldr r1, =0x00000101
@@ -1686,7 +1686,7 @@ _080E3BDE:
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
movs r0, 0x5 movs r0, 0x5
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
ldr r2, =0x01010000 ldr r2, =0x01010000
@@ -1812,7 +1812,7 @@ sub_80E3CE4: @ 80E3CE4
movs r1, 0x26 movs r1, 0x26
movs r2, 0x58 movs r2, 0x58
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r5, =gUnknown_02039F94 ldr r5, =gUnknown_02039F94
ldr r1, [r5] ldr r1, [r5]
ldr r4, =0x00001e23 ldr r4, =0x00001e23
@@ -2135,7 +2135,7 @@ sub_80E3F8C: @ 80E3F8C
movs r1, 0xCC movs r1, 0xCC
movs r2, 0x58 movs r2, 0x58
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_02039F94 ldr r1, =gUnknown_02039F94
@@ -2162,7 +2162,7 @@ sub_80E3F8C: @ 80E3F8C
movs r1, 0xCC movs r1, 0xCC
movs r2, 0x54 movs r2, 0x54
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x3A] strh r0, [r5, 0x3A]
@@ -2181,7 +2181,7 @@ sub_80E3F8C: @ 80E3F8C
movs r1, 0xCC movs r1, 0xCC
movs r2, 0x53 movs r2, 0x53
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -2402,7 +2402,7 @@ sub_80E41B8: @ 80E41B8
lsls r4, r5, 1 lsls r4, r5, 1
adds r0, r4, r0 adds r0, r4, r0
ldrh r0, [r0] ldrh r0, [r0]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 4 lsls r0, 4
mov r1, r8 mov r1, r8
ldrb r2, [r1, 0x5] ldrb r2, [r1, 0x5]
@@ -2414,7 +2414,7 @@ sub_80E41B8: @ 80E41B8
ldr r0, =gUnknown_0858BEFE ldr r0, =gUnknown_0858BEFE
adds r4, r0 adds r4, r0
ldrh r0, [r4] ldrh r0, [r4]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
adds r1, r6, 0 adds r1, r6, 0
adds r1, 0x40 adds r1, 0x40
strh r0, [r1] strh r0, [r1]
@@ -2444,7 +2444,7 @@ sub_80E4218: @ 80E4218
movs r1, 0xCC movs r1, 0xCC
movs r2, 0x74 movs r2, 0x74
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r4, r0, 4 lsls r4, r0, 4
@@ -2466,7 +2466,7 @@ sub_80E4218: @ 80E4218
movs r1, 0xCC movs r1, 0xCC
movs r2, 0x8C movs r2, 0x8C
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r4, r0, 4 lsls r4, r0, 4
@@ -2502,7 +2502,7 @@ sub_80E4290: @ 80E4290
asrs r1, 16 asrs r1, 16
movs r2, 0x38 movs r2, 0x38
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
ldr r3, =gSprites ldr r3, =gSprites
@@ -2540,7 +2540,7 @@ _080E42E2:
ldr r0, =gUnknown_0858C168 ldr r0, =gUnknown_0858C168
movs r2, 0x3C movs r2, 0x3C
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r0, r1, 4 lsls r0, r1, 4
@@ -2648,7 +2648,7 @@ sub_80E43E0: @ 80E43E0
movs r1, 0x38 movs r1, 0x38
movs r2, 0x29 movs r2, 0x29
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r4, r0, 4 lsls r4, r0, 4
asm/player_pc.s
+1 -1
View File
@@ -2227,7 +2227,7 @@ sub_816C0C8: @ 816C0C8
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0xFF movs r0, 0xFF
strb r0, [r5] strb r0, [r5]
_0816C0FA: _0816C0FA:
asm/pokeblock_feed.s
+7 -7
View File
@@ -849,7 +849,7 @@ sub_817A358: @ 817A358
movs r1, 0x30 movs r1, 0x30
movs r2, 0x50 movs r2, 0x50
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
@@ -908,7 +908,7 @@ sub_817A358: @ 817A358
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
adds r0, r6, 0 adds r0, r6, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
mov r2, r9 mov r2, r9
ldr r0, [r2] ldr r0, [r2]
ldr r1, =0x00001053 ldr r1, =0x00001053
@@ -1016,7 +1016,7 @@ sub_817A4A4: @ 817A4A4
adds r3, r5 adds r3, r5
ldr r1, =DummyObjectCallback ldr r1, =DummyObjectCallback
str r1, [r3] str r1, [r3]
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
adds r0, r4, 0 adds r0, r4, 0
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
@@ -1069,7 +1069,7 @@ _0817A548:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
pop {r4-r7} pop {r4-r7}
@@ -1085,7 +1085,7 @@ sub_817A56C: @ 817A56C
movs r1, 0xAE movs r1, 0xAE
movs r2, 0x54 movs r2, 0x54
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -1121,7 +1121,7 @@ sub_817A5A0: @ 817A5A0
cmp r0, 0xA cmp r0, 0xA
bne _0817A5C6 bne _0817A5C6
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0817A5C6: _0817A5C6:
pop {r0} pop {r0}
bx r0 bx r0
@@ -1342,7 +1342,7 @@ _0817A818:
ldr r0, [r4] ldr r0, [r4]
ldr r1, =gUnknown_085F04FC ldr r1, =gUnknown_085F04FC
str r1, [r0, 0x10] str r1, [r0, 0x10]
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
_0817A850: _0817A850:
ldr r0, =0x00001050 ldr r0, =0x00001050
adds r1, r4, r0 adds r1, r4, r0
asm/pokedex.s
+45 -45
View File
@@ -4600,7 +4600,7 @@ sub_80BDB7C: @ 80BDB7C
movs r1, 0xB8 movs r1, 0xB8
movs r2, 0x4 movs r2, 0x4
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -4615,7 +4615,7 @@ sub_80BDB7C: @ 80BDB7C
movs r1, 0xB8 movs r1, 0xB8
movs r2, 0x9C movs r2, 0x9C
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r0, r7, 4 lsls r0, r7, 4
@@ -4633,18 +4633,18 @@ sub_80BDB7C: @ 80BDB7C
movs r1, 0xE6 movs r1, 0xE6
movs r2, 0x14 movs r2, 0x14
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r5, =gUnknown_0855D1C4 ldr r5, =gUnknown_0855D1C4
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x10 movs r1, 0x10
movs r2, 0x78 movs r2, 0x78
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x30 movs r1, 0x30
movs r2, 0x78 movs r2, 0x78
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r0, r7, 4 lsls r0, r7, 4
@@ -4657,7 +4657,7 @@ sub_80BDB7C: @ 80BDB7C
movs r1, 0x10 movs r1, 0x10
movs r2, 0x90 movs r2, 0x90
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r4, r7, 4 lsls r4, r7, 4
@@ -4675,7 +4675,7 @@ sub_80BDB7C: @ 80BDB7C
movs r1, 0x30 movs r1, 0x30
movs r2, 0x90 movs r2, 0x90
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r0, r7, 4 lsls r0, r7, 4
@@ -4689,7 +4689,7 @@ sub_80BDB7C: @ 80BDB7C
movs r1, 0 movs r1, 0
movs r2, 0x50 movs r2, 0x50
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r1, r7, 4 lsls r1, r7, 4
@@ -4719,7 +4719,7 @@ sub_80BDB7C: @ 80BDB7C
movs r1, 0 movs r1, 0
movs r2, 0x50 movs r2, 0x50
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r1, r7, 4 lsls r1, r7, 4
@@ -4753,12 +4753,12 @@ _080BDCD6:
movs r1, 0x20 movs r1, 0x20
movs r2, 0x28 movs r2, 0x28
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x20 movs r1, 0x20
movs r2, 0x48 movs r2, 0x48
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r0, r7, 4 lsls r0, r7, 4
@@ -4773,7 +4773,7 @@ _080BDCD6:
movs r1, 0x18 movs r1, 0x18
movs r2, 0x30 movs r2, 0x30
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
@@ -4812,7 +4812,7 @@ _080BDD78:
movs r1, 0x20 movs r1, 0x20
movs r2, 0x30 movs r2, 0x30
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
@@ -4861,7 +4861,7 @@ _080BDDE8:
movs r1, 0x28 movs r1, 0x28
movs r2, 0x30 movs r2, 0x30
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r5, =gUnknown_02039B4C ldr r5, =gUnknown_02039B4C
@@ -4890,7 +4890,7 @@ _080BDDE8:
movs r1, 0x18 movs r1, 0x18
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, [r5] ldr r0, [r5]
@@ -4927,7 +4927,7 @@ _080BDE8C:
movs r1, 0x20 movs r1, 0x20
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
@@ -4975,7 +4975,7 @@ _080BDEFC:
movs r1, 0x28 movs r1, 0x28
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
@@ -5006,12 +5006,12 @@ _080BDF4C:
movs r1, 0x20 movs r1, 0x20
movs r2, 0x28 movs r2, 0x28
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x20 movs r1, 0x20
movs r2, 0x4C movs r2, 0x4C
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r0, r7, 4 lsls r0, r7, 4
@@ -5025,12 +5025,12 @@ _080BDF4C:
movs r1, 0x11 movs r1, 0x11
movs r2, 0x2D movs r2, 0x2D
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x11 movs r1, 0x11
movs r2, 0x37 movs r2, 0x37
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r0, r7, 4 lsls r0, r7, 4
@@ -5043,12 +5043,12 @@ _080BDF4C:
movs r1, 0x11 movs r1, 0x11
movs r2, 0x51 movs r2, 0x51
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x11 movs r1, 0x11
movs r2, 0x5B movs r2, 0x5B
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r0, r7, 4 lsls r0, r7, 4
@@ -5067,7 +5067,7 @@ _080BDF4C:
movs r1, 0x28 movs r1, 0x28
movs r2, 0x2D movs r2, 0x2D
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
adds r0, r6, 0 adds r0, r6, 0
@@ -5102,7 +5102,7 @@ _080BE030:
movs r1, 0x30 movs r1, 0x30
movs r2, 0x2D movs r2, 0x2D
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
adds r0, r6, 0 adds r0, r6, 0
@@ -5147,7 +5147,7 @@ _080BE090:
movs r1, 0x38 movs r1, 0x38
movs r2, 0x2D movs r2, 0x2D
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
adds r0, r6, 0 adds r0, r6, 0
@@ -5172,7 +5172,7 @@ _080BE090:
movs r1, 0x28 movs r1, 0x28
movs r2, 0x37 movs r2, 0x37
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
@@ -5210,7 +5210,7 @@ _080BE128:
movs r1, 0x30 movs r1, 0x30
movs r2, 0x37 movs r2, 0x37
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
@@ -5259,7 +5259,7 @@ _080BE198:
movs r1, 0x38 movs r1, 0x38
movs r2, 0x37 movs r2, 0x37
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
@@ -5292,7 +5292,7 @@ _080BE198:
movs r1, 0x28 movs r1, 0x28
movs r2, 0x51 movs r2, 0x51
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
adds r0, r6, 0 adds r0, r6, 0
@@ -5326,7 +5326,7 @@ _080BE23C:
movs r1, 0x30 movs r1, 0x30
movs r2, 0x51 movs r2, 0x51
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
adds r0, r6, 0 adds r0, r6, 0
@@ -5371,7 +5371,7 @@ _080BE29C:
movs r1, 0x38 movs r1, 0x38
movs r2, 0x51 movs r2, 0x51
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
adds r0, r6, 0 adds r0, r6, 0
@@ -5396,7 +5396,7 @@ _080BE29C:
movs r1, 0x28 movs r1, 0x28
movs r2, 0x5B movs r2, 0x5B
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
@@ -5434,7 +5434,7 @@ _080BE334:
movs r1, 0x30 movs r1, 0x30
movs r2, 0x5B movs r2, 0x5B
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
@@ -5482,7 +5482,7 @@ _080BE3A4:
movs r1, 0x38 movs r1, 0x38
movs r2, 0x5B movs r2, 0x5B
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02039B4C ldr r0, =gUnknown_02039B4C
@@ -5510,7 +5510,7 @@ _080BE3E2:
movs r1, 0x88 movs r1, 0x88
movs r2, 0x60 movs r2, 0x60
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -5525,7 +5525,7 @@ _080BE414:
movs r1, 0x88 movs r1, 0x88
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r0, r7, 4 lsls r0, r7, 4
@@ -5565,7 +5565,7 @@ sub_80BE44C: @ 80BE44C
cmp r0, 0 cmp r0, 0
beq _080BE464 beq _080BE464
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080BE464: _080BE464:
pop {r0} pop {r0}
bx r0 bx r0
@@ -5788,7 +5788,7 @@ sub_80BE604: @ 80BE604
cmp r0, 0x3 cmp r0, 0x3
beq _080BE62C beq _080BE62C
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _080BE648 b _080BE648
.pool .pool
_080BE62C: _080BE62C:
@@ -5827,7 +5827,7 @@ sub_80BE658: @ 80BE658
cmp r0, 0x3 cmp r0, 0x3
beq _080BE680 beq _080BE680
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _080BE750 b _080BE750
.pool .pool
_080BE680: _080BE680:
@@ -5958,7 +5958,7 @@ sub_80BE758: @ 80BE758
cmp r0, 0x3 cmp r0, 0x3
beq _080BE774 beq _080BE774
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080BE774: _080BE774:
pop {r0} pop {r0}
bx r0 bx r0
@@ -5981,7 +5981,7 @@ sub_80BE780: @ 80BE780
cmp r0, 0x3 cmp r0, 0x3
beq _080BE7AC beq _080BE7AC
adds r0, r6, 0 adds r0, r6, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _080BE824 b _080BE824
.pool .pool
_080BE7AC: _080BE7AC:
@@ -6068,7 +6068,7 @@ sub_80BE834: @ 80BE834
cmp r2, 0x3 cmp r2, 0x3
beq _080BE85C beq _080BE85C
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _080BE8D4 b _080BE8D4
.pool .pool
_080BE85C: _080BE85C:
@@ -13249,7 +13249,7 @@ sub_80C2594: @ 80C2594
movs r1, 0xB8 movs r1, 0xB8
movs r2, 0x4 movs r2, 0x4
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r4, =gSprites ldr r4, =gSprites
@@ -13271,7 +13271,7 @@ sub_80C2594: @ 80C2594
movs r1, 0xB8 movs r1, 0xB8
movs r2, 0x6C movs r2, 0x6C
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
asm/pokedex_area_screen.s
+4 -4
View File
@@ -1642,7 +1642,7 @@ _0813D710:
ldrsh r2, [r3, r0] ldrsh r2, [r3, r0]
ldr r0, =gUnknown_085B4034 ldr r0, =gUnknown_085B4034
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -1729,7 +1729,7 @@ _0813D846:
adds r0, r2 adds r0, r2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -1757,7 +1757,7 @@ _0813D87A:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _0813D892 beq _0813D892
bl RemoveObjectAndFreeTiles bl DestroySprite
_0813D892: _0813D892:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -1834,7 +1834,7 @@ _0813D924:
ldr r0, =gUnknown_085B40FC ldr r0, =gUnknown_085B40FC
movs r2, 0x8C movs r2, 0x8C
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
asm/pokedex_cry_screen.s
+2 -2
View File
@@ -693,7 +693,7 @@ _081458B0:
adds r2, r3 adds r2, r3
asrs r2, 16 asrs r2, 16
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r2, =gUnknown_0203AB98 ldr r2, =gUnknown_0203AB98
ldr r3, [r2] ldr r3, [r2]
lsls r0, 24 lsls r0, 24
@@ -741,7 +741,7 @@ sub_8145914: @ 8145914
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r4, =gUnknown_0203AB90 ldr r4, =gUnknown_0203AB90
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
asm/region_map.s
+8 -8
View File
@@ -426,7 +426,7 @@ sub_812305C: @ 812305C
ldr r0, [r0, 0x1C] ldr r0, [r0, 0x1C]
cmp r0, 0 cmp r0, 0
beq _08123080 beq _08123080
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x58 adds r0, 0x58
ldrh r0, [r0] ldrh r0, [r0]
@@ -440,7 +440,7 @@ _08123080:
ldr r0, [r0, 0x20] ldr r0, [r0, 0x20]
cmp r0, 0 cmp r0, 0
beq _081230A0 beq _081230A0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x70 adds r0, 0x70
ldrh r0, [r0] ldrh r0, [r0]
@@ -2646,7 +2646,7 @@ _0812416E:
movs r1, 0x38 movs r1, 0x38
movs r2, 0x48 movs r2, 0x48
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -2711,7 +2711,7 @@ _08124204:
movs r0, 0x2 movs r0, 0x2
strh r0, [r1, 0x30] strh r0, [r1, 0x30]
adds r0, r6, 0 adds r0, r6, 0
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r1, [r4] ldr r1, [r4]
ldr r2, [r1, 0x1C] ldr r2, [r1, 0x1C]
lsls r0, 24 lsls r0, 24
@@ -2738,7 +2738,7 @@ sub_8124238: @ 8124238
ldr r0, [r0, 0x1C] ldr r0, [r0, 0x1C]
cmp r0, 0 cmp r0, 0
beq _0812425C beq _0812425C
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x58 adds r0, 0x58
ldrh r0, [r0] ldrh r0, [r0]
@@ -2840,7 +2840,7 @@ _08124316:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_0203A144 ldr r1, =gUnknown_0203A144
@@ -3818,7 +3818,7 @@ _08124B44:
ldrsh r2, [r3, r0] ldrsh r2, [r3, r0]
ldr r0, =gUnknown_085A1F7C ldr r0, =gUnknown_085A1F7C
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0x40 cmp r5, 0x40
@@ -3942,7 +3942,7 @@ _08124C0C:
ldrsh r2, [r5, r0] ldrsh r2, [r5, r0]
ldr r0, =gUnknown_085A1F7C ldr r0, =gUnknown_085A1F7C
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
asm/reset_rtc_screen.s
+5 -5
View File
@@ -144,7 +144,7 @@ _0809E9CE:
b _0809E9FE b _0809E9FE
_0809E9F8: _0809E9F8:
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0809E9FE: _0809E9FE:
pop {r0} pop {r0}
bx r0 bx r0
@@ -275,7 +275,7 @@ _0809EAEA:
b _0809EAFE b _0809EAFE
_0809EAF8: _0809EAF8:
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0809EAFE: _0809EAFE:
pop {r0} pop {r0}
bx r0 bx r0
@@ -296,7 +296,7 @@ sub_809EB04: @ 809EB04
movs r1, 0x35 movs r1, 0x35
movs r2, 0x44 movs r2, 0x44
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
ldr r6, =gSprites ldr r6, =gSprites
@@ -316,7 +316,7 @@ sub_809EB04: @ 809EB04
movs r1, 0x35 movs r1, 0x35
movs r2, 0x44 movs r2, 0x44
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r0, r1, 4 lsls r0, r1, 4
@@ -885,7 +885,7 @@ _0809EFCA:
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
movs r0, 0 movs r0, 0
movs r1, 0x80 movs r1, 0x80
bl ResetSpriteRange bl ResetOamRange
bl LoadOamFromSprites bl LoadOamFromSprites
bl remove_some_task bl remove_some_task
bl dp12_8087EA4 bl dp12_8087EA4
asm/rom4.s
+2 -2
View File
@@ -4168,7 +4168,7 @@ _08086816:
ldr r0, [r1, 0x8] ldr r0, [r1, 0x8]
movs r0, 0 movs r0, 0
movs r1, 0x80 movs r1, 0x80
bl ResetSpriteRange bl ResetOamRange
bl LoadOamFromSprites bl LoadOamFromSprites
add sp, 0x4 add sp, 0x4
pop {r4-r7} pop {r4-r7}
@@ -6159,7 +6159,7 @@ sub_808780C: @ 808780C
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
_08087838: _08087838:
movs r0, 0 movs r0, 0
strb r0, [r5] strb r0, [r5]
asm/rom5.s
+11 -11
View File
@@ -538,7 +538,7 @@ _080A9786:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
mov r2, r8 mov r2, r8
bl AddObjectToFront bl CreateSprite
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
adds r4, r7, r1 adds r4, r7, r1
strb r0, [r4] strb r0, [r4]
@@ -674,7 +674,7 @@ _080A98D0:
_080A9914: _080A9914:
movs r1, 0x50 movs r1, 0x50
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r3, =gBankSpriteIds ldr r3, =gBankSpriteIds
strb r0, [r3] strb r0, [r3]
ldr r4, =gSprites ldr r4, =gSprites
@@ -755,7 +755,7 @@ _080A998C:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
mov r2, r8 mov r2, r8
bl AddObjectToFront bl CreateSprite
ldr r1, =gBankSpriteIds ldr r1, =gBankSpriteIds
adds r4, r7, r1 adds r4, r7, r1
strb r0, [r4] strb r0, [r4]
@@ -1087,7 +1087,7 @@ _080A9CC4:
asrs r2, 16 asrs r2, 16
ldr r0, =gUnknown_0853EF60 ldr r0, =gUnknown_0853EF60
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
lsls r0, r4, 4 lsls r0, r4, 4
@@ -1139,7 +1139,7 @@ _080A9D42:
asrs r2, 16 asrs r2, 16
ldr r0, =gUnknown_0853EF60 ldr r0, =gUnknown_0853EF60
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
lsls r0, r4, 4 lsls r0, r4, 4
@@ -1346,11 +1346,11 @@ _080A9EAA:
cmp r0, 0 cmp r0, 0
beq _080A9EE6 beq _080A9EE6
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
b _080A9EEC b _080A9EEC
_080A9EE6: _080A9EE6:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080A9EEC: _080A9EEC:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -1402,11 +1402,11 @@ _080A9F32:
lsls r2, r4, 16 lsls r2, r4, 16
asrs r2, 16 asrs r2, 16
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, =0x0000271a ldr r0, =0x0000271a
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
lsls r0, 16 lsls r0, 16
ldr r1, =0xffff0000 ldr r1, =0xffff0000
cmp r0, r1 cmp r0, r1
@@ -1490,7 +1490,7 @@ sub_80AA020: @ 80AA020
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =0x0000271a ldr r0, =0x0000271a
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
ldr r1, =gTasks ldr r1, =gTasks
@@ -1634,7 +1634,7 @@ sub_80AA124: @ 80AA124
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _080AA186 b _080AA186
.pool .pool
_080AA16C: _080AA16C:
asm/rom6.s
+3 -3
View File
@@ -1857,7 +1857,7 @@ sub_8136444: @ 8136444
asrs r5, 16 asrs r5, 16
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
pop {r4,r5} pop {r4,r5}
@@ -1895,7 +1895,7 @@ _0813648E:
ldr r0, =gUnknown_085B26F0 ldr r0, =gUnknown_085B26F0
str r0, [r4, 0x10] str r0, [r4, 0x10]
adds r0, r4, 0 adds r0, r4, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
strh r5, [r4, 0x30] strh r5, [r4, 0x30]
@@ -10519,7 +10519,7 @@ sub_813AC44: @ 813AC44
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
_0813AC6A: _0813AC6A:
ldr r1, =gUnknown_0203AB6C ldr r1, =gUnknown_0203AB6C
movs r0, 0x40 movs r0, 0x40
asm/rom_8034C54.s
+9 -9
View File
@@ -147,7 +147,7 @@ sub_8034D14: @ 8034D14
beq _08034DD4 beq _08034DD4
ldr r0, [r5, 0x8] ldr r0, [r5, 0x8]
ldrh r0, [r0, 0x6] ldrh r0, [r0, 0x6]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
ldr r2, [r6] ldr r2, [r6]
ldr r1, [r2, 0x4] ldr r1, [r2, 0x4]
adds r1, r4, r1 adds r1, r4, r1
@@ -207,7 +207,7 @@ _08034DD4:
_08034DE0: _08034DE0:
ldr r0, [r5, 0xC] ldr r0, [r5, 0xC]
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r6, =gUnknown_02022E10 ldr r6, =gUnknown_02022E10
ldr r1, [r6] ldr r1, [r6]
ldr r1, [r1, 0x4] ldr r1, [r1, 0x4]
@@ -1280,7 +1280,7 @@ sub_8035608: @ 8035608
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -2189,7 +2189,7 @@ _08035EC4:
movs r1, 0x6F movs r1, 0x6F
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBattleStruct ldr r4, =gBattleStruct
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x7D adds r1, 0x7D
@@ -2198,7 +2198,7 @@ _08035EC4:
movs r1, 0x81 movs r1, 0x81
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x7E adds r1, 0x7E
strb r0, [r1] strb r0, [r1]
@@ -7085,7 +7085,7 @@ _08038B36:
adds r0, r5, 0 adds r0, r5, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r5, 0 adds r0, r5, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08038B6A: _08038B6A:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -8757,7 +8757,7 @@ sub_8039A48: @ 8039A48
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _08039AC8 b _08039AC8
_08039A7C: _08039A7C:
ldrh r0, [r4, 0x2E] ldrh r0, [r4, 0x2E]
@@ -9159,7 +9159,7 @@ dp11b_obj_free: @ 8039D48
ldrh r1, [r0, 0x34] ldrh r1, [r0, 0x34]
lsls r1, 24 lsls r1, 24
lsrs r4, r1, 24 lsrs r4, r1, 24
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r6] ldr r0, [r6]
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
adds r1, r5, r1 adds r1, r5, r1
@@ -9190,7 +9190,7 @@ _08039D9C:
ldrh r1, [r0, 0x34] ldrh r1, [r0, 0x34]
lsls r1, 24 lsls r1, 24
lsrs r4, r1, 24 lsrs r4, r1, 24
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r6] ldr r0, [r6]
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
adds r1, r5, r1 adds r1, r5, r1
asm/rom_8045FFC.s
+44 -44
View File
@@ -17009,7 +17009,7 @@ sub_804F384: @ 804F384
lsls r1, 1 lsls r1, 1
movs r2, 0xA movs r2, 0xA
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -17053,7 +17053,7 @@ _0804F470:
cmp r0, 0 cmp r0, 0
beq _0804F48C beq _0804F48C
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r4, =0x0000d75a ldr r4, =0x0000d75a
adds r0, r4, 0 adds r0, r4, 0
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
@@ -34054,7 +34054,7 @@ bx_802F7A0: @ 80588B4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
_08058908: _08058908:
pop {r4-r6} pop {r4-r6}
@@ -34659,7 +34659,7 @@ _08058E0A:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
_08058E48: _08058E48:
ldr r1, =gUnknown_03005D7C ldr r1, =gUnknown_03005D7C
ldr r4, =gActiveBank ldr r4, =gActiveBank
@@ -34671,7 +34671,7 @@ _08058E48:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r3, =gUnknown_020244D0 ldr r3, =gUnknown_020244D0
ldr r0, [r3] ldr r0, [r3]
ldr r2, [r0, 0x8] ldr r2, [r0, 0x8]
@@ -34915,7 +34915,7 @@ _0805905E:
cmp r0, 0 cmp r0, 0
bne _080590D2 bne _080590D2
adds r0, r3, r4 adds r0, r3, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r4, =gUnknown_03005D70 ldr r4, =gUnknown_03005D70
ldrb r1, [r5] ldrb r1, [r5]
adds r0, r1, r4 adds r0, r1, r4
@@ -35647,7 +35647,7 @@ sub_80596A8: @ 80596A8
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
@@ -35694,7 +35694,7 @@ sub_8059744: @ 8059744
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
@@ -38740,7 +38740,7 @@ sub_805B258: @ 805B258
mov r0, r10 mov r0, r10
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
@@ -38879,7 +38879,7 @@ _0805B41C:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
@@ -39172,7 +39172,7 @@ _0805B670:
mov r0, r8 mov r0, r8
mov r1, r9 mov r1, r9
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -39181,7 +39181,7 @@ _0805B670:
lsls r5, 3 lsls r5, 3
adds r5, r0 adds r5, r0
ldrh r0, [r5, 0x4] ldrh r0, [r5, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r5, =gSprites ldr r5, =gSprites
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -39284,7 +39284,7 @@ _0805B794:
adds r0, r6, 0 adds r0, r6, 0
mov r1, r8 mov r1, r8
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
@@ -39468,7 +39468,7 @@ _0805B926:
asrs r2, 16 asrs r2, 16
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
@@ -41572,7 +41572,7 @@ sub_805CC00: @ 805CC00
lsrs r0, 16 lsrs r0, 16
bl FreeObjectPaletteByTag bl FreeObjectPaletteByTag
adds r0, r5, 0 adds r0, r5, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gBattlePartyID ldr r1, =gBattlePartyID
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
@@ -42909,7 +42909,7 @@ _0805D798:
bl StartObjectRotScalAnim bl StartObjectRotScalAnim
_0805D7A0: _0805D7A0:
adds r0, r4, 0 adds r0, r4, 0
bl AnimateObject bl AnimateSprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -45361,7 +45361,7 @@ sub_805EC84: @ 805EC84
mov r0, r8 mov r0, r8
adds r1, r4, 0 adds r1, r4, 0
movs r3, 0xC8 movs r3, 0xC8
bl AddObjectToFront bl CreateSprite
ldr r6, =gUnknown_020244D0 ldr r6, =gUnknown_020244D0
ldr r1, [r6] ldr r1, [r6]
ldr r2, [r1, 0x4] ldr r2, [r1, 0x4]
@@ -45408,7 +45408,7 @@ sub_805EC84: @ 805EC84
mov r0, r8 mov r0, r8
adds r1, r4, 0 adds r1, r4, 0
movs r3, 0xC8 movs r3, 0xC8
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
ldr r2, [r1, 0x4] ldr r2, [r1, 0x4]
lsls r1, r5, 1 lsls r1, r5, 1
@@ -46085,7 +46085,7 @@ sub_805F240: @ 805F240
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
bl dp01_tbl7_exec_completed bl dp01_tbl7_exec_completed
_0805F292: _0805F292:
pop {r4-r6} pop {r4-r6}
@@ -46799,7 +46799,7 @@ _0805F86E:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r0, [r5] ldrb r0, [r5]
eors r4, r0 eors r4, r0
ldr r1, =gBattlePartyID ldr r1, =gBattlePartyID
@@ -46828,7 +46828,7 @@ _0805F8D2:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r5, [r4] ldrb r5, [r4]
ldr r1, =gBattlePartyID ldr r1, =gBattlePartyID
lsls r0, r5, 1 lsls r0, r5, 1
@@ -47091,7 +47091,7 @@ sub_805FB08: @ 805FB08
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r0, [r6] ldrb r0, [r6]
bl sub_805EEE0 bl sub_805EEE0
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
@@ -47430,7 +47430,7 @@ _0805FE22:
cmp r0, 0 cmp r0, 0
bne _0805FE8C bne _0805FE8C
adds r0, r3, r4 adds r0, r3, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r4, [r5] ldrb r4, [r5]
ldr r1, =gBattlePartyID ldr r1, =gBattlePartyID
lsls r0, r4, 1 lsls r0, r4, 1
@@ -49698,7 +49698,7 @@ sub_8061224: @ 8061224
mov r0, r9 mov r0, r9
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -49902,7 +49902,7 @@ sub_80613DC: @ 80613DC
mov r0, r9 mov r0, r9
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
@@ -50041,7 +50041,7 @@ _080615B4:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r0, [r6] ldrb r0, [r6]
bl sub_805EEE0 bl sub_805EEE0
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
@@ -50298,7 +50298,7 @@ _080617CA:
adds r0, r6, 0 adds r0, r6, 0
mov r1, r9 mov r1, r9
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
@@ -50327,7 +50327,7 @@ _080617CA:
lsls r0, r2, 3 lsls r0, r2, 3
adds r0, r1 adds r0, r1
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
ldrb r1, [r1] ldrb r1, [r1]
@@ -50517,7 +50517,7 @@ _080619DE:
asrs r2, 16 asrs r2, 16
movs r1, 0xB0 movs r1, 0xB0
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r5, =gBankSpriteIds ldr r5, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r5 adds r1, r5
@@ -50556,7 +50556,7 @@ _080619DE:
lsls r0, r2, 3 lsls r0, r2, 3
adds r0, r1 adds r0, r1
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r5 adds r1, r5
ldrb r1, [r1] ldrb r1, [r1]
@@ -52157,7 +52157,7 @@ sub_806280C: @ 806280C
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -55590,7 +55590,7 @@ sub_8064470: @ 8064470
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
bl sub_8065068 bl sub_8065068
_080644C2: _080644C2:
pop {r4-r6} pop {r4-r6}
@@ -56226,7 +56226,7 @@ _080649E2:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r0, [r5] ldrb r0, [r5]
eors r4, r0 eors r4, r0
ldr r1, =gBattlePartyID ldr r1, =gBattlePartyID
@@ -56255,7 +56255,7 @@ _08064A3A:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r5, [r4] ldrb r5, [r4]
ldr r1, =gBattlePartyID ldr r1, =gBattlePartyID
lsls r0, r5, 1 lsls r0, r5, 1
@@ -56502,7 +56502,7 @@ sub_8064C58: @ 8064C58
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r0, [r6] ldrb r0, [r6]
bl sub_805EEE0 bl sub_805EEE0
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
@@ -56841,7 +56841,7 @@ _08064F72:
cmp r0, 0 cmp r0, 0
bne _08064FDC bne _08064FDC
adds r0, r3, r4 adds r0, r3, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r4, [r5] ldrb r4, [r5]
ldr r1, =gBattlePartyID ldr r1, =gBattlePartyID
lsls r0, r4, 1 lsls r0, r4, 1
@@ -59056,7 +59056,7 @@ sub_80662F8: @ 80662F8
mov r0, r8 mov r0, r8
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -59245,7 +59245,7 @@ sub_8066494: @ 8066494
mov r0, r9 mov r0, r9
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
@@ -59384,7 +59384,7 @@ _0806666C:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r0, [r6] ldrb r0, [r6]
bl sub_805EEE0 bl sub_805EEE0
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
@@ -59747,7 +59747,7 @@ _0806694C:
adds r0, r6, 0 adds r0, r6, 0
mov r1, r9 mov r1, r9
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
@@ -59776,7 +59776,7 @@ _0806694C:
lsls r0, r2, 3 lsls r0, r2, 3
adds r0, r1 adds r0, r1
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
ldrb r1, [r1] ldrb r1, [r1]
@@ -59869,7 +59869,7 @@ _08066A76:
asrs r2, 16 asrs r2, 16
movs r1, 0xB0 movs r1, 0xB0
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r5, =gBankSpriteIds ldr r5, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r5 adds r1, r5
@@ -59908,7 +59908,7 @@ _08066A76:
lsls r0, r2, 3 lsls r0, r2, 3
adds r0, r1 adds r0, r1
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r5 adds r1, r5
ldrb r1, [r1] ldrb r1, [r1]
@@ -61310,7 +61310,7 @@ sub_80676FC: @ 80676FC
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
asm/rom_8072304.s
+50 -50
View File
@@ -288,14 +288,14 @@ battle_make_oam_normal_battle: @ 80724DC
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r4, =gSprites ldr r4, =gSprites
@@ -334,14 +334,14 @@ _08072574:
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gSprites ldr r0, =gSprites
@@ -399,7 +399,7 @@ _080725F0:
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
mov r0, r10 mov r0, r10
@@ -414,7 +414,7 @@ _080725F0:
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r4, =gSprites ldr r4, =gSprites
@@ -463,7 +463,7 @@ _08072694:
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
mov r0, r10 mov r0, r10
@@ -478,7 +478,7 @@ _08072694:
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r4, =gSprites ldr r4, =gSprites
@@ -525,7 +525,7 @@ _08072718:
movs r1, 0x8C movs r1, 0x8C
movs r2, 0x3C movs r2, 0x3C
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
@@ -621,7 +621,7 @@ battle_make_oam_safari_battle: @ 8072804
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r6, r0, 0 adds r6, r0, 0
lsls r6, 24 lsls r6, 24
lsrs r6, 24 lsrs r6, 24
@@ -629,7 +629,7 @@ battle_make_oam_safari_battle: @ 8072804
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0xA0 movs r2, 0xA0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -920,16 +920,16 @@ sub_8072A44: @ 8072A44
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x38 movs r0, 0x38
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -2350,7 +2350,7 @@ _0807366C:
lsls r4, 16 lsls r4, 16
asrs r2, r4, 16 asrs r2, r4, 16
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [sp, 0x14] str r0, [sp, 0x14]
@@ -2411,7 +2411,7 @@ _0807371C:
asrs r1, r3, 16 asrs r1, r3, 16
asrs r2, 16 asrs r2, 16
movs r3, 0x9 movs r3, 0x9
bl AddObjectToBack bl CreateSpriteAtEnd
strb r0, [r7] strb r0, [r7]
ldr r0, [sp, 0x10] ldr r0, [sp, 0x10]
cmp r0, 0 cmp r0, 0
@@ -3350,14 +3350,14 @@ _08073E96:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
mov r0, sp mov r0, sp
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
b _08073F32 b _08073F32
.pool .pool
_08073EFC: _08073EFC:
@@ -3369,7 +3369,7 @@ _08073EFC:
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
mov r0, sp mov r0, sp
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -3383,7 +3383,7 @@ _08073EFC:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
_08073F32: _08073F32:
movs r4, 0x1 movs r4, 0x1
ldr r5, =gSprites ldr r5, =gSprites
@@ -3395,7 +3395,7 @@ _08073F36:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x5 cmp r4, 0x5
ble _08073F36 ble _08073F36
@@ -3488,14 +3488,14 @@ _08073FE6:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
mov r0, sp mov r0, sp
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
movs r5, 0x1 movs r5, 0x1
_08074016: _08074016:
mov r1, sp mov r1, sp
@@ -3505,7 +3505,7 @@ _08074016:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r5, 0x1 adds r5, 0x1
cmp r5, 0x5 cmp r5, 0x5
ble _08074016 ble _08074016
@@ -5746,7 +5746,7 @@ sub_807521C: @ 807521C
lsrs r4, r2, 24 lsrs r4, r2, 24
ldr r5, =gUnknown_0831C620 ldr r5, =gUnknown_0831C620
ldrh r0, [r5, 0x6] ldrh r0, [r5, 0x6]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
lsls r0, 16 lsls r0, 16
ldr r1, =0xffff0000 ldr r1, =0xffff0000
cmp r0, r1 cmp r0, r1
@@ -5785,7 +5785,7 @@ _0807524E:
adds r1, r6, 0 adds r1, r6, 0
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -5799,12 +5799,12 @@ _0807524E:
adds r0, 0x1 adds r0, 0x1
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
adds r0, r1, 0 adds r0, r1, 0
bl AnimateObject bl AnimateSprite
mov r0, r9 mov r0, r9
mov r1, r10 mov r1, r10
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r4, r0, 4 lsls r4, r0, 4
@@ -5821,12 +5821,12 @@ _0807524E:
movs r1, 0x1 movs r1, 0x1
bl StartObjectImageAnim bl StartObjectImageAnim
adds r0, r4, 0 adds r0, r4, 0
bl AnimateObject bl AnimateSprite
mov r0, r9 mov r0, r9
adds r1, r6, 0 adds r1, r6, 0
adds r2, r7, 0 adds r2, r7, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r4, r0, 4 lsls r4, r0, 4
@@ -5843,12 +5843,12 @@ _0807524E:
movs r1, 0x2 movs r1, 0x2
bl StartObjectImageAnim bl StartObjectImageAnim
adds r0, r4, 0 adds r0, r4, 0
bl AnimateObject bl AnimateSprite
mov r0, r9 mov r0, r9
mov r1, r10 mov r1, r10
adds r2, r7, 0 adds r2, r7, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r4, r0, 4 lsls r4, r0, 4
@@ -5865,7 +5865,7 @@ _0807524E:
movs r1, 0x3 movs r1, 0x3
bl StartObjectImageAnim bl StartObjectImageAnim
adds r0, r4, 0 adds r0, r4, 0
bl AnimateObject bl AnimateSprite
mov r0, r8 mov r0, r8
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
@@ -5896,7 +5896,7 @@ sub_8075370: @ 8075370
cmp r0, 0 cmp r0, 0
bne _080753A4 bne _080753A4
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
b _080753A8 b _080753A8
.pool .pool
_080753A4: _080753A4:
@@ -5930,7 +5930,7 @@ sub_80753B4: @ 80753B4
subs r1, 0x1 subs r1, 0x1
strh r1, [r0, 0x2E] strh r1, [r0, 0x2E]
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080753DE: _080753DE:
pop {r0} pop {r0}
bx r0 bx r0
@@ -6057,7 +6057,7 @@ _080754C2:
movs r1, 0x20 movs r1, 0x20
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1D movs r3, 0x1D
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -6312,7 +6312,7 @@ sub_80756E0: @ 80756E0
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl AnimateObject bl AnimateSprite
movs r1, 0x3A movs r1, 0x3A
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
adds r0, r5 adds r0, r5
@@ -7308,7 +7308,7 @@ _08075F66:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl AnimateObject bl AnimateSprite
movs r1, 0x3A movs r1, 0x3A
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
adds r0, r5 adds r0, r5
@@ -7455,7 +7455,7 @@ _0807605C:
adds r0, r5, 0 adds r0, r5, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r5, 0 adds r0, r5, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r3, 0 movs r3, 0
ldr r0, [r4] ldr r0, [r4]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
@@ -7540,9 +7540,9 @@ _08076130:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r6, 0 adds r0, r6, 0
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
ldr r0, =gMain ldr r0, =gMain
ldr r1, =0x00000439 ldr r1, =0x00000439
adds r0, r1 adds r0, r1
@@ -7936,7 +7936,7 @@ sub_8076438: @ 8076438
mov r1, r9 mov r1, r9
mov r2, r10 mov r2, r10
adds r3, r4, 0 adds r3, r4, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -8076,7 +8076,7 @@ _08076560:
movs r1, 0x1 movs r1, 0x1
bl StartObjectRotScalAnim bl StartObjectRotScalAnim
adds r0, r4, 0 adds r0, r4, 0
bl AnimateObject bl AnimateSprite
movs r0, 0x80 movs r0, 0x80
lsls r0, 5 lsls r0, 5
strh r0, [r4, 0x30] strh r0, [r4, 0x30]
@@ -8245,7 +8245,7 @@ _080766FC:
bl sub_806ED40 bl sub_806ED40
_08076708: _08076708:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
_0807670E: _0807670E:
pop {r3,r4} pop {r3,r4}
mov r8, r3 mov r8, r3
@@ -8297,7 +8297,7 @@ sub_807671C: @ 807671C
adds r1, r6, 0 adds r1, r6, 0
mov r2, r8 mov r2, r8
adds r3, r4, 0 adds r3, r4, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r6, =gSprites ldr r6, =gSprites
@@ -8407,7 +8407,7 @@ _08076810:
movs r1, 0x2 movs r1, 0x2
bl StartObjectRotScalAnim bl StartObjectRotScalAnim
adds r0, r4, 0 adds r0, r4, 0
bl AnimateObject bl AnimateSprite
strh r5, [r4, 0x30] strh r5, [r4, 0x30]
b _08076870 b _08076870
.pool .pool
@@ -8501,7 +8501,7 @@ _08076904:
thumb_func_start obj_delete_and_free_associated_resources_ thumb_func_start obj_delete_and_free_associated_resources_
obj_delete_and_free_associated_resources_: @ 807690C obj_delete_and_free_associated_resources_: @ 807690C
push {lr} push {lr}
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end obj_delete_and_free_associated_resources_ thumb_func_end obj_delete_and_free_associated_resources_
@@ -8676,7 +8676,7 @@ oamc_804BEB4: @ 8076A38
strh r2, [r1, 0x24] strh r2, [r1, 0x24]
strh r2, [r1, 0x26] strh r2, [r1, 0x26]
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08076A70: _08076A70:
pop {r0} pop {r0}
bx r0 bx r0
@@ -8692,7 +8692,7 @@ sub_8076A78: @ 8076A78
lsls r6, r4, 3 lsls r6, r4, 3
adds r5, r6, r0 adds r5, r6, r0
ldrh r0, [r5, 0x6] ldrh r0, [r5, 0x6]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
lsls r0, 16 lsls r0, 16
ldr r1, =0xffff0000 ldr r1, =0xffff0000
cmp r0, r1 cmp r0, r1
@@ -8716,7 +8716,7 @@ _08076AB0:
lsls r0, r4, 3 lsls r0, r4, 3
adds r0, r1 adds r0, r1
ldrh r0, [r0, 0x6] ldrh r0, [r0, 0x6]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
ldr r0, =gUnknown_08C02300 ldr r0, =gUnknown_08C02300
asm/rom_80A5C6C.s
+13 -13
View File
@@ -2862,7 +2862,7 @@ _080A71F0:
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ObjAffineSet bl ObjAffineSet
ldr r0, =gUnknown_02021BC0 ldr r0, =gOamMatrices
lsls r4, 3 lsls r4, 3
adds r4, r0 adds r4, r0
ldrh r0, [r5] ldrh r0, [r5]
@@ -3007,7 +3007,7 @@ _080A7312:
lsrs r2, 6 lsrs r2, 6
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
pop {r4-r7} pop {r4-r7}
@@ -3055,7 +3055,7 @@ sub_80A7344: @ 80A7344
lsrs r2, 6 lsrs r2, 6
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -3075,7 +3075,7 @@ sub_80A73A0: @ 80A73A0
ldrb r0, [r2, 0x3] ldrb r0, [r2, 0x3]
lsls r0, 26 lsls r0, 26
lsrs r0, 27 lsrs r0, 27
ldr r1, =gUnknown_02021BC0 ldr r1, =gOamMatrices
lsls r0, 3 lsls r0, 3
adds r0, r1 adds r0, r1
ldrh r1, [r0, 0x4] ldrh r1, [r0, 0x4]
@@ -3134,7 +3134,7 @@ sub_80A73E0: @ 80A73E0
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
adds r0, r4, 0 adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
_080A742E: _080A742E:
ldr r6, =0xffff0000 ldr r6, =0xffff0000
lsls r0, r7, 16 lsls r0, r7, 16
@@ -3168,7 +3168,7 @@ _080A745C:
movs r2, 0x1 movs r2, 0x1
movs r3, 0x2 movs r3, 0x2
bl ObjAffineSet bl ObjAffineSet
ldr r0, =gUnknown_02021BC0 ldr r0, =gOamMatrices
lsls r4, 3 lsls r4, 3
adds r4, r0 adds r4, r0
ldrh r0, [r5] ldrh r0, [r5]
@@ -3215,7 +3215,7 @@ sub_80A749C: @ 80A749C
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
adds r0, r4, 0 adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
add sp, 0x4 add sp, 0x4
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -3924,7 +3924,7 @@ obj_delete_but_dont_free_vram: @ 80A7A5C
movs r2, 0x40 movs r2, 0x40
orrs r1, r2 orrs r1, r2
strb r1, [r3] strb r1, [r3]
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end obj_delete_but_dont_free_vram thumb_func_end obj_delete_but_dont_free_vram
@@ -4224,7 +4224,7 @@ sub_80A7CB4: @ 80A7CB4
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, =gUnknown_0203841E ldr r0, =gUnknown_0203841E
ldrh r0, [r0] ldrh r0, [r0]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0xFF cmp r2, 0xFF
@@ -4460,7 +4460,7 @@ sub_80A7E6C: @ 80A7E6C
lsls r1, 26 lsls r1, 26
lsrs r1, 27 lsrs r1, 27
lsls r0, r5, 8 lsls r0, r5, 8
ldr r2, =gUnknown_02021BC0 ldr r2, =gOamMatrices
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
movs r2, 0x6 movs r2, 0x6
@@ -4504,7 +4504,7 @@ sub_80A7EC0: @ 80A7EC0
lsls r1, 26 lsls r1, 26
lsrs r1, 27 lsrs r1, 27
lsls r0, r5, 8 lsls r0, r5, 8
ldr r2, =gUnknown_02021BC0 ldr r2, =gOamMatrices
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
movs r2, 0x6 movs r2, 0x6
@@ -5360,7 +5360,7 @@ _080A85B2:
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
ldr r3, [sp, 0x8] ldr r3, [sp, 0x8]
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_80A4DF0 bl sub_80A4DF0
@@ -5395,7 +5395,7 @@ _080A85EE:
thumb_func_start sub_80A8610 thumb_func_start sub_80A8610
sub_80A8610: @ 80A8610 sub_80A8610: @ 80A8610
push {lr} push {lr}
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80A8610 thumb_func_end sub_80A8610
asm/rom_80C6FA0.s
+38 -38
View File
@@ -1295,7 +1295,7 @@ sub_80C7958: @ 80C7958
movs r1, 0xA0 movs r1, 0xA0
movs r2, 0x60 movs r2, 0x60
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
ldr r3, [r6] ldr r3, [r6]
@@ -1333,7 +1333,7 @@ _080C7A10:
add r0, sp, 0x4 add r0, sp, 0x4
movs r1, 0x7C movs r1, 0x7C
movs r2, 0x50 movs r2, 0x50
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
ldr r2, [r6] ldr r2, [r6]
@@ -1447,7 +1447,7 @@ sub_80C7B14: @ 80C7B14
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C7B2A beq _080C7B2A
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, [r4] ldr r1, [r4]
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
@@ -1462,7 +1462,7 @@ _080C7B2E:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C7B4A beq _080C7B4A
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x4 adds r0, 0x4
adds r0, r4 adds r0, r4
@@ -1484,7 +1484,7 @@ _080C7B56:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C7B6A beq _080C7B6A
bl RemoveObjectAndFreeTiles bl DestroySprite
_080C7B6A: _080C7B6A:
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 16 lsls r0, 16
@@ -1644,7 +1644,7 @@ sub_80C7BE4: @ 80C7BE4
lsls r1, 2 lsls r1, 2
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 11 lsrs r1, 11
@@ -5694,7 +5694,7 @@ sub_80CA154: @ 80CA154
movs r0, 0x96 movs r0, 0x96
strh r0, [r1, 0x22] strh r0, [r1, 0x22]
movs r0, 0x10 movs r0, 0x10
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
ldr r1, [r4] ldr r1, [r4]
movs r2, 0xDA movs r2, 0xDA
lsls r2, 4 lsls r2, 4
@@ -5731,7 +5731,7 @@ _080CA1DA:
ldr r0, =gUnknown_085728BC ldr r0, =gUnknown_085728BC
movs r2, 0x9 movs r2, 0x9
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_02039D08 ldr r1, =gUnknown_02039D08
@@ -5987,7 +5987,7 @@ _080CA40C:
movs r1, 0x28 movs r1, 0x28
movs r2, 0x30 movs r2, 0x30
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -9323,7 +9323,7 @@ _080CBF80:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080CBFC0 beq _080CBFC0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
ldr r0, [r4] ldr r0, [r4]
ldr r3, =0x00000b04 ldr r3, =0x00000b04
adds r0, r3 adds r0, r3
@@ -9717,7 +9717,7 @@ sub_80CC230: @ 80CC230
asrs r2, 16 asrs r2, 16
mov r0, sp mov r0, sp
mov r3, r9 mov r3, r9
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x40 cmp r2, 0x40
@@ -9770,7 +9770,7 @@ sub_80CC314: @ 80CC314
ldrh r0, [r4, 0x2E] ldrh r0, [r4, 0x2E]
bl sub_80CC1E0 bl sub_80CC1E0
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -10791,7 +10791,7 @@ sub_80CCB50: @ 80CCB50
lsls r1, 2 lsls r1, 2
str r1, [r0] str r1, [r0]
adds r0, r7, 0 adds r0, r7, 0
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r4, r10 mov r4, r10
@@ -10813,7 +10813,7 @@ sub_80CCB50: @ 80CCB50
orrs r0, r1 orrs r0, r1
str r0, [r3] str r0, [r3]
adds r0, r7, 0 adds r0, r7, 0
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r1, r10 mov r1, r10
@@ -10865,7 +10865,7 @@ _080CCC70:
ldr r0, =gUnknown_0857B0A8 ldr r0, =gUnknown_0857B0A8
movs r2, 0x1C movs r2, 0x1C
movs r3, 0x18 movs r3, 0x18
bl AddObjectToFront bl CreateSprite
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -11058,7 +11058,7 @@ _080CCE2E:
add r0, sp, 0x4 add r0, sp, 0x4
movs r2, 0x1C movs r2, 0x1C
movs r3, 0x18 movs r3, 0x18
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r1, r9 mov r1, r9
@@ -11220,7 +11220,7 @@ _080CCF78:
cmp r0, 0xC0 cmp r0, 0xC0
bls _080CCF96 bls _080CCF96
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080CCF96: _080CCF96:
pop {r0} pop {r0}
bx r0 bx r0
@@ -11310,7 +11310,7 @@ _080CD036:
ldr r0, =gUnknown_0857B0E0 ldr r0, =gUnknown_0857B0E0
movs r2, 0x1C movs r2, 0x1C
movs r3, 0x16 movs r3, 0x16
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -11672,7 +11672,7 @@ sub_80CD2E8: @ 80CD2E8
adds r1, r5, 0 adds r1, r5, 0
adds r2, r6, 0 adds r2, r6, 0
adds r3, r4, 0 adds r3, r4, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -16473,14 +16473,14 @@ sub_80CFC14: @ 80CFC14
adds r0, r4, 0 adds r0, r4, 0
bl LoadTaggedObjectPalettes bl LoadTaggedObjectPalettes
ldr r0, =0x0000daca ldr r0, =0x0000daca
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r6, =gUnknown_02039D08 ldr r6, =gUnknown_02039D08
ldr r1, [r6] ldr r1, [r6]
ldr r4, =0x00000cd8 ldr r4, =0x00000cd8
adds r1, r4 adds r1, r4
strb r0, [r1] strb r0, [r1]
ldr r0, =0x0000dac7 ldr r0, =0x0000dac7
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r1, [r6] ldr r1, [r6]
ldr r5, =0x00000cd9 ldr r5, =0x00000cd9
adds r1, r5 adds r1, r5
@@ -16501,7 +16501,7 @@ sub_80CFC14: @ 80CFC14
movs r3, 0 movs r3, 0
ldrsh r2, [r5, r3] ldrsh r2, [r5, r3]
movs r3, 0x6 movs r3, 0x6
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -16572,7 +16572,7 @@ _080CFD40:
ldr r0, =gUnknown_0857BA68 ldr r0, =gUnknown_0857BA68
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -18561,7 +18561,7 @@ _080D0CA0:
bl LoadCompressedObjectPic bl LoadCompressedObjectPic
mov r4, r9 mov r4, r9
ldrh r0, [r4, 0x6] ldrh r0, [r4, 0x6]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
mov r5, r8 mov r5, r8
ldr r1, [r5] ldr r1, [r5]
lsls r5, r7, 4 lsls r5, r7, 4
@@ -18598,7 +18598,7 @@ _080D0CA0:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0xB movs r3, 0xB
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r4, r8 mov r4, r8
@@ -23011,7 +23011,7 @@ _080D2F3A:
lsls r0, 3 lsls r0, 3
adds r4, r0, r1 adds r4, r0, r1
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0xFF cmp r0, 0xFF
@@ -23037,7 +23037,7 @@ sub_80D2F68: @ 80D2F68
lsls r0, 3 lsls r0, 3
adds r4, r0, r1 adds r4, r0, r1
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0xFF cmp r0, 0xFF
@@ -23411,7 +23411,7 @@ sub_80D31B4: @ 80D31B4
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
mov r3, r8 mov r3, r8
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r6, =gSprites ldr r6, =gSprites
@@ -23469,7 +23469,7 @@ sub_80D328C: @ 80D328C
str r1, [sp, 0x4] str r1, [sp, 0x4]
mov r1, sp mov r1, sp
str r1, [r0, 0xC] str r1, [r0, 0xC]
bl RemoveObjectAndFreeTiles bl DestroySprite
add sp, 0x8 add sp, 0x8
pop {r0} pop {r0}
bx r0 bx r0
@@ -24618,7 +24618,7 @@ _080D3BA0:
adds r2, 0x14 adds r2, 0x14
ldr r0, =gUnknown_0857C66C ldr r0, =gUnknown_0857C66C
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
adds r1, r6 adds r1, r6
strb r0, [r1] strb r0, [r1]
@@ -25357,7 +25357,7 @@ _080D41D4:
lsls r0, 2 lsls r0, 2
ldr r5, =gSprites ldr r5, =gSprites
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -26716,7 +26716,7 @@ RemoveBagObject: @ 80D4CA8
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0xFF movs r0, 0xFF
strb r0, [r5] strb r0, [r5]
_080D4CEE: _080D4CEE:
@@ -26741,7 +26741,7 @@ AddBagVisualObject: @ 80D4D00
movs r1, 0x44 movs r1, 0x44
movs r2, 0x42 movs r2, 0x42
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
strb r0, [r4] strb r0, [r4]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
@@ -26896,7 +26896,7 @@ AddSwitchPocketRotatingBallObject: @ 80D4E34
movs r1, 0x10 movs r1, 0x10
movs r2, 0x10 movs r2, 0x10
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
strb r0, [r4] strb r0, [r4]
ldr r2, =gSprites ldr r2, =gSprites
ldrb r1, [r4] ldrb r1, [r4]
@@ -26959,7 +26959,7 @@ _080D4ED8:
_080D4EDA: _080D4EDA:
str r0, [r4, 0x10] str r0, [r4, 0x10]
adds r0, r4, 0 adds r0, r4, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x28 adds r0, 0x28
ldrb r0, [r0] ldrb r0, [r0]
@@ -27227,7 +27227,7 @@ sub_80D50D4: @ 80D50D4
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
pop {r4,r5} pop {r4,r5}
@@ -27273,7 +27273,7 @@ sub_80D511C: @ 80D511C
adds r1, r5, 0 adds r1, r5, 0
adds r2, r6, 0 adds r2, r6, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
adds r4, r1, 0 adds r4, r1, 0
@@ -27306,7 +27306,7 @@ sub_80D518C: @ 80D518C
asrs r1, 16 asrs r1, 16
movs r2, 0x74 movs r2, 0x74
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
pop {r1} pop {r1}
asm/rom_8158B30.s
+36 -36
View File
@@ -1592,7 +1592,7 @@ sub_8159800: @ 8159800
asrs r2, 16 asrs r2, 16
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
@@ -4610,7 +4610,7 @@ _0815B0BC:
subs r3, r4 subs r3, r4
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r0, 0x40 movs r0, 0x40
@@ -4809,7 +4809,7 @@ sub_815B23C: @ 815B23C
subs r0, 0x1 subs r0, 0x1
strh r0, [r1] strh r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0815B270: _0815B270:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5176,7 +5176,7 @@ _0815B500:
adds r3, 0x1 adds r3, 0x1
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
bl AddObjectAndAnimateForOneFrame bl CreateSpriteAndAnimate
_0815B54C: _0815B54C:
movs r1, 0x20 movs r1, 0x20
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
@@ -5316,7 +5316,7 @@ _0815B646:
cmp r0, 0x3C cmp r0, 0x3C
ble _0815B654 ble _0815B654
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0815B654: _0815B654:
pop {r0} pop {r0}
bx r0 bx r0
@@ -6264,7 +6264,7 @@ _0815BE2E:
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
adds r0, r4, 0 adds r0, r4, 0
bl AddObjectToFront bl CreateSprite
mov r9, r0 mov r9, r0
mov r1, r9 mov r1, r9
lsls r1, 24 lsls r1, 24
@@ -6279,7 +6279,7 @@ _0815BE2E:
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
adds r0, r4, 0 adds r0, r4, 0
bl AddObjectToFront bl CreateSprite
mov r8, r0 mov r8, r0
mov r1, r8 mov r1, r8
lsls r1, 24 lsls r1, 24
@@ -6472,14 +6472,14 @@ sub_815BFF4: @ 815BFF4
cmp r0, r2 cmp r0, r2
bne _0815C040 bne _0815C040
adds r0, r3, r5 adds r0, r3, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x3C movs r0, 0x3C
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8072740 bl move_anim_8072740
_0815C040: _0815C040:
@@ -10171,7 +10171,7 @@ _0815DE44:
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
ldr r0, =gUnknown_085CE76C ldr r0, =gUnknown_085CE76C
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -10248,7 +10248,7 @@ sub_815DEBC: @ 815DEBC
subs r0, 0x1 subs r0, 0x1
strh r0, [r1] strh r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0815DF02: _0815DF02:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -10680,7 +10680,7 @@ _0815E272:
ldrsh r2, [r3, r0] ldrsh r2, [r3, r0]
ldr r0, =gUnknown_085CE7EC ldr r0, =gUnknown_085CE7EC
movs r3, 0x23 movs r3, 0x23
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -10907,7 +10907,7 @@ sub_815E404: @ 815E404
subs r0, 0x1 subs r0, 0x1
strh r0, [r1] strh r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0815E43A: _0815E43A:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -11014,7 +11014,7 @@ _0815E4EE:
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
adds r2, r6, 0 adds r2, r6, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7, 0x26] strh r0, [r7, 0x26]
@@ -11211,7 +11211,7 @@ _0815E658:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
_0815E6BE: _0815E6BE:
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
@@ -12578,7 +12578,7 @@ sub_815F10C: @ 815F10C
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
_0815F16A: _0815F16A:
movs r0, 0x38 movs r0, 0x38
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
@@ -16254,7 +16254,7 @@ _081610E4:
asrs r2, 16 asrs r2, 16
adds r0, r5, 0 adds r0, r5, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r2, =gUnknown_0203BC34 ldr r2, =gUnknown_0203BC34
ldr r1, [r2] ldr r1, [r2]
adds r1, 0x1 adds r1, 0x1
@@ -16287,7 +16287,7 @@ _08161124:
asrs r2, 16 asrs r2, 16
adds r0, r7, 0 adds r0, r7, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
adds r2, r4, 0 adds r2, r4, 0
adds r2, 0x8 adds r2, 0x8
@@ -26903,7 +26903,7 @@ _08166C70:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -26925,7 +26925,7 @@ _08166CAE:
adds r0, r2 adds r0, r2
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -26944,7 +26944,7 @@ _08166CAE:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
_08166CE6: _08166CE6:
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
@@ -27753,7 +27753,7 @@ _08167360:
ldrsh r2, [r2, r0] ldrsh r2, [r2, r0]
ldr r0, =gUnknown_085DFD5C ldr r0, =gUnknown_085DFD5C
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -27817,7 +27817,7 @@ _081673F8:
cmp r0, 0x3C cmp r0, 0x3C
ble _08167418 ble _08167418
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, =gUnknown_0203BC90 ldr r0, =gUnknown_0203BC90
ldr r1, [r0] ldr r1, [r0]
adds r1, 0x54 adds r1, 0x54
@@ -28096,7 +28096,7 @@ sub_8167608: @ 8167608
movs r1, 0x26 movs r1, 0x26
movs r2, 0x68 movs r2, 0x68
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
ldr r0, [r7] ldr r0, [r7]
@@ -28240,7 +28240,7 @@ _081677AC:
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0xE2 movs r1, 0xE2
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -28296,7 +28296,7 @@ _08167828:
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0xE6 movs r1, 0xE6
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -28344,7 +28344,7 @@ _0816788A:
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0xDE movs r1, 0xDE
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -29337,7 +29337,7 @@ sub_81681B4: @ 81681B4
_081681DC: _081681DC:
movs r0, 0x66 movs r0, 0x66
_081681DE: _081681DE:
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 4 lsls r0, 4
ldrb r2, [r4, 0x5] ldrb r2, [r4, 0x5]
movs r1, 0xF movs r1, 0xF
@@ -29451,7 +29451,7 @@ _081682B6:
mov r0, r10 mov r0, r10
asrs r2, 16 asrs r2, 16
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -30003,7 +30003,7 @@ _081686D2:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
add r0, r8 add r0, r8
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r4, =gUnknown_03005D70 ldr r4, =gUnknown_03005D70
ldrb r0, [r5] ldrb r0, [r5]
adds r1, r6, 0 adds r1, r6, 0
@@ -30039,7 +30039,7 @@ _0816877A:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r5, =gUnknown_03005D70 ldr r5, =gUnknown_03005D70
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r5 adds r0, r1, r5
@@ -30351,7 +30351,7 @@ sub_8168A20: @ 8168A20
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
@@ -32570,7 +32570,7 @@ _08169E80:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
@@ -32610,7 +32610,7 @@ sub_8169EC8: @ 8169EC8
asrs r2, 16 asrs r2, 16
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r6 adds r1, r6
@@ -32695,7 +32695,7 @@ dp01t_07_6_: @ 8169F94
asrs r2, 16 asrs r2, 16
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r6 adds r1, r6
@@ -34015,7 +34015,7 @@ sub_816AA80: @ 816AA80
mov r0, r10 mov r0, r10
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
asm/rom_8184DA4.s
+99 -99
View File
@@ -2886,7 +2886,7 @@ sub_81865C8: @ 81865C8
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
bl sub_81871AC bl sub_81871AC
_0818661A: _0818661A:
pop {r4-r6} pop {r4-r6}
@@ -3505,7 +3505,7 @@ _08186B26:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r0, [r5] ldrb r0, [r5]
eors r4, r0 eors r4, r0
ldr r1, =gBattlePartyID ldr r1, =gBattlePartyID
@@ -3534,7 +3534,7 @@ _08186B8A:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r5, [r4] ldrb r5, [r4]
ldr r1, =gBattlePartyID ldr r1, =gBattlePartyID
lsls r0, r5, 1 lsls r0, r5, 1
@@ -3780,7 +3780,7 @@ sub_8186D9C: @ 8186D9C
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r0, [r6] ldrb r0, [r6]
bl sub_805EEE0 bl sub_805EEE0
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
@@ -4119,7 +4119,7 @@ _081870B6:
cmp r0, 0 cmp r0, 0
bne _08187120 bne _08187120
adds r0, r3, r4 adds r0, r3, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r4, [r5] ldrb r4, [r5]
ldr r1, =gBattlePartyID ldr r1, =gBattlePartyID
lsls r0, r4, 1 lsls r0, r4, 1
@@ -6334,7 +6334,7 @@ sub_818843C: @ 818843C
mov r0, r8 mov r0, r8
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -6523,7 +6523,7 @@ sub_81885D8: @ 81885D8
mov r0, r9 mov r0, r9
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
@@ -6662,7 +6662,7 @@ _081887B0:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r0, [r6] ldrb r0, [r6]
bl sub_805EEE0 bl sub_805EEE0
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
@@ -6857,7 +6857,7 @@ _0818892C:
adds r0, r6, 0 adds r0, r6, 0
mov r1, r9 mov r1, r9
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
@@ -6886,7 +6886,7 @@ _0818892C:
lsls r0, r2, 3 lsls r0, r2, 3
adds r0, r1 adds r0, r1
ldrh r0, [r0, 0x4] ldrh r0, [r0, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
ldrb r1, [r1] ldrb r1, [r1]
@@ -8346,7 +8346,7 @@ sub_818962C: @ 818962C
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -8821,7 +8821,7 @@ sub_81899F0: @ 81899F0
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
bl sub_818A514 bl sub_818A514
_08189A40: _08189A40:
pop {r4-r6} pop {r4-r6}
@@ -9467,7 +9467,7 @@ _08189F62:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r7 adds r0, r7
bl RemoveObjectAndFreeTiles bl DestroySprite
_08189FC8: _08189FC8:
ldr r1, =gUnknown_03005D7C ldr r1, =gUnknown_03005D7C
ldr r4, =gActiveBank ldr r4, =gActiveBank
@@ -9479,7 +9479,7 @@ _08189FC8:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r3, =gUnknown_020244D0 ldr r3, =gUnknown_020244D0
ldr r0, [r3] ldr r0, [r3]
ldr r2, [r0, 0x8] ldr r2, [r0, 0x8]
@@ -9659,7 +9659,7 @@ sub_818A114: @ 818A114
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
@@ -9706,7 +9706,7 @@ sub_818A1B0: @ 818A1B0
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
@@ -10031,7 +10031,7 @@ _0818A4A2:
cmp r0, 0 cmp r0, 0
bne _0818A4E8 bne _0818A4E8
adds r0, r3, r5 adds r0, r3, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 2 lsls r0, 2
@@ -12271,7 +12271,7 @@ sub_818B8E0: @ 818B8E0
mov r0, r8 mov r0, r8
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -12447,7 +12447,7 @@ sub_818BA6C: @ 818BA6C
mov r0, r10 mov r0, r10
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
@@ -12586,7 +12586,7 @@ _0818BC30:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
@@ -12791,7 +12791,7 @@ _0818BDC0:
mov r0, r8 mov r0, r8
mov r1, r9 mov r1, r9
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -12800,7 +12800,7 @@ _0818BDC0:
lsls r5, 3 lsls r5, 3
adds r5, r0 adds r5, r0
ldrh r0, [r5, 0x4] ldrh r0, [r5, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r5, =gSprites ldr r5, =gSprites
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -12903,7 +12903,7 @@ _0818BEDC:
adds r0, r6, 0 adds r0, r6, 0
mov r1, r8 mov r1, r8
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
@@ -15261,7 +15261,7 @@ _0818D2C6:
asrs r2, r0, 16 asrs r2, r0, 16
adds r0, r5, 0 adds r0, r5, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
adds r6, r2, 0 adds r6, r2, 0
@@ -15528,7 +15528,7 @@ _0818D518:
asrs r2, r0, 16 asrs r2, r0, 16
adds r0, r4, 0 adds r0, r4, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
adds r6, r2, 0 adds r6, r2, 0
@@ -15641,7 +15641,7 @@ _0818D624:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
mov r0, r8 mov r0, r8
bl Free bl Free
adds r0, r7, 0 adds r0, r7, 0
@@ -21401,7 +21401,7 @@ _081906B0:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x4 movs r2, 0x4
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r4, r7, 4 lsls r4, r7, 4
@@ -21418,7 +21418,7 @@ _081906B0:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x9C movs r2, 0x9C
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r4, r7, 4 lsls r4, r7, 4
@@ -21434,7 +21434,7 @@ _081906B0:
movs r1, 0x6 movs r1, 0x6
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r0, r7, 4 lsls r0, r7, 4
@@ -21462,7 +21462,7 @@ _08190746:
movs r1, 0xEA movs r1, 0xEA
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
lsls r4, r7, 4 lsls r4, r7, 4
@@ -28596,7 +28596,7 @@ _08194492:
ldrb r2, [r4, 0x1] ldrb r2, [r4, 0x1]
ldr r0, =gUnknown_0860CFA8 ldr r0, =gUnknown_0860CFA8
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
adds r4, 0x2 adds r4, 0x2
adds r5, 0x1 adds r5, 0x1
cmp r5, 0x1E cmp r5, 0x1E
@@ -28614,7 +28614,7 @@ _08194492:
movs r1, 0xDA movs r1, 0xDA
movs r2, 0xC movs r2, 0xC
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
b _081944E8 b _081944E8
.pool .pool
_081944DC: _081944DC:
@@ -28622,7 +28622,7 @@ _081944DC:
movs r1, 0xDA movs r1, 0xDA
movs r2, 0xC movs r2, 0xC
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
_081944E8: _081944E8:
ldr r1, =0x00007f40 ldr r1, =0x00007f40
movs r0, 0 movs r0, 0
@@ -40650,7 +40650,7 @@ sub_819A44C: @ 819A44C
ldrb r4, [r5, 0x5] ldrb r4, [r5, 0x5]
lsrs r4, 4 lsrs r4, 4
movs r0, 0x65 movs r0, 0x65
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsls r4, 16 lsls r4, 16
lsrs r4, 16 lsrs r4, 16
@@ -41256,7 +41256,7 @@ _0819AA24:
ldr r0, =gUnknown_086105D8 ldr r0, =gUnknown_086105D8
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r6, =gUnknown_0300127C ldr r6, =gUnknown_0300127C
ldr r2, [r6] ldr r2, [r6]
movs r5, 0x6C movs r5, 0x6C
@@ -41295,7 +41295,7 @@ _0819AA24:
ldrsh r1, [r1, r2] ldrsh r1, [r1, r2]
movs r2, 0x58 movs r2, 0x58
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
movs r5, 0 movs r5, 0
strb r0, [r1, 0x4] strb r0, [r1, 0x4]
@@ -41303,14 +41303,14 @@ _0819AA24:
movs r1, 0xB0 movs r1, 0xB0
movs r2, 0x70 movs r2, 0x70
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
ldr r0, =gUnknown_08610620 ldr r0, =gUnknown_08610620
movs r1, 0xB0 movs r1, 0xB0
movs r2, 0x90 movs r2, 0x90
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
ldr r0, [r6] ldr r0, [r6]
@@ -41390,7 +41390,7 @@ _0819AB44:
lsls r0, 2 lsls r0, 2
ldr r5, =gSprites ldr r5, =gSprites
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -41402,21 +41402,21 @@ _0819AB44:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r6] ldr r0, [r6]
ldrb r1, [r0, 0x1] ldrb r1, [r0, 0x1]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r6] ldr r0, [r6]
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
@@ -41607,7 +41607,7 @@ sub_819ACE0: @ 819ACE0
cmp r0, 0 cmp r0, 0
beq _0819AD60 beq _0819AD60
movs r0, 0x64 movs r0, 0x64
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r1, [r5] ldr r1, [r5]
@@ -41661,7 +41661,7 @@ _0819AD44:
.pool .pool
_0819AD60: _0819AD60:
movs r0, 0x65 movs r0, 0x65
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r0, [r5] ldr r0, [r5]
@@ -41716,7 +41716,7 @@ sub_819ADAC: @ 819ADAC
_0819ADCC: _0819ADCC:
movs r0, 0x64 movs r0, 0x64
_0819ADCE: _0819ADCE:
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -43637,7 +43637,7 @@ sub_819BE34: @ 819BE34
movs r1, 0x78 movs r1, 0x78
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r6, =gUnknown_0300127C ldr r6, =gUnknown_0300127C
ldr r1, [r6] ldr r1, [r6]
ldr r2, =0x00000299 ldr r2, =0x00000299
@@ -44034,7 +44034,7 @@ sub_819C100: @ 819C100
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r4] ldr r0, [r4]
ldr r1, =0x0000029d ldr r1, =0x0000029d
adds r0, r1 adds r0, r1
@@ -44043,9 +44043,9 @@ sub_819C100: @ 819C100
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r5, 0 adds r0, r5, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0819C1BA: _0819C1BA:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
@@ -44410,7 +44410,7 @@ sub_819C4B4: @ 819C4B4
movs r1, 0x78 movs r1, 0x78
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r6, =gUnknown_0300127C ldr r6, =gUnknown_0300127C
ldr r1, [r6] ldr r1, [r6]
ldr r2, =0x00000299 ldr r2, =0x00000299
@@ -44421,7 +44421,7 @@ sub_819C4B4: @ 819C4B4
movs r1, 0x2C movs r1, 0x2C
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
ldr r5, =0x00000295 ldr r5, =0x00000295
adds r1, r5 adds r1, r5
@@ -44430,7 +44430,7 @@ sub_819C4B4: @ 819C4B4
movs r1, 0xC4 movs r1, 0xC4
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
ldr r4, =0x0000029d ldr r4, =0x0000029d
adds r1, r4 adds r1, r4
@@ -46068,7 +46068,7 @@ _0819D26C:
cmp r0, 0x1 cmp r0, 0x1
bne _0819D2C0 bne _0819D2C0
movs r0, 0x65 movs r0, 0x65
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r1, [r5] ldr r1, [r5]
adds r1, 0x5 adds r1, 0x5
adds r1, r4 adds r1, r4
@@ -46081,7 +46081,7 @@ _0819D26C:
.pool .pool
_0819D2C0: _0819D2C0:
movs r0, 0x64 movs r0, 0x64
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r2, =gUnknown_03001284 ldr r2, =gUnknown_03001284
ldr r1, [r2] ldr r1, [r2]
adds r1, 0x5 adds r1, 0x5
@@ -47676,7 +47676,7 @@ _0819E0E6:
mov r0, sp mov r0, sp
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x5 adds r1, 0x5
adds r1, r6 adds r1, r6
@@ -47711,7 +47711,7 @@ _0819E0E6:
ldr r0, =gUnknown_0861084C ldr r0, =gUnknown_0861084C
movs r2, 0x58 movs r2, 0x58
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
movs r4, 0 movs r4, 0
strb r0, [r1, 0x4] strb r0, [r1, 0x4]
@@ -47719,14 +47719,14 @@ _0819E0E6:
movs r1, 0xB0 movs r1, 0xB0
movs r2, 0x70 movs r2, 0x70
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
ldr r0, =gUnknown_0861087C ldr r0, =gUnknown_0861087C
movs r1, 0xB0 movs r1, 0xB0
movs r2, 0x90 movs r2, 0x90
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
ldr r0, [r7] ldr r0, [r7]
@@ -47806,7 +47806,7 @@ _0819E1E8:
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x78 movs r2, 0x78
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0x8] strb r0, [r1, 0x8]
mov r1, sp mov r1, sp
@@ -47825,7 +47825,7 @@ _0819E1E8:
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x78 movs r2, 0x78
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0x9] strb r0, [r1, 0x9]
movs r5, 0x90 movs r5, 0x90
@@ -47834,7 +47834,7 @@ _0819E1E8:
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x78 movs r2, 0x78
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0xA] strb r0, [r1, 0xA]
mov r1, sp mov r1, sp
@@ -47851,7 +47851,7 @@ _0819E1E8:
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x78 movs r2, 0x78
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0xB] strb r0, [r1, 0xB]
mov r1, sp mov r1, sp
@@ -47867,7 +47867,7 @@ _0819E1E8:
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x78 movs r2, 0x78
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0xC] strb r0, [r1, 0xC]
mov r0, sp mov r0, sp
@@ -47876,7 +47876,7 @@ _0819E1E8:
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x78 movs r2, 0x78
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0xD] strb r0, [r1, 0xD]
mov r1, sp mov r1, sp
@@ -47891,7 +47891,7 @@ _0819E1E8:
ldr r1, [sp, 0x18] ldr r1, [sp, 0x18]
movs r2, 0x90 movs r2, 0x90
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0xE] strb r0, [r1, 0xE]
mov r1, sp mov r1, sp
@@ -47908,7 +47908,7 @@ _0819E1E8:
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x90 movs r2, 0x90
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0xF] strb r0, [r1, 0xF]
mov r1, sp mov r1, sp
@@ -47923,7 +47923,7 @@ _0819E1E8:
ldr r1, [sp, 0x18] ldr r1, [sp, 0x18]
movs r2, 0x90 movs r2, 0x90
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0x10] strb r0, [r1, 0x10]
mov r1, sp mov r1, sp
@@ -47937,7 +47937,7 @@ _0819E1E8:
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x90 movs r2, 0x90
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
strb r0, [r1, 0x11] strb r0, [r1, 0x11]
movs r6, 0 movs r6, 0
@@ -48214,7 +48214,7 @@ _0819E53C:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -48226,21 +48226,21 @@ _0819E53C:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r6] ldr r0, [r6]
ldrb r1, [r0, 0x1] ldrb r1, [r0, 0x1]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r6] ldr r0, [r6]
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r5, 0 movs r5, 0
_0819E590: _0819E590:
movs r4, 0 movs r4, 0
@@ -48258,7 +48258,7 @@ _0819E594:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -48286,7 +48286,7 @@ _0819E5CC:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -49862,7 +49862,7 @@ sub_819F2B4: @ 819F2B4
movs r1, 0x78 movs r1, 0x78
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
strb r0, [r4] strb r0, [r4]
ldr r2, =gSprites ldr r2, =gSprites
ldrb r1, [r4] ldrb r1, [r4]
@@ -49900,7 +49900,7 @@ sub_819F304: @ 819F304
movs r1, 0x78 movs r1, 0x78
movs r2, 0x40 movs r2, 0x40
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r6, =gUnknown_03001284 ldr r6, =gUnknown_03001284
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x2D adds r1, 0x2D
@@ -50058,7 +50058,7 @@ sub_819F444: @ 819F444
adds r0, r4 adds r0, r4
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0 movs r0, 0
strb r0, [r6] strb r0, [r6]
pop {r4-r6} pop {r4-r6}
@@ -50300,7 +50300,7 @@ _0819F688:
bl sub_819BE20 bl sub_819BE20
_0819F68E: _0819F68E:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0819F694: _0819F694:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -61327,7 +61327,7 @@ _081A53CE:
ldr r0, =gUnknown_08611F5C ldr r0, =gUnknown_08611F5C
movs r2, 0x54 movs r2, 0x54
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -61615,7 +61615,7 @@ _081A565E:
ldr r1, [sp] ldr r1, [sp]
mov r2, r10 mov r2, r10
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
lsls r0, r6, 4 lsls r0, r6, 4
@@ -61645,7 +61645,7 @@ sub_81A5698: @ 81A5698
cmp r0, 0x8 cmp r0, 0x8
bls _081A56AA bls _081A56AA
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_081A56AA: _081A56AA:
pop {r0} pop {r0}
bx r0 bx r0
@@ -80466,7 +80466,7 @@ AddScrollIndicatorArrowObject: @ 81AF2F0
mov r3, r12 mov r3, r12
strh r3, [r0, 0x2] strh r3, [r0, 0x2]
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -80856,13 +80856,13 @@ _081AF648:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldrb r1, [r5, 0xD] ldrb r1, [r5, 0xD]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r6, 0 adds r0, r6, 0
bl DestroyTask bl DestroyTask
pop {r4-r6} pop {r4-r6}
@@ -81195,7 +81195,7 @@ _081AF896:
adds r2, 0x78 adds r2, 0x78
mov r0, sp mov r0, sp
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
strb r0, [r5, 0xC] strb r0, [r5, 0xC]
ldrb r1, [r5, 0xC] ldrb r1, [r5, 0xC]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -81327,7 +81327,7 @@ _081AFA06:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
pop {r4-r6} pop {r4-r6}
@@ -81440,7 +81440,7 @@ _081AFAC6:
ldrb r2, [r5, 0x1] ldrb r2, [r5, 0x1]
mov r0, sp mov r0, sp
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
strb r0, [r4] strb r0, [r4]
ldr r3, =gSprites ldr r3, =gSprites
ldrb r1, [r4] ldrb r1, [r4]
@@ -81539,7 +81539,7 @@ _081AFBC8:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
pop {r4-r6} pop {r4-r6}
@@ -81972,7 +81972,7 @@ AddItemIconObject: @ 81AFE70
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -82057,7 +82057,7 @@ AddItemIconObjectWithCustomObjectTemplate: @ 81AFF34
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -92941,7 +92941,7 @@ party_menu_held_item_object: @ 81B5C14
ldrb r1, [r2, 0x2] ldrb r1, [r2, 0x2]
ldrb r2, [r2, 0x3] ldrb r2, [r2, 0x3]
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
strb r0, [r4, 0xA] strb r0, [r4, 0xA]
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -92967,7 +92967,7 @@ party_menu_link_mon_held_item_object: @ 81B5C48
ldrb r1, [r2, 0x2] ldrb r1, [r2, 0x2]
ldrb r2, [r2, 0x3] ldrb r2, [r2, 0x3]
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
strb r0, [r4, 0xA] strb r0, [r4, 0xA]
ldr r2, =gSprites ldr r2, =gSprites
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
@@ -93193,7 +93193,7 @@ sub_81B5DF0: @ 81B5DF0
lsrs r3, 24 lsrs r3, 24
movs r1, 0xFA movs r1, 0xFA
movs r2, 0xAA movs r2, 0xAA
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r4, r0, 4 lsls r4, r0, 4
@@ -93287,7 +93287,7 @@ party_menu_pokeball_object: @ 81B5ECC
ldrb r1, [r2, 0x6] ldrb r1, [r2, 0x6]
ldrb r2, [r2, 0x7] ldrb r2, [r2, 0x7]
movs r3, 0x8 movs r3, 0x8
bl AddObjectToFront bl CreateSprite
strb r0, [r4, 0xB] strb r0, [r4, 0xB]
_081B5EEA: _081B5EEA:
pop {r4} pop {r4}
@@ -93308,7 +93308,7 @@ party_menu_link_mon_pokeball_object: @ 81B5EF4
ldrb r1, [r2, 0x6] ldrb r1, [r2, 0x6]
ldrb r2, [r2, 0x7] ldrb r2, [r2, 0x7]
movs r3, 0x8 movs r3, 0x8
bl AddObjectToFront bl CreateSprite
strb r0, [r4, 0xB] strb r0, [r4, 0xB]
ldr r2, =gSprites ldr r2, =gSprites
ldrb r0, [r4, 0xB] ldrb r0, [r4, 0xB]
@@ -93340,7 +93340,7 @@ sub_81B5F34: @ 81B5F34
ldr r0, =gUnknown_08615F08 ldr r0, =gUnknown_08615F08
adds r1, r3, 0 adds r1, r3, 0
movs r3, 0x8 movs r3, 0x8
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -93372,7 +93372,7 @@ sub_81B5F74: @ 81B5F74
ldr r0, =gUnknown_08615F78 ldr r0, =gUnknown_08615F78
adds r1, r3, 0 adds r1, r3, 0
movs r3, 0x8 movs r3, 0x8
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
pop {r1} pop {r1}
@@ -93490,7 +93490,7 @@ party_menu_status_condition_object: @ 81B6064
ldrb r1, [r2, 0x4] ldrb r1, [r2, 0x4]
ldrb r2, [r2, 0x5] ldrb r2, [r2, 0x5]
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
strb r0, [r4, 0xC] strb r0, [r4, 0xC]
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -93516,7 +93516,7 @@ party_menu_link_mon_status_condition_object: @ 81B6098
ldrb r1, [r2, 0x4] ldrb r1, [r2, 0x4]
ldrb r2, [r2, 0x5] ldrb r2, [r2, 0x5]
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
strb r0, [r4, 0xC] strb r0, [r4, 0xC]
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
asm/rom_81BAD84.s
+126 -126
View File
@@ -167,7 +167,7 @@ sub_81BAE98: @ 81BAE98
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
bl dp01_tbl3_exec_completed bl dp01_tbl3_exec_completed
_081BAEE8: _081BAEE8:
pop {r4-r6} pop {r4-r6}
@@ -415,7 +415,7 @@ _081BB07A:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
add r0, r10 add r0, r10
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r4, =gUnknown_03005D70 ldr r4, =gUnknown_03005D70
ldrb r0, [r7] ldrb r0, [r7]
mov r1, r8 mov r1, r8
@@ -453,7 +453,7 @@ _081BB134:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r5, =gUnknown_03005D70 ldr r5, =gUnknown_03005D70
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r5 adds r0, r1, r5
@@ -1204,7 +1204,7 @@ sub_81BB78C: @ 81BB78C
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r6 adds r0, r6
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
@@ -1251,7 +1251,7 @@ sub_81BB828: @ 81BB828
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
@@ -1576,7 +1576,7 @@ _081BBB1A:
cmp r0, 0 cmp r0, 0
bne _081BBB60 bne _081BBB60
adds r0, r3, r5 adds r0, r3, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 2 lsls r0, 2
@@ -3816,7 +3816,7 @@ sub_81BCF58: @ 81BCF58
mov r0, r8 mov r0, r8
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -3992,7 +3992,7 @@ sub_81BD0E4: @ 81BD0E4
mov r0, r10 mov r0, r10
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
@@ -4131,7 +4131,7 @@ _081BD2A8:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =gUnknown_03005D70 ldr r1, =gUnknown_03005D70
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
@@ -4280,7 +4280,7 @@ _081BD3BE:
adds r0, r6, 0 adds r0, r6, 0
mov r1, r8 mov r1, r8
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r6, =gBankSpriteIds ldr r6, =gBankSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
@@ -4354,7 +4354,7 @@ _081BD494:
mov r0, r8 mov r0, r8
mov r1, r9 mov r1, r9
adds r2, r4, 0 adds r2, r4, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gBankSpriteIds ldr r4, =gBankSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -4363,7 +4363,7 @@ _081BD494:
lsls r5, 3 lsls r5, 3
adds r5, r0 adds r5, r0
ldrh r0, [r5, 0x4] ldrh r0, [r5, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r5, =gSprites ldr r5, =gSprites
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
@@ -6871,7 +6871,7 @@ _081BEA2A:
ldrsh r2, [r0, r3] ldrsh r2, [r0, r3]
ldr r0, =gUnknown_08617E60 ldr r0, =gUnknown_08617E60
movs r3, 0x8 movs r3, 0x8
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r0, r1, 4 lsls r0, r1, 4
@@ -6912,7 +6912,7 @@ _081BEA78:
asrs r2, 16 asrs r2, 16
ldr r0, =gUnknown_08617E34 ldr r0, =gUnknown_08617E34
movs r3, 0x8 movs r3, 0x8
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r0, r1, 4 lsls r0, r1, 4
@@ -6970,7 +6970,7 @@ sub_81BEAD8: @ 81BEAD8
cmp r3, r0 cmp r3, r0
ble _081BEB1A ble _081BEB1A
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
bl sub_81BE968 bl sub_81BE968
_081BEB1A: _081BEB1A:
pop {r4} pop {r4}
@@ -7670,7 +7670,7 @@ _081BF0F0:
mov r0, sp mov r0, sp
movs r1, 0x80 movs r1, 0x80
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
movs r3, 0 movs r3, 0
strb r0, [r1, 0x8] strb r0, [r1, 0x8]
@@ -7769,7 +7769,7 @@ _081BF1CC:
cmp r1, r0 cmp r1, r0
bne _081BF238 bne _081BF238
adds r0, r2, r3 adds r0, r2, r3
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r5] ldr r0, [r5]
ldr r0, [r0, 0xC] ldr r0, [r0, 0xC]
bl Free bl Free
@@ -10138,7 +10138,7 @@ _081C0786:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeResources bl ResetSpriteAndFreeResources
b _081C08EC b _081C08EC
.pool .pool
_081C07A8: _081C07A8:
@@ -16808,7 +16808,7 @@ sub_81C41C0: @ 81C41C0
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r5] ldr r0, [r5]
ldr r1, =0x000040d3 ldr r1, =0x000040d3
adds r0, r1 adds r0, r1
@@ -16936,7 +16936,7 @@ _081C42CE:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
ldr r1, [r5] ldr r1, [r5]
ldr r2, =0x000040d3 ldr r2, =0x000040d3
adds r1, r2 adds r1, r2
@@ -17522,7 +17522,7 @@ sub_81C47B4: @ 81C47B4
movs r1, 0x28 movs r1, 0x28
movs r2, 0x40 movs r2, 0x40
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
@@ -17780,7 +17780,7 @@ sub_81C49E0: @ 81C49E0
ldr r0, =gUnknown_0203CF1C ldr r0, =gUnknown_0203CF1C
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, =0x00007533 ldr r0, =0x00007533
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
adds r0, r4, 0 adds r0, r4, 0
@@ -17812,7 +17812,7 @@ sub_81C4A08: @ 81C4A08
movs r1, 0x10 movs r1, 0x10
movs r2, 0x88 movs r2, 0x88
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r2, =gUnknown_0203CF1C ldr r2, =gUnknown_0203CF1C
ldr r1, [r2] ldr r1, [r2]
ldr r3, =0x000040d4 ldr r3, =0x000040d4
@@ -17859,7 +17859,7 @@ sub_81C4A88: @ 81C4A88
movs r1, 0x40 movs r1, 0x40
movs r2, 0x98 movs r2, 0x98
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
strb r0, [r4] strb r0, [r4]
_081C4AA6: _081C4AA6:
ldr r0, [r5] ldr r0, [r5]
@@ -17934,7 +17934,7 @@ _081C4B30:
ldr r0, =gUnknown_0861D084 ldr r0, =gUnknown_0861D084
movs r2, 0x28 movs r2, 0x28
mov r3, r9 mov r3, r9
bl AddObjectToFront bl CreateSprite
adds r1, r7, r5 adds r1, r7, r5
strb r0, [r1] strb r0, [r1]
adds r4, r1, 0 adds r4, r1, 0
@@ -21987,7 +21987,7 @@ sub_81C6E38: @ 81C6E38
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0xFF movs r0, 0xFF
strb r0, [r5] strb r0, [r5]
_081C6E80: _081C6E80:
@@ -22044,7 +22044,7 @@ sub_81C6EF4: @ 81C6EF4
movs r1, 0x44 movs r1, 0x44
movs r2, 0x38 movs r2, 0x38
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
strb r0, [r4] strb r0, [r4]
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -23743,7 +23743,7 @@ _081C7C36:
ldr r0, =gUnknown_0861FA54 ldr r0, =gUnknown_0861FA54
bl sub_81C795C bl sub_81C795C
movs r0, 0 movs r0, 0
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x80 movs r1, 0x80
@@ -23757,7 +23757,7 @@ _081C7C36:
movs r1, 0xDC movs r1, 0xDC
movs r2, 0xC movs r2, 0xC
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -23778,7 +23778,7 @@ sub_81C7C94: @ 81C7C94
movs r0, 0 movs r0, 0
bl sub_81C763C bl sub_81C763C
ldr r0, [r0, 0x18] ldr r0, [r0, 0x18]
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0 movs r0, 0
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
movs r0, 0 movs r0, 0
@@ -23873,7 +23873,7 @@ _081C7D50:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
lsls r4, r5, 2 lsls r4, r5, 2
@@ -23896,7 +23896,7 @@ _081C7D50:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
adds r2, r6, 0 adds r2, r6, 0
@@ -23968,13 +23968,13 @@ sub_81C7E14: @ 81C7E14
cmp r4, 0x4 cmp r4, 0x4
bne _081C7E30 bne _081C7E30
movs r0, 0x2 movs r0, 0x2
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
ldr r3, [r5, 0x20] ldr r3, [r5, 0x20]
adds r0, 0x20 adds r0, 0x20
b _081C7E3A b _081C7E3A
_081C7E30: _081C7E30:
movs r0, 0x2 movs r0, 0x2
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
ldr r3, [r5, 0x20] ldr r3, [r5, 0x20]
adds r0, 0x40 adds r0, 0x40
_081C7E3A: _081C7E3A:
@@ -24018,7 +24018,7 @@ sub_81C7E58: @ 81C7E58
ldr r0, =gUnknown_08DC7F00 ldr r0, =gUnknown_08DC7F00
adds r4, r0 adds r4, r0
movs r0, 0x1 movs r0, 0x1
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 4 lsrs r1, 4
@@ -24034,7 +24034,7 @@ sub_81C7E58: @ 81C7E58
adds r1, r4, 0 adds r1, r4, 0
bl LZ77UnCompWram bl LZ77UnCompWram
movs r0, 0x2 movs r0, 0x2
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 11 lsrs r1, 11
@@ -24047,7 +24047,7 @@ sub_81C7E58: @ 81C7E58
movs r3, 0x1 movs r3, 0x1
bl RequestDma3Copy bl RequestDma3Copy
movs r0, 0x2 movs r0, 0x2
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
ldr r3, [r7, 0x20] ldr r3, [r7, 0x20]
ldrh r1, [r6, 0x4] ldrh r1, [r6, 0x4]
adds r0, r1 adds r0, r1
@@ -24100,7 +24100,7 @@ sub_81C7F24: @ 81C7F24
ldr r0, =gUnknown_08DC7F00 ldr r0, =gUnknown_08DC7F00
adds r4, r0 adds r4, r0
movs r0, 0x2 movs r0, 0x2
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 4 lsrs r1, 4
@@ -24116,7 +24116,7 @@ sub_81C7F24: @ 81C7F24
adds r1, r4, 0 adds r1, r4, 0
bl LZ77UnCompWram bl LZ77UnCompWram
movs r0, 0x2 movs r0, 0x2
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 11 lsrs r1, 11
@@ -26165,7 +26165,7 @@ sub_81C8EF8: @ 81C8EF8
adds r2, 0x1 adds r2, 0x1
lsls r2, 3 lsls r2, 3
movs r3, 0x7 movs r3, 0x7
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
lsls r0, r3, 4 lsls r0, r3, 4
@@ -26193,7 +26193,7 @@ sub_81C8EF8: @ 81C8EF8
mov r0, r10 mov r0, r10
adds r1, r6, 0 adds r1, r6, 0
movs r3, 0x7 movs r3, 0x7
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
lsls r2, r3, 4 lsls r2, r3, 4
@@ -26222,7 +26222,7 @@ sub_81C8EF8: @ 81C8EF8
mov r0, r10 mov r0, r10
adds r1, r6, 0 adds r1, r6, 0
movs r3, 0x7 movs r3, 0x7
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
lsls r1, r3, 4 lsls r1, r3, 4
@@ -26257,11 +26257,11 @@ sub_81C8FE0: @ 81C8FE0
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r0, [r4, 0x3C] ldr r0, [r4, 0x3C]
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r4, 0x40] ldr r0, [r4, 0x40]
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r4, 0x44] ldr r0, [r4, 0x44]
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0xA movs r0, 0xA
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
movs r0, 0x14 movs r0, 0x14
@@ -28362,7 +28362,7 @@ _081CA054:
movs r1, 0x8C movs r1, 0x8C
asrs r2, r5, 16 asrs r2, r5, 16
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -28404,7 +28404,7 @@ _081CA0AA:
ldr r0, [r4] ldr r0, [r4]
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
ldm r4!, {r0} ldm r4!, {r0}
bl RemoveObjectAndFreeTiles bl DestroySprite
subs r5, 0x1 subs r5, 0x1
cmp r5, 0 cmp r5, 0
bge _081CA0AA bge _081CA0AA
@@ -28450,7 +28450,7 @@ sub_81CA0EC: @ 81CA0EC
bl sub_81C763C bl sub_81C763C
mov r10, r0 mov r10, r0
movs r0, 0x3 movs r0, 0x3
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -28499,7 +28499,7 @@ _081CA13E:
adds r0, 0x4 adds r0, 0x4
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r3, [r4] ldr r3, [r4]
lsls r0, 4 lsls r0, 4
ldrb r2, [r3, 0x5] ldrb r2, [r3, 0x5]
@@ -28847,7 +28847,7 @@ _081CA3C8:
ldr r0, [r4] ldr r0, [r4]
strh r5, [r0, 0x3C] strh r5, [r0, 0x3C]
ldr r0, [r4] ldr r0, [r4]
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
ldm r4!, {r0} ldm r4!, {r0}
movs r1, 0 movs r1, 0
bl StartObjectRotScalAnim bl StartObjectRotScalAnim
@@ -29030,7 +29030,7 @@ _081CA526:
lsrs r2, 6 lsrs r2, 6
adds r0, r4, 0 adds r0, r4, 0
movs r3, 0 movs r3, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
ldrb r1, [r4, 0x1] ldrb r1, [r4, 0x1]
movs r0, 0x4 movs r0, 0x4
negs r0, r0 negs r0, r0
@@ -29160,7 +29160,7 @@ sub_81CA640: @ 81CA640
movs r1, 0x10 movs r1, 0x10
movs r2, 0x60 movs r2, 0x60
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -29196,7 +29196,7 @@ sub_81CA698: @ 81CA698
movs r0, 0x2 movs r0, 0x2
bl sub_81C763C bl sub_81C763C
ldr r0, [r0, 0x28] ldr r0, [r0, 0x28]
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_81CA698 thumb_func_end sub_81CA698
@@ -32812,12 +32812,12 @@ sub_81CC2B4: @ 81CC2B4
ldr r0, [r4, 0x1C] ldr r0, [r4, 0x1C]
cmp r0, 0 cmp r0, 0
beq _081CC2C8 beq _081CC2C8
bl RemoveObjectAndFreeTiles bl DestroySprite
_081CC2C8: _081CC2C8:
ldr r0, [r4, 0x20] ldr r0, [r4, 0x20]
cmp r0, 0 cmp r0, 0
beq _081CC2D2 beq _081CC2D2
bl RemoveObjectAndFreeTiles bl DestroySprite
_081CC2D2: _081CC2D2:
movs r0, 0x8 movs r0, 0x8
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
@@ -32844,7 +32844,7 @@ sub_81CC2F0: @ 81CC2F0
movs r1, 0x4 movs r1, 0x4
movs r2, 0x50 movs r2, 0x50
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -32868,7 +32868,7 @@ sub_81CC330: @ 81CC330
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r0, [r4, 0x1C] ldr r0, [r4, 0x1C]
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0 movs r0, 0
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
pop {r4} pop {r4}
@@ -32914,7 +32914,7 @@ sub_81CC370: @ 81CC370
movs r1, 0x2C movs r1, 0x2C
movs r2, 0x68 movs r2, 0x68
movs r3, 0x6 movs r3, 0x6
bl AddObjectToFront bl CreateSprite
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -33749,7 +33749,7 @@ sub_81CC9EC: @ 81CC9EC
movs r4, 0x2 movs r4, 0x2
_081CCA08: _081CCA08:
ldm r5!, {r0} ldm r5!, {r0}
bl RemoveObjectAndFreeTiles bl DestroySprite
subs r4, 0x1 subs r4, 0x1
cmp r4, 0 cmp r4, 0
bge _081CCA08 bge _081CCA08
@@ -34296,7 +34296,7 @@ _081CCE80:
ldr r0, =gUnknown_086231D0 ldr r0, =gUnknown_086231D0
asrs r2, r7, 16 asrs r2, r7, 16
movs r3, 0x8 movs r3, 0x8
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -37571,7 +37571,7 @@ sub_81CE990: @ 81CE990
_081CE9B0: _081CE9B0:
movs r0, 0x66 movs r0, 0x66
_081CE9B2: _081CE9B2:
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 4 lsls r0, 4
ldrb r2, [r5, 0x5] ldrb r2, [r5, 0x5]
movs r1, 0xF movs r1, 0xF
@@ -37647,7 +37647,7 @@ sub_81CE9E4: @ 81CE9E4
adds r1, r6, r2 adds r1, r6, r2
str r0, [r1] str r0, [r1]
movs r0, 0x69 movs r0, 0x69
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
@@ -37676,7 +37676,7 @@ _081CEA8C:
adds r0, r7, 0 adds r0, r7, 0
movs r1, 0xE2 movs r1, 0xE2
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -37735,7 +37735,7 @@ _081CEB0A:
adds r0, r7, 0 adds r0, r7, 0
movs r1, 0xE6 movs r1, 0xE6
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -37777,7 +37777,7 @@ _081CEB5C:
adds r0, r7, 0 adds r0, r7, 0
movs r1, 0xDE movs r1, 0xDE
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -37843,7 +37843,7 @@ sub_81CEBF4: @ 81CEBF4
ldr r1, =0x000028dc ldr r1, =0x000028dc
adds r0, r5, r1 adds r0, r5, r1
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x6A movs r0, 0x6A
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
movs r0, 0x69 movs r0, 0x69
@@ -37866,7 +37866,7 @@ _081CEC2A:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -37894,7 +37894,7 @@ _081CEC68:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x64 movs r0, 0x64
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
movs r0, 0x64 movs r0, 0x64
@@ -38012,7 +38012,7 @@ sub_81CED30: @ 81CED30
movs r1, 0x26 movs r1, 0x26
movs r2, 0x68 movs r2, 0x68
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strb r0, [r7] strb r0, [r7]
@@ -41770,7 +41770,7 @@ sub_81D09F4: @ 81D09F4
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0xE movs r0, 0xE
bl sub_81C7650 bl sub_81C7650
pop {r4} pop {r4}
@@ -42974,7 +42974,7 @@ sub_81D13FC: @ 81D13FC
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -43024,7 +43024,7 @@ sub_81D1448: @ 81D1448
bl sub_81D0954 bl sub_81D0954
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0x9 movs r0, 0x9
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
ldr r3, [r6, 0x14] ldr r3, [r6, 0x14]
ldr r1, =gUnknown_08624BF8 ldr r1, =gUnknown_08624BF8
lsls r4, 2 lsls r4, 2
@@ -43044,7 +43044,7 @@ sub_81D1448: @ 81D1448
adds r0, 0xF adds r0, 0xF
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
ldr r3, [r6, 0x14] ldr r3, [r6, 0x14]
lsls r0, 4 lsls r0, 4
ldrb r2, [r3, 0x5] ldrb r2, [r3, 0x5]
@@ -47351,7 +47351,7 @@ _081D34A2:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
adds r6, r3, 0 adds r6, r3, 0
@@ -47422,7 +47422,7 @@ _081D3526:
ldr r0, [r4] ldr r0, [r4]
cmp r0, 0 cmp r0, 0
beq _081D3544 beq _081D3544
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0 movs r0, 0
str r0, [r4] str r0, [r4]
adds r0, r5, 0x1 adds r0, r5, 0x1
@@ -50144,7 +50144,7 @@ _081D4B3A:
adds r0, r4, 0 adds r0, r4, 0
bl LoadTaggedObjectPalette bl LoadTaggedObjectPalette
ldrh r0, [r4, 0x4] ldrh r0, [r4, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80ABE18 bl sub_80ABE18
@@ -50177,7 +50177,7 @@ _081D4B3A:
subs r3, 0x1 subs r3, 0x1
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
bl AddObjectToBack bl CreateSpriteAtEnd
ldr r1, =gUnknown_0203CF50 ldr r1, =gUnknown_0203CF50
strb r0, [r1] strb r0, [r1]
lsls r0, 24 lsls r0, 24
@@ -50225,7 +50225,7 @@ sub_81D4BEC: @ 81D4BEC
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
_081D4C06: _081D4C06:
pop {r0} pop {r0}
bx r0 bx r0
@@ -53772,7 +53772,7 @@ sub_81D6984: @ 81D6984
movs r1, 0x58 movs r1, 0x58
movs r2, 0x48 movs r2, 0x48
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
@@ -53792,7 +53792,7 @@ sub_81D6984: @ 81D6984
movs r1, 0x38 movs r1, 0x38
movs r2, 0x68 movs r2, 0x68
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4] strh r0, [r4]
@@ -53800,7 +53800,7 @@ sub_81D6984: @ 81D6984
movs r1, 0x4B movs r1, 0x4B
movs r2, 0x65 movs r2, 0x65
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x2] strh r0, [r4, 0x2]
@@ -53808,7 +53808,7 @@ sub_81D6984: @ 81D6984
movs r1, 0x6D movs r1, 0x6D
movs r2, 0x72 movs r2, 0x72
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x4] strh r0, [r4, 0x4]
@@ -54014,7 +54014,7 @@ sub_81D6B7C: @ 81D6B7C
movs r1, 0x88 movs r1, 0x88
movs r2, 0x60 movs r2, 0x60
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
mov r8, r0 mov r8, r0
mov r0, r8 mov r0, r8
lsls r0, 24 lsls r0, 24
@@ -54036,14 +54036,14 @@ sub_81D6B7C: @ 81D6B7C
movs r1, 0xA8 movs r1, 0xA8
movs r2, 0x60 movs r2, 0x60
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 8 lsls r0, 8
strh r0, [r4] strh r0, [r4]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x88 movs r1, 0x88
movs r2, 0x70 movs r2, 0x70
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4] ldrh r1, [r4]
@@ -54053,14 +54053,14 @@ sub_81D6B7C: @ 81D6B7C
movs r1, 0xA8 movs r1, 0xA8
movs r2, 0x70 movs r2, 0x70
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 8 lsls r0, 8
strh r0, [r4, 0x2] strh r0, [r4, 0x2]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x88 movs r1, 0x88
movs r2, 0x80 movs r2, 0x80
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
@@ -54070,14 +54070,14 @@ sub_81D6B7C: @ 81D6B7C
movs r1, 0xA8 movs r1, 0xA8
movs r2, 0x80 movs r2, 0x80
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 8 lsls r0, 8
strh r0, [r4, 0x4] strh r0, [r4, 0x4]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x68 movs r1, 0x68
movs r2, 0x80 movs r2, 0x80
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x4] ldrh r1, [r4, 0x4]
@@ -54087,14 +54087,14 @@ sub_81D6B7C: @ 81D6B7C
movs r1, 0x88 movs r1, 0x88
movs r2, 0x80 movs r2, 0x80
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 8 lsls r0, 8
strh r0, [r4, 0x6] strh r0, [r4, 0x6]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0xB8 movs r1, 0xB8
movs r2, 0x80 movs r2, 0x80
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x6] ldrh r1, [r4, 0x6]
@@ -54104,14 +54104,14 @@ sub_81D6B7C: @ 81D6B7C
movs r1, 0xD0 movs r1, 0xD0
movs r2, 0x84 movs r2, 0x84
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 8 lsls r0, 8
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
ldr r0, =gUnknown_0862A864 ldr r0, =gUnknown_0862A864
movs r1, 0xC8 movs r1, 0xC8
movs r2, 0x78 movs r2, 0x78
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x8] ldrh r1, [r4, 0x8]
@@ -55290,7 +55290,7 @@ sub_81D7664: @ 81D7664
movs r1, 0x62 movs r1, 0x62
movs r2, 0x48 movs r2, 0x48
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
@@ -55310,7 +55310,7 @@ sub_81D7664: @ 81D7664
movs r1, 0x42 movs r1, 0x42
movs r2, 0x68 movs r2, 0x68
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4] strh r0, [r4]
@@ -55318,7 +55318,7 @@ sub_81D7664: @ 81D7664
movs r1, 0x55 movs r1, 0x55
movs r2, 0x65 movs r2, 0x65
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x2] strh r0, [r4, 0x2]
@@ -55326,7 +55326,7 @@ sub_81D7664: @ 81D7664
movs r1, 0x77 movs r1, 0x77
movs r2, 0x72 movs r2, 0x72
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x4] strh r0, [r4, 0x4]
@@ -55583,7 +55583,7 @@ sub_81D78BC: @ 81D78BC
movs r1, 0x7E movs r1, 0x7E
movs r2, 0x60 movs r2, 0x60
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
mov r8, r0 mov r8, r0
mov r0, r8 mov r0, r8
lsls r0, 24 lsls r0, 24
@@ -55605,14 +55605,14 @@ sub_81D78BC: @ 81D78BC
movs r1, 0x9E movs r1, 0x9E
movs r2, 0x60 movs r2, 0x60
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 8 lsls r0, 8
strh r0, [r4] strh r0, [r4]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x7E movs r1, 0x7E
movs r2, 0x70 movs r2, 0x70
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4] ldrh r1, [r4]
@@ -55622,14 +55622,14 @@ sub_81D78BC: @ 81D78BC
movs r1, 0x9E movs r1, 0x9E
movs r2, 0x70 movs r2, 0x70
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 8 lsls r0, 8
strh r0, [r4, 0x2] strh r0, [r4, 0x2]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x7E movs r1, 0x7E
movs r2, 0x80 movs r2, 0x80
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
@@ -55639,14 +55639,14 @@ sub_81D78BC: @ 81D78BC
movs r1, 0x9E movs r1, 0x9E
movs r2, 0x80 movs r2, 0x80
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 8 lsls r0, 8
strh r0, [r4, 0x4] strh r0, [r4, 0x4]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x5E movs r1, 0x5E
movs r2, 0x80 movs r2, 0x80
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x4] ldrh r1, [r4, 0x4]
@@ -55656,14 +55656,14 @@ sub_81D78BC: @ 81D78BC
movs r1, 0x7E movs r1, 0x7E
movs r2, 0x80 movs r2, 0x80
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 8 lsls r0, 8
strh r0, [r4, 0x6] strh r0, [r4, 0x6]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0xAE movs r1, 0xAE
movs r2, 0x80 movs r2, 0x80
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x6] ldrh r1, [r4, 0x6]
@@ -55673,14 +55673,14 @@ sub_81D78BC: @ 81D78BC
movs r1, 0xC6 movs r1, 0xC6
movs r2, 0x84 movs r2, 0x84
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 8 lsls r0, 8
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
ldr r0, =gUnknown_0862AA3C ldr r0, =gUnknown_0862AA3C
movs r1, 0xBE movs r1, 0xBE
movs r2, 0x78 movs r2, 0x78
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x8] ldrh r1, [r4, 0x8]
@@ -56685,7 +56685,7 @@ sub_81D81A4: @ 81D81A4
adds r2, r3 adds r2, r3
asrs r2, 16 asrs r2, 16
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -56712,7 +56712,7 @@ sub_81D81A4: @ 81D81A4
orrs r1, r0 orrs r1, r0
strb r1, [r3, 0x5] strb r1, [r3, 0x5]
adds r0, r3, 0 adds r0, r3, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
ldrh r1, [r4] ldrh r1, [r4]
movs r6, 0 movs r6, 0
ldrsh r0, [r4, r6] ldrsh r0, [r4, r6]
@@ -57216,7 +57216,7 @@ sub_81D86CC: @ 81D86CC
movs r1, 0xA0 movs r1, 0xA0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
adds r6, r0, 0 adds r6, r0, 0
lsls r6, 24 lsls r6, 24
lsrs r6, 24 lsrs r6, 24
@@ -57231,7 +57231,7 @@ sub_81D86CC: @ 81D86CC
negs r2, r2 negs r2, r2
movs r1, 0xB8 movs r1, 0xB8
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r1, r8 mov r1, r8
@@ -58336,7 +58336,7 @@ sub_81D90A8: @ 81D90A8
movs r1, 0x40 movs r1, 0x40
movs r2, 0x78 movs r2, 0x78
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x6] strh r0, [r4, 0x6]
@@ -58352,7 +58352,7 @@ sub_81D90A8: @ 81D90A8
movs r1, 0x10 movs r1, 0x10
movs r2, 0x82 movs r2, 0x82
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7] strh r0, [r7]
@@ -58393,7 +58393,7 @@ sub_81D90A8: @ 81D90A8
movs r1, 0xA0 movs r1, 0xA0
movs r2, 0x80 movs r2, 0x80
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
@@ -58408,7 +58408,7 @@ sub_81D90A8: @ 81D90A8
movs r1, 0xC0 movs r1, 0xC0
movs r2, 0x80 movs r2, 0x80
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7] strh r0, [r7]
@@ -58416,7 +58416,7 @@ sub_81D90A8: @ 81D90A8
movs r1, 0xE0 movs r1, 0xE0
movs r2, 0x80 movs r2, 0x80
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7, 0x2] strh r0, [r7, 0x2]
@@ -58477,7 +58477,7 @@ sub_81D90A8: @ 81D90A8
negs r2, r2 negs r2, r2
movs r1, 0x78 movs r1, 0x78
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
@@ -58493,7 +58493,7 @@ sub_81D90A8: @ 81D90A8
negs r2, r2 negs r2, r2
movs r1, 0x78 movs r1, 0x78
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7] strh r0, [r7]
@@ -58908,7 +58908,7 @@ _081D9550:
movs r1, 0x98 movs r1, 0x98
movs r2, 0x84 movs r2, 0x84
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7, 0x3C] strh r0, [r7, 0x3C]
@@ -58931,7 +58931,7 @@ _081D9550:
movs r1, 0xE0 movs r1, 0xE0
movs r2, 0x84 movs r2, 0x84
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7, 0x3C] strh r0, [r7, 0x3C]
@@ -61157,7 +61157,7 @@ sub_81DA74C: @ 81DA74C
adds r1, r5, 0 adds r1, r5, 0
adds r2, r6, 0 adds r2, r6, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r7, 0x1 cmp r7, 0x1
@@ -61352,7 +61352,7 @@ sub_81DA8BC: @ 81DA8BC
adds r1, r6, 0 adds r1, r6, 0
mov r2, r8 mov r2, r8
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r5, 0x1 cmp r5, 0x1
@@ -61507,21 +61507,21 @@ sub_81DAA20: @ 81DAA20
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x12 movs r0, 0x12
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x14 movs r0, 0x14
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
asm/rotating_gate.s
+2 -2
View File
@@ -326,7 +326,7 @@ _080FBA38:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x94 movs r3, 0x94
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0x40 cmp r5, 0x40
@@ -630,7 +630,7 @@ _080FBC94:
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x40 movs r0, 0x40
strb r0, [r5] strb r0, [r5]
_080FBCB4: _080FBCB4:
asm/roulette.s
+24 -24
View File
@@ -4896,7 +4896,7 @@ sub_8142C60: @ 8142C60
ldrb r3, [r1] ldrb r3, [r1]
movs r1, 0x74 movs r1, 0x74
movs r2, 0x50 movs r2, 0x50
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r5, r0, 0 adds r5, r0, 0
@@ -4991,7 +4991,7 @@ _08142D24:
adds r2, r4, 0 adds r2, r4, 0
adds r2, 0x5C adds r2, 0x5C
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r1, =gUnknown_0203AB88 ldr r1, =gUnknown_0203AB88
ldr r1, [r1] ldr r1, [r1]
adds r2, r5, 0 adds r2, r5, 0
@@ -5042,7 +5042,7 @@ _08142D86:
asrs r1, 16 asrs r1, 16
movs r2, 0x46 movs r2, 0x46
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r1, =gUnknown_0203AB88 ldr r1, =gUnknown_0203AB88
ldr r1, [r1] ldr r1, [r1]
adds r1, r6 adds r1, r6
@@ -5077,7 +5077,7 @@ _08142DCC:
asrs r2, 16 asrs r2, 16
movs r1, 0x7E movs r1, 0x7E
movs r3, 0x1E movs r3, 0x1E
bl AddObjectToFront bl CreateSprite
ldr r1, =gUnknown_0203AB88 ldr r1, =gUnknown_0203AB88
ldr r1, [r1] ldr r1, [r1]
adds r1, r6 adds r1, r6
@@ -5123,7 +5123,7 @@ _08142E40:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -5282,7 +5282,7 @@ _08142F8C:
movs r1, 0x74 movs r1, 0x74
movs r2, 0x14 movs r2, 0x14
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
adds r3, r5, 0 adds r3, r5, 0
adds r3, 0x31 adds r3, 0x31
@@ -5691,7 +5691,7 @@ _081432A2:
_081432DC: _081432DC:
lsls r0, r2, 12 lsls r0, r2, 12
lsrs r5, r0, 16 lsrs r5, r0, 16
ldr r1, =gUnknown_02021BC0 ldr r1, =gOamMatrices
lsls r0, r3, 3 lsls r0, r3, 3
adds r1, r0, r1 adds r1, r0, r1
adds r0, r4, 0 adds r0, r4, 0
@@ -5753,7 +5753,7 @@ _08143322:
movs r1, 0xD0 movs r1, 0xD0
movs r2, 0x10 movs r2, 0x10
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
ldr r3, =gUnknown_0203AB88 ldr r3, =gUnknown_0203AB88
ldr r1, [r3] ldr r1, [r3]
adds r1, 0x50 adds r1, 0x50
@@ -5782,7 +5782,7 @@ _0814338C:
ldr r0, =gUnknown_085B77FC ldr r0, =gUnknown_085B77FC
movs r2, 0x18 movs r2, 0x18
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r3, r5, 0 adds r3, r5, 0
adds r3, 0x15 adds r3, 0x15
@@ -5824,7 +5824,7 @@ _0814338C:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x44 movs r2, 0x44
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
ldr r2, =gUnknown_0203AB88 ldr r2, =gUnknown_0203AB88
ldr r1, [r2] ldr r1, [r2]
adds r1, 0x55 adds r1, 0x55
@@ -5853,7 +5853,7 @@ _0814341C:
ldr r0, =gUnknown_085B782C ldr r0, =gUnknown_085B782C
movs r2, 0x24 movs r2, 0x24
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
adds r2, r5, 0 adds r2, r5, 0
adds r2, 0x1A adds r2, 0x1A
@@ -5897,7 +5897,7 @@ _0814341C:
movs r1, 0x98 movs r1, 0x98
movs r2, 0x60 movs r2, 0x60
movs r3, 0x9 movs r3, 0x9
bl AddObjectToFront bl CreateSprite
ldr r3, =gUnknown_0203AB88 ldr r3, =gUnknown_0203AB88
ldr r1, [r3] ldr r1, [r3]
adds r1, 0x6C adds r1, 0x6C
@@ -6463,7 +6463,7 @@ sub_814391C: @ 814391C
movs r1, 0x74 movs r1, 0x74
movs r2, 0x50 movs r2, 0x50
movs r3, 0x51 movs r3, 0x51
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -6502,7 +6502,7 @@ sub_814399C: @ 814399C
ldrb r0, [r0, 0x3] ldrb r0, [r0, 0x3]
lsls r0, 26 lsls r0, 26
lsrs r0, 27 lsrs r0, 27
ldr r1, =gUnknown_02021BC0 ldr r1, =gOamMatrices
lsls r0, 3 lsls r0, 3
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_0203AB88 ldr r1, =gUnknown_0203AB88
@@ -6533,7 +6533,7 @@ _081439D0:
ldr r0, =gUnknown_085B7928 ldr r0, =gUnknown_085B7928
movs r1, 0x74 movs r1, 0x74
movs r2, 0x50 movs r2, 0x50
bl AddObjectToFront bl CreateSprite
ldr r1, [r5] ldr r1, [r5]
adds r1, 0x3C adds r1, 0x3C
adds r1, r4 adds r1, r4
@@ -8133,7 +8133,7 @@ sub_81446DC: @ 81446DC
negs r2, r2 negs r2, r2
movs r1, 0x24 movs r1, 0x24
movs r3, 0x32 movs r3, 0x32
bl AddObjectToFront bl CreateSprite
ldr r1, [r5] ldr r1, [r5]
adds r1, 0x73 adds r1, 0x73
strb r0, [r1] strb r0, [r1]
@@ -8153,7 +8153,7 @@ sub_81446DC: @ 81446DC
ldrsh r2, [r0, r3] ldrsh r2, [r0, r3]
adds r0, r4, 0 adds r0, r4, 0
movs r3, 0x3B movs r3, 0x3B
bl AddObjectToFront bl CreateSprite
ldr r1, [r5] ldr r1, [r5]
adds r1, 0x74 adds r1, 0x74
strb r0, [r1] strb r0, [r1]
@@ -8162,7 +8162,7 @@ sub_81446DC: @ 81446DC
movs r1, 0x24 movs r1, 0x24
movs r2, 0x8C movs r2, 0x8C
movs r3, 0x33 movs r3, 0x33
bl AddObjectToFront bl CreateSprite
ldr r1, [r5] ldr r1, [r5]
adds r1, 0x75 adds r1, 0x75
strb r0, [r1] strb r0, [r1]
@@ -8367,7 +8367,7 @@ sub_81448B8: @ 81448B8
movs r3, 0 movs r3, 0
ldrsh r2, [r2, r3] ldrsh r2, [r2, r3]
movs r3, 0x32 movs r3, 0x32
bl AddObjectToFront bl CreateSprite
ldr r5, =gUnknown_0203AB88 ldr r5, =gUnknown_0203AB88
ldr r1, [r5] ldr r1, [r5]
adds r1, 0x73 adds r1, 0x73
@@ -8396,7 +8396,7 @@ sub_81448B8: @ 81448B8
movs r3, 0 movs r3, 0
ldrsh r2, [r4, r3] ldrsh r2, [r4, r3]
movs r3, 0x33 movs r3, 0x33
bl AddObjectToFront bl CreateSprite
ldr r1, [r5] ldr r1, [r5]
adds r1, 0x74 adds r1, 0x74
strb r0, [r1] strb r0, [r1]
@@ -8835,7 +8835,7 @@ sub_8144C70: @ 8144C70
strb r0, [r3, 0x3] strb r0, [r3, 0x3]
_08144CAC: _08144CAC:
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, [r4] ldr r1, [r4]
movs r0, 0 movs r0, 0
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
@@ -8935,7 +8935,7 @@ _08144D54:
ands r1, r2 ands r1, r2
strb r1, [r0] strb r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_08144D7E: _08144D7E:
add sp, 0x18 add sp, 0x18
pop {r4} pop {r4}
@@ -9224,7 +9224,7 @@ _08144FC8:
movs r0, 0x5E movs r0, 0x5E
bl m4aSongNumStop bl m4aSongNumStop
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r5, =gSprites ldr r5, =gSprites
ldr r4, =gUnknown_0203AB88 ldr r4, =gUnknown_0203AB88
ldr r0, [r4] ldr r0, [r4]
@@ -9245,7 +9245,7 @@ _08144FC8:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
_0814501C: _0814501C:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
asm/script_pokemon_util_80F87D8.s
+2 -2
View File
@@ -755,7 +755,7 @@ _080F8DD8:
adds r2, r3 adds r2, r3
asrs r2, 16 asrs r2, 16
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r0, =gUnknown_02039F2A ldr r0, =gUnknown_02039F2A
@@ -913,7 +913,7 @@ _080F8F42:
bl rotscale_free_entry bl rotscale_free_entry
_080F8F72: _080F8F72:
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080F8F78: _080F8F78:
ldrh r0, [r5, 0x8] ldrh r0, [r5, 0x8]
adds r0, 0x1 adds r0, 0x1
asm/shop.s
+1 -1
View File
@@ -1036,7 +1036,7 @@ BuyMenuRemoveItemIcon: @ 80E031C
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0xFF movs r0, 0xFF
strb r0, [r5] strb r0, [r5]
_080E0356: _080E0356:
asm/slot_machine.s
+45 -45
View File
@@ -5359,7 +5359,7 @@ sub_812CEF4: @ 812CEF4
ldr r5, =gSprites ldr r5, =gSprites
_0812CEFA: _0812CEFA:
ldr r0, =sub_812D024 ldr r0, =sub_812D024
bl obj_add_empty_with_callback bl CreateInvisibleSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -7545,7 +7545,7 @@ _0812E00E:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x40 movs r0, 0x40
strh r0, [r4] strh r0, [r4]
_0812E02E: _0812E02E:
@@ -7649,7 +7649,7 @@ _0812E0F0:
asrs r1, r5, 16 asrs r1, r5, 16
movs r2, 0 movs r2, 0
movs r3, 0xE movs r3, 0xE
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -7734,12 +7734,12 @@ sub_812E154: @ 812E154
bl sub_812BC44 bl sub_812BC44
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x40 adds r1, 0x40
strh r0, [r1] strh r0, [r1]
adds r0, r5, 0 adds r0, r5, 0
bl sub_8008324 bl SetSpriteSheetFrameTileNum
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -7824,7 +7824,7 @@ sub_812E230: @ 812E230
adds r1, r5, 0 adds r1, r5, 0
adds r2, r6, 0 adds r2, r6, 0
movs r3, 0xD movs r3, 0xD
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -7890,12 +7890,12 @@ _0812E2BC:
adds r0, r3 adds r0, r3
lsrs r2, r0, 16 lsrs r2, r0, 16
adds r0, r2, 0 adds r0, r2, 0
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x40 adds r1, 0x40
strh r0, [r1] strh r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8008324 bl SetSpriteSheetFrameTileNum
_0812E2F6: _0812E2F6:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -7910,7 +7910,7 @@ sub_812E300: @ 812E300
movs r1, 0x58 movs r1, 0x58
movs r2, 0x48 movs r2, 0x48
movs r3, 0xF movs r3, 0xF
bl AddObjectToFront bl CreateSprite
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -7979,7 +7979,7 @@ _0812E350:
mov r0, sp mov r0, sp
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -8022,7 +8022,7 @@ sub_812E3E8: @ 812E3E8
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r4, =gUnknown_0203AAE4 ldr r4, =gUnknown_0203AAE4
ldr r0, [r4] ldr r0, [r4]
cmp r0, 0 cmp r0, 0
@@ -8121,7 +8121,7 @@ _0812E490:
lsls r1, 1 lsls r1, 1
movs r2, 0x34 movs r2, 0x34
movs r3, 0x7 movs r3, 0x7
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
lsls r0, r4, 4 lsls r0, r4, 4
@@ -8182,7 +8182,7 @@ _0812E510:
lsls r1, 1 lsls r1, 1
movs r2, 0x54 movs r2, 0x54
movs r3, 0x7 movs r3, 0x7
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
lsls r0, r4, 4 lsls r0, r4, 4
@@ -8256,7 +8256,7 @@ _0812E5BC:
mov r0, sp mov r0, sp
movs r2, 0x50 movs r2, 0x50
movs r3, 0x7 movs r3, 0x7
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -8302,7 +8302,7 @@ _0812E656:
lsls r1, 1 lsls r1, 1
movs r2, 0 movs r2, 0
movs r3, 0xA movs r3, 0xA
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r3, r0, 4 lsls r3, r0, 4
@@ -8394,7 +8394,7 @@ sub_812E70C: @ 812E70C
ldr r0, =gUnknown_085A7DA0 ldr r0, =gUnknown_085A7DA0
movs r2, 0x64 movs r2, 0x64
movs r3, 0x9 movs r3, 0x9
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -8435,7 +8435,7 @@ sub_812E70C: @ 812E70C
ldr r0, =gUnknown_085A7DA0 ldr r0, =gUnknown_085A7DA0
movs r2, 0x68 movs r2, 0x68
movs r3, 0x4 movs r3, 0x4
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -8478,7 +8478,7 @@ sub_812E7CC: @ 812E7CC
lsls r1, 1 lsls r1, 1
movs r2, 0x4C movs r2, 0x4C
movs r3, 0xB movs r3, 0xB
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -8524,7 +8524,7 @@ sub_812E82C: @ 812E82C
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r4, 0 movs r4, 0
_0812E846: _0812E846:
ldr r0, =gUnknown_0203AB34 ldr r0, =gUnknown_0203AB34
@@ -8537,7 +8537,7 @@ _0812E846:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -8571,7 +8571,7 @@ _0812E88A:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -8598,7 +8598,7 @@ _0812E8C8:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -8622,7 +8622,7 @@ sub_812E8F8: @ 812E8F8
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r4, =gUnknown_0203AAF0 ldr r4, =gUnknown_0203AAF0
ldr r0, [r4] ldr r0, [r4]
cmp r0, 0 cmp r0, 0
@@ -8649,7 +8649,7 @@ sub_812E934: @ 812E934
movs r1, 0x98 movs r1, 0x98
movs r2, 0x20 movs r2, 0x20
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -8691,7 +8691,7 @@ sub_812E934: @ 812E934
movs r1, 0xB8 movs r1, 0xB8
movs r2, 0x20 movs r2, 0x20
movs r3, 0x5 movs r3, 0x5
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -8818,7 +8818,7 @@ _0812EA80:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -8841,7 +8841,7 @@ sub_812EAB0: @ 812EAB0
movs r1, 0x48 movs r1, 0x48
movs r2, 0x50 movs r2, 0x50
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -8874,7 +8874,7 @@ sub_812EAB0: @ 812EAB0
movs r1, 0x68 movs r1, 0x68
movs r2, 0x50 movs r2, 0x50
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -8922,7 +8922,7 @@ sub_812EB48: @ 812EB48
cmp r0, 0 cmp r0, 0
bgt _0812EB9A bgt _0812EB9A
movs r0, 0x7 movs r0, 0x7
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
ldr r2, =0x01030000 ldr r2, =0x01030000
@@ -8970,7 +8970,7 @@ sub_812EBAC: @ 812EBAC
sub_812EBCC: @ 812EBCC sub_812EBCC: @ 812EBCC
push {r4,lr} push {r4,lr}
movs r0, 0x7 movs r0, 0x7
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r0, 4 lsrs r0, 4
ldr r1, =0x01030000 ldr r1, =0x01030000
@@ -8992,7 +8992,7 @@ _0812EBEA:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -9011,7 +9011,7 @@ sub_812EC20: @ 812EC20
movs r1, 0xA8 movs r1, 0xA8
movs r2, 0x50 movs r2, 0x50
movs r3, 0x6 movs r3, 0x6
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -9056,7 +9056,7 @@ sub_812EC70: @ 812EC70
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -9081,7 +9081,7 @@ _0812ECA4:
ldr r0, =gUnknown_085A7E18 ldr r0, =gUnknown_085A7E18
movs r2, 0x44 movs r2, 0x44
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r3, r0, 4 lsls r3, r0, 4
@@ -9198,7 +9198,7 @@ _0812ED90:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl RemoveObjectAndFreeTiles bl DestroySprite
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -9217,7 +9217,7 @@ sub_812EDC0: @ 812EDC0
movs r1, 0xA8 movs r1, 0xA8
movs r2, 0x3C movs r2, 0x3C
movs r3, 0x8 movs r3, 0x8
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -9237,7 +9237,7 @@ sub_812EDC0: @ 812EDC0
movs r2, 0x3 movs r2, 0x3
orrs r1, r2 orrs r1, r2
strb r1, [r0, 0x1] strb r1, [r0, 0x1]
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
ldr r0, =gUnknown_0203AB34 ldr r0, =gUnknown_0203AB34
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x43 adds r0, 0x43
@@ -9363,7 +9363,7 @@ sub_812EECC: @ 812EECC
lsrs r0, 27 lsrs r0, 27
bl rotscale_free_entry bl rotscale_free_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -9382,7 +9382,7 @@ sub_812EF00: @ 812EF00
asrs r2, 16 asrs r2, 16
adds r1, r3, 0 adds r1, r3, 0
movs r3, 0xC movs r3, 0xC
bl AddObjectToFront bl CreateSprite
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -9402,7 +9402,7 @@ sub_812EF00: @ 812EF00
movs r2, 0x3 movs r2, 0x3
orrs r1, r2 orrs r1, r2
strb r1, [r0, 0x1] strb r1, [r0, 0x1]
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
adds r0, r4, 0 adds r0, r4, 0
pop {r4} pop {r4}
pop {r1} pop {r1}
@@ -9442,7 +9442,7 @@ sub_812EF6C: @ 812EF6C
lsrs r0, 27 lsrs r0, 27
bl rotscale_free_entry bl rotscale_free_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -9518,7 +9518,7 @@ sub_812EFDC: @ 812EFDC
asrs r2, 16 asrs r2, 16
mov r0, sp mov r0, sp
movs r3, 0x10 movs r3, 0x10
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r7, r0, 0 adds r7, r0, 0
@@ -10128,7 +10128,7 @@ sub_812F470: @ 812F470
adds r0, r1 adds r0, r1
ldr r4, [r0] ldr r4, [r0]
movs r0, 0x6 movs r0, 0x6
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 4 lsrs r1, 4
@@ -10161,7 +10161,7 @@ _0812F4C0:
adds r0, r1 adds r0, r1
ldr r4, [r0] ldr r4, [r0]
movs r0, 0x6 movs r0, 0x6
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 4 lsrs r1, 4
@@ -10540,7 +10540,7 @@ sub_812F794: @ 812F794
ldr r0, =gUnknown_085A8520 ldr r0, =gUnknown_085A8520
ldr r4, [r0] ldr r4, [r0]
movs r0, 0x6 movs r0, 0x6
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 4 lsrs r1, 4
asm/sprite.s
+114 -114
View File
@@ -11,7 +11,7 @@ ResetAllObjectData: @ 8006974
push {r4,lr} push {r4,lr}
movs r0, 0 movs r0, 0
movs r1, 0x80 movs r1, 0x80
bl ResetSpriteRange bl ResetOamRange
bl ResetAllSprites bl ResetAllSprites
bl ClearSpriteCopyRequests bl ClearSpriteCopyRequests
bl ResetAffineAnimData bl ResetAffineAnimData
@@ -62,7 +62,7 @@ _080069C6:
cmp r0, 0 cmp r0, 0
beq _080069F6 beq _080069F6
adds r0, r4, 0 adds r0, r4, 0
bl AnimateObject bl AnimateSprite
_080069F6: _080069F6:
adds r0, r6, 0x1 adds r0, r6, 0x1
lsls r0, 24 lsls r0, 24
@@ -210,7 +210,7 @@ BuildSpritePriorities: @ 8006B1C
push {r4,lr} push {r4,lr}
movs r2, 0 movs r2, 0
ldr r4, =gSprites ldr r4, =gSprites
ldr r3, =gUnknown_02021774 ldr r3, =gSpritePriorities
_08006B24: _08006B24:
lsls r0, r2, 4 lsls r0, r2, 4
adds r0, r2 adds r0, r2
@@ -249,7 +249,7 @@ SortSprites: @ 8006B5C
sub sp, 0x4 sub sp, 0x4
movs r0, 0x1 movs r0, 0x1
mov r12, r0 mov r12, r0
ldr r1, =gUnknown_020217F4 ldr r1, =gSpriteOrder
mov r10, r1 mov r10, r1
ldr r3, =0xffffff00 ldr r3, =0xffffff00
mov r9, r3 mov r9, r3
@@ -274,7 +274,7 @@ _08006B78:
lsls r0, 2 lsls r0, 2
adds r4, r0, r7 adds r4, r0, r7
lsls r2, 1 lsls r2, 1
ldr r0, =gUnknown_02021774 ldr r0, =gSpritePriorities
adds r2, r0 adds r2, r0
ldrh r2, [r2] ldrh r2, [r2]
str r2, [sp] str r2, [sp]
@@ -376,7 +376,7 @@ _08006C38:
lsls r0, 2 lsls r0, 2
adds r4, r0, r6 adds r4, r0, r6
lsls r2, 1 lsls r2, 1
ldr r0, =gUnknown_02021774 ldr r0, =gSpritePriorities
adds r2, r0 adds r2, r0
ldrh r2, [r2] ldrh r2, [r2]
str r2, [sp] str r2, [sp]
@@ -478,7 +478,7 @@ CopyMatricesToOamBuffer: @ 8006D1C
push {r4-r6,lr} push {r4-r6,lr}
movs r4, 0 movs r4, 0
ldr r5, =gMain ldr r5, =gMain
ldr r6, =gUnknown_02021BC0 ldr r6, =gOamMatrices
_08006D24: _08006D24:
lsls r2, r4, 2 lsls r2, r4, 2
lsls r1, r4, 5 lsls r1, r4, 5
@@ -522,7 +522,7 @@ AddSpritesToOamBuffer: @ 8006D68
mov r0, sp mov r0, sp
strb r4, [r0] strb r4, [r0]
_08006D72: _08006D72:
ldr r0, =gUnknown_020217F4 ldr r0, =gSpriteOrder
adds r0, r4, r0 adds r0, r4, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -582,9 +582,9 @@ _08006DD8:
.pool .pool
thumb_func_end AddSpritesToOamBuffer thumb_func_end AddSpritesToOamBuffer
thumb_func_start AddObjectToFront thumb_func_start CreateSprite
@ u8 AddObjectToFront(struct objtemplate *template, u16 x, u16 y, u8 subpriority) @ u8 CreateSprite(struct objtemplate *template, u16 x, u16 y, u8 subpriority)
AddObjectToFront: @ 8006DF4 CreateSprite: @ 8006DF4
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
adds r7, r0, 0 adds r7, r0, 0
@@ -610,7 +610,7 @@ _08006E08:
adds r1, r7, 0 adds r1, r7, 0
asrs r2, r5, 16 asrs r2, r5, 16
asrs r3, r6, 16 asrs r3, r6, 16
bl AddObject bl CreateSpriteAt
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
b _08006E40 b _08006E40
@@ -627,11 +627,11 @@ _08006E40:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end AddObjectToFront thumb_func_end CreateSprite
thumb_func_start AddObjectToBack thumb_func_start CreateSpriteAtEnd
@ u8 AddObjectToBack(struct objtemplate *template, u16 x, u16 y, u8 subpriority) @ u8 CreateSpriteAtEnd(struct objtemplate *template, u16 x, u16 y, u8 subpriority)
AddObjectToBack: @ 8006E48 CreateSpriteAtEnd: @ 8006E48
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -665,7 +665,7 @@ _08006E66:
adds r1, r7, 0 adds r1, r7, 0
asrs r2, r4, 16 asrs r2, r4, 16
asrs r3, r5, 16 asrs r3, r5, 16
bl AddObject bl CreateSpriteAt
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
b _08006EA6 b _08006EA6
@@ -685,18 +685,18 @@ _08006EA6:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end AddObjectToBack thumb_func_end CreateSpriteAtEnd
thumb_func_start obj_add_empty_with_callback thumb_func_start CreateInvisibleSprite
@ int obj_add_empty_with_callback(void ( *func)()) @ int CreateInvisibleSprite(void ( *func)())
obj_add_empty_with_callback: @ 8006EB4 CreateInvisibleSprite: @ 8006EB4
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
ldr r0, =gUnknown_082EC6AC ldr r0, =gUnknown_082EC6AC
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x1F movs r3, 0x1F
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0x40 cmp r5, 0x40
@@ -723,11 +723,11 @@ _08006EF6:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end obj_add_empty_with_callback thumb_func_end CreateInvisibleSprite
thumb_func_start AddObject thumb_func_start CreateSpriteAt
@ u8 AddObject(u8 index, struct objtemplate *template, u16 x, u16 y, u8 subpriority) @ u8 CreateSpriteAt(u8 index, struct objtemplate *template, u16 x, u16 y, u8 subpriority)
AddObject: @ 8006EFC CreateSpriteAt: @ 8006EFC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -752,7 +752,7 @@ AddObject: @ 8006EFC
ldr r1, =gSprites ldr r1, =gSprites
adds r7, r0, r1 adds r7, r0, r1
adds r0, r7, 0 adds r0, r7, 0
bl RemoveObject bl ResetSprite
adds r2, r7, 0 adds r2, r7, 0
adds r2, 0x3E adds r2, 0x3E
ldrb r0, [r2] ldrb r0, [r2]
@@ -797,7 +797,7 @@ AddObject: @ 8006EFC
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
adds r0, r7, 0 adds r0, r7, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
mov r0, r8 mov r0, r8
ldrh r1, [r0] ldrh r1, [r0]
ldr r4, =0xffff0000 ldr r4, =0xffff0000
@@ -819,7 +819,7 @@ AddObject: @ 8006EFC
cmp r0, r1 cmp r0, r1
bne _08006FC8 bne _08006FC8
adds r0, r7, 0 adds r0, r7, 0
bl RemoveObject bl ResetSprite
movs r0, 0x40 movs r0, 0x40
b _08007040 b _08007040
.pool .pool
@@ -848,12 +848,12 @@ _08006FC8:
_08006FF8: _08006FF8:
mov r1, r8 mov r1, r8
ldrh r0, [r1] ldrh r0, [r1]
bl GetObjectTileRangeStartByTag bl GetSpriteTileStartByTag
adds r1, r7, 0 adds r1, r7, 0
adds r1, 0x40 adds r1, 0x40
strh r0, [r1] strh r0, [r1]
adds r0, r7, 0 adds r0, r7, 0
bl sub_8008324 bl SetSpriteSheetFrameTileNum
_0800700C: _0800700C:
ldrb r0, [r7, 0x1] ldrb r0, [r7, 0x1]
lsls r0, 30 lsls r0, 30
@@ -863,7 +863,7 @@ _0800700C:
cmp r0, 0 cmp r0, 0
beq _08007020 beq _08007020
adds r0, r7, 0 adds r0, r7, 0
bl obj_alloc_rotscale_entry bl InitSpriteAffineAnim
_08007020: _08007020:
mov r0, r8 mov r0, r8
ldrh r1, [r0, 0x2] ldrh r1, [r0, 0x2]
@@ -872,7 +872,7 @@ _08007020:
beq _0800703E beq _0800703E
mov r1, r8 mov r1, r8
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 4 lsls r0, 4
ldrb r2, [r7, 0x5] ldrb r2, [r7, 0x5]
movs r1, 0xF movs r1, 0xF
@@ -890,11 +890,11 @@ _08007040:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end AddObject thumb_func_end CreateSpriteAt
thumb_func_start AddObjectAndAnimateForOneFrame thumb_func_start CreateSpriteAndAnimate
@ u8 AddObjectAndAnimateForOneFrame(struct objtemplate *template, u16 x, u16 y, u8 subpriority) @ u8 CreateSpriteAndAnimate(struct objtemplate *template, u16 x, u16 y, u8 subpriority)
AddObjectAndAnimateForOneFrame: @ 8007054 CreateSpriteAndAnimate: @ 8007054
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -930,7 +930,7 @@ _08007074:
asrs r2, r3, 16 asrs r2, r3, 16
mov r5, r8 mov r5, r8
asrs r3, r5, 16 asrs r3, r5, 16
bl AddObject bl CreateSpriteAt
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r5, r0, 0 adds r5, r0, 0
@@ -946,7 +946,7 @@ _08007074:
cmp r0, 0 cmp r0, 0
beq _080070C0 beq _080070C0
adds r0, r4, 0 adds r0, r4, 0
bl AnimateObject bl AnimateSprite
_080070C0: _080070C0:
adds r0, r5, 0 adds r0, r5, 0
b _080070D8 b _080070D8
@@ -968,11 +968,11 @@ _080070D8:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end AddObjectAndAnimateForOneFrame thumb_func_end CreateSpriteAndAnimate
thumb_func_start RemoveObjectAndFreeTiles thumb_func_start DestroySprite
@ void RemoveObjectAndFreeTiles(struct obj *object) @ void DestroySprite(struct obj *object)
RemoveObjectAndFreeTiles: @ 80070E8 DestroySprite: @ 80070E8
push {r4-r7,lr} push {r4-r7,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r0, 0x3E adds r0, 0x3E
@@ -998,7 +998,7 @@ RemoveObjectAndFreeTiles: @ 80070E8
adds r3, r1, 0 adds r3, r1, 0
cmp r3, r4 cmp r3, r4
bcs _0800713E bcs _0800713E
ldr r0, =gUnknown_02021B3C ldr r0, =gSpriteTileAllocBitmap
mov r12, r0 mov r12, r0
movs r6, 0x7 movs r6, 0x7
movs r7, 0x1 movs r7, 0x1
@@ -1019,17 +1019,17 @@ _08007122:
bcc _08007122 bcc _08007122
_0800713E: _0800713E:
adds r0, r5, 0 adds r0, r5, 0
bl RemoveObject bl ResetSprite
_08007144: _08007144:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end RemoveObjectAndFreeTiles thumb_func_end DestroySprite
thumb_func_start ResetSpriteRange thumb_func_start ResetOamRange
@ void ResetSpriteRange(u8 startIndex, u8 endIndex) @ void ResetOamRange(u8 startIndex, u8 endIndex)
ResetSpriteRange: @ 8007150 ResetOamRange: @ 8007150
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsls r1, 24 lsls r1, 24
@@ -1056,7 +1056,7 @@ _08007178:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end ResetSpriteRange thumb_func_end ResetOamRange
thumb_func_start LoadOamFromSprites thumb_func_start LoadOamFromSprites
@ void LoadOamFromSprites() @ void LoadOamFromSprites()
@@ -1115,12 +1115,12 @@ _080071CC:
.pool .pool
thumb_func_end ClearSpriteCopyRequests thumb_func_end ClearSpriteCopyRequests
thumb_func_start ResetSpriteTransformationMatrices thumb_func_start ResetOamMatrices
@ void ResetSpriteTransformationMatrices() @ void ResetOamMatrices()
ResetSpriteTransformationMatrices: @ 80071F8 ResetOamMatrices: @ 80071F8
push {r4,lr} push {r4,lr}
movs r1, 0 movs r1, 0
ldr r4, =gUnknown_02021BC0 ldr r4, =gOamMatrices
movs r3, 0 movs r3, 0
movs r2, 0x80 movs r2, 0x80
lsls r2, 1 lsls r2, 1
@@ -1140,7 +1140,7 @@ _08007204:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end ResetSpriteTransformationMatrices thumb_func_end ResetOamMatrices
thumb_func_start SetSpriteTransformationMatrix thumb_func_start SetSpriteTransformationMatrix
@ void SetSpriteTransformationMatrix(u8 index, u16 a, u16 b, u16 c, u16 d) @ void SetSpriteTransformationMatrix(u8 index, u16 a, u16 b, u16 c, u16 d)
@@ -1148,7 +1148,7 @@ SetSpriteTransformationMatrix: @ 8007224
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, [sp, 0xC] ldr r5, [sp, 0xC]
lsls r0, 24 lsls r0, 24
ldr r4, =gUnknown_02021BC0 ldr r4, =gOamMatrices
lsrs r0, 21 lsrs r0, 21
adds r0, r4 adds r0, r4
strh r1, [r0] strh r1, [r0]
@@ -1161,9 +1161,9 @@ SetSpriteTransformationMatrix: @ 8007224
.pool .pool
thumb_func_end SetSpriteTransformationMatrix thumb_func_end SetSpriteTransformationMatrix
thumb_func_start RemoveObject thumb_func_start ResetSprite
@ void RemoveObject(struct obj *object) @ void ResetSprite(struct obj *object)
RemoveObject: @ 8007244 ResetSprite: @ 8007244
push {lr} push {lr}
ldr r1, =gUnknown_082EC64C ldr r1, =gUnknown_082EC64C
movs r2, 0x44 movs r2, 0x44
@@ -1171,11 +1171,11 @@ RemoveObject: @ 8007244
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end RemoveObject thumb_func_end ResetSprite
thumb_func_start CalcVecFromObjectCenterToObjectUpperLeft thumb_func_start CalcCenterToCornerVec
@ void CalcVecFromObjectCenterToObjectUpperLeft(struct obj *object, u8 shape, u8 size, u8 affineMode) @ void CalcCenterToCornerVec(struct obj *object, u8 shape, u8 size, u8 affineMode)
CalcVecFromObjectCenterToObjectUpperLeft: @ 8007258 CalcCenterToCornerVec: @ 8007258
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
lsls r1, 24 lsls r1, 24
@@ -1209,7 +1209,7 @@ _08007286:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end CalcVecFromObjectCenterToObjectUpperLeft thumb_func_end CalcCenterToCornerVec
thumb_func_start AllocSpriteTiles thumb_func_start AllocSpriteTiles
@ s16 AllocSpriteTiles(u16 numTiles) @ s16 AllocSpriteTiles(u16 numTiles)
@@ -1227,7 +1227,7 @@ AllocSpriteTiles: @ 800729C
ldr r0, =0x000003ff ldr r0, =0x000003ff
cmp r3, r0 cmp r3, r0
bhi _080072DA bhi _080072DA
ldr r7, =gUnknown_02021B3C ldr r7, =gSpriteTileAllocBitmap
movs r6, 0x7 movs r6, 0x7
adds r4, r0, 0 adds r4, r0, 0
movs r5, 0x1 movs r5, 0x1
@@ -1257,7 +1257,7 @@ _080072EC:
_080072F2: _080072F2:
ldr r0, =gReservedSpriteTileCount ldr r0, =gReservedSpriteTileCount
ldrh r3, [r0] ldrh r3, [r0]
ldr r0, =gUnknown_02021B3C ldr r0, =gSpriteTileAllocBitmap
mov r9, r0 mov r9, r0
movs r7, 0x7 movs r7, 0x7
movs r6, 0x1 movs r6, 0x1
@@ -1273,7 +1273,7 @@ _080072FE:
beq _08007332 beq _08007332
movs r5, 0x80 movs r5, 0x80
lsls r5, 3 lsls r5, 3
ldr r2, =gUnknown_02021B3C ldr r2, =gSpriteTileAllocBitmap
_08007316: _08007316:
adds r0, r3, 0x1 adds r0, r3, 0x1
lsls r0, 16 lsls r0, 16
@@ -1297,7 +1297,7 @@ _08007332:
movs r1, 0x80 movs r1, 0x80
lsls r1, 3 lsls r1, 3
mov r12, r1 mov r12, r1
ldr r5, =gUnknown_02021B3C ldr r5, =gSpriteTileAllocBitmap
_08007342: _08007342:
adds r0, r3, 0x1 adds r0, r3, 0x1
lsls r0, 16 lsls r0, 16
@@ -1330,7 +1330,7 @@ _0800736C:
adds r6, r0, 0 adds r6, r0, 0
cmp r3, r1 cmp r3, r1
bge _080073A2 bge _080073A2
ldr r0, =gUnknown_02021B3C ldr r0, =gSpriteTileAllocBitmap
mov r8, r0 mov r8, r0
movs r7, 0x7 movs r7, 0x7
adds r4, r1, 0 adds r4, r1, 0
@@ -1385,7 +1385,7 @@ Unused_ObjectTileAllocationBitArrayOp: @ 80073B8
mvns r0, r0 mvns r0, r0
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
ldr r0, =gUnknown_02021B3C ldr r0, =gSpriteTileAllocBitmap
adds r0, r3, r0 adds r0, r3, r0
ldrb r1, [r0] ldrb r1, [r0]
ands r2, r1 ands r2, r1
@@ -1398,7 +1398,7 @@ _080073F0:
lsls r1, r2 lsls r1, r2
lsls r0, r1, 24 lsls r0, r1, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
ldr r0, =gUnknown_02021B3C ldr r0, =gSpriteTileAllocBitmap
adds r0, r3, r0 adds r0, r3, r0
ldrb r1, [r0] ldrb r1, [r0]
orrs r2, r1 orrs r2, r1
@@ -1410,7 +1410,7 @@ _0800740C:
lsls r0, 17 lsls r0, 17
lsls r0, r4 lsls r0, r4
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r0, =gUnknown_02021B3C ldr r0, =gSpriteTileAllocBitmap
adds r0, r6, r0 adds r0, r6, r0
ldrb r0, [r0] ldrb r0, [r0]
ands r5, r0 ands r5, r0
@@ -1622,8 +1622,8 @@ _08007590:
lsls r0, 2 lsls r0, 2
ldr r5, =gSprites ldr r5, =gSprites
adds r0, r5 adds r0, r5
bl RemoveObject bl ResetSprite
ldr r0, =gUnknown_020217F4 ldr r0, =gSpriteOrder
adds r0, r4, r0 adds r0, r4, r0
strb r4, [r0] strb r4, [r0]
adds r0, r4, 0x1 adds r0, r4, 0x1
@@ -1635,7 +1635,7 @@ _08007590:
adds r0, r4 adds r0, r4
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObject bl ResetSprite
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1697,9 +1697,9 @@ _0800761A:
bx r0 bx r0
thumb_func_end obj_free_rotscale_entry thumb_func_end obj_free_rotscale_entry
thumb_func_start RemoveObjectAndFreeResources thumb_func_start ResetSpriteAndFreeResources
@ void RemoveObjectAndFreeResources(struct obj *object) @ void ResetSpriteAndFreeResources(struct obj *object)
RemoveObjectAndFreeResources: @ 8007620 ResetSpriteAndFreeResources: @ 8007620
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl FreeObjectTiles bl FreeObjectTiles
@@ -1708,15 +1708,15 @@ RemoveObjectAndFreeResources: @ 8007620
adds r0, r4, 0 adds r0, r4, 0
bl obj_free_rotscale_entry bl obj_free_rotscale_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end RemoveObjectAndFreeResources thumb_func_end ResetSpriteAndFreeResources
thumb_func_start AnimateObject thumb_func_start AnimateSprite
@ void AnimateObject(struct obj *object) @ void AnimateSprite(struct obj *object)
AnimateObject: @ 8007640 AnimateSprite: @ 8007640
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r2, =gUnknown_082EC6C4 ldr r2, =gUnknown_082EC6C4
@@ -1747,7 +1747,7 @@ _08007676:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end AnimateObject thumb_func_end AnimateSprite
thumb_func_start BeginObjectImageAnim thumb_func_start BeginObjectImageAnim
@ void BeginObjectImageAnim(struct obj *object) @ void BeginObjectImageAnim(struct obj *object)
@@ -2738,7 +2738,7 @@ RotScalAnimCmd_frame: @ 8007DA0
@ void rotscale_set_indirect(u8 rotscale_entry_index, s16 rotscale_data[]) @ void rotscale_set_indirect(u8 rotscale_entry_index, s16 rotscale_data[])
rotscale_set_indirect: @ 8007DD8 rotscale_set_indirect: @ 8007DD8
lsls r0, 24 lsls r0, 24
ldr r2, =gUnknown_02021BC0 ldr r2, =gOamMatrices
lsrs r0, 21 lsrs r0, 21
adds r0, r2 adds r0, r2
ldrh r2, [r1] ldrh r2, [r1]
@@ -2844,7 +2844,7 @@ obj_update_pos2: @ 8007E54
ldr r0, [r1] ldr r0, [r1]
lsls r4, r0, 8 lsls r4, r0, 8
lsls r0, 16 lsls r0, 16
ldr r2, =gUnknown_02021BC0 ldr r2, =gOamMatrices
lsls r1, r7, 3 lsls r1, r7, 3
adds r1, r2 adds r1, r2
movs r2, 0 movs r2, 0
@@ -2871,7 +2871,7 @@ _08007EA2:
ldr r0, [r1] ldr r0, [r1]
lsls r4, r0, 8 lsls r4, r0, 8
lsls r0, 16 lsls r0, 16
ldr r2, =gUnknown_02021BC0 ldr r2, =gOamMatrices
lsls r1, r7, 3 lsls r1, r7, 3
adds r1, r2 adds r1, r2
movs r2, 0x6 movs r2, 0x6
@@ -3481,8 +3481,8 @@ _08008318:
.pool .pool
thumb_func_end sub_80082F0 thumb_func_end sub_80082F0
thumb_func_start sub_8008324 thumb_func_start SetSpriteSheetFrameTileNum
sub_8008324: @ 8008324 SetSpriteSheetFrameTileNum: @ 8008324
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
adds r0, 0x3F adds r0, 0x3F
@@ -3526,7 +3526,7 @@ _08008370:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8008324 thumb_func_end SetSpriteSheetFrameTileNum
thumb_func_start ResetAffineAnimData thumb_func_start ResetAffineAnimData
@ void ResetAffineAnimData() @ void ResetAffineAnimData()
@@ -3538,7 +3538,7 @@ ResetAffineAnimData: @ 800837C
ldr r1, =gUnknown_03003018 ldr r1, =gUnknown_03003018
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
bl ResetSpriteTransformationMatrices bl ResetOamMatrices
movs r4, 0 movs r4, 0
_08008390: _08008390:
adds r0, r4, 0 adds r0, r4, 0
@@ -3624,9 +3624,9 @@ _08008406:
.pool .pool
thumb_func_end rotscale_free_entry thumb_func_end rotscale_free_entry
thumb_func_start obj_alloc_rotscale_entry thumb_func_start InitSpriteAffineAnim
@ void obj_alloc_rotscale_entry(struct obj *obj) @ void InitSpriteAffineAnim(struct obj *obj)
obj_alloc_rotscale_entry: @ 8008428 InitSpriteAffineAnim: @ 8008428
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
bl rotscale_alloc_entry bl rotscale_alloc_entry
@@ -3641,7 +3641,7 @@ obj_alloc_rotscale_entry: @ 8008428
lsls r3, 30 lsls r3, 30
lsrs r3, 30 lsrs r3, 30
adds r0, r4, 0 adds r0, r4, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
movs r0, 0x1F movs r0, 0x1F
adds r1, r5, 0 adds r1, r5, 0
ands r1, r0 ands r1, r0
@@ -3664,7 +3664,7 @@ _08008470:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end obj_alloc_rotscale_entry thumb_func_end InitSpriteAffineAnim
thumb_func_start sub_8008478 thumb_func_start sub_8008478
sub_8008478: @ 8008478 sub_8008478: @ 8008478
@@ -3744,7 +3744,7 @@ LoadObjectPic: @ 80084F8
ldrh r2, [r5, 0x4] ldrh r2, [r5, 0x4]
lsrs r2, 5 lsrs r2, 5
adds r1, r4, 0 adds r1, r4, 0
bl AddObjectTileRange bl CreateSpriteAtTileRange
ldr r0, [r5] ldr r0, [r5]
lsls r1, r6, 5 lsls r1, r6, 5
ldr r2, =0x06010000 ldr r2, =0x06010000
@@ -3816,7 +3816,7 @@ FreeObjectTilesByTag: @ 8008568
lsls r5, r4, 1 lsls r5, r4, 1
cmp r3, r0 cmp r3, r0
bge _080085BE bge _080085BE
ldr r1, =gUnknown_02021B3C ldr r1, =gSpriteTileAllocBitmap
mov r12, r1 mov r12, r1
movs r6, 0x7 movs r6, 0x7
movs r7, 0x1 movs r7, 0x1
@@ -3883,9 +3883,9 @@ _080085F0:
.pool .pool
thumb_func_end FreeSpriteTileRanges thumb_func_end FreeSpriteTileRanges
thumb_func_start GetObjectTileRangeStartByTag thumb_func_start GetSpriteTileStartByTag
@ u16 GetObjectTileRangeStartByTag(u16 tag) @ u16 GetSpriteTileStartByTag(u16 tag)
GetObjectTileRangeStartByTag: @ 8008620 GetSpriteTileStartByTag: @ 8008620
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -3906,7 +3906,7 @@ _08008642:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end GetObjectTileRangeStartByTag thumb_func_end GetSpriteTileStartByTag
thumb_func_start IndexOfObjectTilesTag thumb_func_start IndexOfObjectTilesTag
@ u8 IndexOfObjectTilesTag(u16 tag) @ u8 IndexOfObjectTilesTag(u16 tag)
@@ -3975,9 +3975,9 @@ _080086B8:
.pool .pool
thumb_func_end GetTagByObjectTileRangeStart thumb_func_end GetTagByObjectTileRangeStart
thumb_func_start AddObjectTileRange thumb_func_start CreateSpriteAtTileRange
@ void AddObjectTileRange(u16 tag, u16 start, u16 count) @ void CreateSpriteAtTileRange(u16 tag, u16 start, u16 count)
AddObjectTileRange: @ 80086C4 CreateSpriteAtTileRange: @ 80086C4
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -4007,7 +4007,7 @@ AddObjectTileRange: @ 80086C4
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end AddObjectTileRange thumb_func_end CreateSpriteAtTileRange
thumb_func_start ResetObjectPaletteAllocator thumb_func_start ResetObjectPaletteAllocator
@ void ResetObjectPaletteAllocator() @ void ResetObjectPaletteAllocator()
@@ -4043,7 +4043,7 @@ LoadTaggedObjectPalette: @ 8008744
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
ldrh r0, [r5, 0x4] ldrh r0, [r5, 0x4]
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0xFF cmp r4, 0xFF
@@ -4052,7 +4052,7 @@ LoadTaggedObjectPalette: @ 8008744
b _0800878A b _0800878A
_0800875A: _0800875A:
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0xFF cmp r4, 0xFF
@@ -4127,7 +4127,7 @@ AllocObjectPalette: @ 80087D4
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
ldr r0, =0x0000ffff ldr r0, =0x0000ffff
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0xFF cmp r2, 0xFF
@@ -4147,9 +4147,9 @@ _080087FE:
bx r1 bx r1
thumb_func_end AllocObjectPalette thumb_func_end AllocObjectPalette
thumb_func_start IndexOfObjectPaletteTag thumb_func_start IndexOfSpritePaletteTag
@ u8 IndexOfObjectPaletteTag(u16 tag) @ u8 IndexOfSpritePaletteTag(u16 tag)
IndexOfObjectPaletteTag: @ 8008804 IndexOfSpritePaletteTag: @ 8008804
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 16 lsrs r2, r0, 16
@@ -4178,7 +4178,7 @@ _08008836:
_08008838: _08008838:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end IndexOfObjectPaletteTag thumb_func_end IndexOfSpritePaletteTag
thumb_func_start GetObjectPaletteTagBySlot thumb_func_start GetObjectPaletteTagBySlot
@ u16 GetObjectPaletteTagBySlot(u8 paletteSlot) @ u16 GetObjectPaletteTagBySlot(u8 paletteSlot)
@@ -4198,7 +4198,7 @@ FreeObjectPaletteByTag: @ 800884C
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl IndexOfObjectPaletteTag bl IndexOfSpritePaletteTag
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0xFF cmp r1, 0xFF
asm/starter_choose.s
+6 -6
View File
@@ -229,7 +229,7 @@ set_256color_bg_bg0: @ 8133F0C
movs r1, 0x78 movs r1, 0x78
movs r2, 0x38 movs r2, 0x38
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r3, =gSprites ldr r3, =gSprites
@@ -245,7 +245,7 @@ set_256color_bg_bg0: @ 8133F0C
ldrb r2, [r5, 0x1] ldrb r2, [r5, 0x1]
adds r0, r6, 0 adds r0, r6, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -259,7 +259,7 @@ set_256color_bg_bg0: @ 8133F0C
ldrb r2, [r5, 0x3] ldrb r2, [r5, 0x3]
adds r0, r6, 0 adds r0, r6, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -273,7 +273,7 @@ set_256color_bg_bg0: @ 8133F0C
ldrb r2, [r5, 0x5] ldrb r2, [r5, 0x5]
adds r0, r6, 0 adds r0, r6, 0
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -380,7 +380,7 @@ sub_813425C: @ 813425C
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0xC] strh r0, [r6, 0xC]
@@ -599,7 +599,7 @@ _08134450:
lsrs r0, 27 lsrs r0, 27
bl rotscale_free_entry bl rotscale_free_entry
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, =sub_81344AC ldr r0, =sub_81344AC
str r0, [r5] str r0, [r5]
_0813449A: _0813449A:
asm/title_screen.s
+10 -10
View File
@@ -147,7 +147,7 @@ _080AA4FA:
adds r1, r5, 0 adds r1, r5, 0
asrs r2, r7, 16 asrs r2, r7, 16
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r4, r0, 4 lsls r4, r0, 4
@@ -190,7 +190,7 @@ _080AA556:
adds r1, r4, 0 adds r1, r4, 0
asrs r2, r6, 16 asrs r2, r6, 16
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -301,7 +301,7 @@ _080AA63C:
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
adds r0, r3, 0 adds r0, r3, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080AA648: _080AA648:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -327,7 +327,7 @@ title_screen_logo_shine_obj_callback_type2: @ 80AA654
.pool .pool
_080AA670: _080AA670:
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080AA676: _080AA676:
pop {r0} pop {r0}
bx r0 bx r0
@@ -358,7 +358,7 @@ _080AA69C:
movs r1, 0 movs r1, 0
movs r2, 0x44 movs r2, 0x44
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -382,7 +382,7 @@ _080AA6D0:
movs r1, 0 movs r1, 0
movs r2, 0x44 movs r2, 0x44
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
ldr r6, =gSprites ldr r6, =gSprites
@@ -410,7 +410,7 @@ _080AA6D0:
movs r1, 0 movs r1, 0
movs r2, 0x44 movs r2, 0x44
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
lsls r1, r2, 4 lsls r1, r2, 4
@@ -434,7 +434,7 @@ _080AA6D0:
mov r0, r9 mov r0, r9
movs r2, 0x44 movs r2, 0x44
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
lsls r0, r2, 4 lsls r0, r2, 4
@@ -887,7 +887,7 @@ _080AABC0:
movs r1, 0x62 movs r1, 0x62
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r4, =gSprites ldr r4, =gSprites
@@ -902,7 +902,7 @@ _080AABC0:
movs r1, 0xA2 movs r1, 0xA2
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
asm/trade.s
+61 -61
View File
@@ -837,7 +837,7 @@ _080778DE:
add r0, sp, 0x10 add r0, sp, 0x10
movs r2, 0xA movs r2, 0xA
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r4, 0x20 adds r4, 0x20
adds r6, 0x1 adds r6, 0x1
cmp r6, 0x2 cmp r6, 0x2
@@ -875,7 +875,7 @@ _0807792C:
add r0, sp, 0x10 add r0, sp, 0x10
movs r2, 0xA movs r2, 0xA
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r4, 0x20 adds r4, 0x20
adds r6, 0x1 adds r6, 0x1
cmp r6, 0x2 cmp r6, 0x2
@@ -903,7 +903,7 @@ _08077970:
movs r1, 0xD7 movs r1, 0xD7
movs r2, 0x98 movs r2, 0x98
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
add r0, sp, 0x10 add r0, sp, 0x10
ldm r4!, {r3,r5,r7} ldm r4!, {r3,r5,r7}
stm r0!, {r3,r5,r7} stm r0!, {r3,r5,r7}
@@ -918,7 +918,7 @@ _08077970:
movs r1, 0xF7 movs r1, 0xF7
movs r2, 0x98 movs r2, 0x98
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
movs r6, 0 movs r6, 0
add r4, sp, 0x10 add r4, sp, 0x10
movs r5, 0xC0 movs r5, 0xC0
@@ -939,7 +939,7 @@ _080779BC:
add r0, sp, 0x10 add r0, sp, 0x10
movs r2, 0x96 movs r2, 0x96
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
movs r0, 0x80 movs r0, 0x80
lsls r0, 14 lsls r0, 14
adds r5, r0 adds r5, r0
@@ -957,7 +957,7 @@ _080779BC:
ldrb r2, [r2, 0x1] ldrb r2, [r2, 0x1]
lsls r2, 3 lsls r2, 3
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
ldr r2, =gUnknown_0203229C ldr r2, =gUnknown_0203229C
ldr r1, [r2] ldr r1, [r2]
adds r1, 0x34 adds r1, 0x34
@@ -1461,7 +1461,7 @@ _08077EB4:
add r0, sp, 0xC add r0, sp, 0xC
movs r2, 0xA movs r2, 0xA
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r4, 0x20 adds r4, 0x20
adds r6, 0x1 adds r6, 0x1
cmp r6, 0x2 cmp r6, 0x2
@@ -1499,7 +1499,7 @@ _08077F02:
add r0, sp, 0xC add r0, sp, 0xC
movs r2, 0xA movs r2, 0xA
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
adds r4, 0x20 adds r4, 0x20
adds r6, 0x1 adds r6, 0x1
cmp r6, 0x2 cmp r6, 0x2
@@ -1527,7 +1527,7 @@ _08077F48:
movs r1, 0xD7 movs r1, 0xD7
movs r2, 0x98 movs r2, 0x98
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
add r0, sp, 0xC add r0, sp, 0xC
ldm r4!, {r3,r5,r7} ldm r4!, {r3,r5,r7}
stm r0!, {r3,r5,r7} stm r0!, {r3,r5,r7}
@@ -1542,7 +1542,7 @@ _08077F48:
movs r1, 0xF7 movs r1, 0xF7
movs r2, 0x98 movs r2, 0x98
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
movs r6, 0 movs r6, 0
add r4, sp, 0xC add r4, sp, 0xC
movs r5, 0xC0 movs r5, 0xC0
@@ -1563,7 +1563,7 @@ _08077F94:
add r0, sp, 0xC add r0, sp, 0xC
movs r2, 0x96 movs r2, 0x96
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
movs r0, 0x80 movs r0, 0x80
lsls r0, 14 lsls r0, 14
adds r5, r0 adds r5, r0
@@ -1606,7 +1606,7 @@ _08077FEA:
ldrb r2, [r2] ldrb r2, [r2]
lsls r2, 3 lsls r2, 3
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x34 adds r1, 0x34
strb r0, [r1] strb r0, [r1]
@@ -6791,7 +6791,7 @@ sub_807AABC: @ 807AABC
cmp r1, 0xA cmp r1, 0xA
bne _0807AADA bne _0807AADA
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0807AADA: _0807AADA:
pop {r0} pop {r0}
bx r0 bx r0
@@ -6812,7 +6812,7 @@ sub_807AAE0: @ 807AAE0
cmp r1, 0xA cmp r1, 0xA
bne _0807AAFE bne _0807AAFE
adds r0, r2, 0 adds r0, r2, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_0807AAFE: _0807AAFE:
pop {r0} pop {r0}
bx r0 bx r0
@@ -7178,7 +7178,7 @@ _0807ADE0:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x3C movs r2, 0x3C
movs r3, 0x6 movs r3, 0x6
bl AddObjectToFront bl CreateSprite
ldr r4, =gUnknown_020322A0 ldr r4, =gUnknown_020322A0
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x8E adds r1, 0x8E
@@ -9100,7 +9100,7 @@ _0807C1FC:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x20 movs r2, 0x20
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0xD3 adds r1, 0xD3
strb r0, [r1] strb r0, [r1]
@@ -9120,7 +9120,7 @@ _0807C1FC:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, [r7] ldr r1, [r7]
bl _0807CF4C bl _0807CF4C
.pool .pool
@@ -9230,7 +9230,7 @@ _0807C328:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x91 adds r1, 0x91
strb r0, [r1] strb r0, [r1]
@@ -9255,7 +9255,7 @@ _0807C348:
bl _0807CFB4 bl _0807CFB4
_0807C368: _0807C368:
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r1, 0xC8 movs r1, 0xC8
lsls r1, 3 lsls r1, 3
movs r0, 0x50 movs r0, 0x50
@@ -9298,7 +9298,7 @@ _0807C3C4:
movs r1, 0x80 movs r1, 0x80
movs r2, 0x41 movs r2, 0x41
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x92 adds r1, 0x92
strb r0, [r1] strb r0, [r1]
@@ -9309,7 +9309,7 @@ _0807C3E0:
movs r1, 0x80 movs r1, 0x80
movs r2, 0x50 movs r2, 0x50
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
ldr r4, =gUnknown_020322A0 ldr r4, =gUnknown_020322A0
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x90 adds r1, 0x90
@@ -9318,7 +9318,7 @@ _0807C3E0:
movs r1, 0x80 movs r1, 0x80
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x91 adds r1, 0x91
strb r0, [r1] strb r0, [r1]
@@ -9430,7 +9430,7 @@ _0807C4EC:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x91 adds r0, 0x91
ldrb r1, [r0] ldrb r1, [r0]
@@ -9438,7 +9438,7 @@ _0807C4EC:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x2 movs r0, 0x2
bl sub_807B62C bl sub_807B62C
ldr r1, [r7] ldr r1, [r7]
@@ -9458,7 +9458,7 @@ _0807C528:
movs r1, 0x6F movs r1, 0x6F
movs r2, 0xAA movs r2, 0xAA
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gUnknown_020322A0 ldr r4, =gUnknown_020322A0
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x90 adds r1, 0x90
@@ -9468,7 +9468,7 @@ _0807C528:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x81 movs r1, 0x81
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x91 adds r1, 0x91
strb r0, [r1] strb r0, [r1]
@@ -9623,7 +9623,7 @@ _0807C66C:
movs r1, 0 movs r1, 0
movs r2, 0x3 movs r2, 0x3
movs r3, 0x3 movs r3, 0x3
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x8E adds r0, 0x8E
ldrb r1, [r0] ldrb r1, [r0]
@@ -9872,7 +9872,7 @@ _0807C8A6:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x91 adds r0, 0x91
ldrb r1, [r0] ldrb r1, [r0]
@@ -9880,7 +9880,7 @@ _0807C8A6:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
b _0807CFB4 b _0807CFB4
.pool .pool
_0807C8EC: _0807C8EC:
@@ -9909,7 +9909,7 @@ _0807C8FA:
movs r1, 0x80 movs r1, 0x80
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x90 adds r1, 0x90
strb r0, [r1] strb r0, [r1]
@@ -9917,7 +9917,7 @@ _0807C8FA:
movs r1, 0x80 movs r1, 0x80
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x91 adds r1, 0x91
strb r0, [r1] strb r0, [r1]
@@ -10023,7 +10023,7 @@ _0807CA02:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x91 adds r0, 0x91
ldrb r1, [r0] ldrb r1, [r0]
@@ -10031,7 +10031,7 @@ _0807CA02:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r3, [r7] ldr r3, [r7]
adds r2, r3, 0 adds r2, r3, 0
adds r2, 0x94 adds r2, 0x94
@@ -10093,7 +10093,7 @@ _0807CA92:
movs r1, 0x80 movs r1, 0x80
movs r2, 0x41 movs r2, 0x41
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x92 adds r1, 0x92
strb r0, [r1] strb r0, [r1]
@@ -10115,7 +10115,7 @@ _0807CAC8:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r2, =gUnknown_020322A0 ldr r2, =gUnknown_020322A0
ldr r1, [r2] ldr r1, [r2]
adds r1, 0x91 adds r1, 0x91
@@ -10144,7 +10144,7 @@ _0807CAF0:
b _0807CFB4 b _0807CFB4
_0807CB0E: _0807CB0E:
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x6 movs r0, 0x6
bl sub_807B62C bl sub_807B62C
ldr r1, [r7] ldr r1, [r7]
@@ -10258,7 +10258,7 @@ _0807CBF4:
negs r2, r2 negs r2, r2
movs r1, 0x78 movs r1, 0x78
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r5, =gUnknown_020322A0 ldr r5, =gUnknown_020322A0
ldr r1, [r5] ldr r1, [r5]
adds r1, 0xD3 adds r1, 0xD3
@@ -10461,7 +10461,7 @@ _0807CD1C:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, [r7] ldr r1, [r7]
b _0807CF4C b _0807CF4C
.pool .pool
@@ -11162,7 +11162,7 @@ _0807D5D8:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x20 movs r2, 0x20
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0xD3 adds r1, 0xD3
strb r0, [r1] strb r0, [r1]
@@ -11182,7 +11182,7 @@ _0807D5D8:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r5 adds r0, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, [r7] ldr r1, [r7]
bl _0807E398 bl _0807E398
.pool .pool
@@ -11292,7 +11292,7 @@ _0807D704:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x91 adds r1, 0x91
strb r0, [r1] strb r0, [r1]
@@ -11317,7 +11317,7 @@ _0807D728:
bl _0807E400 bl _0807E400
_0807D748: _0807D748:
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, =0x00000452 ldr r1, =0x00000452
movs r0, 0x50 movs r0, 0x50
bl SetGpuReg bl SetGpuReg
@@ -11367,7 +11367,7 @@ _0807D7C4:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
ldr r4, =gUnknown_020322A0 ldr r4, =gUnknown_020322A0
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x90 adds r1, 0x90
@@ -11388,7 +11388,7 @@ _0807D7C4:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x91 adds r1, 0x91
strb r0, [r1] strb r0, [r1]
@@ -11499,7 +11499,7 @@ _0807D8E8:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x91 adds r0, 0x91
ldrb r1, [r0] ldrb r1, [r0]
@@ -11507,7 +11507,7 @@ _0807D8E8:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x2 movs r0, 0x2
bl sub_807B62C bl sub_807B62C
ldr r1, [r7] ldr r1, [r7]
@@ -11527,7 +11527,7 @@ _0807D924:
movs r1, 0x6F movs r1, 0x6F
movs r2, 0xAA movs r2, 0xAA
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r4, =gUnknown_020322A0 ldr r4, =gUnknown_020322A0
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x90 adds r1, 0x90
@@ -11537,7 +11537,7 @@ _0807D924:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x81 movs r1, 0x81
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x91 adds r1, 0x91
strb r0, [r1] strb r0, [r1]
@@ -11697,7 +11697,7 @@ _0807DA74:
movs r1, 0 movs r1, 0
movs r2, 0x3 movs r2, 0x3
movs r3, 0x3 movs r3, 0x3
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x8E adds r0, 0x8E
ldrb r1, [r0] ldrb r1, [r0]
@@ -11946,7 +11946,7 @@ _0807DCAE:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x91 adds r0, 0x91
ldrb r1, [r0] ldrb r1, [r0]
@@ -11954,7 +11954,7 @@ _0807DCAE:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
b _0807E400 b _0807E400
.pool .pool
_0807DCF4: _0807DCF4:
@@ -11990,7 +11990,7 @@ _0807DD02:
movs r1, 0x78 movs r1, 0x78
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0x3 movs r3, 0x3
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x90 adds r1, 0x90
strb r0, [r1] strb r0, [r1]
@@ -12010,7 +12010,7 @@ _0807DD02:
movs r1, 0x78 movs r1, 0x78
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x91 adds r1, 0x91
strb r0, [r1] strb r0, [r1]
@@ -12151,7 +12151,7 @@ _0807DE84:
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x91 adds r0, 0x91
ldrb r1, [r0] ldrb r1, [r0]
@@ -12159,7 +12159,7 @@ _0807DE84:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r3, [r7] ldr r3, [r7]
adds r2, r3, 0 adds r2, r3, 0
adds r2, 0x94 adds r2, 0x94
@@ -12220,7 +12220,7 @@ _0807DF16:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r2, =gUnknown_020322A0 ldr r2, =gUnknown_020322A0
ldr r1, [r2] ldr r1, [r2]
adds r1, 0x91 adds r1, 0x91
@@ -12249,7 +12249,7 @@ _0807DF3C:
b _0807E400 b _0807E400
_0807DF5A: _0807DF5A:
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x6 movs r0, 0x6
bl sub_807B62C bl sub_807B62C
ldr r1, [r7] ldr r1, [r7]
@@ -12363,7 +12363,7 @@ _0807E040:
negs r2, r2 negs r2, r2
movs r1, 0x78 movs r1, 0x78
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
ldr r5, =gUnknown_020322A0 ldr r5, =gUnknown_020322A0
ldr r1, [r5] ldr r1, [r5]
adds r1, 0xD3 adds r1, 0xD3
@@ -12566,7 +12566,7 @@ _0807E168:
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r1, [r7] ldr r1, [r7]
b _0807E398 b _0807E398
.pool .pool
@@ -13088,7 +13088,7 @@ _0807E660:
cmp r0, 0x17 cmp r0, 0x17
bne _0807E69E bne _0807E69E
adds r0, r4, 0 adds r0, r4, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, =gUnknown_020322A0 ldr r0, =gUnknown_020322A0
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x94 adds r0, 0x94
@@ -13519,7 +13519,7 @@ sub_807EA2C: @ 807EA2C
lsls r0, 2 lsls r0, 2
ldr r4, =gSprites ldr r4, =gSprites
adds r0, r4 adds r0, r4
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x8F adds r0, 0x8F
ldrb r1, [r0] ldrb r1, [r0]
asm/trainer_card.s
+10 -10
View File
@@ -6964,7 +6964,7 @@ sub_80C62DC: @ 80C62DC
movs r6, 0xA movs r6, 0xA
ldrsh r2, [r2, r6] ldrsh r2, [r2, r6]
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r3, =gUnknown_02039CF0 ldr r3, =gUnknown_02039CF0
@@ -7019,7 +7019,7 @@ _080C633C:
lsls r3, r4, 24 lsls r3, r4, 24
lsrs r3, 24 lsrs r3, 24
mov r0, sp mov r0, sp
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r3, r9 mov r3, r9
@@ -7070,7 +7070,7 @@ sub_80C63FC: @ 80C63FC
ldr r4, =gUnknown_02039CF0 ldr r4, =gUnknown_02039CF0
ldr r0, [r4] ldr r0, [r4]
ldr r0, [r0] ldr r0, [r0]
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r4] ldr r0, [r4]
str r5, [r0] str r5, [r0]
adds r6, r4, 0 adds r6, r4, 0
@@ -7082,7 +7082,7 @@ _080C6410:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C642C beq _080C642C
bl RemoveObjectAndFreeTiles bl DestroySprite
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x4 adds r0, 0x4
adds r0, r4 adds r0, r4
@@ -7409,7 +7409,7 @@ _080C6732:
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
cmp r0, 0 cmp r0, 0
beq _080C6746 beq _080C6746
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0 movs r0, 0
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
_080C6746: _080C6746:
@@ -7417,7 +7417,7 @@ _080C6746:
ldr r0, [r0, 0xC] ldr r0, [r0, 0xC]
cmp r0, 0 cmp r0, 0
beq _080C6758 beq _080C6758
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x1 movs r0, 0x1
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
_080C6758: _080C6758:
@@ -7425,7 +7425,7 @@ _080C6758:
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
cmp r0, 0 cmp r0, 0
beq _080C676A beq _080C676A
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x4 movs r0, 0x4
bl FreeObjectTilesByTag bl FreeObjectTilesByTag
_080C676A: _080C676A:
@@ -7717,7 +7717,7 @@ sub_80C6974: @ 80C6974
mov r0, r8 mov r0, r8
movs r1, 0x9B movs r1, 0x9B
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r0, [r4] ldr r0, [r4]
@@ -7761,7 +7761,7 @@ sub_80C6974: @ 80C6974
ldrsh r2, [r0, r3] ldrsh r2, [r0, r3]
mov r0, r8 mov r0, r8
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r1, [r4] ldr r1, [r4]
@@ -7909,7 +7909,7 @@ _080C6B3E:
asrs r2, 16 asrs r2, 16
mov r0, sp mov r0, sp
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r4, =gUnknown_02039CF4 ldr r4, =gUnknown_02039CF4
asm/util.s
+1 -1
View File
@@ -13,7 +13,7 @@ CreateInvisibleSpriteWithCallback: @ 806F640
movs r1, 0xF8 movs r1, 0xF8
movs r2, 0xA8 movs r2, 0xA8
movs r3, 0xE movs r3, 0xE
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r5, =gSprites ldr r5, =gSprites
asm/wallclock.s
+8 -8
View File
@@ -276,7 +276,7 @@ Cb2_StartWallClock: @ 81349F4
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSprites ldr r1, =gSprites
@@ -306,7 +306,7 @@ Cb2_StartWallClock: @ 81349F4
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -328,7 +328,7 @@ Cb2_StartWallClock: @ 81349F4
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -342,7 +342,7 @@ Cb2_StartWallClock: @ 81349F4
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -421,7 +421,7 @@ _08134BA4:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0x1 movs r3, 0x1
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r6, =gSprites ldr r6, =gSprites
@@ -452,7 +452,7 @@ _08134BA4:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -474,7 +474,7 @@ _08134BA4:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
@@ -488,7 +488,7 @@ _08134BA4:
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0x2 movs r3, 0x2
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r0, 4 lsls r1, r0, 4
asm/weather.s
+20 -20
View File
@@ -2735,7 +2735,7 @@ _080AC5B2:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0xFF movs r3, 0xFF
bl AddObjectToFront bl CreateSprite
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
cmp r3, 0x40 cmp r3, 0x40
@@ -2824,7 +2824,7 @@ _080AC678:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080AC686 beq _080AC686
bl RemoveObjectAndFreeTiles bl DestroySprite
_080AC686: _080AC686:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -3685,7 +3685,7 @@ _080ACD92:
movs r3, 0x2 movs r3, 0x2
ldrsh r2, [r2, r3] ldrsh r2, [r2, r3]
movs r3, 0x4E movs r3, 0x4E
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0x40 cmp r5, 0x40
@@ -3895,7 +3895,7 @@ _080ACF50:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080ACF5E beq _080ACF5E
bl RemoveObjectAndFreeTiles bl DestroySprite
_080ACF5E: _080ACF5E:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -4146,7 +4146,7 @@ snowflake_add: @ 80AD164
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x4E movs r3, 0x4E
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -4210,7 +4210,7 @@ _080AD1EC:
adds r1, 0x60 adds r1, 0x60
adds r1, r0 adds r1, r0
ldr r0, [r1] ldr r0, [r1]
bl RemoveObjectAndFreeTiles bl DestroySprite
movs r0, 0x1 movs r0, 0x1
_080AD200: _080AD200:
pop {r1} pop {r1}
@@ -5465,7 +5465,7 @@ _080ADCD0:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0xFF movs r3, 0xFF
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -5544,7 +5544,7 @@ _080ADD7E:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080ADD8C beq _080ADD8C
bl RemoveObjectAndFreeTiles bl DestroySprite
_080ADD8C: _080ADD8C:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -5796,7 +5796,7 @@ _080ADF80:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x4E movs r3, 0x4E
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -5880,7 +5880,7 @@ _080AE02C:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080AE03A beq _080AE03A
bl RemoveObjectAndFreeTiles bl DestroySprite
_080AE03A: _080AE03A:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -6243,7 +6243,7 @@ _080AE314:
ldr r0, =gUnknown_0854FD8C ldr r0, =gUnknown_0854FD8C
movs r1, 0 movs r1, 0
movs r3, 0xFF movs r3, 0xFF
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x40 cmp r0, 0x40
@@ -6317,7 +6317,7 @@ _080AE3C0:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080AE3CE beq _080AE3CE
bl RemoveObjectAndFreeTiles bl DestroySprite
_080AE3CE: _080AE3CE:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -6677,7 +6677,7 @@ _080AE6BC:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080AE6CA beq _080AE6CA
bl RemoveObjectAndFreeTiles bl DestroySprite
_080AE6CA: _080AE6CA:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -6710,7 +6710,7 @@ _080AE6FC:
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080AE70A beq _080AE70A
bl RemoveObjectAndFreeTiles bl DestroySprite
_080AE70A: _080AE70A:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -6756,7 +6756,7 @@ _080AE758:
ldr r0, =gUnknown_0854FDC4 ldr r0, =gUnknown_0854FDC4
movs r1, 0 movs r1, 0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -6843,7 +6843,7 @@ _080AE818:
ldr r0, =gUnknown_0854FDC4 ldr r0, =gUnknown_0854FDC4
movs r2, 0xD0 movs r2, 0xD0
movs r3, 0x1 movs r3, 0x1
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x40 cmp r1, 0x40
@@ -6891,7 +6891,7 @@ _080AE818:
movs r1, 0 movs r1, 0
movs r2, 0x2 movs r2, 0x2
movs r3, 0 movs r3, 0
bl CalcVecFromObjectCenterToObjectUpperLeft bl CalcCenterToCornerVec
ldr r1, [r4] ldr r1, [r4]
ldr r0, =sub_80AE958 ldr r0, =sub_80AE958
str r0, [r1, 0x1C] str r0, [r1, 0x1C]
@@ -7245,7 +7245,7 @@ sub_80AEB48: @ 80AEB48
lsls r2, 16 lsls r2, 16
asrs r2, 16 asrs r2, 16
movs r3, 0 movs r3, 0
bl AddObjectToBack bl CreateSpriteAtEnd
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
cmp r2, 0x40 cmp r2, 0x40
@@ -7310,7 +7310,7 @@ _080AEBE4:
cmp r1, r0 cmp r1, r0
bne _080AEBFE bne _080AEBFE
adds r0, r2, r5 adds r0, r2, r5
bl RemoveObjectAndFreeTiles bl DestroySprite
_080AEBFE: _080AEBFE:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -7379,7 +7379,7 @@ _080AEC74:
cmp r0, 0x77 cmp r0, 0x77
ble _080AEC8E ble _080AEC8E
adds r0, r1, 0 adds r0, r1, 0
bl RemoveObjectAndFreeTiles bl DestroySprite
_080AEC8E: _080AEC8E:
pop {r0} pop {r0}
bx r0 bx r0
sym_ewram.txt
+4 -4
View File
@@ -22,10 +22,10 @@ gUnknown_0202064C: @ 202064C
gUnknown_0202065E: @ 202065E gUnknown_0202065E: @ 202065E
.space 0x1116 .space 0x1116
gUnknown_02021774: @ 2021774 gSpritePriorities: @ 2021774
.space 0x80 .space 0x80
gUnknown_020217F4: @ 20217F4 gSpriteOrder: @ 20217F4
.space 0x40 .space 0x40
gShouldProcessSpriteCopyRequests: @ 2021834 gShouldProcessSpriteCopyRequests: @ 2021834
@@ -43,7 +43,7 @@ gOamLimit: @ 2021B38
gReservedSpriteTileCount: @ 2021B3A gReservedSpriteTileCount: @ 2021B3A
.space 0x2 .space 0x2
gUnknown_02021B3C: @ 2021B3C gSpriteTileAllocBitmap: @ 2021B3C
.space 0x80 .space 0x80
gSpriteCoordOffsetX: @ 2021BBC gSpriteCoordOffsetX: @ 2021BBC
@@ -52,7 +52,7 @@ gSpriteCoordOffsetX: @ 2021BBC
gSpriteCoordOffsetY: @ 2021BBE gSpriteCoordOffsetY: @ 2021BBE
.space 0x2 .space 0x2
gUnknown_02021BC0: @ 2021BC0 gOamMatrices: @ 2021BC0
.space 0x100 .space 0x100
gUnknown_02021CC0: @ 2021CC0 gUnknown_02021CC0: @ 2021CC0