ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-28 16:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

decompile more of sprite.s

Browse Source
This commit is contained in:
DizzyEggg 2017-09-02 12:12:09 +02:00
parent c146c247f2
commit 24a1e3e544
62 changed files with 1153 additions and 2008 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/battle_4.s
View File

@ -17002,7 +17002,7 @@ sub_804F384: @ 804F384
orrs r0, r1
str r0, [r4, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r4, 0
bl LoadTaggedObjectPalette
ldr r0, =gUnknown_0831C3C0

10
asm/battle_7.s
View File

@ -767,13 +767,13 @@ sub_805D770: @ 805D770
bne _0805D798
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0805D7A0
.pool
_0805D798:
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0805D7A0:
adds r0, r4, 0
bl AnimateSprite
@ -2289,7 +2289,7 @@ sub_805E448: @ 805E448
ldr r1, [r4]
ldr r1, [r1, 0x8]
ldrb r1, [r1]
bl StartObjectImageAnim
bl StartSpriteAnim
lsls r0, r7, 20
movs r2, 0x80
lsls r2, 17
@ -2617,7 +2617,7 @@ _0805E74A:
ldr r1, =gUnknown_020244E4
adds r1, r7, r1
ldrb r1, [r1]
bl StartObjectImageAnim
bl StartSpriteAnim
_0805E77A:
add sp, 0x4
pop {r3-r5}
@ -2776,7 +2776,7 @@ refresh_graphics_maybe: @ 805E8F4
adds r0, r6, r0
ldrb r1, [r0]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
cmp r5, 0
bne _0805E938
adds r0, r6, 0

8
asm/battle_814AEAC.s
View File

@ -867,7 +867,7 @@ sub_814B5A8: @ 814B5A8
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldrb r1, [r7]
adds r0, r1, r4
@ -3240,7 +3240,7 @@ sub_814CB0C: @ 814CB0C
ldr r1, =gUnknown_020244E4
adds r2, r1
ldrb r1, [r2]
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, =gBattleBankFunc
ldrb r0, [r6]
lsls r0, 2
@ -3422,7 +3422,7 @@ sub_814CC98: @ 814CC98
ldr r1, =gUnknown_020244E4
adds r6, r1
ldrb r1, [r6]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@ -5031,7 +5031,7 @@ sub_814DAA8: @ 814DAA8
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =0x0000d6f9
bl AllocObjectPalette
lsls r0, 24

200
asm/battle_anim_80FE840.s
View File

@ -129,7 +129,7 @@ sub_80FE930: @ 80FE930
ldr r5, =gUnknown_0203841E
ldrb r1, [r5, 0x6]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
ldr r5, =gUnknown_02038437
@ -373,7 +373,7 @@ sub_80FEB44: @ 80FEB44
movs r0, 0x7
ands r1, r0
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r4, =gUnknown_02038436
ldrb r0, [r4]
movs r1, 0x2
@ -578,7 +578,7 @@ sub_80FECF0: @ 80FECF0
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x3C
strh r0, [r4, 0x2E]
ldr r0, =sub_80A64B0
@ -601,7 +601,7 @@ sub_80FED28: @ 80FED28
ldr r5, =gUnknown_0203841E
ldrb r1, [r5, 0x8]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r1, 0x8
ldrsh r0, [r5, r1]
cmp r0, 0x1
@ -1405,7 +1405,7 @@ sub_80FF374: @ 80FF374
ldr r4, =gUnknown_0203841E
ldrb r1, [r4, 0x4]
adds r0, r5, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x3A]
ldrh r0, [r4, 0x6]
@ -1496,7 +1496,7 @@ _080FF424:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _080FF452
_080FF44C:
adds r0, r4, 0
@ -1842,7 +1842,7 @@ _080FF704:
beq _080FF756
adds r0, r5, 0
movs r1, 0x1
bl sub_80082B8
bl ChangeSpriteAffineAnim
movs r0, 0x19
strh r0, [r5, 0x2E]
ldr r4, =gUnknown_02038436
@ -1903,7 +1903,7 @@ sub_80FF768: @ 80FF768
strb r0, [r1]
ldrb r1, [r4, 0x6]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x8]
strh r0, [r5, 0x32]
ldrh r0, [r5, 0x2E]
@ -2012,7 +2012,7 @@ sub_80FF7EC: @ 80FF7EC
strb r0, [r1]
ldrb r1, [r6, 0x8]
mov r0, r9
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r6, 0xA]
mov r1, r9
strh r0, [r1, 0x32]
@ -2274,7 +2274,7 @@ sub_80FFA84: @ 80FFA84
bne _080FFA98
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_080FFA98:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@ -2772,7 +2772,7 @@ _080FFE6A:
strh r0, [r4, 0x34]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _080FFEBA
_080FFE82:
movs r1, 0x36
@ -3261,7 +3261,7 @@ _08100204:
strb r0, [r1]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
ldrh r0, [r6, 0x8]
@ -3333,7 +3333,7 @@ _08100272:
strb r0, [r1]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
ldrh r0, [r6, 0x8]
@ -3392,7 +3392,7 @@ _081002E8:
strb r1, [r0]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
ldrh r0, [r6, 0x8]
@ -3446,7 +3446,7 @@ _08100380:
strb r1, [r0]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
ldrh r0, [r6, 0x8]
@ -3503,7 +3503,7 @@ _081003D2:
strb r0, [r1]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
ldrh r0, [r6, 0x8]
@ -3555,7 +3555,7 @@ _08100464:
strb r1, [r0]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
ldrh r0, [r6, 0x8]
@ -3688,7 +3688,7 @@ sub_8100524: @ 8100524
strh r0, [r1, 0x22]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r6, 0x10]
adds r4, 0x43
strb r0, [r4]
@ -4285,7 +4285,7 @@ sub_8100A50: @ 8100A50
bne _08100A6A
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_08100A6A:
ldr r0, =sub_81009DC
str r0, [r5, 0x1C]
@ -4327,7 +4327,7 @@ sub_8100A94: @ 8100A94
strh r0, [r4, 0x38]
ldrb r1, [r1, 0xC]
adds r0, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r1, =move_anim_8074EE0
adds r0, r4, 0
bl oamt_set_x3A_32
@ -4774,7 +4774,7 @@ _08100E4A:
ldr r4, =gUnknown_0203841E
ldrb r1, [r4, 0xA]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x6]
negs r0, r0
strh r0, [r5, 0x30]
@ -5222,7 +5222,7 @@ _081011CC:
strh r0, [r4, 0x30]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _08101272
_081011E8:
adds r0, r4, 0
@ -5552,7 +5552,7 @@ _08101474:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0810148E:
ldr r0, =sub_81014A0
str r0, [r4, 0x1C]
@ -5644,7 +5644,7 @@ _0810152C:
strh r0, [r4, 0x34]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0810154A:
ldr r0, =sub_8101560
str r0, [r4, 0x1C]
@ -7013,7 +7013,7 @@ sub_8101FF0: @ 8101FF0
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
strh r6, [r4, 0x2E]
strh r6, [r4, 0x30]
ldr r0, =sub_810208C
@ -8621,7 +8621,7 @@ sub_8102CD4: @ 8102CD4
ldr r4, =gUnknown_0203841E
ldrb r1, [r4]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r2, =gUnknown_08593020
movs r0, 0x2
ldrsh r1, [r4, r0]
@ -8888,7 +8888,7 @@ _08102ECE:
strh r0, [r6, 0x22]
ldrb r1, [r4]
adds r0, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
strh r5, [r6, 0x32]
strh r5, [r6, 0x34]
ldrh r0, [r6, 0x20]
@ -9041,7 +9041,7 @@ sub_8103028: @ 8103028
ldr r5, =gUnknown_0203841E
ldrb r1, [r5, 0x2]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r2, =gUnknown_08593020
movs r0, 0x4
ldrsh r1, [r5, r0]
@ -9220,7 +9220,7 @@ _08103182:
adds r0, r1, 0x2
strh r0, [r5, 0x30]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, =sub_81031D0
adds r0, r5, 0
bl oamt_set_x3A_32
@ -9249,7 +9249,7 @@ sub_81031D0: @ 81031D0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =sub_80A67D8
str r0, [r4, 0x1C]
_081031F8:
@ -9303,7 +9303,7 @@ sub_8103250: @ 8103250
ble _08103276
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r1, =move_anim_8074EE0
adds r0, r4, 0
bl oamt_set_x3A_32
@ -9480,14 +9480,14 @@ _081033AE:
bne _081033D4
adds r0, r5, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x2
b _081033DE
.pool
_081033D4:
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x3
_081033DE:
strh r0, [r5, 0x2E]
@ -9516,7 +9516,7 @@ sub_81033F0: @ 81033F0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, =sub_810342C
adds r0, r4, 0
bl oamt_set_x3A_32
@ -11409,7 +11409,7 @@ sub_8104364: @ 8104364
movs r6, 0x10
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_08104390:
lsls r0, r7, 16
asrs r0, 16
@ -11494,7 +11494,7 @@ sub_8104414: @ 8104414
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08104448:
mov r0, r8
lsls r1, r0, 16
@ -11561,7 +11561,7 @@ sub_81044BC: @ 81044BC
beq _08104520
adds r0, r4, 0
movs r1, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r0, [r2]
@ -11645,7 +11645,7 @@ _08104548:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =sub_8104594
str r0, [r4, 0x1C]
_0810458A:
@ -11973,7 +11973,7 @@ sub_8104800: @ 8104800
asrs r4, r0, 16
cmp r4, 0
blt _081048DA
bl rotscale_alloc_entry
bl AllocOamMatrix
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0xFF
@ -12353,7 +12353,7 @@ sub_8104B1C: @ 8104B1C
bne _08104B50
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r0, [r5]
movs r1, 0x2
bl sub_80A5C6C
@ -12367,7 +12367,7 @@ sub_8104B1C: @ 8104B1C
_08104B50:
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r0, [r5]
movs r1, 0x2
bl sub_80A5C6C
@ -13564,7 +13564,7 @@ sub_81054E8: @ 81054E8
_0810550E:
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r1, =sub_80A77C8
str r1, [r4, 0x1C]
adds r0, r4, 0
@ -13653,7 +13653,7 @@ _081055AC:
strh r5, [r4, 0x2E]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =sub_81055F4
str r0, [r4, 0x1C]
_081055E0:
@ -13676,7 +13676,7 @@ sub_81055F4: @ 81055F4
ble _08105612
adds r0, r4, 0
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =sub_810561C
str r0, [r4, 0x1C]
_08105612:
@ -13698,7 +13698,7 @@ sub_810561C: @ 810561C
beq _08105682
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r0, 0
strh r0, [r4, 0x2E]
movs r1, 0x3C
@ -16313,7 +16313,7 @@ sub_8106B54: @ 8106B54
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gUnknown_02038437
ldrb r0, [r0]
bl sub_80A82E4
@ -16465,7 +16465,7 @@ sub_8106C80: @ 8106C80
strh r0, [r4, 0x22]
ldrb r1, [r1, 0x4]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@ -16545,7 +16545,7 @@ _08106D38:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =sub_8106D5C
str r0, [r5, 0x1C]
_08106D50:
@ -16575,7 +16575,7 @@ sub_8106D5C: @ 8106D5C
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _08106D8C
_08106D86:
adds r0, r2, 0
@ -16831,7 +16831,7 @@ sub_8106F60: @ 8106F60
strh r0, [r6, 0x22]
ldrb r1, [r4, 0x2]
adds r0, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
strh r5, [r6, 0x38]
ldrh r0, [r4, 0x4]
strh r0, [r6, 0x34]
@ -16892,7 +16892,7 @@ _08106F8E:
strh r5, [r6, 0x34]
adds r0, r6, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0810700A:
pop {r4-r6}
pop {r0}
@ -17012,7 +17012,7 @@ sub_81070AC: @ 81070AC
strh r0, [r5, 0x22]
adds r0, r5, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _08107118
.pool
_081070F8:
@ -17493,7 +17493,7 @@ sub_81074E4: @ 81074E4
bne _08107506
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r1, [r2]
@ -19849,7 +19849,7 @@ sub_81087C0: @ 81087C0
ldr r4, =gSprites
adds r0, r4
movs r1, 0x3
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r2, 0x30
ldrsh r1, [r5, r2]
lsls r0, r1, 4
@ -22245,7 +22245,7 @@ _08109B18:
ldr r4, =gUnknown_0203841E
ldrb r1, [r4, 0x4]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x3C]
ldr r0, =gUnknown_02038436
@ -24422,7 +24422,7 @@ sub_810ACC0: @ 810ACC0
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =sub_810AC8C
str r0, [r4, 0x1C]
pop {r4}
@ -24517,7 +24517,7 @@ sub_810AD98: @ 810AD98
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r4, =gUnknown_02038436
ldrb r0, [r4]
movs r1, 0x2
@ -25139,7 +25139,7 @@ _0810B24E:
strh r0, [r5, 0x22]
adds r0, r5, 0
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldrh r0, [r5, 0x2E]
adds r0, 0x1
strh r0, [r5, 0x2E]
@ -28166,7 +28166,7 @@ _0810CAE2:
adds r4, r0
adds r0, r4, 0
mov r1, r9
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
mov r0, sp
ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E]
@ -28364,7 +28364,7 @@ unc_080B06FC: @ 810CC88
movs r1, 0x4
_0810CCA6:
adds r0, r5, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
@ -28420,7 +28420,7 @@ sub_810CD1C: @ 810CD1C
beq _0810CD3E
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =sub_80A67D8
str r0, [r4, 0x1C]
ldr r1, =move_anim_8072740
@ -28597,7 +28597,7 @@ _0810CE90:
ldr r4, =gUnknown_0203841E
ldrb r1, [r4, 0xC]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
strh r0, [r4, 0xC]
adds r0, r5, 0
@ -28638,7 +28638,7 @@ sub_810CEE0: @ 810CEE0
adds r5, r0, 0
ldr r4, =gUnknown_0203841E
ldrb r1, [r4, 0x8]
bl StartObjectImageAnim
bl StartSpriteAnim
movs r1, 0x6
ldrsh r0, [r4, r1]
cmp r0, 0
@ -28702,7 +28702,7 @@ _0810CF56:
_0810CF74:
ldrb r1, [r4, 0x4]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
mov r0, r8
movs r1, 0x2
bl sub_80A5C6C
@ -28821,7 +28821,7 @@ _0810D028:
ldr r4, =gSprites
adds r0, r4
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r2, 0x3C
ldrsh r1, [r5, r2]
lsls r0, r1, 4
@ -29075,7 +29075,7 @@ sub_810D278: @ 810D278
ldr r5, =gUnknown_0203841E
ldrb r1, [r5, 0x4]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]
ldr r0, =sub_80A64B0
@ -29094,7 +29094,7 @@ sub_810D2B0: @ 810D2B0
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r0, [r2]
@ -29977,7 +29977,7 @@ _0810D9E2:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r5, 0x32]
strh r0, [r5, 0x24]
ldrh r0, [r5, 0x34]
@ -30015,7 +30015,7 @@ _0810DA34:
beq _0810DA48
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
b _0810DA5E
_0810DA48:
ldr r0, =gUnknown_02038436
@ -30026,7 +30026,7 @@ _0810DA48:
beq _0810DA5E
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0810DA5E:
ldr r0, =sub_80A67D8
str r0, [r4, 0x1C]
@ -30198,7 +30198,7 @@ sub_810DBAC: @ 810DBAC
bne _0810DBC2
adds r0, r5, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_0810DBC2:
adds r0, r5, 0
movs r1, 0x1
@ -30258,7 +30258,7 @@ sub_810DC2C: @ 810DC2C
bne _0810DC44
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_0810DC44:
adds r0, r4, 0
movs r1, 0x1
@ -30846,7 +30846,7 @@ _0810E0FE:
bl oamt_set_x3A_32
ldrb r1, [r4, 0xA]
adds r0, r5, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@ -30942,7 +30942,7 @@ sub_810E1C8: @ 810E1C8
strh r0, [r5, 0x22]
adds r0, r5, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0810E1FE
.pool
_0810E1F8:
@ -32131,7 +32131,7 @@ _0810EAF8:
ldr r4, =gUnknown_0203841E
ldrb r1, [r4, 0x8]
adds r0, r5, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
ldrh r0, [r5, 0x20]
subs r0, 0x20
strh r0, [r5, 0x20]
@ -32177,7 +32177,7 @@ sub_810EB40: @ 810EB40
strh r1, [r4, 0x2E]
strh r1, [r4, 0x24]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0810EB6A:
ldrh r0, [r4, 0x3C]
subs r0, 0x1
@ -33588,7 +33588,7 @@ sub_810F634: @ 810F634
beq _0810F684
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r5, 0x20]
subs r0, 0x28
strh r0, [r5, 0x20]
@ -34474,7 +34474,7 @@ _0810FD60:
movs r1, 0x3
ands r1, r0
adds r0, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0810FDB4:
ldrh r0, [r5, 0xC]
adds r0, 0x1
@ -34811,7 +34811,7 @@ sub_8110034: @ 8110034
lsls r0, 3
ldr r1, =gTasks
adds r7, r0, r1
bl rotscale_alloc_entry
bl AllocOamMatrix
lsls r0, 24
lsrs r5, r0, 24
mov r10, r5
@ -35118,7 +35118,7 @@ _081102B8:
bl audio_play_and_stuff
adds r0, r5, 0
movs r1, 0x1
bl sub_80082B8
bl ChangeSpriteAffineAnim
_081102E2:
ldrh r0, [r5, 0x2E]
adds r0, 0x1
@ -35198,7 +35198,7 @@ sub_8110368: @ 8110368
beq _08110394
adds r0, r6, 0
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =gUnknown_0203841E
ldrh r1, [r0, 0x4]
negs r1, r1
@ -35217,7 +35217,7 @@ _08110394:
bne _081103C4
adds r0, r6, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r1, =gUnknown_0203841E
ldrh r0, [r1, 0x2]
negs r0, r0
@ -35293,7 +35293,7 @@ sub_8110438: @ 8110438
strh r0, [r1]
adds r0, r6, 0
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _08110478
.pool
_0811045C:
@ -35999,7 +35999,7 @@ _08110A10:
strh r0, [r5, 0x22]
ldrb r1, [r6, 0x2]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0
bl AnimateSprite
strh r4, [r5, 0x2E]
@ -36061,7 +36061,7 @@ sub_8110AB4: @ 8110AB4
adds r5, r0, 0
ldr r4, =gUnknown_0203841E
ldrb r1, [r4, 0xA]
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0
bl AnimateSprite
ldr r0, =gUnknown_02038436
@ -36583,7 +36583,7 @@ sub_8110F30: @ 8110F30
adds r4, r0, 0
ldr r5, =gUnknown_0203841E
ldrb r1, [r5, 0x8]
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
bl sub_80A69CC
@ -37119,7 +37119,7 @@ sub_8111388: @ 8111388
adds r4, r0, 0
ldr r5, =gUnknown_0203841E
ldrb r1, [r5, 0x8]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r5]
strh r0, [r4, 0x24]
ldrh r0, [r5, 0x2]
@ -37202,7 +37202,7 @@ sub_8111418: @ 8111418
bne _08111434
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_08111434:
adds r0, r4, 0
bl sub_80A7820
@ -37242,7 +37242,7 @@ sub_8111444: @ 8111444
strh r0, [r4, 0x38]
ldrb r1, [r2, 0x6]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =sub_811149C
str r0, [r4, 0x1C]
pop {r4,r5}
@ -40809,7 +40809,7 @@ _08113164:
strh r0, [r5, 0x36]
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0811318E:
ldr r0, =gUnknown_0203841E
ldrh r0, [r0, 0x8]
@ -40884,7 +40884,7 @@ sub_8113224: @ 8113224
beq _0811323E
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0811323E:
adds r0, r4, 0
bl sub_8113100
@ -41827,7 +41827,7 @@ sub_81139DC: @ 81139DC
strh r0, [r4, 0x22]
ldrb r1, [r5, 0x4]
adds r0, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]
ldrh r0, [r5, 0x8]
@ -42002,7 +42002,7 @@ _08113B54:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r6, 0xEC
_08113B60:
movs r0, 0x20
@ -43138,7 +43138,7 @@ sub_81144BC: @ 81144BC
strh r0, [r4, 0x22]
ldrb r1, [r1, 0x4]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =sub_80A67D8
str r0, [r4, 0x1C]
ldr r1, =move_anim_8072740
@ -45353,7 +45353,7 @@ _0811576C:
strh r1, [r4, 0x36]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0811577A:
ldr r0, =gUnknown_0203841E
ldrh r0, [r0, 0x8]
@ -46890,7 +46890,7 @@ sub_8116388: @ 8116388
adds r5, r0, 0
ldr r4, =gUnknown_0203841E
ldrb r1, [r4, 0x6]
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0
@ -46922,7 +46922,7 @@ sub_81163D0: @ 81163D0
adds r5, r0, 0
ldr r4, =gUnknown_0203841E
ldrb r1, [r4, 0x6]
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0
@ -46996,7 +46996,7 @@ sub_8116458: @ 8116458
_08116474:
ldrb r1, [r5, 0x2]
adds r0, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r1, 0
ldrsh r0, [r5, r1]
cmp r0, 0
@ -47079,7 +47079,7 @@ sub_81164F0: @ 81164F0
strh r0, [r4, 0x26]
ldrb r1, [r5, 0x6]
adds r0, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r1, =move_anim_8074EE0
adds r0, r4, 0
bl oamt_set_x3A_32
@ -47130,7 +47130,7 @@ sub_81165A8: @ 81165A8
adds r5, r0, 0
ldr r4, =gUnknown_0203841E
ldrb r1, [r4, 0x6]
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0

52
asm/battle_anim_8170478.s
View File

@ -1448,7 +1448,7 @@ sub_81710A8: @ 81710A8
lsls r0, 2
adds r0, r6
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0
bl DestroyTask
_081710F4:
@ -1504,7 +1504,7 @@ sub_8171134: @ 8171134
_08171160:
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x24]
ldrh r1, [r4, 0x20]
adds r0, r1
@ -1740,7 +1740,7 @@ _08171354:
bl DestroyTask
adds r0, r7, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
strh r0, [r7, 0x38]
ldr r0, =sub_817138C
@ -1939,7 +1939,7 @@ sub_81714D4: @ 81714D4
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r0, [r0, 0x8]
@ -2052,12 +2052,12 @@ _081715AE:
bge _081715EA
adds r0, r4, 0
movs r1, 0x2
bl sub_80082B8
bl ChangeSpriteAffineAnim
b _081717AE
_081715EA:
adds r0, r4, 0
movs r1, 0x1
bl sub_80082B8
bl ChangeSpriteAffineAnim
b _081717AE
_081715F4:
ldr r1, =gUnknown_020244D0
@ -2145,12 +2145,12 @@ _0817166E:
bge _0817169C
adds r0, r4, 0
movs r1, 0x2
bl sub_80082B8
bl ChangeSpriteAffineAnim
b _081716A4
_0817169C:
adds r0, r4, 0
movs r1, 0x1
bl sub_80082B8
bl ChangeSpriteAffineAnim
_081716A4:
ldr r1, =gUnknown_020244D0
ldr r5, [r1]
@ -2264,20 +2264,20 @@ _08171768:
strh r0, [r4, 0x34]
adds r0, r4, 0
movs r1, 0x3
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r6, 0x36
ldrsh r0, [r4, r6]
cmp r0, 0
bge _081717A0
adds r0, r4, 0
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _081717A8
.pool
_081717A0:
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_081717A8:
movs r0, 0x17
bl audio_play
@ -2638,7 +2638,7 @@ _08171A26:
ldr r0, =gUnknown_085E51B4
ldrb r1, [r0, 0x4]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08171A82:
adds r7, 0x1
cmp r7, 0x2
@ -2689,10 +2689,10 @@ sub_8171AE4: @ 8171AE4
sub sp, 0x4
adds r4, r0, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =sub_8171BAC
str r0, [r4, 0x1C]
ldr r0, =gUnknown_02024208
@ -2746,7 +2746,7 @@ _08171B36:
lsls r0, 2
adds r0, r6
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@ -2808,7 +2808,7 @@ _08171BCA:
bge _08171C04
adds r0, r1, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r5, 0x1
b _08171C24
.pool
@ -3149,7 +3149,7 @@ sub_8171E50: @ 8171E50
adds r0, r1, r0
ldrb r1, [r0]
adds r0, r7, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x1C
adds r4, r5
ldr r0, =sub_8171F68
@ -3337,7 +3337,7 @@ _0817200A:
add r0, r8
ldrb r1, [r0]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_8172508
@ -3455,7 +3455,7 @@ _0817210E:
add r0, r8
ldrb r1, [r0]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_8172508
@ -3572,7 +3572,7 @@ _08172212:
mov r3, r10
ldrb r1, [r3]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_8172508
@ -3689,7 +3689,7 @@ _08172312:
add r0, r8
ldrb r1, [r0]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_8172508
@ -3819,7 +3819,7 @@ _08172430:
mov r3, r10
ldrb r1, [r3]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_8172508
@ -3995,7 +3995,7 @@ _081725A6:
mov r3, r10
ldrb r1, [r3]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_817265C
@ -4162,7 +4162,7 @@ _08172708:
add r0, r9
ldrb r1, [r0]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, =gSprites + 0x1C
adds r4, r1
ldr r0, =sub_8172508
@ -4295,7 +4295,7 @@ _0817282E:
mov r3, r10
ldrb r1, [r3]
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_81728E0
@ -5706,7 +5706,7 @@ sub_8173400: @ 8173400
lsls r0, 2
adds r0, r5
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
bl move_anim_8072740
_08173448:

6
asm/battle_controller_linkopponent.s
View File

@ -1307,7 +1307,7 @@ sub_8064E50: @ 8064E50
lsls r0, 2
adds r0, r7
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldrb r1, [r5]
adds r0, r1, r4
@ -3658,7 +3658,7 @@ sub_80662F8: @ 80662F8
ldr r1, =gUnknown_020244E4
adds r2, r1
ldrb r1, [r2]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r4, [r6]
lsls r0, r4, 1
adds r0, r7
@ -3853,7 +3853,7 @@ sub_8066494: @ 8066494
ldr r1, =gUnknown_020244E4
adds r6, r1
ldrb r1, [r6]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1

6
asm/battle_controller_opponent.s
View File

@ -1401,7 +1401,7 @@ sub_805FD00: @ 805FD00
lsls r0, 2
adds r0, r7
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldrb r1, [r5]
adds r0, r1, r4
@ -3814,7 +3814,7 @@ sub_8061224: @ 8061224
ldr r1, =gUnknown_020244E4
adds r2, r1
ldrb r1, [r2]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r4, [r6]
lsls r0, r4, 1
ldr r2, =gBattlePartyID
@ -4015,7 +4015,7 @@ sub_80613DC: @ 80613DC
ldr r1, =gUnknown_020244E4
adds r6, r1
ldrb r1, [r6]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1

8
asm/battle_controller_player.s
View File

@ -7070,7 +7070,7 @@ sub_805B258: @ 805B258
ldr r1, =gUnknown_020244E4
adds r6, r1
ldrb r1, [r6]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@ -7874,7 +7874,7 @@ sub_805B9F8: @ 805B9F8
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, =gBattleBankFunc
ldrb r0, [r6]
lsls r0, 2
@ -9752,7 +9752,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80
lsls r0, 2
adds r0, r5
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =0x0000d6f8
bl AllocObjectPalette
adds r4, r0, 0
@ -9870,7 +9870,7 @@ sub_805CC00: @ 805CC00
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0

10
asm/battle_transition.s
View File

@ -2205,7 +2205,7 @@ sub_81470D0: @ 81470D0
bl InitSpriteAffineAnim
ldrb r1, [r5, 0x8]
adds r0, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r0, 0
pop {r4,r5}
pop {r1}
@ -4331,7 +4331,7 @@ sub_8148218: @ 8148218
ldrb r0, [r6, 0x1]
orrs r0, r1
strb r0, [r6, 0x1]
bl rotscale_alloc_entry
bl AllocOamMatrix
lsls r0, 24
lsrs r0, 24
movs r3, 0x1F
@ -4346,7 +4346,7 @@ sub_8148218: @ 8148218
ands r1, r2
orrs r1, r0
strb r1, [r5, 0x3]
bl rotscale_alloc_entry
bl AllocOamMatrix
lsls r0, 24
lsrs r0, 24
mov r1, r9
@ -4398,7 +4398,7 @@ sub_8148218: @ 8148218
movs r4, 0
ldrsh r2, [r3, r4]
movs r3, 0
bl sub_8008478
bl SetOamMatrixRotationScaling
ldrb r0, [r6, 0x3]
lsls r0, 26
lsrs r0, 27
@ -4406,7 +4406,7 @@ sub_8148218: @ 8148218
movs r2, 0x80
lsls r2, 2
movs r3, 0
bl sub_8008478
bl SetOamMatrixRotationScaling
add sp, 0x4
pop {r3,r4}
mov r8, r3

32
asm/berry_blender.s
View File

@ -224,11 +224,11 @@ _0807F940:
.pool
_0807F950:
ldr r0, =gUnknown_08339AC0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08339BD8
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08339B38
bl LoadObjectPic
bl LoadSpriteSheet
_0807F962:
ldr r0, =gUnknown_020322A4
ldr r1, [r0]
@ -240,9 +240,9 @@ _0807F966:
.pool
_0807F980:
ldr r0, =gUnknown_08339C24
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08339C58
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08339AD0
bl LoadTaggedObjectPalette
ldr r0, =gUnknown_08339AC8
@ -507,7 +507,7 @@ _0807FBBE:
adds r1, 0x8
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x2
adds r4, 0x1
cmp r4, 0x3
@ -1111,7 +1111,7 @@ _08080126:
adds r1, 0x8
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r4, 0x2
adds r5, 0x1
cmp r5, 0x3
@ -1924,7 +1924,7 @@ _080807E4:
mov r1, r8
lsrs r4, r1, 24
adds r1, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
add r1, sp, 0x8
movs r0, 0xFF
strb r0, [r1]
@ -2146,7 +2146,7 @@ _08080A0A:
adds r1, 0x8
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x2
adds r4, 0x1
cmp r4, 0x3
@ -3133,7 +3133,7 @@ sub_8081288: @ 8081288
ldr r5, =gSprites
adds r0, r4, r5
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x1C
adds r4, r5
ldr r0, =sub_8082F9C
@ -3152,7 +3152,7 @@ _08081314:
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x1F
bl audio_play
b _08081358
@ -3167,7 +3167,7 @@ _0808133C:
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x20
bl audio_play
_08081358:
@ -3701,7 +3701,7 @@ _080817BA:
adds r1, r5, 0x4
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r4]
adds r0, 0x4A
ldrh r0, [r0]
@ -6684,7 +6684,7 @@ _080830A0:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_080830B2:
ldrh r0, [r4, 0x30]
strh r0, [r4, 0x26]
@ -8077,7 +8077,7 @@ _08083B9A:
ldr r6, =gSprites
adds r0, r6
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r7]
adds r0, 0x46
ldrb r1, [r0]
@ -8121,7 +8121,7 @@ _08083B9A:
lsls r0, 2
adds r0, r6
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r7]
adds r0, 0x48
ldrb r1, [r0]

4
asm/cable_car.s
View File

@ -2252,7 +2252,7 @@ _08151036:
adds r0, r4, 0
movs r1, 0x7
_08151044:
bl StartObjectImageAnim
bl StartSpriteAnim
strh r7, [r4, 0x30]
ldrh r0, [r4, 0x22]
adds r0, 0x2
@ -2262,7 +2262,7 @@ _08151052:
adds r0, r4, 0
movs r1, 0x6
_08151056:
bl StartObjectImageAnim
bl StartSpriteAnim
strh r5, [r4, 0x30]
_0815105C:
ldr r0, =gSprites

12
asm/contest.s
View File

@ -6841,7 +6841,7 @@ _080DB280:
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r7, 0
pop {r3}
mov r8, r3
@ -8937,7 +8937,7 @@ _080DC2A8:
sub_80DC2BC: @ 80DC2BC
push {r4,r5,lr}
ldr r0, =gUnknown_08587A74
bl LoadObjectPic
bl LoadSpriteSheet
movs r4, 0
ldr r5, =gUnknown_08587A6C
_080DC2C8:
@ -10104,14 +10104,14 @@ sub_80DCBE8: @ 80DCBE8
lsls r5, 24
lsrs r5, 24
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
lsls r4, r5, 4
adds r4, r5
lsls r4, 2
mov r1, r8
adds r0, r4, r1
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r2, 0x1C
add r8, r2
add r6, r8
@ -13358,7 +13358,7 @@ sub_80DE69C: @ 80DE69C
ldr r6, =gSprites
ldr r5, =gUnknown_02039F34
_080DE6AE:
bl rotscale_alloc_entry
bl AllocOamMatrix
ldr r1, [r5]
ldr r1, [r1, 0x14]
lsls r4, r7, 2
@ -13406,7 +13406,7 @@ _080DE6AE:
lsls r0, 2
adds r0, r6
mov r1, r8
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
mov r0, r8
cmp r0, 0x2
bne _080DE74C

4
asm/contest_link_80F57C4.s
View File

@ -2140,7 +2140,7 @@ sub_80F6AE8: @ 80F6AE8
movs r1, 0x1
strb r1, [r0]
ldr r0, =gUnknown_0858D8E0
bl LoadObjectPic
bl LoadSpriteSheet
adds r1, r0, 0
lsls r1, 16
movs r0, 0x1
@ -2464,7 +2464,7 @@ sub_80F6DC0: @ 80F6DC0
movs r4, 0x7
_080F6DD6:
adds r0, r6, 0
bl LoadObjectPic
bl LoadSpriteSheet
adds r6, 0x8
subs r4, 0x1
cmp r4, 0

24
asm/credits.s
View File

@ -553,7 +553,7 @@ _0817596E:
adds r0, r1, 0
strh r0, [r2, 0x6]
adds r0, r6, 0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085E702C
bl LoadTaggedObjectPalette
ldr r1, =gMain
@ -3107,7 +3107,7 @@ _08176F1C:
_08176F34:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08176F88
_08176F3E:
adds r0, r4, 0
@ -3116,17 +3116,17 @@ _08176F3E:
_08176F44:
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08176F88
_08176F4E:
adds r0, r4, 0
movs r1, 0x3
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08176F88
_08176F58:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r1, [r4, 0x20]
movs r2, 0x20
ldrsh r0, [r4, r2]
@ -3138,7 +3138,7 @@ _08176F6E:
adds r0, r4, 0
movs r1, 0
_08176F72:
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r2, [r4, 0x20]
movs r0, 0x20
ldrsh r1, [r4, r0]
@ -3188,7 +3188,7 @@ _08176FC8:
strh r0, [r4, 0x26]
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08177048
_08176FD4:
movs r1, 0x20
@ -3197,12 +3197,12 @@ _08176FD4:
ble _08176FE6
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08176FEE
_08176FE6:
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
_08176FEE:
ldrh r2, [r4, 0x20]
movs r0, 0x20
@ -3226,7 +3226,7 @@ _08177010:
strh r0, [r4, 0x3C]
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r1, [r4, 0x3C]
movs r0, 0x3
ands r0, r1
@ -3238,7 +3238,7 @@ _08177010:
_0817702E:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r2, [r4, 0x20]
movs r0, 0x20
ldrsh r1, [r4, r0]
@ -3550,7 +3550,7 @@ sub_8177224: @ 8177224
lsls r5, 24
lsrs r5, 24
adds r1, r5, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
adds r0, r4, 0
pop {r4-r7}
pop {r1}

6
asm/decompress.s
View File

@ -40,7 +40,7 @@ LoadCompressedObjectPic: @ 8034530
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
lsls r0, 16
lsrs r0, 16
add sp, 0x8
@ -66,7 +66,7 @@ LoadCompressedObjectPicOverrideBuffer: @ 8034564
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
add sp, 0x8
pop {r4,r5}
pop {r0}
@ -659,7 +659,7 @@ LoadCompressedObjectPicUsingHeap: @ 8034988
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r5, 0
bl Free
movs r0, 0

4
asm/decoration.s
View File

@ -5166,7 +5166,7 @@ AddDecorationIconObjectFromIconTable: @ 81293D8
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r5, 0
movs r1, 0x1
bl GetDecorationIconPicOrPalette
@ -5297,7 +5297,7 @@ AddDecorationIconObjectFromFieldObject: @ 81294C0
orrs r0, r1
str r0, [sp, 0x8]
add r0, sp, 0x4
bl LoadObjectPic
bl LoadSpriteSheet
str r5, [sp, 0xC]
add r0, sp, 0xC
ldr r1, [r0, 0x4]

36
asm/easy_chat.s
View File

@ -7714,7 +7714,7 @@ sub_811DE5C: @ 811DE5C
sub_811DE90: @ 811DE90
push {r4,r5,lr}
ldr r0, =gUnknown_08597CA0
bl LoadObjectPics
bl LoadSpriteSheets
ldr r0, =gUnknown_08597CC0
bl LoadTaggedObjectPalettes
movs r5, 0
@ -8026,7 +8026,7 @@ sub_811E0EC: @ 811E0EC
adds r0, r4
ldr r0, [r0]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
mov r2, r8
ldr r1, [r2]
adds r4, r1, r4
@ -8045,7 +8045,7 @@ sub_811E0EC: @ 811E0EC
adds r1, r6
ldr r0, [r1]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
mov r1, r8
ldr r0, [r1]
adds r0, r6
@ -8061,7 +8061,7 @@ _0811E150:
adds r0, r4
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r6]
adds r4, r1, r4
ldr r0, [r4]
@ -8079,7 +8079,7 @@ _0811E150:
adds r1, r5
ldr r0, [r1]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r6]
adds r0, r5
ldr r1, [r0]
@ -8144,7 +8144,7 @@ _0811E1EC:
adds r0, r4
ldr r0, [r0]
adds r1, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r5]
adds r4, r1, r4
ldr r0, [r4]
@ -8157,7 +8157,7 @@ _0811E1EC:
adds r1, r4
ldr r0, [r1]
adds r1, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r5]
adds r0, r4
ldr r1, [r0]
@ -8175,7 +8175,7 @@ _0811E234:
adds r0, r4
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r6]
adds r4, r1, r4
ldr r0, [r4]
@ -8193,7 +8193,7 @@ _0811E234:
adds r1, r5
ldr r0, [r1]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r6]
adds r0, r5
ldr r1, [r0]
@ -8445,7 +8445,7 @@ _0811E430:
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _0811E476
_0811E466:
ldr r0, [r4]
@ -8454,7 +8454,7 @@ _0811E466:
adds r0, r1
ldr r0, [r0]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_0811E476:
ldr r0, =gUnknown_0203A11C
ldr r1, [r0]
@ -8499,7 +8499,7 @@ sub_811E4AC: @ 811E4AC
adds r0, r1
ldr r0, [r0]
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@ -8589,7 +8589,7 @@ sub_811E55C: @ 811E55C
adds r0, r1
ldr r0, [r0]
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@ -8609,7 +8609,7 @@ sub_811E578: @ 811E578
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _0811E5AE
.pool
_0811E59C:
@ -8620,7 +8620,7 @@ _0811E59C:
adds r0, r1
ldr r0, [r0]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_0811E5AE:
pop {r0}
bx r0
@ -8861,7 +8861,7 @@ _0811E74E:
adds r0, r1
str r0, [r2]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0811E77E:
bl sub_811E7F8
pop {r4}
@ -9004,7 +9004,7 @@ _0811E852:
ands r1, r2
strb r1, [r0, 0x5]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_0811E892:
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@ -9035,7 +9035,7 @@ _0811E8A0:
ands r1, r2
strb r1, [r0, 0x5]
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
_0811E8D0:
add sp, 0x4
pop {r4,r5}

14
asm/egg_hatch.s
View File

@ -634,9 +634,9 @@ _080718D0:
.pool
_08071904:
ldr r0, =gUnknown_0832BFE4
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_0832BFEC
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_0832BFF4
bl LoadTaggedObjectPalette
b _080719A6
@ -1215,7 +1215,7 @@ _08071E54:
bl audio_play
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
bl sub_8072140
_08071E84:
pop {r4}
@ -1267,7 +1267,7 @@ _08071EBC:
bl audio_play
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_08071EE8:
pop {r4}
pop {r0}
@ -1340,7 +1340,7 @@ _08071F5C:
bl audio_play
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
bl sub_8072140
bl sub_8072140
_08071F90:
@ -1470,7 +1470,7 @@ sub_8072048: @ 8072048
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_08072084:
movs r2, 0x2E
ldrsh r0, [r5, r2]
@ -1661,7 +1661,7 @@ sub_8072194: @ 8072194
mov r1, r9
strh r1, [r0, 0x34]
mov r1, r10
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r3-r5}
mov r8, r3
mov r9, r4

14
asm/field_effect.s
View File

@ -194,7 +194,7 @@ FieldEffectScript_LoadTiles: @ 80B5C3C
cmp r0, r1
bne _080B5C5A
adds r0, r5, 0
bl LoadObjectPic
bl LoadSpriteSheet
_080B5C5A:
ldr r0, [r4]
adds r0, 0x4
@ -1804,7 +1804,7 @@ sub_80B68AC: @ 80B68AC
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_080B68D0:
adds r0, r4, 0
adds r0, 0x3F
@ -7044,7 +7044,7 @@ sub_80B9390: @ 80B9390
ldr r6, =gSprites
adds r0, r6
movs r1, 0x16
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r0, [r4, 0x1]
movs r1, 0x10
orrs r0, r1
@ -7277,7 +7277,7 @@ sub_80B957C: @ 80B957C
bl InitSpriteAffineAnim
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r0, 0x76
strh r0, [r4, 0x20]
ldr r0, =0x0000ffd0
@ -7429,7 +7429,7 @@ sub_80B96B0: @ 80B96B0
bl InitSpriteAffineAnim
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r0, 0x5E
strh r0, [r4, 0x20]
ldr r0, =0x0000ffe0
@ -7637,7 +7637,7 @@ _080B9856:
ldr r1, =gSprites
adds r0, r1
movs r1, 0x16
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4, 0x1]
movs r0, 0x21
negs r0, r0
@ -8248,7 +8248,7 @@ _080B9D5A:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
strh r5, [r4, 0x2E]
ldrb r1, [r6, 0x5]
lsrs r1, 4

26
asm/field_effect_helpers.s
View File

@ -55,7 +55,7 @@ SetUpReflection: @ 8153ED4
str r0, [r7, 0x8]
adds r0, r7, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gDummyObjectRotScalAnimTable
str r0, [r7, 0x10]
mov r1, r8
@ -560,7 +560,7 @@ _081542E2:
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0815432E:
add sp, 0x4
pop {r3}
@ -806,7 +806,7 @@ oei_grass_normal: @ 81544AC
beq _08154538
adds r0, r3, 0
movs r1, 0x4
bl SeekObjectImageAnim
bl SeekSpriteAnim
_08154538:
movs r0, 0
add sp, 0x4
@ -1145,7 +1145,7 @@ sub_8154758: @ 8154758
beq _081547E8
adds r0, r4, 0
movs r1, 0x6
bl SeekObjectImageAnim
bl SeekSpriteAnim
_081547E8:
movs r0, 0
add sp, 0x4
@ -1491,7 +1491,7 @@ _08154A98:
beq _08154AB2
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08154AB2:
strh r7, [r4, 0x20]
strh r5, [r4, 0x22]
@ -1579,7 +1579,7 @@ sub_8154B04: @ 8154B04
movs r1, 0xD
strh r1, [r0, 0x3C]
ldrb r1, [r4, 0x10]
bl StartObjectImageAnim
bl StartSpriteAnim
_08154B62:
movs r0, 0
pop {r4}
@ -1634,7 +1634,7 @@ sub_8154B78: @ 8154B78
movs r1, 0x18
strh r1, [r0, 0x3C]
ldrb r1, [r4, 0x10]
bl StartObjectImageAnim
bl StartSpriteAnim
_08154BD8:
adds r0, r5, 0
pop {r4,r5}
@ -1689,7 +1689,7 @@ sub_8154BEC: @ 8154BEC
movs r1, 0x23
strh r1, [r0, 0x3C]
ldrb r1, [r4, 0x10]
bl StartObjectImageAnim
bl StartSpriteAnim
_08154C4C:
adds r0, r5, 0
pop {r4,r5}
@ -2099,7 +2099,7 @@ sub_8154EFC: @ 8154EFC
subs r1, 0x4
strh r1, [r0, 0x26]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_08154F92:
movs r0, 0
pop {r4-r7}
@ -3025,7 +3025,7 @@ sub_81556B0: @ 81556B0
add r0, sp
ldrb r1, [r0]
adds r0, r4, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
_081556DC:
add sp, 0xC
pop {r4,r5}
@ -3391,7 +3391,7 @@ sub_8155900: @ 8155900
subs r1, 0x2
strh r1, [r0, 0x26]
movs r1, 0x2
bl SeekObjectImageAnim
bl SeekSpriteAnim
_081559A4:
movs r0, 0
pop {r4-r7}
@ -3469,7 +3469,7 @@ _08155A2C:
beq _08155A46
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08155A46:
strh r6, [r4, 0x20]
strh r5, [r4, 0x22]
@ -3854,7 +3854,7 @@ _08155CB8:
strh r0, [r5, 0x2E]
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_08155D38:
movs r3, 0x2E
ldrsh r0, [r5, r3]

40
asm/field_map_obj.s
View File

@ -93,7 +93,7 @@ sub_808D450: @ 808D450
bl InitSpriteAffineAnim
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r4, 0x3E
ldrb r0, [r4]
movs r6, 0x4
@ -119,7 +119,7 @@ sub_808D450: @ 808D450
bl InitSpriteAffineAnim
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r4, 0x3E
ldrb r0, [r4]
orrs r0, r6
@ -966,7 +966,7 @@ _0808DA64:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0808DB16:
ldrb r0, [r6, 0xB]
lsrs r0, 4
@ -1525,7 +1525,7 @@ _0808DF48:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0808DF6C:
adds r0, r6, 0
add sp, 0x20
@ -2035,7 +2035,7 @@ _0808E31E:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0808E362:
adds r0, r6, 0
bl sub_808E38C
@ -2308,14 +2308,14 @@ FieldObjectTurn: @ 808E544
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r6, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
movs r1, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
_0808E58A:
pop {r4-r6}
pop {r0}
@ -2444,7 +2444,7 @@ _0808E648:
strb r0, [r7, 0x5]
adds r0, r7, 0
adds r1, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0808E680:
pop {r4-r7}
pop {r0}
@ -11744,7 +11744,7 @@ _08092AA8:
_08092AAA:
ldrb r1, [r1]
adds r0, r4, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
_08092AB2:
pop {r4}
pop {r0}
@ -11780,7 +11780,7 @@ obj_npc_animation_step: @ 8092AB8
ldrb r1, [r2, 0x4]
_08092AEA:
adds r0, r4, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
_08092AF0:
pop {r4}
pop {r0}
@ -16779,7 +16779,7 @@ sub_8094DE4: @ 8094DE4
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
add sp, 0x4
pop {r4,r5}
pop {r0}
@ -18133,7 +18133,7 @@ sub_8095740: @ 8095740
strb r0, [r2]
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnimIfDifferent
bl StartSpriteAffineAnimIfDifferent
adds r0, r5, 0
adds r1, r4, 0
bl sub_8095774
@ -18185,7 +18185,7 @@ sub_80957A0: @ 80957A0
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
bl sub_80082F0
bl ChangeSpriteAffineAnimIfDifferent
adds r0, r5, 0
adds r1, r4, 0
bl sub_80957D4
@ -18238,7 +18238,7 @@ sub_8095800: @ 8095800
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x2
bl sub_80082F0
bl ChangeSpriteAffineAnimIfDifferent
adds r0, r5, 0
adds r1, r4, 0
bl sub_8095834
@ -18291,7 +18291,7 @@ sub_8095860: @ 8095860
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x3
bl sub_80082F0
bl ChangeSpriteAffineAnimIfDifferent
adds r0, r5, 0
adds r1, r4, 0
bl sub_8095894
@ -18751,7 +18751,7 @@ sub_8095B84: @ 8095B84
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
adds r0, r6, 0
bl DoShadowFieldEffect
add sp, 0x4
@ -19478,10 +19478,10 @@ sub_80960C8: @ 80960C8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@ -19834,10 +19834,10 @@ sub_8096330: @ 8096330
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
pop {r4,r5}
pop {r0}
bx r0

16
asm/field_player_avatar.s
View File

@ -3168,7 +3168,7 @@ sub_808C114: @ 808C114
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@ -3207,7 +3207,7 @@ sub_808C15C: @ 808C15C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4-r6}
pop {r0}
bx r0
@ -3249,14 +3249,14 @@ sub_808C1B4: @ 808C1B4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r6, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
add r0, r8
movs r1, 0x1
bl SeekObjectImageAnim
bl SeekSpriteAnim
pop {r3}
mov r8, r3
pop {r4-r6}
@ -3297,7 +3297,7 @@ sub_808C228: @ 808C228
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4-r6}
pop {r0}
bx r0
@ -4381,7 +4381,7 @@ _0808CB32:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0808CB5C:
movs r0, 0x1
pop {r4-r6}
@ -4679,7 +4679,7 @@ fishB: @ 808CD94
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
@ -4727,7 +4727,7 @@ fishC: @ 808CE04
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer

2
asm/fldeff_emotion.s
View File

@ -126,7 +126,7 @@ sub_80B46D8: @ 80B46D8
strh r3, [r0, 0x34]
strh r1, [r0, 0x3C]
adds r1, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4}
pop {r0}
bx r0

4
asm/front_pic_anim.s
View File

@ -254,13 +254,13 @@ _0817F68E:
bne _0817F6A8
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0817F6B0
.pool
_0817F6A8:
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0817F6B0:
ldrb r3, [r4, 0x1]
lsrs r1, r3, 6

2
asm/hall_of_fame.s
View File

@ -3318,7 +3318,7 @@ sub_81751FC: @ 81751FC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
bl Random
movs r1, 0x3
ands r1, r0

42
asm/intro.s
View File

@ -1585,7 +1585,7 @@ _0816DA20:
_0816DA50:
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@ -1645,7 +1645,7 @@ _0816DABA:
adds r0, r4, 0
movs r1, 0x1
_0816DABE:
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@ -2459,7 +2459,7 @@ _0816E19C:
strh r7, [r2, 0x36]
ldrb r1, [r5, 0x2]
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x6
adds r4, 0x1
cmp r4, 0x5
@ -3210,7 +3210,7 @@ _0816E80A:
bne _0816E82A
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x3E
ldrb r1, [r2]
@ -3598,7 +3598,7 @@ _0816EB72:
ldr r5, =gSprites
adds r0, r5
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0xC8
movs r2, 0x70
@ -3611,7 +3611,7 @@ _0816EB72:
lsls r0, 2
adds r0, r5
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r6]
adds r0, 0x1
strh r0, [r6]
@ -3645,7 +3645,7 @@ _0816EBE0:
ldr r5, =gSprites
adds r0, r5
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0x28
movs r2, 0x70
@ -3658,7 +3658,7 @@ _0816EBE0:
lsls r0, 2
adds r0, r5
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r6]
adds r0, 0x1
strh r0, [r6]
@ -4593,7 +4593,7 @@ sub_816F3A4: @ 816F3A4
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x80
lsls r0, 3
strh r0, [r4, 0x32]
@ -5017,7 +5017,7 @@ _0816F6E8:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x80
lsls r0, 3
strh r0, [r4, 0x32]
@ -5083,7 +5083,7 @@ _0816F768:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x80
lsls r0, 3
strh r0, [r4, 0x32]
@ -5199,7 +5199,7 @@ sub_816F7D0: @ 816F7D0
bl CalcCenterToCornerVec
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
mov r1, r8
cmp r1, 0
bne _0816F898
@ -5287,7 +5287,7 @@ _0816F8A0:
strh r2, [r5, 0x30]
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r0, [r5, 0x1]
movs r1, 0x3
orrs r0, r1
@ -5378,14 +5378,14 @@ _0816F9F0:
_0816FA04:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r0, [r4, 0x20]
subs r0, 0x1
b _0816FA60
_0816FA12:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldr r0, =gUnknown_030062A0
ldr r0, [r0]
movs r1, 0x7
@ -5586,7 +5586,7 @@ _0816FB7C:
strb r1, [r2]
adds r0, r6, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0816FCE6
_0816FB94:
ldr r0, =gUnknown_030062A0
@ -5735,7 +5735,7 @@ _0816FCC4:
bne _0816FD38
adds r0, r6, 0
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldrb r1, [r6, 0x1]
movs r0, 0xD
negs r0, r0
@ -5831,7 +5831,7 @@ _0816FD7C:
bne _0816FDB0
adds r0, r4, 0
movs r1, 0x3
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0816FD90:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@ -5932,10 +5932,10 @@ _0816FDD2:
adds r5, r3
ldrb r1, [r5]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r7, 0x1
lsls r0, 16
lsrs r7, r0, 16
@ -5975,7 +5975,7 @@ _0816FDD2:
orrs r1, r2
strb r1, [r0, 0x3]
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r6, 0
add sp, 0xC
pop {r3-r5}

6
asm/intro_credits_graphics.s
View File

@ -701,7 +701,7 @@ _0817B6C2:
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r1, 0
mov r0, sp
ldrh r0, [r0]
@ -1005,7 +1005,7 @@ sub_817B948: @ 817B948
adds r0, r4, r5
strh r6, [r0, 0x2E]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x1C
adds r4, r5
ldr r0, =sub_817B8E8
@ -1060,7 +1060,7 @@ sub_817B9C4: @ 817B9C4
adds r0, r4, r5
strh r6, [r0, 0x2E]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r5, 0x1C
adds r4, r5
ldr r0, =sub_817B8E8

74
asm/link.s
View File

@ -45088,7 +45088,7 @@ sub_802093C: @ 802093C
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r4]
ldr r2, [r1]
mov r0, sp
@ -45104,7 +45104,7 @@ _0802097C:
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r2, [r4]
ldr r1, [r2]
movs r0, 0x18
@ -45160,7 +45160,7 @@ sub_80209E0: @ 80209E0
ldr r0, [r0]
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _08020A0C
.pool
_08020A00:
@ -45168,7 +45168,7 @@ _08020A00:
ldr r0, [r0]
ldr r0, [r0]
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
_08020A0C:
ldr r0, =gUnknown_02022C8C
ldr r1, [r0]
@ -45206,13 +45206,13 @@ _08020A30:
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _08020A28
_08020A54:
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
b _08020A28
_08020A60:
movs r0, 0x1
@ -45382,7 +45382,7 @@ sub_8020B80: @ 8020B80
ldr r0, [r3]
ldr r0, [r0, 0x10]
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
b _08020BF6
.pool
_08020BB8:
@ -45415,7 +45415,7 @@ _08020BD8:
ldr r0, [r0, 0x10]
lsls r1, r4, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
_08020BF6:
pop {r4}
pop {r0}
@ -46574,7 +46574,7 @@ _08021558:
bge _080215D0
ldr r0, [r6]
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_080215D0:
mov r0, r9
adds r0, 0x1
@ -46758,7 +46758,7 @@ _08021704:
adds r0, r5, r4
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _0802175A
.pool
_08021748:
@ -46769,7 +46769,7 @@ _08021748:
adds r0, r5, r4
ldr r0, [r0]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0802175A:
adds r3, r5, r4
ldr r2, [r3]
@ -46894,13 +46894,13 @@ _080217E8:
beq _08021860
ldr r0, [r7]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _08021868
.pool
_08021860:
ldr r0, [r7]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08021868:
mov r0, r8
adds r0, 0x1
@ -60400,7 +60400,7 @@ sub_80283A8: @ 80283A8
str r4, [sp]
str r5, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r4, 0
bl Free
_080283E8:
@ -60781,7 +60781,7 @@ sub_80286B4: @ 80286B4
lsls r0, 2
ldr r2, =gSprites
adds r0, r2
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@ -60870,7 +60870,7 @@ sub_8028734: @ 8028734
bl AllocZeroed
str r0, [r4]
adds r0, r5, 0
bl LoadObjectPic
bl LoadSpriteSheet
add r0, sp, 0x20
bl LoadTaggedObjectPalette
movs r4, 0
@ -61059,7 +61059,7 @@ _080288E0:
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@ -61106,7 +61106,7 @@ _0802894C:
lsls r0, 2
adds r0, r6
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
b _0802899E
_0802896A:
lsls r1, r4, 1
@ -61119,7 +61119,7 @@ _0802896A:
lsls r0, 2
adds r0, r6
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _0802899E
_08028984:
ldr r0, =gUnknown_02022CF4
@ -61133,7 +61133,7 @@ _08028984:
lsls r0, 2
adds r0, r6
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0802899E:
adds r0, r4, 0x1
lsls r0, 24
@ -61157,7 +61157,7 @@ _080289B4:
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@ -61236,7 +61236,7 @@ sub_8028A34: @ 8028A34
orrs r0, r5
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
_08028A6A:
add r0, sp, 0x8
bl LoadTaggedObjectPalette
@ -61343,7 +61343,7 @@ _08028B40:
ldr r1, =gSprites
adds r0, r1
adds r1, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -61524,7 +61524,7 @@ sub_8028CA4: @ 8028CA4
lsls r0, 2
ldr r2, =gSprites
adds r0, r2
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@ -61628,7 +61628,7 @@ sub_8028D44: @ 8028D44
stm r2!, {r3-r5}
ldm r1!, {r3-r5}
stm r2!, {r3-r5}
bl LoadObjectPic
bl LoadSpriteSheet
add r0, sp, 0x20
bl LoadTaggedObjectPalette
movs r5, 0
@ -69000,7 +69000,7 @@ _0802CA32:
lsls r2, 4
orrs r1, r2
str r1, [r0, 0x4]
bl LoadObjectPic
bl LoadSpriteSheet
ldrh r0, [r7]
ldr r1, [r7, 0x4]
ldr r2, [r7, 0x8]
@ -69115,7 +69115,7 @@ sub_802CB14: @ 802CB14
ldr r1, =sub_802CB7C
str r1, [r0, 0x1C]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4-r6}
pop {r0}
bx r0
@ -69697,7 +69697,7 @@ _0802CF92:
ldr r0, [r2]
mov r2, r8
lsrs r1, r2, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r6, 0x1
adds r4, 0x14
subs r5, 0x1
@ -69740,7 +69740,7 @@ _0802CFE8:
ldr r0, [r2]
mov r2, r8
lsrs r1, r2, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r6, 0x1
subs r4, 0x14
subs r5, 0x1
@ -72806,7 +72806,7 @@ sub_802E83C: @ 802E83C
ldr r5, =gSprites
adds r0, r5
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x1C
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@ -72822,7 +72822,7 @@ sub_802E83C: @ 802E83C
lsls r0, 2
adds r0, r5
movs r1, 0x5
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x1E
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@ -72947,7 +72947,7 @@ _0802E9A6:
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _0802EA44
_0802E9BA:
movs r0, 0x15
@ -72956,7 +72956,7 @@ _0802E9BA:
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r4, =gSprites
movs r2, 0x1C
ldrsh r0, [r5, r2]
@ -73389,7 +73389,7 @@ _0802ED2C:
strh r0, [r4, 0x2E]
adds r0, r4, 0
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0802EDC4
_0802ED4E:
ldrh r0, [r4, 0x22]
@ -73411,7 +73411,7 @@ _0802ED4E:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
strh r0, [r4, 0x32]
b _0802EDA6
@ -73437,7 +73437,7 @@ _0802ED86:
adds r0, r4, 0
movs r1, 0x3
_0802EDA2:
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0802EDA6:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@ -73832,7 +73832,7 @@ sub_802EFFC: @ 802EFFC
lsls r0, 2
adds r0, r2
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
add sp, 0x18
pop {r3-r5}
mov r8, r3

2
asm/main_menu.s
View File

@ -3466,7 +3466,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4
bl InitSpriteAffineAnim
adds r0, r5, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r7, 0
adds r0, 0x1C
adds r4, r0

6
asm/map_obj_8097404.s
View File

@ -811,7 +811,7 @@ obj_anim_image_set_and_seek: @ 8097994
ands r1, r3
strb r1, [r4]
adds r1, r2, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
pop {r4}
pop {r0}
bx r0
@ -1081,7 +1081,7 @@ sub_8097B78: @ 8097B78
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08097BAA:
pop {r4,r5}
pop {r0}
@ -1153,7 +1153,7 @@ _08097C20:
_08097C36:
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08097C3E:
pop {r4,r5}
pop {r0}

2
asm/menu_helpers.s
View File

@ -793,7 +793,7 @@ _08122358:
lsls r0, 2
adds r0, r7
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0812237E:
ldrb r1, [r4]
lsls r0, r1, 4

14
asm/mon_markings.s
View File

@ -528,7 +528,7 @@ sub_811FC80: @ 811FC80
ldr r0, =TaskDummy7
str r0, [r4, 0x14]
mov r0, sp
bl LoadObjectPics
bl LoadSpriteSheets
mov r0, r10
bl LoadTaggedObjectPalettes
movs r5, 0
@ -575,7 +575,7 @@ _0811FD70:
str r0, [r2]
lsls r1, r5, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@ -674,7 +674,7 @@ _0811FDEE:
ldr r0, [r6]
ldr r0, [r0, 0x28]
movs r1, 0x9
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r6]
ldr r2, [r1, 0x28]
ldr r3, [sp, 0x48]
@ -726,7 +726,7 @@ _0811FEAE:
strh r0, [r1, 0x2E]
ldr r0, [r2, 0x24]
movs r1, 0x8
bl StartObjectImageAnim
bl StartSpriteAnim
b _0811FF28
.pool
_0811FEFC:
@ -787,14 +787,14 @@ sub_811FF40: @ 811FF40
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _0811FF76
.pool
_0811FF6C:
lsls r1, 25
lsrs r1, 24
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0811FF76:
pop {r0}
bx r0
@ -897,7 +897,7 @@ sub_811FFD4: @ 811FFD4
orrs r0, r3
str r0, [r5, 0x4]
adds r0, r5, 0
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r4, 0
bl LoadTaggedObjectPalette
mov r0, sp

12
asm/naming_screen.s
View File

@ -1589,7 +1589,7 @@ sub_80E3B30: @ 80E3B30
beq _080E3B48
adds r0, r5, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_080E3B48:
ldrh r0, [r5, 0x36]
movs r1, 0xFF
@ -1998,7 +1998,7 @@ sub_80E3E3C: @ 80E3E3C
lsls r0, 2
adds r0, r5
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@ -2052,7 +2052,7 @@ sub_80E3ED8: @ 80E3ED8
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@ -2634,7 +2634,7 @@ sub_80E4384: @ 80E4384
orrs r1, r2
strb r1, [r0, 0x5]
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
add sp, 0x4
pop {r0}
bx r0
@ -2732,7 +2732,7 @@ sub_80E447C: @ 80E447C
orrs r1, r2
strb r1, [r0, 0x5]
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
add sp, 0x4
pop {r0}
bx r0
@ -3739,7 +3739,7 @@ choose_name_or_words_screen_load_bg_tile_patterns: @ 80E4C54
movs r3, 0
bl LoadBgTiles
ldr r0, =gUnknown_0858C1C8
bl LoadObjectPics
bl LoadSpriteSheets
ldr r0, =gUnknown_0858C230
bl LoadTaggedObjectPalettes
pop {r4-r6}

4
asm/pokeblock_feed.s
View File

@ -1368,13 +1368,13 @@ _0817A858:
adds r1, 0xA
lsls r1, 24
lsrs r1, 24
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0817A8C8
.pool
_0817A898:
ldr r0, [r4]
ldrb r1, [r2]
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0817A8C8
_0817A8A2:
bl sub_817A9E4

50
asm/pokedex.s
View File

@ -4652,7 +4652,7 @@ sub_80BDB7C: @ 80BDB7C
lsls r0, 2
add r0, r10
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0
movs r1, 0x10
movs r2, 0x90
@ -4666,7 +4666,7 @@ sub_80BDB7C: @ 80BDB7C
add r4, r10
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x80
mov r9, r0
mov r1, r9
@ -4683,7 +4683,7 @@ sub_80BDB7C: @ 80BDB7C
lsls r0, 2
add r0, r10
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r6, =gUnknown_0855D1DC
adds r0, r6, 0
movs r1, 0
@ -4766,7 +4766,7 @@ _080BDCD6:
lsls r0, 2
add r0, r10
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
mov r8, r0
ldr r0, =gUnknown_0855D224
@ -4793,7 +4793,7 @@ _080BDCD6:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
cmp r5, 0
beq _080BDD6C
movs r0, 0x1
@ -4841,7 +4841,7 @@ _080BDDB0:
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
b _080BDDE8
.pool
_080BDDD4:
@ -4883,7 +4883,7 @@ _080BDDE8:
adds r0, r4
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
mov r8, r0
adds r0, r6, 0
@ -4908,7 +4908,7 @@ _080BDDE8:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
cmp r5, 0
beq _080BDE80
movs r0, 0x1
@ -4956,7 +4956,7 @@ _080BDEC4:
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
b _080BDEFC
.pool
_080BDEE8:
@ -4997,7 +4997,7 @@ _080BDEFC:
adds r0, r2
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
b _080BE3E2
.pool
_080BDF4C:
@ -5019,7 +5019,7 @@ _080BDF4C:
lsls r0, 2
add r0, r10
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r4, =gUnknown_0855D20C
adds r0, r4, 0
movs r1, 0x11
@ -5038,7 +5038,7 @@ _080BDF4C:
lsls r0, 2
add r0, r10
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0x11
movs r2, 0x51
@ -5056,7 +5056,7 @@ _080BDF4C:
lsls r0, 2
add r0, r10
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
bl sub_80C0844
lsls r0, 16
@ -5083,7 +5083,7 @@ _080BDF4C:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
cmp r5, 0
beq _080BE024
movs r0, 0x1
@ -5127,7 +5127,7 @@ _080BE060:
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
b _080BE090
.pool
_080BE07C:
@ -5165,7 +5165,7 @@ _080BE090:
adds r0, r4
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
mov r8, r0
adds r0, r5, 0
@ -5191,7 +5191,7 @@ _080BE090:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
cmp r5, 0
beq _080BE11C
movs r0, 0x1
@ -5239,7 +5239,7 @@ _080BE160:
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
b _080BE198
.pool
_080BE184:
@ -5281,7 +5281,7 @@ _080BE198:
adds r0, r4
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x1
bl sub_80C0844
lsls r0, 16
@ -5307,7 +5307,7 @@ _080BE198:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
cmp r5, 0
beq _080BE230
movs r1, 0x1
@ -5351,7 +5351,7 @@ _080BE26C:
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
b _080BE29C
.pool
_080BE288:
@ -5389,7 +5389,7 @@ _080BE29C:
adds r0, r4
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
movs r1, 0
mov r8, r1
adds r0, r5, 0
@ -5415,7 +5415,7 @@ _080BE29C:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
cmp r5, 0
beq _080BE328
movs r0, 0x1
@ -5463,7 +5463,7 @@ _080BE36C:
adds r0, r1
lsls r1, r5, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
b _080BE3A4
.pool
_080BE390:
@ -5504,7 +5504,7 @@ _080BE3A4:
adds r0, r2
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
_080BE3E2:
ldr r0, =gUnknown_0855D254
movs r1, 0x88

4
asm/pokedex_area_screen.s
View File

@ -1560,7 +1560,7 @@ sub_813D6D0: @ 813D6D0
mov r5, r8
push {r5-r7}
ldr r0, =gUnknown_085B401C
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085B4024
bl LoadTaggedObjectPalette
ldr r0, =gUnknown_03001204
@ -1784,7 +1784,7 @@ sub_813D8A8: @ 813D8A8
ldr r0, =gUnknown_08DC4140
bl LZ77UnCompWram
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085B40EC
bl LoadTaggedObjectPalette
add sp, 0x8

2
asm/pokedex_cry_screen.s
View File

@ -676,7 +676,7 @@ _08145884:
.pool
_081458B0:
ldr r0, =gUnknown_085B8C80
bl LoadObjectPics
bl LoadSpriteSheets
ldr r0, =gUnknown_085B8C90
bl LoadTaggedObjectPalettes
ldr r0, =gUnknown_085B8C68

4
asm/pokemon_3.s
View File

@ -6075,7 +6075,7 @@ _0806ED84:
beq _0806EDA6
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0806EDA6:
ldr r0, =gUnknown_08329B87
subs r4, 0x1
@ -6136,7 +6136,7 @@ sub_806EE0C: @ 806EE0C
beq _0806EE2E
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_0806EE2E:
ldr r0, =gUnknown_08329B87
subs r4, 0x1

4
asm/porthole.s
View File

@ -209,7 +209,7 @@ sub_80FB6EC: @ 80FB6EC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _080FB75E
.pool
_080FB74C:
@ -219,7 +219,7 @@ _080FB74C:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_080FB75E:
add sp, 0x4
pop {r4}

12
asm/region_map.s
View File

@ -2639,7 +2639,7 @@ _08124158:
_0812416E:
str r0, [sp, 0x14]
adds r0, r2, 0
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r7, 0
bl LoadTaggedObjectPalette
mov r0, sp
@ -2680,7 +2680,7 @@ _0812416E:
strh r0, [r1, 0x22]
ldr r0, [r2, 0x1C]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _08124204
.pool
_081241DC:
@ -2833,7 +2833,7 @@ _08124304:
str r0, [sp, 0x20]
_08124316:
adds r0, r6, 0
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r4, 0
bl LoadTaggedObjectPalette
mov r0, sp
@ -3739,7 +3739,7 @@ sub_8124A70: @ 8124A70
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085A1F10
bl LoadTaggedObjectPalette
bl sub_8124AD4
@ -3859,7 +3859,7 @@ _08124BA2:
lsls r1, r7, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
mov r2, r9
strh r2, [r4, 0x2E]
_08124BB8:
@ -3963,7 +3963,7 @@ _08124C0C:
str r0, [r2]
adds r0, r4, 0
movs r1, 0x6
bl StartObjectImageAnim
bl StartSpriteAnim
strh r6, [r4, 0x2E]
_08124C84:
mov r0, r8

4
asm/reshow_battle_screen.s
View File

@ -590,7 +590,7 @@ _080A9786:
ldr r1, =gUnknown_020244E4
adds r1, r7, r1
ldrb r1, [r1]
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r0, [r0]
@ -807,7 +807,7 @@ _080A998C:
ldr r1, =gUnknown_020244E4
adds r1, r7, r1
ldrb r1, [r1]
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gUnknown_020244D0
ldr r0, [r0]
ldr r0, [r0]

4
asm/rom4.s
View File

@ -6780,7 +6780,7 @@ sub_8087C8C: @ 8087C8C
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _08087D0A
.pool
_08087CF8:
@ -6790,7 +6790,7 @@ _08087CF8:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
_08087D0A:
adds r0, r5, 0
movs r1, 0

2
asm/rom6.s
View File

@ -211,7 +211,7 @@ _081355B8:
ldr r1, =gSprites
adds r0, r1
ldrb r1, [r6, 0x8]
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x6
bl FieldEffectActiveListRemove
ldr r1, =gTasks

14
asm/rom_8034C54.s
View File

@ -165,7 +165,7 @@ sub_8034D14: @ 8034D14
cmp r0, 0
beq _08034D94
adds r0, r1, 0
bl LoadObjectPic
bl LoadSpriteSheet
b _08034DB4
.pool
_08034D94:
@ -7098,7 +7098,7 @@ sub_8038B74: @ 8038B74
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =sub_8038B04
str r0, [r4, 0x1C]
movs r0, 0x68
@ -8431,7 +8431,7 @@ oac_poke_opponent: @ 80397DC
ldr r1, =sub_803980C
str r1, [r0, 0x1C]
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
movs r0, 0x80
lsls r0, 10
ldr r1, =0x00002108
@ -8495,7 +8495,7 @@ sub_8039838: @ 8039838
str r0, [r4, 0x1C]
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
movs r0, 0x80
lsls r0, 10
ldr r1, =0x00002108
@ -8796,7 +8796,7 @@ _08039AAE:
adds r1, r0
ldrb r1, [r1]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08039AC8:
pop {r4}
pop {r0}
@ -8907,7 +8907,7 @@ _08039B80:
beq _08039B94
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_08039B94:
ldrh r1, [r4, 0x32]
adds r0, r4, 0
@ -9300,7 +9300,7 @@ sub_8039E84: @ 8039E84
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =sub_8039E60
str r0, [r4, 0x1C]
pop {r4}

48
asm/rom_8072304.s
View File

@ -2334,7 +2334,7 @@ _0807366C:
ldr r0, =gUnknown_0832C334
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_0832C34C
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_0832C33C
bl LoadTaggedObjectPalette
ldr r0, =gUnknown_0832C344
@ -5819,7 +5819,7 @@ _0807524E:
strh r0, [r5, 0x2E]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
bl AnimateSprite
mov r0, r9
@ -5841,7 +5841,7 @@ _0807524E:
strh r0, [r5, 0x2E]
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
bl AnimateSprite
mov r0, r9
@ -5863,7 +5863,7 @@ _0807524E:
strh r0, [r5, 0x2E]
adds r0, r4, 0
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
bl AnimateSprite
mov r0, r8
@ -6206,7 +6206,7 @@ objc_0804ABD4: @ 8075620
mov r8, r0
adds r0, r7, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r2, r7, 0
adds r2, 0x2C
ldrb r0, [r2]
@ -6303,7 +6303,7 @@ sub_80756E0: @ 80756E0
ldr r4, =gSprites
adds r0, r4
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r1, 0x3A
ldrsh r0, [r6, r1]
adds r0, r5
@ -6361,7 +6361,7 @@ _08075764:
bge _080757BC
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
movs r2, 0x3A
ldrsh r0, [r4, r2]
adds r0, r5
@ -6595,7 +6595,7 @@ sub_8075930: @ 8075930
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =sub_8075970
str r0, [r4, 0x1C]
movs r0, 0x17
@ -6683,12 +6683,12 @@ _080759D2:
bge _08075A0E
adds r0, r4, 0
movs r1, 0x2
bl sub_80082B8
bl ChangeSpriteAffineAnim
b _08075AB6
_08075A0E:
adds r0, r4, 0
movs r1, 0x1
bl sub_80082B8
bl ChangeSpriteAffineAnim
b _08075AB6
_08075A18:
adds r0, r4, 0
@ -6752,20 +6752,20 @@ _08075A70:
strh r0, [r4, 0x34]
adds r0, r4, 0
movs r1, 0x3
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r1, 0x36
ldrsh r0, [r4, r1]
cmp r0, 0
bge _08075AA8
adds r0, r4, 0
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _08075AB0
.pool
_08075AA8:
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_08075AB0:
movs r0, 0x17
bl audio_play
@ -7052,7 +7052,7 @@ sub_8075D14: @ 8075D14
lsrs r5, r0, 24
adds r0, r6, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0
bl sub_8076B14
lsls r0, 16
@ -7262,7 +7262,7 @@ _08075EF4:
ldr r5, =gSprites
adds r0, r5
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldrh r0, [r6, 0x3A]
lsls r0, 24
lsrs r0, 24
@ -7398,7 +7398,7 @@ _08076016:
bge _08076040
adds r0, r1, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r7, 0x1
b _0807605C
.pool
@ -7654,7 +7654,7 @@ sub_8076204: @ 8076204
strh r7, [r5, 0x32]
adds r0, r5, 0
movs r1, 0x4
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_08076266:
ldrh r4, [r5, 0x2E]
adds r0, r5, 0
@ -7776,7 +7776,7 @@ _0807635A:
str r0, [r5, 0x1C]
adds r0, r5, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_08076364:
pop {r3}
mov r8, r3
@ -8037,7 +8037,7 @@ _0807655E:
_08076560:
adds r0, r6, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r6, 0x20]
lsls r0, 24
lsrs r0, 24
@ -8074,7 +8074,7 @@ _08076560:
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r4, 0
bl AnimateSprite
movs r0, 0x80
@ -8135,7 +8135,7 @@ _08076610:
bge _08076634
adds r0, r5, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r1, 0x1
mov r12, r1
_08076634:
@ -8375,7 +8375,7 @@ _0807680E:
_08076810:
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x20]
lsls r0, 24
lsrs r0, 24
@ -8405,7 +8405,7 @@ _08076810:
adds r4, r0
adds r0, r4, 0
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r4, 0
bl AnimateSprite
strh r5, [r4, 0x30]
@ -8452,7 +8452,7 @@ _08076894:
bge _080768D8
adds r0, r5, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x3E
ldrb r0, [r2]

6
asm/rom_80A5C6C.s
View File

@ -5142,7 +5142,7 @@ sub_80A8394: @ 80A8394
lsls r0, r7, 3
ldr r1, =gUnknown_08525FC0
adds r0, r1
bl LoadObjectPic
bl LoadSpriteSheet
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0xC]
@ -5378,7 +5378,7 @@ _080A85B2:
str r2, [r1]
adds r0, r3
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_080A85EE:
adds r0, r4, 0
add sp, 0x10
@ -6037,7 +6037,7 @@ _080A8B26:
strh r0, [r4, 0x38]
ldrb r1, [r1, 0xC]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, =move_anim_8074EE0
adds r0, r4, 0
bl oamt_set_x3A_32

80
asm/rom_80C6FA0.s
View File

@ -1099,7 +1099,7 @@ sub_80C77E8: @ 80C77E8
bl LoadTaggedObjectPalette
_080C7846:
mov r0, sp
bl LoadObjectPics
bl LoadSpriteSheets
ldr r0, =gUnknown_02039D04
str r5, [r0]
movs r1, 0x90
@ -1380,7 +1380,7 @@ _080C7A6E:
ldr r0, [r0]
lsls r1, r5, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@ -5720,7 +5720,7 @@ sub_80CA1C4: @ 80CA1C4
str r0, [sp]
str r1, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
movs r4, 0
_080CA1DA:
lsls r1, r4, 6
@ -5942,7 +5942,7 @@ _080CA36C:
movs r1, 0
str r1, [r0]
adds r0, r3, 0
bl LoadObjectPic
bl LoadSpriteSheet
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
@ -6266,7 +6266,7 @@ _080CA680:
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@ -6293,7 +6293,7 @@ _080CA6C6:
ldr r0, [r0]
lsls r1, r4, 25
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@ -9345,7 +9345,7 @@ _080CBF80:
ldr r0, [r1]
ldr r0, [r0]
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_080CBFC0:
pop {r4}
pop {r0}
@ -9451,7 +9451,7 @@ sub_80CC064: @ 80CC064
ldr r0, [r0]
ldr r0, [r0]
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_080CC094:
pop {r0}
bx r0
@ -10850,7 +10850,7 @@ sub_80CCB50: @ 80CCB50
movs r3, 0
bl sub_80C6D80
ldr r0, [sp, 0x2C]
bl LoadObjectPic
bl LoadSpriteSheet
mov r0, r8
bl sav3_get_box_name
bl sub_80CD00C
@ -10884,7 +10884,7 @@ _080CCC70:
str r0, [r2]
lsls r1, r4, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@ -11016,7 +11016,7 @@ _080CCDB0:
movs r3, 0
bl sub_80C6D80
adds r0, r6, 0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, [sp, 0x28]
bl sub_80D20F8
lsls r0, 24
@ -11093,7 +11093,7 @@ _080CCE2E:
str r1, [r0, 0x1C]
lsls r1, r7, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
mov r1, r9
ldr r0, [r1]
movs r3, 0xE4
@ -11297,7 +11297,7 @@ sub_80CD00C: @ 80CD00C
sub_80CD02C: @ 80CD02C
push {r4,r5,lr}
ldr r0, =gUnknown_0857B080
bl LoadObjectPic
bl LoadSpriteSheet
movs r5, 0
_080CD036:
lsls r1, r5, 4
@ -11323,7 +11323,7 @@ _080CD036:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x1
cmp r5, 0
bne _080CD076
@ -11685,7 +11685,7 @@ sub_80CD2E8: @ 80CD2E8
ldr r5, =gSprites
adds r6, r4, r5
adds r0, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x3
mov r1, r8
ands r1, r0
@ -12346,7 +12346,7 @@ sub_80CD894: @ 80CD894
adds r0, r1, r2
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _080CD8FC
.pool
_080CD8E4:
@ -12359,7 +12359,7 @@ _080CD8E4:
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_080CD8FC:
ldr r0, =gUnknown_02039D08
ldr r0, [r0]
@ -12547,7 +12547,7 @@ sub_80CDA68: @ 80CDA68
adds r0, r2, r3
ldr r0, [r0]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _080CDAD8
.pool
_080CDAC0:
@ -12560,7 +12560,7 @@ _080CDAC0:
adds r0, r1
ldr r0, [r0]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_080CDAD8:
bl sub_80CEB40
ldr r0, =gUnknown_02039D78
@ -12838,7 +12838,7 @@ _080CDD08:
adds r0, r1, r2
ldr r0, [r0]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
b _080CDD4A
.pool
_080CDD1C:
@ -12851,7 +12851,7 @@ _080CDD1C:
adds r0, r1
ldr r0, [r0]
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
bl sub_80CDF38
b _080CDD4A
.pool
@ -12905,7 +12905,7 @@ _080CDD82:
adds r0, r1
ldr r0, [r0]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
bl sub_80CDFAC
b _080CDDBC
.pool
@ -12919,7 +12919,7 @@ _080CDDA4:
adds r0, r1
ldr r0, [r0]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_080CDDBC:
ldr r1, [r4]
adds r1, r5
@ -12987,7 +12987,7 @@ _080CDE2A:
adds r0, r1
ldr r0, [r0]
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r4]
ldr r2, =0x00000d91
adds r0, r2
@ -13011,7 +13011,7 @@ _080CDE68:
adds r0, r1
ldr r0, [r0]
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r4]
ldr r2, =0x00000d91
adds r0, r2
@ -13431,7 +13431,7 @@ _080CE208:
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x1
_080CE21A:
pop {r4-r6}
@ -13449,7 +13449,7 @@ sub_80CE22C: @ 80CE22C
adds r0, r1
ldr r0, [r0]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
bl sub_80CEB40
pop {r0}
bx r0
@ -13508,7 +13508,7 @@ _080CE2B8:
adds r0, r1
ldr r0, [r0]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0
_080CE2CA:
pop {r1}
@ -13567,7 +13567,7 @@ sub_80CE324: @ 80CE324
adds r0, r1
ldr r0, [r0]
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
_080CE33E:
pop {r0}
bx r0
@ -16469,7 +16469,7 @@ sub_80CFC14: @ 80CFC14
ldr r0, [r0]
str r0, [r1]
mov r0, sp
bl LoadObjectPics
bl LoadSpriteSheets
adds r0, r4, 0
bl LoadTaggedObjectPalettes
ldr r0, =0x0000daca
@ -16545,7 +16545,7 @@ sub_80CFC14: @ 80CFC14
adds r0, r4
ldr r0, [r0]
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
b _080CFD22
.pool
_080CFD18:
@ -16710,7 +16710,7 @@ sub_80CFE54: @ 80CFE54
ldr r2, =0x00000cb4
adds r0, r2
ldr r0, [r0]
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@ -19669,7 +19669,7 @@ sub_80D15D4: @ 80D15D4
adds r0, r1
ldr r0, [r0]
adds r1, r3, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_080D15F6:
pop {r0}
bx r0
@ -26779,7 +26779,7 @@ SetBagVisualPocketId: @ 80D4D38
strh r0, [r2, 0x2E]
adds r0, r2, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _080D4D90
.pool
_080D4D84:
@ -26787,7 +26787,7 @@ _080D4D84:
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_080D4D90:
pop {r0}
bx r0
@ -26811,7 +26811,7 @@ _080D4DA8:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080D4DB8:
@ -26844,7 +26844,7 @@ ShakeBagVisual: @ 80D4DC4
beq _080D4DF4
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =ObjectCB_ShakeBagVisual
str r0, [r4, 0x1C]
_080D4DF4:
@ -26867,7 +26867,7 @@ ObjectCB_ShakeBagVisual: @ 80D4E0C
beq _080D4E28
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080D4E28:
@ -26889,7 +26889,7 @@ AddSwitchPocketRotatingBallObject: @ 80D4E34
ldr r0, =0x00000805
adds r4, r0
ldr r0, =gUnknown_0857FBA0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_0857FBA8
bl LoadTaggedObjectPalette
ldr r0, =gUnknown_0857FBB0
@ -27286,7 +27286,7 @@ sub_80D511C: @ 80D511C
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_080D5172:
adds r0, r4, 0
pop {r3}

60
asm/rom_8158B30.s
View File

@ -2956,7 +2956,7 @@ _0815A35C:
bl SetGpuReg
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r0, 0
strh r0, [r4, 0x32]
adds r2, r4, 0
@ -3798,7 +3798,7 @@ _0815AA12:
_0815AA32:
adds r0, r4, 0
movs r1, 0x1
bl sub_80082B8
bl ChangeSpriteAffineAnim
_0815AA3A:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@ -4743,7 +4743,7 @@ _0815B1C4:
movs r1, 0x2
str r2, [sp]
str r3, [sp, 0x4]
bl StartObjectImageAnim
bl StartSpriteAnim
mov r0, r8
adds r1, r4, r0
ldr r0, =sub_815B23C
@ -5771,7 +5771,7 @@ _0815BA06:
lsls r0, 2
adds r0, r3
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0815BA1C:
ldr r0, =gTasks
mov r1, r9
@ -6295,7 +6295,7 @@ _0815BE2E:
adds r0, r5, 0
movs r1, 0x1
str r2, [sp]
bl StartObjectImageAnim
bl StartSpriteAnim
mov r0, r8
lsls r6, r0, 4
add r6, r8
@ -6304,7 +6304,7 @@ _0815BE2E:
adds r4, r6, r1
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, =gUnknown_0203841E
ldrh r0, [r1]
strh r0, [r5, 0x30]
@ -7278,7 +7278,7 @@ _0815C6DE:
strh r0, [r4, 0x32]
ldrb r1, [r1, 0x2]
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =sub_815C700
str r0, [r4, 0x1C]
pop {r4}
@ -8090,7 +8090,7 @@ _0815CD4A:
bne _0815CDAA
adds r0, r4, 0
movs r1, 0x1
bl sub_80082B8
bl ChangeSpriteAffineAnim
b _0815CD7A
_0815CD60:
adds r0, r4, 0
@ -9346,7 +9346,7 @@ sub_815D7B4: @ 815D7B4
ldr r0, =gUnknown_0203841E
ldrb r1, [r0]
adds r0, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r0, 0x20
ldrsh r1, [r4, r0]
movs r0, 0x22
@ -9437,7 +9437,7 @@ sub_815D870: @ 815D870
strh r0, [r5, 0x2E]
ldrb r1, [r6]
adds r0, r5, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =gUnknown_02038437
ldrb r0, [r0]
bl GetBankSide
@ -10443,7 +10443,7 @@ _0815E080:
_0815E09A:
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0xA0
lsls r0, 2
strh r0, [r5, 0x2E]
@ -11074,7 +11074,7 @@ _0815E4EE:
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0815E596:
ldr r0, =sub_815E5CC
str r0, [r7]
@ -12766,7 +12766,7 @@ _0815F2AC:
lsls r0, 2
adds r0, r3
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0815F2EE:
mov r4, r9
adds r3, r7, 0
@ -14747,7 +14747,7 @@ sub_8160338: @ 8160338
strh r0, [r4, 0x30]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _08160396
.pool
_0816037C:
@ -15181,7 +15181,7 @@ sub_81606A0: @ 81606A0
strb r0, [r4, 0x4]
bl sub_8161280
ldr r0, =gUnknown_085CEBB0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085CEBB8
bl LoadTaggedObjectPalette
bl sub_81610B8
@ -15238,7 +15238,7 @@ sub_8160740: @ 8160740
bl sub_81D2824
bl sub_8161280
ldr r0, =gUnknown_085CEBB0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085CEBB8
bl LoadTaggedObjectPalette
bl sub_81610B8
@ -16304,7 +16304,7 @@ _08161124:
ldr r5, =gSprites
adds r0, r5
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
adds r4, 0x1
cmp r4, 0x7
ble _0816111C
@ -16618,7 +16618,7 @@ _081613F4:
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _08161436
.pool
_08161420:
@ -16631,7 +16631,7 @@ _08161420:
lsls r0, 2
adds r0, r4
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_08161436:
ldr r0, [r7]
adds r0, 0x1
@ -16687,7 +16687,7 @@ _08161484:
lsls r0, 2
adds r0, r7
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
b _081614D4
.pool
_081614B8:
@ -16703,7 +16703,7 @@ _081614B8:
lsls r0, 2
adds r0, r7
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
_081614D4:
mov r1, r8
ldr r0, [r1]
@ -27723,7 +27723,7 @@ sub_8167338: @ 8167338
mov r7, r8
push {r7}
ldr r0, =gUnknown_085DFD18
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085DFD20
bl LoadTaggedObjectPalette
ldr r2, =gUnknown_0203BC90
@ -28087,7 +28087,7 @@ sub_8167608: @ 8167608
adds r1, r2
strh r0, [r1]
adds r0, r5, 0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r1, [r7]
ldr r3, =0x00007b14
adds r1, r3
@ -28207,7 +28207,7 @@ sub_8167760: @ 8167760
adds r2, r4, 0
bl sub_81D321C
mov r0, sp
bl LoadObjectPics
bl LoadSpriteSheets
adds r0, r4, 0
bl LoadTaggedObjectPalettes
movs r4, 0
@ -28387,7 +28387,7 @@ _08167902:
mov r1, r10
bl sub_81D32B0
mov r0, r9
bl LoadObjectPic
bl LoadSpriteSheet
mov r0, r10
bl LoadTaggedObjectPalette
add sp, 0x60
@ -29304,13 +29304,13 @@ sub_8168180: @ 8168180
bne _081681A8
adds r0, r2, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _081681B0
.pool
_081681A8:
adds r0, r2, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_081681B0:
pop {r0}
bx r0
@ -29470,7 +29470,7 @@ _081682B6:
lsls r1, r6, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
lsls r0, r6, 2
adds r0, r7
str r4, [r0]
@ -33865,7 +33865,7 @@ sub_816A90C: @ 816A90C
lsls r0, 2
adds r0, r5
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =0x0000d6f8
bl AllocObjectPalette
adds r4, r0, 0
@ -34067,7 +34067,7 @@ sub_816AA80: @ 816AA80
ldr r1, =gUnknown_020244E4
adds r6, r1
ldrb r1, [r6]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1

82
asm/rom_8184DA4.s
View File

@ -4029,7 +4029,7 @@ sub_8186F94: @ 8186F94
lsls r0, 2
adds r0, r7
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldrb r1, [r5]
adds r0, r1, r4
@ -6380,7 +6380,7 @@ sub_818843C: @ 818843C
ldr r1, =gUnknown_020244E4
adds r2, r1
ldrb r1, [r2]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r4, [r6]
lsls r0, r4, 1
adds r0, r7
@ -6575,7 +6575,7 @@ sub_81885D8: @ 81885D8
ldr r1, =gUnknown_020244E4
adds r6, r1
ldrb r1, [r6]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@ -9944,7 +9944,7 @@ sub_818A37C: @ 818A37C
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldrb r1, [r7]
adds r0, r1, r4
@ -12317,7 +12317,7 @@ sub_818B8E0: @ 818B8E0
ldr r1, =gUnknown_020244E4
adds r2, r1
ldrb r1, [r2]
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, =gBattleBankFunc
ldrb r0, [r6]
lsls r0, 2
@ -12499,7 +12499,7 @@ sub_818BA6C: @ 818BA6C
ldr r1, =gUnknown_020244E4
adds r6, r1
ldrb r1, [r6]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@ -14313,7 +14313,7 @@ sub_818CA64: @ 818CA64
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =0x0000d6f9
bl AllocObjectPalette
lsls r0, 24
@ -21412,7 +21412,7 @@ _081906B0:
add r4, r8
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
strh r6, [r4, 0x2E]
adds r0, r5, 0
movs r1, 0x78
@ -21427,7 +21427,7 @@ _081906B0:
add r4, r8
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
strh r6, [r4, 0x2E]
ldr r5, =gUnknown_0860D050
adds r0, r5, 0
@ -21444,7 +21444,7 @@ _081906B0:
adds r4, r0, r2
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
strh r6, [r4, 0x2E]
movs r0, 0
strh r0, [r4, 0x30]
@ -21471,7 +21471,7 @@ _08190746:
add r4, r8
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
strh r6, [r4, 0x2E]
movs r0, 0x1
strh r0, [r4, 0x30]
@ -27380,7 +27380,7 @@ _081939C2:
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _08193BC2
.pool
_08193A00:
@ -27724,7 +27724,7 @@ _08193CDE:
ldr r4, =gSprites
adds r0, r4
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r2, =gUnknown_0860CBF1
lsls r1, r6, 2
add r1, r8
@ -27739,7 +27739,7 @@ _08193CDE:
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, =gTasks
lsls r0, r7, 2
adds r0, r7
@ -40683,24 +40683,24 @@ _0819A484:
bne _0819A4A6
adds r0, r5, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x20
strh r0, [r5, 0x2E]
b _0819A4C2
_0819A4A6:
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _0819A4C2
_0819A4B0:
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _0819A4C2
_0819A4BA:
adds r0, r5, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
_0819A4C2:
pop {r4,r5}
pop {r0}
@ -40999,7 +40999,7 @@ _0819A7CC:
ldr r0, =gUnknown_086103F4
bl LoadTaggedObjectPalettes
ldr r0, =gUnknown_086103BC
bl LoadObjectPics
bl LoadSpriteSheets
ldr r0, =gUnknown_086103E4
bl LoadCompressedObjectPic
movs r0, 0
@ -43655,7 +43655,7 @@ sub_819BE34: @ 819BE34
mov r8, r1
add r0, r8
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r2, [r6]
ldrb r1, [r2, 0x3]
movs r0, 0x6C
@ -44288,7 +44288,7 @@ _0819C2FC:
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
mov r1, r8
ldr r0, [r1]
add r0, r9
@ -44298,7 +44298,7 @@ _0819C2FC:
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
mov r1, r8
ldr r0, [r1]
adds r0, r5
@ -44308,7 +44308,7 @@ _0819C2FC:
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r1, 0x80
lsls r1, 6
movs r0, 0
@ -47426,7 +47426,7 @@ _0819DE94:
ldr r0, =gUnknown_086106B0
bl LoadTaggedObjectPalettes
ldr r0, =gUnknown_08610650
bl LoadObjectPics
bl LoadSpriteSheets
ldr r0, =gUnknown_086106A0
bl LoadCompressedObjectPic
ldr r0, =sub_819C7FC
@ -49917,7 +49917,7 @@ sub_819F304: @ 819F304
mov r8, r1
add r0, r8
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, [r6]
ldrb r1, [r0, 0x3]
movs r0, 0x64
@ -50496,7 +50496,7 @@ sub_819F7B4: @ 819F7B4
lsls r0, 2
adds r0, r3
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
movs r1, 0x80
lsls r1, 6
movs r0, 0
@ -61337,7 +61337,7 @@ _081A53CE:
ldr r1, =gSprites
adds r0, r1
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x80
lsls r0, 13
adds r6, r0
@ -61624,7 +61624,7 @@ _081A565E:
ldr r1, =gSprites
adds r0, r1
adds r1, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
add sp, 0x4
pop {r3-r5}
mov r8, r3
@ -80375,7 +80375,7 @@ _081AF276:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@ -81948,7 +81948,7 @@ AddItemIconObject: @ 81AFE70
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r5, 0
movs r1, 0x1
bl GetItemIconPicOrPalette
@ -82033,7 +82033,7 @@ AddItemIconObjectWithCustomObjectTemplate: @ 81AFF34
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r5, 0
movs r1, 0x1
bl GetItemIconPicOrPalette
@ -93037,7 +93037,7 @@ _081B5CD8:
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _081B5D0E
.pool
_081B5CFC:
@ -93048,7 +93048,7 @@ _081B5CFC:
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_081B5D0E:
ldr r2, =gSprites
ldrb r1, [r4, 0xA]
@ -93073,7 +93073,7 @@ _081B5D24:
sub_81B5D30: @ 81B5D30
push {lr}
ldr r0, =gUnknown_08615EB0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08615EB8
bl LoadTaggedObjectPalette
pop {r0}
@ -93213,7 +93213,7 @@ sub_81B5DF0: @ 81B5DF0
strh r6, [r5, 0x3C]
adds r0, r5, 0
mov r1, r9
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r4]
adds r0, r5, 0
bl _call_via_r1
@ -93393,7 +93393,7 @@ sub_81B5F98: @ 81B5F98
lsls r0, 2
ldr r2, =gSprites
adds r0, r2
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@ -93420,14 +93420,14 @@ sub_81B5FBC: @ 81B5FBC
add r4, r8
adds r0, r4, 0
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
lsls r5, r7, 4
adds r5, r7
lsls r5, 2
add r5, r8
adds r0, r5, 0
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
strh r6, [r4, 0x26]
strh r6, [r5, 0x26]
b _081B602C
@ -93441,14 +93441,14 @@ _081B6000:
add r5, r8
adds r0, r5, 0
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
lsls r4, r7, 4
adds r4, r7
lsls r4, 2
add r4, r8
adds r0, r4, 0
movs r1, 0x5
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =0x0000fffc
strh r0, [r5, 0x26]
movs r0, 0x4
@ -93588,7 +93588,7 @@ _081B6128:
subs r1, r2, 0x1
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r5, 0xC]
lsls r0, r1, 4
adds r0, r1

108
asm/rom_81BAD84.s
View File

@ -1489,7 +1489,7 @@ sub_81BB9F4: @ 81BB9F4
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldrb r1, [r7]
adds r0, r1, r4
@ -3862,7 +3862,7 @@ sub_81BCF58: @ 81BCF58
ldr r1, =gUnknown_020244E4
adds r2, r1
ldrb r1, [r2]
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, =gBattleBankFunc
ldrb r0, [r6]
lsls r0, 2
@ -4044,7 +4044,7 @@ sub_81BD0E4: @ 81BD0E4
ldr r1, =gUnknown_020244E4
adds r6, r1
ldrb r1, [r6]
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@ -5865,7 +5865,7 @@ sub_81BE10C: @ 81BE10C
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =0x0000d6f9
bl AllocObjectPalette
lsls r0, 24
@ -6784,7 +6784,7 @@ _081BE988:
sub_81BE994: @ 81BE994
push {lr}
ldr r0, =gUnknown_08617D94
bl LoadObjectPics
bl LoadSpriteSheets
bl sub_81BEA20
ldr r0, =sub_81BE9C0
movs r1, 0x8
@ -7853,7 +7853,7 @@ _081BF274:
bls _081BF274
adds r0, r5, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _081BF2B0
.pool
_081BF2AC:
@ -16990,7 +16990,7 @@ sub_81C4318: @ 81C4318
adds r0, r4, 0
adds r1, r5, 0
str r3, [sp]
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gUnknown_0861CFDC
adds r5, r0
ldrb r1, [r5]
@ -17751,7 +17751,7 @@ sub_81C4984: @ 81C4984
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r6]
ldr r2, [r1, 0x8]
movs r0, 0x3C
@ -17878,7 +17878,7 @@ _081C4AA6:
subs r1, r2, 0x1
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x2
movs r1, 0
bl sub_81C4204
@ -17946,7 +17946,7 @@ _081C4B30:
lsls r0, 2
adds r0, r6
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
b _081C4B9A
.pool
_081C4B74:
@ -17958,7 +17958,7 @@ _081C4B74:
lsls r0, 2
adds r0, r6
movs r1, 0x5
bl StartObjectImageAnim
bl StartSpriteAnim
b _081C4B9A
_081C4B8A:
ldrb r1, [r4]
@ -17967,7 +17967,7 @@ _081C4B8A:
lsls r0, 2
adds r0, r6
movs r1, 0x6
bl StartObjectImageAnim
bl StartSpriteAnim
_081C4B9A:
ldrb r1, [r4]
lsls r0, r1, 4
@ -18142,7 +18142,7 @@ _081C4CD4:
mov r2, r8
_081C4CE4:
lsrs r1, r2, 24
bl StartObjectImageAnim
bl StartSpriteAnim
b _081C4D02
_081C4CEC:
adds r0, r5, r4
@ -18154,7 +18154,7 @@ _081C4CEC:
adds r1, r6, 0x6
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
_081C4D02:
adds r0, r4, 0x1
lsls r0, 24
@ -22074,7 +22074,7 @@ sub_81C6F20: @ 81C6F20
beq _081C6F50
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =sub_81C6F68
str r0, [r4, 0x1C]
_081C6F50:
@ -22096,7 +22096,7 @@ sub_81C6F68: @ 81C6F68
beq _081C6F84
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_081C6F84:
@ -28850,7 +28850,7 @@ _081CA3C8:
bl InitSpriteAffineAnim
ldm r4!, {r0}
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r5, 0x1
cmp r5, 0x3
ble _081CA3C8
@ -28952,7 +28952,7 @@ sub_81CA4AC: @ 81CA4AC
bne _081CA4E2
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldrh r0, [r4, 0x30]
adds r0, 0x1
strh r0, [r4, 0x30]
@ -32773,7 +32773,7 @@ _081CC224:
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
ldr r2, =0x00001824
adds r1, r6, r2
lsls r0, 16
@ -37540,12 +37540,12 @@ sub_81CE964: @ 81CE964
bne _081CE982
adds r0, r5, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
b _081CE98A
_081CE982:
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_081CE98A:
pop {r4,r5}
pop {r0}
@ -37592,7 +37592,7 @@ sub_81CE9C8: @ 81CE9C8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4}
pop {r0}
bx r0
@ -37658,7 +37658,7 @@ sub_81CE9E4: @ 81CE9E4
.pool
_081CEA78:
mov r0, sp
bl LoadObjectPics
bl LoadSpriteSheets
mov r0, r10
bl sub_81C795C
movs r4, 0
@ -37816,7 +37816,7 @@ _081CEBC6:
mov r1, r10
bl sub_81D32B0
mov r0, r8
bl LoadObjectPic
bl LoadSpriteSheet
movs r0, 0
mov r3, r10
str r0, [r3, 0x8]
@ -38004,7 +38004,7 @@ sub_81CED30: @ 81CED30
add r4, r8
strh r0, [r4]
adds r0, r5, 0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r5, =0x0000181a
add r5, r8
strh r0, [r5]
@ -43054,7 +43054,7 @@ sub_81D1448: @ 81D1448
strb r1, [r3, 0x5]
ldr r0, [r6, 0x14]
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r1, [r6, 0x14]
adds r1, 0x3E
ldrb r2, [r1]
@ -43085,7 +43085,7 @@ sub_81D1500: @ 81D1500
strh r0, [r1, 0x2E]
ldr r0, [r4, 0x14]
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r1, [r4, 0x14]
ldr r0, =sub_81D1538
str r0, [r1, 0x1C]
@ -47463,7 +47463,7 @@ sub_81D3564: @ 81D3564
bne _081D35DC
adds r0, r4, 0
movs r1, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
adds r2, r4, 0
adds r2, 0x3E
ldrb r1, [r2]
@ -47539,7 +47539,7 @@ _081D3604:
adds r4, r0
adds r0, r4, 0
movs r1, 0
bl SeekObjectImageAnim
bl SeekSpriteAnim
adds r1, r4, 0
adds r1, 0x3E
ldrb r0, [r1]
@ -53819,7 +53819,7 @@ sub_81D6984: @ 81D6984
lsls r0, 2
adds r0, r6
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0
pop {r3}
mov r8, r3
@ -54125,14 +54125,14 @@ sub_81D6B7C: @ 81D6B7C
lsls r0, 2
adds r0, r6
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r1, [r4, 0x2]
lsls r1, 16
asrs r1, 24
@ -54141,14 +54141,14 @@ sub_81D6B7C: @ 81D6B7C
lsls r0, 2
adds r0, r6
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4, 0x2]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r1, [r4, 0x4]
lsls r1, 16
asrs r1, 24
@ -54157,14 +54157,14 @@ sub_81D6B7C: @ 81D6B7C
lsls r0, 2
adds r0, r6
movs r1, 0x5
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
movs r1, 0x6
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r1, [r4, 0x6]
lsls r1, 16
asrs r1, 24
@ -54173,14 +54173,14 @@ sub_81D6B7C: @ 81D6B7C
lsls r0, 2
adds r0, r6
movs r1, 0x7
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4, 0x6]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
movs r1, 0x8
bl StartObjectImageAnim
bl StartSpriteAnim
mov r0, r8
pop {r3}
mov r8, r3
@ -55337,7 +55337,7 @@ sub_81D7664: @ 81D7664
lsls r0, 2
adds r0, r6
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0
pop {r3}
mov r8, r3
@ -55694,14 +55694,14 @@ sub_81D78BC: @ 81D78BC
lsls r0, 2
adds r0, r6
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r1, [r4, 0x2]
lsls r1, 16
asrs r1, 24
@ -55710,14 +55710,14 @@ sub_81D78BC: @ 81D78BC
lsls r0, 2
adds r0, r6
movs r1, 0x3
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4, 0x2]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
movs r1, 0x4
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r1, [r4, 0x4]
lsls r1, 16
asrs r1, 24
@ -55726,14 +55726,14 @@ sub_81D78BC: @ 81D78BC
lsls r0, 2
adds r0, r6
movs r1, 0x5
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
movs r1, 0x6
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r1, [r4, 0x6]
lsls r1, 16
asrs r1, 24
@ -55742,14 +55742,14 @@ sub_81D78BC: @ 81D78BC
lsls r0, 2
adds r0, r6
movs r1, 0x7
bl StartObjectImageAnim
bl StartSpriteAnim
ldrb r1, [r4, 0x6]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
movs r1, 0x8
bl StartObjectImageAnim
bl StartSpriteAnim
mov r0, r8
pop {r3}
mov r8, r3
@ -58463,7 +58463,7 @@ sub_81D90A8: @ 81D90A8
lsls r0, 2
add r0, r8
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
movs r2, 0x2
ldrsh r1, [r7, r2]
lsls r0, r1, 4
@ -58471,7 +58471,7 @@ sub_81D90A8: @ 81D90A8
lsls r0, 2
add r0, r8
movs r1, 0x2
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gUnknown_0862ACC0
movs r2, 0x41
negs r2, r2
@ -58735,7 +58735,7 @@ sub_81D93D8: @ 81D93D8
lsls r0, 2
adds r0, r3
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r0}
bx r0
.pool
@ -59311,10 +59311,10 @@ sub_81D9868: @ 81D9868
ldrh r1, [r0, 0x26]
strh r1, [r4, 0x26]
adds r1, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r4, 0
adds r1, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@ -61230,7 +61230,7 @@ _081DA7F8:
strh r2, [r0, 0x36]
strh r2, [r0, 0x38]
adds r1, r7, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r6, 0
adds r0, 0x1C
adds r4, r0
@ -61420,7 +61420,7 @@ _081DA972:
strh r7, [r0, 0x3A]
adds r1, r5, 0
str r2, [sp, 0x8]
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r2, [sp, 0x8]
adds r0, r2, 0
adds r0, 0x1C

8
asm/rotating_gate.s
View File

@ -377,7 +377,7 @@ _080FBA38:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
adds r0, r5, 0
b _080FBAD6
.pool
@ -424,7 +424,7 @@ _080FBB1A:
bl audio_play
adds r0, r6, 0
adds r1, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _080FBB58
_080FBB2A:
cmp r5, 0x2
@ -447,7 +447,7 @@ _080FBB4A:
bl audio_play
adds r0, r6, 0
adds r1, r4, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_080FBB58:
movs r0, 0
strh r0, [r6, 0x30]
@ -544,7 +544,7 @@ _080FBBF2:
LoadRotatingGatePics: @ 80FBC00
push {lr}
ldr r0, =gUnknown_08591D58
bl LoadObjectPics
bl LoadSpriteSheets
pop {r0}
bx r0
.pool

28
asm/roulette.s
View File

@ -4959,7 +4959,7 @@ sub_8142CD0: @ 8142CD0
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
ldr r4, =gUnknown_085B7490
ldr r0, [r4]
adds r1, r5, 0
@ -4970,7 +4970,7 @@ sub_8142CD0: @ 8142CD0
ldrh r0, [r4, 0x6]
strh r0, [r6, 0x6]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
movs r6, 0
ldr r0, =gSprites
mov r8, r0
@ -5343,7 +5343,7 @@ _08142F8C:
lsls r0, 2
adds r0, r4
movs r1, 0x8
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -5585,7 +5585,7 @@ sub_81431E4: @ 81431E4
ldrh r1, [r4, 0x4]
orrs r1, r2
str r1, [r0, 0x4]
bl LoadObjectPic
bl LoadSpriteSheet
movs r1, 0xF
mov r0, sp
strh r1, [r0]
@ -5743,7 +5743,7 @@ _08143322:
orrs r0, r2
str r0, [r6, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -6458,7 +6458,7 @@ sub_814391C: @ 814391C
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_085B7950
movs r1, 0x74
movs r2, 0x50
@ -6615,7 +6615,7 @@ _08143A64:
ldr r1, =SpriteCallbackDummy
str r1, [r2]
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r1, 0
adds r2, r5, 0x1
adds r3, r6, 0x1
@ -7009,7 +7009,7 @@ _08143D8C:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0
bl sub_8143B14
movs r0, 0x1E
@ -7285,7 +7285,7 @@ sub_8143FA4: @ 8143FA4
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0
bl sub_8143B14
movs r0, 0x1E
@ -7540,7 +7540,7 @@ _081441CE:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0
bl sub_8143B14
movs r0, 0x1E
@ -7622,7 +7622,7 @@ sub_8144264: @ 8144264
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r6, 0
bl sub_8143B14
movs r0, 0x1E
@ -8383,7 +8383,7 @@ sub_81448B8: @ 81448B8
ldrh r1, [r7, 0x2E]
lsls r1, 24
lsrs r1, 24
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =gUnknown_085B7AEC
movs r1, 0x2E
ldrsh r2, [r7, r1]
@ -9317,7 +9317,7 @@ _08145090:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, =sub_8144FB0
str r0, [r4, 0x1C]
ldr r2, =gSprites
@ -9469,7 +9469,7 @@ _081451EC:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x2D
strh r0, [r4, 0x30]
ldr r0, =sub_8145030

2
asm/shop.s
View File

@ -1834,7 +1834,7 @@ _080E09C0:
adds r1, r3
adds r1, r5
ldrb r1, [r1]
bl StartObjectImageAnim
bl StartSpriteAnim
_080E09D8:
adds r0, r7, 0x1
lsls r0, 24

24
asm/slot_machine.s
View File

@ -6355,7 +6355,7 @@ sub_812D63C: @ 812D63C
mov r2, sp
adds r1, r2, r5
ldrb r1, [r1]
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
movs r1, 0x10
ldrsh r0, [r7, r1]
movs r1, 0x80
@ -6410,7 +6410,7 @@ sub_812D6EC: @ 812D6EC
ldr r1, =gSprites
adds r0, r1
movs r1, 0x3
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
_0812D730:
pop {r4}
pop {r0}
@ -6611,7 +6611,7 @@ sub_812D870: @ 812D870
ldr r1, =gSprites
adds r0, r1
movs r1, 0x5
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldr r0, =0x00000187
bl fanfare_play
b _0812D914
@ -6628,7 +6628,7 @@ _0812D8D0:
ldr r4, =gSprites
adds r0, r4
movs r1, 0x4
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldr r0, [r5]
adds r0, 0x3F
ldrb r1, [r0]
@ -6870,7 +6870,7 @@ sub_812DA90: @ 812DA90
lsls r0, 2
adds r0, r5
movs r1, 0x5
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
ldrh r0, [r4, 0x8]
adds r0, 0x1
movs r1, 0
@ -8375,7 +8375,7 @@ sub_812E6C4: @ 812E6C4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
pop {r4}
pop {r0}
bx r0
@ -9824,7 +9824,7 @@ _0812F250:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@ -10059,7 +10059,7 @@ _0812F3C6:
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldrh r0, [r4, 0x30]
lsls r1, r0, 4
orrs r1, r0
@ -10108,7 +10108,7 @@ _0812F42C:
strb r0, [r4, 0x1]
adds r0, r4, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_0812F468:
pop {r4}
pop {r0}
@ -10185,7 +10185,7 @@ _0812F4C0:
_0812F4FC:
adds r0, r5, 0
movs r1, 0x1
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
movs r0, 0
strh r0, [r5, 0x3C]
pop {r4,r5}
@ -10647,7 +10647,7 @@ _0812F822:
adds r1, r2
str r1, [r0]
adds r0, r3, 0
bl LoadObjectPics
bl LoadSpriteSheets
ldr r0, =gUnknown_085A8544
bl LoadTaggedObjectPalettes
pop {r4-r6}
@ -10698,7 +10698,7 @@ _0812F8C6:
strh r1, [r0, 0x4]
movs r1, 0x11
strh r1, [r0, 0x6]
bl LoadObjectPic
bl LoadSpriteSheet
pop {r4-r6}
pop {r0}
bx r0

1338
asm/sprite.s
View File

File diff suppressed because it is too large Load Diff

4
asm/starter_choose.s
View File

@ -930,13 +930,13 @@ sub_813473C: @ 813473C
bne _08134768
adds r0, r3, 0
movs r1, 0x1
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
b _08134770
.pool
_08134768:
adds r0, r3, 0
movs r1, 0
bl StartObjectImageAnimIfDifferent
bl StartSpriteAnimIfDifferent
_08134770:
pop {r0}
bx r0

4
asm/title_screen.s
View File

@ -157,7 +157,7 @@ _080AA4FA:
adds r4, r0
adds r0, r4, 0
adds r1, r6, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x1
strh r0, [r4, 0x2E]
adds r0, r6, 0x1
@ -202,7 +202,7 @@ _080AA556:
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
bl StartObjectImageAnim
bl StartSpriteAnim
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24

54
asm/trade.s
View File

@ -3067,7 +3067,7 @@ sub_8078CB8: @ 8078CB8
ldr r4, =gSprites
adds r0, r4
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r2, [r5]
adds r2, 0x34
ldrb r1, [r2]
@ -3097,7 +3097,7 @@ _08078D10:
ldr r5, =gSprites
adds r0, r5
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r4, [r4]
adds r4, 0x34
ldrb r0, [r4]
@ -5684,7 +5684,7 @@ _0807A29C:
b _0807A2D6
_0807A2A0:
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
ldr r1, =gUnknown_0203229C
ldr r1, [r1]
adds r2, r1, 0
@ -5708,7 +5708,7 @@ _0807A2C8:
_0807A2D4:
ldr r0, =gUnknown_0832DC3C
_0807A2D6:
bl LoadObjectPic
bl LoadSpriteSheet
_0807A2DA:
ldr r0, =gUnknown_0203229C
ldr r1, [r0]
@ -7465,7 +7465,7 @@ _0807B07A:
_0807B094:
bl sub_807BA94
ldr r0, =gUnknown_08338D18
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08338D20
bl LoadTaggedObjectPalette
b _0807B0DC
@ -7809,7 +7809,7 @@ _0807B3D0:
_0807B3F0:
bl sub_807BA94
ldr r0, =gUnknown_08338D18
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08338D20
bl LoadTaggedObjectPalette
b _0807B424
@ -8495,13 +8495,13 @@ _0807BA68:
sub_807BA94: @ 807BA94
push {lr}
ldr r0, =gUnknown_08338D70
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08338DC0
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08338DF4
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08338E6C
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_08338D78
bl LoadTaggedObjectPalette
ldr r0, =gUnknown_08338D80
@ -9331,7 +9331,7 @@ _0807C3E0:
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r4]
bl _0807CF4C
.pool
@ -9632,7 +9632,7 @@ _0807C66C:
lsls r0, 2
adds r0, r4
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0807C6FA
.pool
_0807C6E4:
@ -9645,7 +9645,7 @@ _0807C6E4:
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0807C6FA:
ldr r5, =gUnknown_020322A0
ldr r0, [r5]
@ -9657,7 +9657,7 @@ _0807C6FA:
ldr r4, =gSprites
adds r0, r4
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r2, [r5]
adds r3, r2, 0
adds r3, 0x8E
@ -9930,7 +9930,7 @@ _0807C8FA:
ldr r1, =gSprites
adds r0, r1
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _0807CFB4
.pool
_0807C964:
@ -10289,7 +10289,7 @@ _0807CBF4:
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r5]
adds r0, 0xD3
ldrb r1, [r0]
@ -10298,7 +10298,7 @@ _0807CBF4:
lsls r0, 2
adds r0, r4
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, [r5]
adds r0, 0xD3
ldrb r1, [r0]
@ -10421,7 +10421,7 @@ _0807CD1C:
lsls r0, 2
adds r0, r4
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r3, [r7]
adds r0, r3, 0
adds r0, 0x8F
@ -11400,7 +11400,7 @@ _0807D7C4:
lsls r0, 2
adds r0, r5
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r4]
bl _0807E398
.pool
@ -11706,7 +11706,7 @@ _0807DA74:
lsls r0, 2
adds r0, r4
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
b _0807DB02
.pool
_0807DAEC:
@ -11719,7 +11719,7 @@ _0807DAEC:
ldr r1, =gSprites
adds r0, r1
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0807DB02:
ldr r5, =gUnknown_020322A0
ldr r0, [r5]
@ -11731,7 +11731,7 @@ _0807DB02:
ldr r4, =gSprites
adds r0, r4
movs r1, 0
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r2, [r5]
adds r3, r2, 0
adds r3, 0x8E
@ -12022,7 +12022,7 @@ _0807DD02:
lsls r0, 2
adds r0, r5
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
b _0807E400
.pool
_0807DD94:
@ -12394,7 +12394,7 @@ _0807E040:
lsls r0, 2
adds r0, r4
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r5]
adds r0, 0xD3
ldrb r1, [r0]
@ -12403,7 +12403,7 @@ _0807E040:
lsls r0, 2
adds r0, r4
movs r1, 0x2
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
ldr r0, [r5]
adds r0, 0xD3
ldrb r1, [r0]
@ -12526,7 +12526,7 @@ _0807E168:
lsls r0, 2
adds r0, r4
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r3, [r7]
adds r0, r3, 0
adds r0, 0x8F
@ -13062,7 +13062,7 @@ sub_807E64C: @ 807E64C
bne _0807E660
adds r0, r4, 0
movs r1, 0x1
bl StartObjectRotScalAnim
bl StartSpriteAffineAnim
_0807E660:
ldrh r0, [r4, 0x30]
adds r0, 0x1

10
asm/trainer_card.s
View File

@ -7047,7 +7047,7 @@ _080C633C:
adds r0, r3
ldr r0, [r0]
adds r1, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
_080C63C2:
lsls r0, r4, 24
lsrs r5, r0, 24
@ -7744,7 +7744,7 @@ sub_80C6974: @ 80C6974
ldr r0, [r4]
ldr r0, [r0, 0x4]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
adds r6, 0x8
adds r0, r6, 0
bl LoadCompressedObjectPic
@ -7779,7 +7779,7 @@ sub_80C6974: @ 80C6974
lsls r1, 4
adds r1, r6
ldrb r1, [r1, 0xC]
bl StartObjectImageAnim
bl StartSpriteAnim
bl sav1_map_get_name
lsls r0, 24
lsrs r5, r0, 24
@ -7933,7 +7933,7 @@ _080C6B3E:
ldr r0, [r4]
ldr r0, [r0, 0x8]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
_080C6B7A:
add sp, 0x18
pop {r3,r4}
@ -8116,7 +8116,7 @@ _080C6C94:
lsls r1, 4
adds r1, r4
ldrb r1, [r1, 0xC]
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r1, [r5]
ldr r2, [r1, 0xC]
ldrb r0, [r1, 0x10]

22
asm/weather.s
View File

@ -2726,7 +2726,7 @@ sub_80AC594: @ 80AC594
cmp r0, 0x1
beq _080AC650
ldr r0, =gUnknown_0854FB5C
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_0854C290
bl sub_80ABF4C
movs r5, 0
@ -3392,7 +3392,7 @@ _080ACAC4:
strh r0, [r7, 0x34]
adds r0, r7, 0
movs r1, 0
bl StartObjectImageAnim
bl StartSpriteAnim
mov r3, r8
strh r3, [r7, 0x36]
adds r2, r7, 0
@ -3495,7 +3495,7 @@ _080ACC0E:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
movs r0, 0x1
strh r0, [r5, 0x36]
ldr r1, =gSpriteCoordOffsetX
@ -3653,7 +3653,7 @@ _080ACD5C:
sub_80ACD68: @ 80ACD68
push {lr}
ldr r0, =gUnknown_0854FC54
bl LoadObjectPic
bl LoadSpriteSheet
pop {r0}
bx r0
.pool
@ -4281,7 +4281,7 @@ sub_80AD204: @ 80AD204
movs r1, 0x1
bics r1, r6
adds r0, r5, 0
bl StartObjectImageAnim
bl StartSpriteAnim
strh r7, [r5, 0x34]
movs r0, 0x1
cmp r4, 0
@ -5458,7 +5458,7 @@ sub_80ADCAC: @ 80ADCAC
str r0, [sp]
str r1, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
movs r5, 0
_080ADCD0:
ldr r0, =gUnknown_0854FD18
@ -5773,7 +5773,7 @@ _080ADF54:
sub_80ADF5C: @ 80ADF5C
push {lr}
ldr r0, =gUnknown_0854FD38
bl LoadObjectPic
bl LoadSpriteSheet
pop {r0}
bx r0
.pool
@ -6231,7 +6231,7 @@ sub_80AE2F0: @ 80AE2F0
str r0, [sp]
str r1, [sp, 0x4]
mov r0, sp
bl LoadObjectPic
bl LoadSpriteSheet
movs r6, 0
_080AE314:
adds r0, r6, 0
@ -6742,7 +6742,7 @@ sub_80AE738: @ 80AE738
cmp r0, 0
bne _080AE7E6
ldr r0, =gUnknown_0854FDDC
bl LoadObjectPic
bl LoadSpriteSheet
ldr r0, =gUnknown_0854C2B0
bl sub_80ABF4C
movs r7, 0
@ -6886,7 +6886,7 @@ _080AE818:
strh r0, [r1, 0x34]
ldr r0, [r4]
movs r1, 0x1
bl StartObjectImageAnim
bl StartSpriteAnim
ldr r0, [r4]
movs r1, 0
movs r2, 0x2
@ -7110,7 +7110,7 @@ sub_80AEA34: @ 80AEA34
cmp r5, 0
bne _080AEA6C
ldr r0, =gUnknown_0854FDF8
bl LoadObjectPic
bl LoadSpriteSheet
movs r2, 0xE5
lsls r2, 3
adds r0, r4, r2

477
src/sprite.c
View File

@ -81,13 +81,14 @@ void ResetAffineAnimData(void);
u8 IndexOfSpriteTileTag(u16 tag);
void AllocSpriteTileRange(u16 tag, u16 start, u16 count);
void DoLoadSpritePalette(const u16 *src, u16 paletteOffset);
void obj_update_pos2(struct Sprite* sprite, s16 arg1, s16 arg2);
void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2);
typedef void (*AnimFunc)(struct Sprite *);
typedef void (*AnimCmdFunc)(struct Sprite *);
typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *);
extern struct AffineAnimState sAffineAnimStates[OAM_MATRIX_COUNT];
extern u32 gOamMatrixAllocBitmap;
EWRAM_DATA struct Sprite gSprites[MAX_SPRITES + 1] = {0};
EWRAM_DATA u16 gSpritePriorities[MAX_SPRITES] = {0};
@ -111,6 +112,7 @@ extern const AnimFunc sAnimFuncs[];
extern const AnimFunc sAffineAnimFuncs[];
extern const AnimCmdFunc sAnimCmdFuncs[];
extern const AffineAnimCmdFunc sAffineAnimCmdFuncs[];
extern const s32 gUnknown_082EC6F4[];
void ResetSpriteData(void)
{
@ -915,3 +917,476 @@ void ContinueAffineAnim(struct Sprite *sprite)
obj_update_pos2(sprite, sprite->data6, sprite->data7);
}
}
void AffineAnimDelay(u8 matrixNum, struct Sprite *sprite)
{
if (!DecrementAffineAnimDelayCounter(sprite, matrixNum))
{
struct AffineAnimFrameCmd frameCmd;
GetAffineAnimFrame(matrixNum, sprite, &frameCmd);
ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, &frameCmd);
}
}
void AffineAnimCmd_loop(u8 matrixNum, struct Sprite *sprite)
{
if (sAffineAnimStates[matrixNum].loopCounter)
ContinueAffineAnimLoop(matrixNum, sprite);
else
BeginAffineAnimLoop(matrixNum, sprite);
}
void BeginAffineAnimLoop(u8 matrixNum, struct Sprite *sprite)
{
sAffineAnimStates[matrixNum].loopCounter = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].loop.count;
JumpToTopOfAffineAnimLoop(matrixNum, sprite);
ContinueAffineAnim(sprite);
}
void ContinueAffineAnimLoop(u8 matrixNum, struct Sprite *sprite)
{
sAffineAnimStates[matrixNum].loopCounter--;
JumpToTopOfAffineAnimLoop(matrixNum, sprite);
ContinueAffineAnim(sprite);
}
void JumpToTopOfAffineAnimLoop(u8 matrixNum, struct Sprite *sprite)
{
if (sAffineAnimStates[matrixNum].loopCounter)
{
sAffineAnimStates[matrixNum].animCmdIndex--;
while (sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex - 1].type != 32765)
{
if (sAffineAnimStates[matrixNum].animCmdIndex == 0)
break;
sAffineAnimStates[matrixNum].animCmdIndex--;
}
sAffineAnimStates[matrixNum].animCmdIndex--;
}
}
void AffineAnimCmd_jump(u8 matrixNum, struct Sprite *sprite)
{
struct AffineAnimFrameCmd frameCmd;
sAffineAnimStates[matrixNum].animCmdIndex = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].jump.target;
GetAffineAnimFrame(matrixNum, sprite, &frameCmd);
ApplyAffineAnimFrame(matrixNum, &frameCmd);
sAffineAnimStates[matrixNum].delayCounter = frameCmd.duration;
}
void AffineAnimCmd_end(u8 matrixNum, struct Sprite *sprite)
{
struct AffineAnimFrameCmd dummyFrameCmd = {0};
sprite->affineAnimEnded = TRUE;
sAffineAnimStates[matrixNum].animCmdIndex--;
ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, &dummyFrameCmd);
}
void AffineAnimCmd_frame(u8 matrixNum, struct Sprite *sprite)
{
struct AffineAnimFrameCmd frameCmd;
GetAffineAnimFrame(matrixNum, sprite, &frameCmd);
ApplyAffineAnimFrame(matrixNum, &frameCmd);
sAffineAnimStates[matrixNum].delayCounter = frameCmd.duration;
}
void CopyOamMatrix(u8 destMatrixIndex, struct OamMatrix *srcMatrix)
{
gOamMatrices[destMatrixIndex].a = srcMatrix->a;
gOamMatrices[destMatrixIndex].b = srcMatrix->b;
gOamMatrices[destMatrixIndex].c = srcMatrix->c;
gOamMatrices[destMatrixIndex].d = srcMatrix->d;
}
u8 GetSpriteMatrixNum(struct Sprite *sprite)
{
u8 matrixNum = 0;
if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)
matrixNum = sprite->oam.matrixNum;
return matrixNum;
}
void sub_8007E18(struct Sprite* sprite, s16 a2, s16 a3)
{
sprite->data6 = a2;
sprite->data7 = a3;
sprite->flags_f = 1;
}
s32 sub_8007E28(s32 a0, s32 a1, s32 a2)
{
s32 subResult, var1;
subResult = a1 - a0;
if (subResult < 0)
var1 = -(subResult) >> 9;
else
var1 = -(subResult >> 9);
return a2 - ((u32)(a2 * a1) / (u32)(a0) + var1);
}
#ifdef NONMATCHING
void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
{
s32 var0, var1, var2;
u8 matrixNum = sprite->oam.matrixNum;
if (a1 != 0x800)
{
var0 = gUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32];
var1 = var0 << 8;
var2 = (var0 << 16) / gOamMatrices[matrixNum].a;
sprite->pos2.x = sub_8007E28(var1, var2, a1);
}
if (a2 != 0x800)
{
var0 = gUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)];
var1 = var0 << 8;
var2 = (var0 << 16) / gOamMatrices[matrixNum].d;
sprite->pos2.y = sub_8007E28(var1, var2, a2);
}
}
#else
__attribute__((naked))
void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
mov r7, r9\n\
mov r6, r8\n\
push {r6,r7}\n\
adds r5, r0, 0\n\
adds r6, r1, 0\n\
mov r8, r2\n\
ldrb r1, [r5, 0x3]\n\
lsls r0, r1, 26\n\
lsrs r7, r0, 27\n\
movs r0, 0x80\n\
lsls r0, 4\n\
mov r9, r0\n\
cmp r6, r9\n\
beq _08007EA2\n\
ldr r2, =gUnknown_082EC6F4\n\
lsrs r1, 6\n\
lsls r1, 3\n\
ldrb r0, [r5, 0x1]\n\
lsrs r0, 6\n\
lsls r0, 5\n\
adds r1, r0\n\
adds r1, r2\n\
ldr r0, [r1]\n\
lsls r4, r0, 8\n\
lsls r0, 16\n\
ldr r2, =gOamMatrices\n\
lsls r1, r7, 3\n\
adds r1, r2\n\
movs r2, 0\n\
ldrsh r1, [r1, r2]\n\
bl __divsi3\n\
adds r1, r0, 0\n\
adds r0, r4, 0\n\
adds r2, r6, 0\n\
bl sub_8007E28\n\
strh r0, [r5, 0x24]\n\
_08007EA2:\n\
cmp r8, r9\n\
beq _08007EDA\n\
ldr r2, =gUnknown_082EC6F4\n\
ldrb r1, [r5, 0x3]\n\
lsrs r1, 6\n\
lsls r1, 3\n\
ldrb r0, [r5, 0x1]\n\
lsrs r0, 6\n\
lsls r0, 5\n\
adds r1, r0\n\
adds r2, 0x4\n\
adds r1, r2\n\
ldr r0, [r1]\n\
lsls r4, r0, 8\n\
lsls r0, 16\n\
ldr r2, =gOamMatrices\n\
lsls r1, r7, 3\n\
adds r1, r2\n\
movs r2, 0x6\n\
ldrsh r1, [r1, r2]\n\
bl __divsi3\n\
adds r1, r0, 0\n\
adds r0, r4, 0\n\
mov r2, r8\n\
bl sub_8007E28\n\
strh r0, [r5, 0x26]\n\
_08007EDA:\n\
pop {r3,r4}\n\
mov r8, r3\n\
mov r9, r4\n\
pop {r4-r7}\n\
pop {r0}\n\
bx r0\n\
.pool\n\
.syntax divided");
}
#endif // NONMATCHING
void SetSpriteOamFlipBits(struct Sprite *sprite, u8 hFlip, u8 vFlip)
{
sprite->oam.matrixNum &= 0x7;
sprite->oam.matrixNum |= (((hFlip ^ sprite->hFlip) & 1) << 3);
sprite->oam.matrixNum |= (((vFlip ^ sprite->vFlip) & 1) << 4);
}
void AffineAnimStateRestartAnim(u8 matrixNum)
{
sAffineAnimStates[matrixNum].animCmdIndex = 0;
sAffineAnimStates[matrixNum].delayCounter = 0;
sAffineAnimStates[matrixNum].loopCounter = 0;
}
void AffineAnimStateStartAnim(u8 matrixNum, u8 animNum)
{
sAffineAnimStates[matrixNum].animNum = animNum;
sAffineAnimStates[matrixNum].animCmdIndex = 0;
sAffineAnimStates[matrixNum].delayCounter = 0;
sAffineAnimStates[matrixNum].loopCounter = 0;
sAffineAnimStates[matrixNum].xScale = 0x0100;
sAffineAnimStates[matrixNum].yScale = 0x0100;
sAffineAnimStates[matrixNum].rotation = 0;
}
void AffineAnimStateReset(u8 matrixNum)
{
sAffineAnimStates[matrixNum].animNum = 0;
sAffineAnimStates[matrixNum].animCmdIndex = 0;
sAffineAnimStates[matrixNum].delayCounter = 0;
sAffineAnimStates[matrixNum].loopCounter = 0;
sAffineAnimStates[matrixNum].xScale = 0x0100;
sAffineAnimStates[matrixNum].yScale = 0x0100;
sAffineAnimStates[matrixNum].rotation = 0;
}
void ApplyAffineAnimFrameAbsolute(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd)
{
sAffineAnimStates[matrixNum].xScale = frameCmd->xScale;
sAffineAnimStates[matrixNum].yScale = frameCmd->yScale;
sAffineAnimStates[matrixNum].rotation = frameCmd->rotation << 8;
}
void DecrementAnimDelayCounter(struct Sprite *sprite)
{
if (!sprite->animPaused)
sprite->animDelayCounter--;
}
bool8 DecrementAffineAnimDelayCounter(struct Sprite *sprite, u8 matrixNum)
{
if (!sprite->affineAnimPaused)
--sAffineAnimStates[matrixNum].delayCounter;
return sprite->affineAnimPaused;
}
void ApplyAffineAnimFrameRelativeAndUpdateMatrix(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd)
{
struct ObjAffineSrcData srcData;
struct OamMatrix matrix;
sAffineAnimStates[matrixNum].xScale += frameCmd->xScale;
sAffineAnimStates[matrixNum].yScale += frameCmd->yScale;
sAffineAnimStates[matrixNum].rotation = (sAffineAnimStates[matrixNum].rotation + (frameCmd->rotation << 8)) & ~0xFF;
srcData.xScale = ConvertScaleParam(sAffineAnimStates[matrixNum].xScale);
srcData.yScale = ConvertScaleParam(sAffineAnimStates[matrixNum].yScale);
srcData.rotation = sAffineAnimStates[matrixNum].rotation;
ObjAffineSet(&srcData, &matrix, 1, 2);
CopyOamMatrix(matrixNum, &matrix);
}
s16 ConvertScaleParam(s16 scale)
{
s32 val = 0x10000;
return val / scale;
}
void GetAffineAnimFrame(u8 matrixNum, struct Sprite *sprite, struct AffineAnimFrameCmd *frameCmd)
{
frameCmd->xScale = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.xScale;
frameCmd->yScale = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.yScale;
frameCmd->rotation = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.rotation;
frameCmd->duration = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.duration;
}
void ApplyAffineAnimFrame(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd)
{
struct AffineAnimFrameCmd dummyFrameCmd = {0};
if (frameCmd->duration)
{
frameCmd->duration--;
ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, frameCmd);
}
else
{
ApplyAffineAnimFrameAbsolute(matrixNum, frameCmd);
ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, &dummyFrameCmd);
}
}
void StartSpriteAnim(struct Sprite *sprite, u8 animNum)
{
sprite->animNum = animNum;
sprite->animBeginning = TRUE;
sprite->animEnded = FALSE;
}
void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum)
{
if (sprite->animNum != animNum)
StartSpriteAnim(sprite, animNum);
}
void SeekSpriteAnim(struct Sprite *sprite, u8 animCmdIndex)
{
u8 temp = sprite->animPaused;
sprite->animCmdIndex = animCmdIndex - 1;
sprite->animDelayCounter = 0;
sprite->animBeginning = FALSE;
sprite->animEnded = FALSE;
sprite->animPaused = FALSE;
ContinueAnim(sprite);
if (sprite->animDelayCounter)
sprite->animDelayCounter++;
sprite->animPaused = temp;
}
void StartSpriteAffineAnim(struct Sprite *sprite, u8 animNum)
{
u8 matrixNum = GetSpriteMatrixNum(sprite);
AffineAnimStateStartAnim(matrixNum, animNum);
sprite->affineAnimBeginning = TRUE;
sprite->affineAnimEnded = FALSE;
}
void StartSpriteAffineAnimIfDifferent(struct Sprite *sprite, u8 animNum)
{
u8 matrixNum = GetSpriteMatrixNum(sprite);
if (sAffineAnimStates[matrixNum].animNum != animNum)
StartSpriteAffineAnim(sprite, animNum);
}
void ChangeSpriteAffineAnim(struct Sprite *sprite, u8 animNum)
{
u8 matrixNum = GetSpriteMatrixNum(sprite);
sAffineAnimStates[matrixNum].animNum = animNum;
sprite->affineAnimBeginning = TRUE;
sprite->affineAnimEnded = FALSE;
}
void ChangeSpriteAffineAnimIfDifferent(struct Sprite *sprite, u8 animNum)
{
u8 matrixNum = GetSpriteMatrixNum(sprite);
if (sAffineAnimStates[matrixNum].animNum != animNum)
ChangeSpriteAffineAnim(sprite, animNum);
}
void SetSpriteSheetFrameTileNum(struct Sprite *sprite)
{
if (sprite->usingSheet)
{
s16 tileOffset = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue;
if (tileOffset < 0)
tileOffset = 0;
sprite->oam.tileNum = sprite->sheetTileStart + tileOffset;
}
}
void ResetAffineAnimData(void)
{
u8 i;
gAffineAnimsDisabled = 0;
gOamMatrixAllocBitmap = 0;
ResetOamMatrices();
for (i = 0; i < OAM_MATRIX_COUNT; i++)
AffineAnimStateReset(i);
}
u8 AllocOamMatrix(void)
{
u8 i = 0;
u32 bit = 1;
u32 bitmap = gOamMatrixAllocBitmap;
while (i < OAM_MATRIX_COUNT)
{
if (!(bitmap & bit))
{
gOamMatrixAllocBitmap |= bit;
return i;
}
i++;
bit <<= 1;
}
return 0xFF;
}
void FreeOamMatrix(u8 matrixNum)
{
u8 i = 0;
u32 bit = 1;
while (i < matrixNum)
{
i++;
bit <<= 1;
}
gOamMatrixAllocBitmap &= ~bit;
SetOamMatrix(matrixNum, 0x100, 0, 0, 0x100);
}
void InitSpriteAffineAnim(struct Sprite *sprite)
{
u8 matrixNum = AllocOamMatrix();
if (matrixNum != 0xFF)
{
CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
sprite->oam.matrixNum = matrixNum;
sprite->affineAnimBeginning = TRUE;
AffineAnimStateReset(matrixNum);
}
}
void SetOamMatrixRotationScaling(u8 matrixNum, s16 xScale, s16 yScale, u16 rotation)
{
struct ObjAffineSrcData srcData;
struct OamMatrix matrix;
srcData.xScale = ConvertScaleParam(xScale);
srcData.yScale = ConvertScaleParam(yScale);
srcData.rotation = rotation;
ObjAffineSet(&srcData, &matrix, 1, 2);
CopyOamMatrix(matrixNum, &matrix);
}
u16 LoadSpriteSheet(const struct SpriteSheet *sheet)
{
s16 tileStart = AllocSpriteTiles(sheet->size / TILE_SIZE_4BPP);
if (tileStart < 0)
{
return 0;
}
else
{
AllocSpriteTileRange(sheet->tag, (u16)tileStart, sheet->size / TILE_SIZE_4BPP);
CpuCopy16(sheet->data, (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileStart, sheet->size);
return (u16)tileStart;
}
}
void LoadSpriteSheets(const struct SpriteSheet *sheets)
{
u8 i;
for (i = 0; sheets[i].data != NULL; i++)
LoadSpriteSheet(&sheets[i]);
}

2
sym_common.txt
View File

@ -51,7 +51,7 @@ gUnknown_03002F70: @ 3002F70
.include "text.o"
.align 2
gUnknown_03003018: @ 3003018
gOamMatrixAllocBitmap: @ 3003018
.space 0x4
gUnknown_0300301C: @ 300301C