ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

split some battle files

Browse Source
This commit is contained in:
DizzyEggg 2017-09-01 23:40:13 +02:00
parent b614971cba
commit 449d546556
72 changed files with 30944 additions and 30879 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30555
asm/rom_8045FFC.s → asm/battle_4.s
View File

File diff suppressed because it is too large Load Diff

582
asm/battle_5.s Normal file
View File

@ -0,0 +1,582 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8056F28
sub_8056F28: @ 8056F28
push {r4-r6,lr}
ldr r5, =gBattleResources
ldr r6, =gBattleTypeFlags
ldr r0, [r6]
movs r1, 0x80
lsls r1, 19
ands r0, r1
cmp r0, 0
beq _08056F3E
bl sub_81D55D0
_08056F3E:
ldr r4, =gBattleStruct
movs r0, 0xA9
lsls r0, 2
bl AllocZeroed
str r0, [r4]
movs r0, 0x20
bl AllocZeroed
str r0, [r5]
movs r0, 0xA0
bl AllocZeroed
ldr r1, [r5]
str r0, [r1]
movs r0, 0x10
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x4]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x8]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0xC]
movs r0, 0xC
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x10]
movs r0, 0x1C
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x14]
movs r0, 0x54
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x18]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x1C]
ldr r4, =gUnknown_020244A0
movs r5, 0x80
lsls r5, 5
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_020244A4
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_0202305C
movs r0, 0x80
lsls r0, 6
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_02023060
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r0, [r6]
movs r1, 0x80
lsls r1, 20
ands r0, r1
cmp r0, 0
beq _08056FFA
ldr r0, =0x00004054
bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r2, =gSaveBlock1Ptr
lsls r1, r0, 2
adds r1, r0
lsls r1, 5
ldr r0, =0x00001a9c
adds r1, r0
ldr r0, [r2]
adds r0, r1
bl create_enemy_party
_08056FFA:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8056F28
thumb_func_start sub_8057028
sub_8057028: @ 8057028
push {r4-r6,lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x80
lsls r1, 19
ands r0, r1
cmp r0, 0
beq _0805703C
bl sub_81D5694
_0805703C:
ldr r6, =gBattleResources
ldr r0, [r6]
cmp r0, 0
beq _080570D0
ldr r4, =gBattleStruct
ldr r0, [r4]
bl Free
movs r5, 0
str r5, [r4]
ldr r0, [r6]
ldr r0, [r0]
bl Free
ldr r0, [r6]
str r5, [r0]
ldr r0, [r0, 0x4]
bl Free
ldr r0, [r6]
str r5, [r0, 0x4]
ldr r0, [r0, 0x8]
bl Free
ldr r0, [r6]
str r5, [r0, 0x8]
ldr r0, [r0, 0xC]
bl Free
ldr r0, [r6]
str r5, [r0, 0xC]
ldr r0, [r0, 0x10]
bl Free
ldr r0, [r6]
str r5, [r0, 0x10]
ldr r0, [r0, 0x14]
bl Free
ldr r0, [r6]
str r5, [r0, 0x14]
ldr r0, [r0, 0x18]
bl Free
ldr r0, [r6]
str r5, [r0, 0x18]
ldr r0, [r0, 0x1C]
bl Free
ldr r0, [r6]
str r5, [r0, 0x1C]
bl Free
str r5, [r6]
ldr r4, =gUnknown_020244A0
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_020244A4
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_0202305C
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_02023060
ldr r0, [r4]
bl Free
str r5, [r4]
_080570D0:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8057028
thumb_func_start sub_80570F4
sub_80570F4: @ 80570F4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _08057140
movs r0, 0x1
bl GetBankByPlayerAI
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
bl GetBankByPlayerAI
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =gBattleMons
movs r0, 0x58
adds r1, r3, 0
muls r1, r0
adds r1, r2
adds r1, 0x2A
muls r0, r4
adds r0, r2
adds r0, 0x2A
ldrb r1, [r1]
ldrb r0, [r0]
cmp r1, r0
bls _0805714A
adds r4, r3, 0
b _0805714A
.pool
_08057140:
movs r0, 0x1
bl GetBankByPlayerAI
lsls r0, 24
lsrs r4, r0, 24
_0805714A:
ldr r2, =gBattleMons
movs r1, 0x58
adds r0, r4, 0
muls r0, r1
adds r0, r2
adds r3, r0, 0
adds r3, 0x2A
adds r0, r5, 0
muls r0, r1
adds r0, r2
adds r1, r0, 0
adds r1, 0x2A
ldrb r0, [r3]
ldrb r2, [r1]
cmp r0, r2
bls _080571B8
ldrb r1, [r1]
subs r0, r1
cmp r0, 0x1D
ble _08057198
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x8
bl happiness_algorithm
b _080571CE
.pool
_08057198:
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x6
bl happiness_algorithm
b _080571CE
.pool
_080571B8:
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x6
bl happiness_algorithm
_080571CE:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_80570F4
thumb_func_start sub_80571DC
sub_80571DC: @ 80571DC
push {r4-r7,lr}
lsls r0, 24
lsrs r4, r0, 24
lsls r1, 24
lsrs r7, r1, 24
adds r0, r4, 0
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08057248
movs r2, 0
ldr r6, =gBattlePartyID
lsls r3, r4, 1
ldr r5, =gUnknown_0203CF00
ldr r4, =gBattleStruct
_080571FE:
adds r0, r2, r5
ldr r1, [r4]
adds r1, r2, r1
adds r1, 0x60
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x2
ble _080571FE
adds r0, r3, r6
ldrb r0, [r0]
bl pokemon_order_func
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r7, 0
bl pokemon_order_func
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81B8FB0
movs r2, 0
ldr r4, =gBattleStruct
ldr r3, =gUnknown_0203CF00
_08057236:
ldr r0, [r4]
adds r0, r2, r0
adds r0, 0x60
adds r1, r2, r3
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x2
ble _08057236
_08057248:
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_80571DC
thumb_func_start sub_805725C
sub_805725C: @ 805725C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
mov r9, r0
movs r0, 0
mov r8, r0
ldr r1, =gBattleCommunication
mov r10, r1
b _08057284
.pool
_0805727C:
mov r2, r8
cmp r2, 0
beq _08057284
b _08057406
_08057284:
mov r1, r10
ldrb r0, [r1]
cmp r0, 0x1
bne _0805728E
b _08057390
_0805728E:
cmp r0, 0x1
ble _08057294
b _080573FC
_08057294:
cmp r0, 0
beq _0805729A
b _080573FC
_0805729A:
ldr r6, =gBattleMons
movs r0, 0x58
mov r5, r9
muls r5, r0
adds r0, r6, 0
adds r0, 0x4C
adds r4, r5, r0
ldr r0, [r4]
movs r7, 0x7
ands r0, r7
cmp r0, 0
beq _08057372
mov r0, r9
bl sub_8050650
lsls r0, 24
cmp r0, 0
beq _080572FC
ldr r0, [r4]
movs r1, 0x8
negs r1, r1
ands r0, r1
str r0, [r4]
adds r2, r6, 0
adds r2, 0x50
adds r2, r5, r2
ldr r0, [r2]
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl b_movescr_stack_push_cursor
movs r0, 0x1
mov r2, r10
strb r0, [r2, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB220
str r0, [r1]
movs r0, 0x2
mov r8, r0
b _08057372
.pool
_080572FC:
adds r0, r5, r6
adds r0, 0x20
ldrb r0, [r0]
movs r2, 0x1
cmp r0, 0x30
bne _0805730A
movs r2, 0x2
_0805730A:
ldr r1, [r4]
adds r0, r1, 0
ands r0, r7
cmp r0, r2
bcs _0805731E
movs r0, 0x8
negs r0, r0
ands r1, r0
str r1, [r4]
b _08057322
_0805731E:
subs r0, r1, r2
str r0, [r4]
_08057322:
ldr r2, =gBattleMons
movs r0, 0x58
mov r1, r9
muls r1, r0
adds r0, r2, 0
adds r0, 0x4C
adds r0, r1, r0
ldr r4, [r0]
movs r0, 0x7
ands r4, r0
cmp r4, 0
beq _08057354
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB213
str r0, [r1]
movs r1, 0x2
mov r8, r1
b _08057372
.pool
_08057354:
adds r2, 0x50
adds r2, r1, r2
ldr r0, [r2]
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl b_movescr_stack_push_cursor
ldr r0, =gBattleCommunication
strb r4, [r0, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB220
str r0, [r1]
movs r2, 0x2
mov r8, r2
_08057372:
ldr r1, =gBattleCommunication
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
mov r10, r1
b _080573FC
.pool
_08057390:
ldr r1, =gBattleMons
movs r0, 0x58
mov r2, r9
muls r2, r0
adds r0, r2, 0
adds r1, 0x4C
adds r4, r0, r1
ldr r0, [r4]
movs r1, 0x20
ands r0, r1
cmp r0, 0
beq _080573F4
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
bl __umodsi3
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq _080573D4
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB26A
str r0, [r1]
b _080573EC
.pool
_080573D4:
ldr r0, [r4]
movs r1, 0x21
negs r1, r1
ands r0, r1
str r0, [r4]
bl b_movescr_stack_push_cursor
ldr r1, =gBattlescriptCurrInstr
ldr r0, =gUnknown_082DB277
str r0, [r1]
mov r0, r10
strb r5, [r0, 0x5]
_080573EC:
movs r1, 0x2
mov r8, r1
ldr r2, =gBattleCommunication
mov r10, r2
_080573F4:
mov r1, r10
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
_080573FC:
mov r2, r10
ldrb r0, [r2]
cmp r0, 0x2
beq _08057406
b _0805727C
_08057406:
mov r0, r8
cmp r0, 0x2
bne _08057430
ldr r4, =gActiveBank
mov r1, r9
strb r1, [r4]
ldrb r1, [r4]
movs r0, 0x58
muls r0, r1
ldr r1, =gUnknown_020240D0
adds r0, r1
str r0, [sp]
movs r0, 0
movs r1, 0x28
movs r2, 0
movs r3, 0x4
bl dp01_build_cmdbuf_x02_a_b_varargs
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
_08057430:
mov r0, r8
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_805725C
.align 2, 0 @ Don't pad with nop.

3815
asm/battle_7.s Normal file
View File

File diff suppressed because it is too large Load Diff

20
asm/battle_814AEAC.s
View File

@ -73,7 +73,7 @@ sub_814AF1C: @ 814AF1C
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0814AF40
bl dp01_tbl4_exec_completed
@ -99,7 +99,7 @@ sub_814AF54: @ 814AF54
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0814AFA4
movs r0, 0
@ -195,7 +195,7 @@ _0814B028:
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0814B094
b _0814B092
@ -214,7 +214,7 @@ _0814B05C:
adds r4, 0x1C
adds r0, r4
ldr r2, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r2, r0
bne _0814B094
movs r0, 0x2
@ -319,7 +319,7 @@ _0814B136:
adds r5, 0x1C
adds r0, r5
ldr r3, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r3, r0
bne _0814B252
ldr r0, =gBankSpriteIds
@ -732,7 +732,7 @@ sub_814B4E0: @ 814B4E0
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0814B532
adds r0, r3, 0
@ -793,7 +793,7 @@ sub_814B554: @ 814B554
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0814B590
bl dp01_tbl4_exec_completed
@ -939,7 +939,7 @@ _0814B6CE:
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0814B714
ldr r0, [r6]
@ -3440,7 +3440,7 @@ sub_814CC98: @ 814CC98
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
movs r0, 0
movs r1, 0xFF
@ -3853,7 +3853,7 @@ sub_814D0F0: @ 814D0F0
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
ldr r1, =gBattleBankFunc
ldrb r0, [r4]

2847
asm/battle_9.s Normal file
View File

File diff suppressed because it is too large Load Diff

10
asm/battle_anim_80FE840.s
View File

@ -17270,7 +17270,7 @@ _081072D8:
strh r0, [r6, 0x36]
adds r0, r6, 0
bl obj_translate_based_on_private_1_2_3_4
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
bl CreateInvisibleSpriteWithCallback
adds r4, r0, 0
lsls r4, 24
@ -28829,7 +28829,7 @@ _0810D028:
lsls r0, 2
adds r4, 0x1C
adds r0, r4
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
_0810D08C:
ldr r0, =sub_810D0B8
@ -34846,7 +34846,7 @@ _08110094:
adds r0, r2, 0
adds r0, 0x1C
adds r0, r4, r0
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
adds r4, r2
ldrb r0, [r4, 0x1]
@ -38348,7 +38348,7 @@ _08111D12:
adds r0, r1
lsls r0, 2
adds r0, r4
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
movs r0, 0x8
ldrsh r1, [r5, r0]
@ -39266,7 +39266,7 @@ _08112436:
strh r2, [r4, 0x38]
mov r3, r9
strh r3, [r4, 0x3A]
ldr r0, =gUnknown_0202064C
ldr r0, =gSprites + 0x1C
adds r5, r0
ldr r0, =sub_8112384
str r0, [r5]

24
asm/battle_anim_8170478.s
View File

@ -69,12 +69,12 @@ sub_8170478: @ 8170478
ldrh r6, [r4, 0x38]
lsls r6, 24
lsrs r6, 24
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
bl CreateInvisibleSpriteWithCallback
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x14]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
bl CreateInvisibleSpriteWithCallback
mov r10, r0
mov r2, r10
@ -146,7 +146,7 @@ sub_8170478: @ 8170478
movs r0, 0x1C
add r9, r0
add r6, r9
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r6]
add r4, r9
str r1, [r4]
@ -1332,7 +1332,7 @@ _08170F54:
movs r0, 0x1C
add r9, r0
add r4, r9
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4]
movs r0, 0
bl GetBankByPlayerAI
@ -3338,7 +3338,7 @@ _0817200A:
ldrb r1, [r0]
adds r0, r5, 0
bl StartObjectImageAnim
ldr r0, =gUnknown_0202064C
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_8172508
str r0, [r4]
@ -3456,7 +3456,7 @@ _0817210E:
ldrb r1, [r0]
adds r0, r5, 0
bl StartObjectImageAnim
ldr r0, =gUnknown_0202064C
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_8172508
str r0, [r4]
@ -3573,7 +3573,7 @@ _08172212:
ldrb r1, [r3]
adds r0, r5, 0
bl StartObjectImageAnim
ldr r0, =gUnknown_0202064C
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_8172508
str r0, [r4]
@ -3690,7 +3690,7 @@ _08172312:
ldrb r1, [r0]
adds r0, r5, 0
bl StartObjectImageAnim
ldr r0, =gUnknown_0202064C
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_8172508
str r0, [r4]
@ -3820,7 +3820,7 @@ _08172430:
ldrb r1, [r3]
adds r0, r5, 0
bl StartObjectImageAnim
ldr r0, =gUnknown_0202064C
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_8172508
str r0, [r4]
@ -3996,7 +3996,7 @@ _081725A6:
ldrb r1, [r3]
adds r0, r5, 0
bl StartObjectImageAnim
ldr r0, =gUnknown_0202064C
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_817265C
str r0, [r4]
@ -4163,7 +4163,7 @@ _08172708:
ldrb r1, [r0]
adds r0, r5, 0
bl StartObjectImageAnim
ldr r1, =gUnknown_0202064C
ldr r1, =gSprites + 0x1C
adds r4, r1
ldr r0, =sub_8172508
str r0, [r4]
@ -4296,7 +4296,7 @@ _0817282E:
ldrb r1, [r3]
adds r0, r5, 0
bl StartObjectImageAnim
ldr r0, =gUnknown_0202064C
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r0, =sub_81728E0
str r0, [r4]

6266
asm/battle_controller_linkopponent.s Normal file
View File

File diff suppressed because it is too large Load Diff

6676
asm/battle_controller_opponent.s Normal file
View File

File diff suppressed because it is too large Load Diff

10419
asm/battle_controller_player.s Normal file
View File

File diff suppressed because it is too large Load Diff

2
asm/battle_transition.s
View File

@ -7844,7 +7844,7 @@ sub_8149F08: @ 8149F08
sub_8149F2C: @ 8149F2C
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

6
asm/berry_blender.s
View File

@ -71,7 +71,7 @@ sub_807F764: @ 807F764
movs r0, 0x2
bl SetBgAffine
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
add sp, 0x10
pop {r4}
@ -6494,7 +6494,7 @@ _08082EF4:
ands r0, r2
subs r0, r7, r0
strh r0, [r4, 0x30]
ldr r3, =gUnknown_0202064C
ldr r3, =gSprites + 0x1C
adds r5, r3
ldr r0, =sub_8082E3C
str r0, [r5]
@ -8087,7 +8087,7 @@ _08083B9A:
adds r5, r6, 0
adds r5, 0x1C
adds r0, r5
ldr r4, =DummyObjectCallback
ldr r4, =SpriteCallbackDummy
str r4, [r0]
mov r0, r8
movs r1, 0xA0

2
asm/berry_tag_screen.s
View File

@ -46,7 +46,7 @@ sub_8177C54: @ 8177C54
sub_8177C70: @ 8177C70
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

2
asm/cable_car.s
View File

@ -1340,7 +1340,7 @@ sub_8150800: @ 8150800
movs r0, 0x12
bl SetGpuReg
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r4}
pop {r0}

20
asm/contest.s
View File

@ -1366,7 +1366,7 @@ vblank_cb_battle: @ 80D827C
bl SetGpuReg
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl sub_80BA0A8
pop {r0}
bx r0
@ -2578,7 +2578,7 @@ _080D8E7C:
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _080D8EA0
bl _080DA100
@ -4760,7 +4760,7 @@ _080DA148:
cmp r0, 0x1F
bne _080DA15C
strh r2, [r1, 0x2E]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r1, 0x1C]
_080DA15C:
pop {r0}
@ -4784,7 +4784,7 @@ sub_80DA164: @ 80DA164
negs r1, r1
cmp r0, r1
bge _080DA18E
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
adds r2, 0x3E
ldrb r0, [r2]
@ -6677,7 +6677,7 @@ sub_80DB0C4: @ 80DB0C4
strb r1, [r5, 0x5]
adds r4, 0x1C
adds r2, r4
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r2]
pop {r4,r5}
pop {r1}
@ -6811,7 +6811,7 @@ _080DB1CC:
mov r0, r8
adds r0, 0x1C
adds r0, r6, r0
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldrb r0, [r4, 0x5]
lsrs r0, 4
@ -9126,7 +9126,7 @@ sub_80DC408: @ 80DC408
negs r0, r0
ands r0, r2
strb r0, [r1, 0x2]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
b _080DC446
.pool
@ -10118,7 +10118,7 @@ sub_80DCBE8: @ 80DCBE8
ldr r0, =sub_80DCC84
str r0, [r6]
add r4, r8
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4]
mov r3, r9
cmp r3, 0
@ -11481,7 +11481,7 @@ sub_80DD6DC: @ 80DD6DC
movs r1, 0x4
orrs r0, r1
strb r0, [r3]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
@ -13794,7 +13794,7 @@ sub_80DE9DC: @ 80DE9DC
thumb_func_start sub_80DEA20
sub_80DEA20: @ 80DEA20
push {lr}
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
bl CreateInvisibleSpriteWithCallback
ldr r1, =gBankSpriteIds
strb r0, [r1, 0x3]

8
asm/contest_link_80F57C4.s
View File

@ -490,7 +490,7 @@ sub_80F5C24: @ 80F5C24
movs r0, 0x46
bl SetGpuReg
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80BA0A8
pop {r0}
@ -2642,7 +2642,7 @@ sub_80F6F40: @ 80F6F40
strh r1, [r0, 0x22]
strh r2, [r0, 0x26]
strh r2, [r0, 0x24]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0, 0x1C]
ldr r0, =gUnknown_0203A034
ldr r0, [r0]
@ -3478,7 +3478,7 @@ _080F75F6:
ldrsh r0, [r4, r2]
cmp r0, 0x78
bne _080F7610
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x30]
@ -3517,7 +3517,7 @@ sub_80F7620: @ 80F7620
negs r1, r1
cmp r0, r1
bge _080F7664
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
adds r2, r3, 0
adds r2, 0x3E

2
asm/contest_painting.s
View File

@ -553,7 +553,7 @@ sub_81302D0: @ 81302D0
push {lr}
bl sub_8130280
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

2
asm/credits.s
View File

@ -9,7 +9,7 @@
sub_81754C8: @ 81754C8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

18
asm/decoration.s
View File

@ -2903,13 +2903,13 @@ _081281EA:
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _0812820C
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r0, [sp]
movs r0, 0xC1
b _08128214
.pool
_0812820C:
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
movs r0, 0xC2
@ -5111,7 +5111,7 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 8129334
_081293B4:
ldr r0, [r4, 0x1C]
ldrh r0, [r0]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r2, 0x1
str r2, [sp]
movs r2, 0
@ -5331,7 +5331,7 @@ AddDecorationIconObjectFromFieldObject: @ 81294C0
_081295A4:
ldr r0, [r4, 0x1C]
ldrh r0, [r0]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r2, 0x1
str r2, [sp]
movs r2, 0
@ -5890,13 +5890,13 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 81299DC
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _08129A3C
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r0, [sp]
movs r0, 0xC1
b _08129A44
.pool
_08129A3C:
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
movs r0, 0xC2
@ -6134,7 +6134,7 @@ sub_8129BF8: @ 8129BF8
lsls r0, 2
adds r3, 0x1C
adds r0, r3
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldr r5, =gStringVar4
ldr r1, =gUnknown_085EAA62
@ -6213,7 +6213,7 @@ _08129CDE:
lsls r0, 2
adds r3, 0x1C
adds r0, r3
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAA62
@ -6369,7 +6369,7 @@ sub_8129E0C: @ 8129E0C
adds r3, r5, 0
adds r3, 0x1C
adds r2, r3
ldr r3, =DummyObjectCallback
ldr r3, =SpriteCallbackDummy
str r3, [r2]
ldr r4, =gUnknown_0203AA39
ldrb r3, [r4]

2
asm/diploma.s
View File

@ -9,7 +9,7 @@
sub_8177874: @ 8177874
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

4
asm/easy_chat.s
View File

@ -68,7 +68,7 @@ sub_811A290: @ 811A290
push {lr}
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_811A290
@ -8982,7 +8982,7 @@ _0811E852:
cmp r0, 0x4
bne _0811E8D0
adds r0, r4, 0
ldr r5, =DummyObjectCallback
ldr r5, =SpriteCallbackDummy
movs r4, 0
str r4, [sp]
adds r1, r5, 0

10
asm/egg_hatch.s
View File

@ -442,7 +442,7 @@ _080716D8:
strb r0, [r2]
adds r4, 0x1C
adds r1, r4
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r1]
_08071712:
adds r0, r7, 0
@ -459,7 +459,7 @@ _08071712:
sub_807172C: @ 807172C
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -914,7 +914,7 @@ _08071BA0:
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _08071BBC
b _08071E06
@ -951,7 +951,7 @@ _08071BF8:
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _08071C12
b _08071E06
@ -1506,7 +1506,7 @@ _080720BC:
ldrsh r0, [r5, r2]
cmp r0, 0x28
ble _080720CA
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r5, 0x1C]
_080720CA:
adds r0, r1, 0x1

6
asm/evolution_scene.s
View File

@ -3663,7 +3663,7 @@ sub_813FCDC: @ 813FCDC
movs r0, 0x1E
bl SetGpuReg
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80BA0A8
pop {r0}
@ -3707,7 +3707,7 @@ sub_813FD64: @ 813FD64
movs r0, 0x1E
bl SetGpuReg
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80BA0A8
pop {r0}
@ -4200,7 +4200,7 @@ sub_8140208: @ 8140208
adds r2, 0x1C
adds r1, r2
ldr r1, [r1]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _08140230
movs r0, 0

4
asm/field_effect.s
View File

@ -545,7 +545,7 @@ sub_80B5E6C: @ 80B5E6C
str r2, [sp, 0xC]
ldr r0, =gDummyObjectRotScalAnimTable
str r0, [sp, 0x10]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [sp, 0x14]
lsls r5, 16
asrs r5, 16
@ -6185,7 +6185,7 @@ sub_80B8C60: @ 80B8C60
lsls r2, 2
ldr r1, =gSprites
adds r2, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r2, 0x1C]
ldrb r3, [r2, 0x5]
movs r1, 0xD

2
asm/field_region_map.s
View File

@ -88,7 +88,7 @@ sub_81701C4: @ 81701C4
sub_8170260: @ 8170260
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

4
asm/front_pic_anim.s
View File

@ -26,7 +26,7 @@ sub_817F498: @ 817F498
movs r0, 0x8
ldrsh r4, [r2, r0]
mov r8, r1
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
mov r12, r0
cmp r4, 0
bne _0817F508
@ -11677,7 +11677,7 @@ sub_8184D88: @ 8184D88
ands r0, r1
cmp r0, 0
beq _08184D9C
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_08184D9C:
pop {r0}

4
asm/hall_of_fame.s
View File

@ -9,7 +9,7 @@
sub_817354C: @ 817354C
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -775,7 +775,7 @@ sub_8173BC0: @ 8173BC0
ldr r1, =gSprites
adds r3, r0, r1
ldr r1, [r3, 0x1C]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08173C1A
ldrb r1, [r3, 0x1]

6
asm/intro.s
View File

@ -9,7 +9,7 @@
sub_816CBE8: @ 816CBE8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80BA0A8
pop {r0}
@ -5263,7 +5263,7 @@ _0816F8A0:
movs r2, 0x2
movs r3, 0x2
bl CalcCenterToCornerVec
ldr r2, =gUnknown_0202064C
ldr r2, =gSprites + 0x1C
adds r4, r2
ldr r0, =sub_816F3A4
str r0, [r4]
@ -5305,7 +5305,7 @@ _0816F8A0:
movs r2, 0x2
movs r3, 0x2
bl CalcCenterToCornerVec
ldr r0, =gUnknown_0202064C
ldr r0, =gSprites + 0x1C
adds r4, r0
ldr r1, =sub_816F3A4
str r1, [r4]

2
asm/intro_credits_graphics.s
View File

@ -693,7 +693,7 @@ _0817B6C2:
movs r0, 0xF
ands r3, r0
strb r3, [r4, 0x5]
ldr r0, =gUnknown_02020638
ldr r0, =gSprites + 8
adds r5, r0
ldr r2, [sp, 0x8]
str r2, [r5]

36
asm/link.s
View File

@ -329,7 +329,7 @@ _0800969E:
sub_80096BC: @ 80096BC
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -16589,7 +16589,7 @@ sub_8011AC8: @ 8011AC8
sub_8011AE8: @ 8011AE8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -28582,7 +28582,7 @@ sub_8018404: @ 8018404
thumb_func_start sub_8018424
sub_8018424: @ 8018424
push {lr}
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl LoadOamFromSprites
bl TransferPlttBuffer
pop {r0}
@ -32555,7 +32555,7 @@ _0801A414:
sub_801A418: @ 801A418
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -33540,7 +33540,7 @@ _0801AC38:
sub_801AC40: @ 801AC40
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -36531,7 +36531,7 @@ sub_801C4C0: @ 801C4C0
bl sub_80D2E84
lsls r0, 16
lsrs r0, 16
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r7, [sp]
str r7, [sp, 0x4]
movs r2, 0xDC
@ -36636,7 +36636,7 @@ _0801C572:
mov r2, r9
str r2, [sp]
str r2, [sp, 0x4]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
adds r2, r5, 0
movs r3, 0x88
bl sub_80D2D78
@ -39836,7 +39836,7 @@ sub_801DF20: @ 801DF20
push {lr}
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl sub_80BA0A8
pop {r0}
bx r0
@ -45844,7 +45844,7 @@ sub_8020F74: @ 8020F74
push {lr}
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_8020F74
@ -46665,7 +46665,7 @@ _0802166E:
ands r0, r2
cmp r1, r0
blt _0802169A
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r5, 0x1C]
adds r0, r5, 0
bl obj_free_rotscale_entry
@ -49025,7 +49025,7 @@ sub_8022A4C: @ 8022A4C
push {r4,r5,lr}
adds r3, r0, 0
movs r1, 0
ldr r5, =DummyObjectCallback
ldr r5, =SpriteCallbackDummy
adds r2, r3, 0
adds r2, 0x2E
movs r4, 0
@ -55992,7 +55992,7 @@ sub_80261E4: @ 80261E4
push {lr}
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_80261E4
@ -65139,7 +65139,7 @@ sub_802AC58: @ 802AC58
push {lr}
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_802AC58
@ -69180,7 +69180,7 @@ _0802CBD6:
movs r1, 0x4
orrs r0, r1
strb r0, [r3]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_0802CBE6:
pop {r0}
@ -69261,7 +69261,7 @@ _0802CC6C:
ble _0802CC7C
movs r0, 0
strh r0, [r2, 0x26]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_0802CC7C:
pop {r0}
@ -69303,7 +69303,7 @@ sub_802CCB0: @ 802CCB0
ldr r1, =0x000081a8
adds r3, r4, r1
ldr r7, =sub_802CD08
ldr r6, =DummyObjectCallback
ldr r6, =SpriteCallbackDummy
movs r5, 0xA
adds r4, r0, 0
_0802CCD2:
@ -69499,7 +69499,7 @@ _0802CE06:
b _0802CE3C
.pool
_0802CE38:
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r5, 0x1C]
_0802CE3C:
pop {r4,r5}
@ -73652,7 +73652,7 @@ _0802EF34:
asrs r0, 16
cmp r0, 0x28
ble _0802EF46
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r5, 0x1C]
_0802EF46:
pop {r4,r5}

6
asm/mail.s
View File

@ -513,7 +513,7 @@ _08121910:
_08121940:
adds r0, r4, 0
bl sub_80D2F68
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@ -524,7 +524,7 @@ _08121940:
_08121958:
adds r0, r4, 0
bl sub_80D2F68
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@ -884,7 +884,7 @@ _08121BCC:
sub_8121C50: @ 8121C50
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

4
asm/main_menu.s
View File

@ -22,7 +22,7 @@ CB2_MainMenu: @ 802F6B0
VBlankCB_MainMenu: @ 802F6C8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -2277,7 +2277,7 @@ sub_8030B14: @ 8030B14
.pool
_08030B64:
ldr r1, [r3, 0x1C]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08030BBA
ldrb r1, [r3, 0x1]

2
asm/mon_markings.s
View File

@ -642,7 +642,7 @@ _0811FDEE:
lsrs r5, r0, 16
cmp r5, 0x3
bls _0811FDC8
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x14]
adds r0, r4, 0
movs r1, 0

2
asm/mystery_event_menu.s
View File

@ -9,7 +9,7 @@
sub_8178944: @ 8178944
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

8
asm/naming_screen.s
View File

@ -2615,7 +2615,7 @@ sub_80E4384: @ 80E4384
bl sub_808BD3C
lsls r0, 24
lsrs r0, 24
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r2, 0
str r2, [sp]
movs r2, 0x38
@ -2679,7 +2679,7 @@ sub_80E4420: @ 80E4420
ldr r1, =0x00001e34
adds r0, r3, r1
ldrh r0, [r0]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r2, 0
str r2, [sp]
ldr r2, =0x00001e38
@ -2712,7 +2712,7 @@ sub_80E4420: @ 80E4420
sub_80E447C: @ 80E447C
push {lr}
sub sp, 0x4
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
movs r0, 0x13
@ -4091,7 +4091,7 @@ sub_80E4F84: @ 80E4F84
sub_80E4F94: @ 80E4F94
push {r4,r5,lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
ldr r5, =gUnknown_02039F94
ldr r0, [r5]

2
asm/option_menu.s
View File

@ -20,7 +20,7 @@ sub_80BA4B0: @ 80BA4B0
sub_80BA4C8: @ 80BA4C8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

8
asm/pokeblock_feed.s
View File

@ -21,7 +21,7 @@ sub_8179B68: @ 8179B68
sub_8179B84: @ 8179B84
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -880,7 +880,7 @@ sub_817A358: @ 817A358
adds r0, r7, 0
adds r0, 0x1C
adds r0, r5, r0
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
mov r2, r9
ldr r0, [r2]
@ -976,7 +976,7 @@ _0817A48E:
ldrsh r0, [r4, r1]
cmp r0, 0x9
bne _0817A49A
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_0817A49A:
pop {r4}
@ -1014,7 +1014,7 @@ sub_817A4A4: @ 817A4A4
str r2, [r1]
adds r5, 0x1C
adds r3, r5
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r3]
bl InitSpriteAffineAnim
adds r0, r4, 0

2
asm/pokedex.s
View File

@ -80,7 +80,7 @@ sub_80BB358: @ 80BB358
sub_80BB370: @ 80BB370
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

4
asm/pokemon_3.s
View File

@ -6058,7 +6058,7 @@ _0806ED66:
adds r0, r4, 0
bl cry_related
_0806ED7C:
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
b _0806EDFA
.pool
_0806ED84:
@ -6215,7 +6215,7 @@ sub_806EEB4: @ 806EEB4
ands r0, r1
cmp r0, 0
bne _0806EEE8
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
b _0806EEFC
.pool
_0806EEE8:

2
asm/porthole.s
View File

@ -176,7 +176,7 @@ _080FB6E2:
sub_80FB6EC: @ 80FB6EC
push {r4,lr}
sub sp, 0x4
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r0, 0
str r0, [sp]
movs r0, 0x8C

6
asm/region_map.s
View File

@ -2809,7 +2809,7 @@ sub_8124288: @ 8124288
str r5, [sp, 0xC]
ldr r0, =gDummyObjectRotScalAnimTable
str r0, [sp, 0x10]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [sp, 0x14]
ldr r0, =gUnknown_02037318
ldrb r0, [r0, 0x14]
@ -2914,7 +2914,7 @@ sub_81243B0: @ 81243B0
strb r0, [r2]
ldr r0, [r3]
ldr r1, [r0, 0x20]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r1, 0x1C]
_081243CE:
pop {r0}
@ -3517,7 +3517,7 @@ _081248AA:
sub_81248C0: @ 81248C0
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

2
asm/reset_rtc_screen.s
View File

@ -949,7 +949,7 @@ sub_809F090: @ 809F090
thumb_func_start sub_809F0AC
sub_809F0AC: @ 809F0AC
push {lr}
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl LoadOamFromSprites
bl TransferPlttBuffer
pop {r0}

12
asm/rom3.s
View File

@ -758,7 +758,7 @@ b_setup_bx_link: @ 8032CC0
str r0, [r2]
ldr r1, =gBanksBySide
strb r3, [r1]
ldr r0, =sub_8064394
ldr r0, =SetBankFuncToLinkOpponentBufferRunCommand
str r0, [r2, 0x4]
strb r5, [r1, 0x1]
ldr r1, =gNoOfAllBanks
@ -771,7 +771,7 @@ _08032D1C:
str r0, [r2, 0x4]
ldr r1, =gBanksBySide
strb r4, [r1, 0x1]
ldr r0, =sub_8064394
ldr r0, =SetBankFuncToLinkOpponentBufferRunCommand
str r0, [r2]
strb r5, [r1]
ldr r1, =gNoOfAllBanks
@ -797,7 +797,7 @@ _08032D48:
ldr r1, =gBanksBySide
movs r0, 0
strb r0, [r1]
ldr r3, =sub_8064394
ldr r3, =SetBankFuncToLinkOpponentBufferRunCommand
str r3, [r2, 0x4]
strb r5, [r1, 0x1]
str r4, [r2, 0x8]
@ -814,7 +814,7 @@ _08032D98:
str r0, [r2, 0x4]
ldr r1, =gBanksBySide
strb r3, [r1, 0x1]
ldr r3, =sub_8064394
ldr r3, =SetBankFuncToLinkOpponentBufferRunCommand
str r3, [r2]
strb r5, [r1]
str r0, [r2, 0xC]
@ -860,7 +860,7 @@ _08032E1C:
str r0, [r2]
ldr r1, =gBanksBySide
strb r3, [r1]
ldr r3, =sub_8064394
ldr r3, =SetBankFuncToLinkOpponentBufferRunCommand
str r3, [r2, 0x4]
strb r5, [r1, 0x1]
ldr r0, =SetBankFuncToPlayerBufferRunCommand
@ -1057,7 +1057,7 @@ _08032FD4:
lsls r0, 2
ldr r1, =gBattleBankFunc
adds r0, r1
ldr r1, =sub_8064394
ldr r1, =SetBankFuncToLinkOpponentBufferRunCommand
str r1, [r0]
ldrh r0, [r2, 0x18]
cmp r0, 0x2

2
asm/rom4.s
View File

@ -3636,7 +3636,7 @@ SetFieldVBlankCallback: @ 8086380
VBlankCB_Field: @ 8086390
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl sub_80BA0A8
bl FieldUpdateBgTilemapScroll
bl TransferPlttBuffer

6
asm/rom5.s
View File

@ -561,7 +561,7 @@ _080A9786:
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldrb r1, [r4]
lsls r0, r1, 4
@ -694,7 +694,7 @@ _080A9914:
adds r1, r4, 0
adds r1, 0x1C
adds r0, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldrb r1, [r3]
lsls r0, r1, 4
@ -778,7 +778,7 @@ _080A998C:
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldrb r1, [r4]
lsls r0, r1, 4

6
asm/rom6.s
View File

@ -582,7 +582,7 @@ sub_813591C: @ 813591C
sub_8135938: @ 8135938
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -1921,7 +1921,7 @@ _081364B4:
lsls r0, 26
lsrs r0, 27
bl rotscale_free_entry
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_081364E0:
pop {r4,r5}
@ -3429,7 +3429,7 @@ sub_81371D4: @ 81371D4
sub_81371EC: @ 81371EC
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

2
asm/rom_8034C54.s
View File

@ -7022,7 +7022,7 @@ _08038A3A:
movs r0, 0x46
bl SetGpuReg
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80BA0A8
pop {r0}

14
asm/rom_8072304.s
View File

@ -1977,7 +1977,7 @@ _08073336:
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _08073354
b _080735A8
@ -2420,7 +2420,7 @@ _0807371C:
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r2, =gUnknown_0202064C
ldr r2, =gSprites + 0x1C
adds r1, r2
ldr r0, =sub_80741C8
str r0, [r1]
@ -3664,7 +3664,7 @@ _08074140:
movs r0, 0x73
bl sub_80A3808
_0807414A:
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_0807414E:
pop {r4}
@ -3725,7 +3725,7 @@ _08074196:
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
_080741BC:
pop {r4}
@ -5900,7 +5900,7 @@ sub_8075370: @ 8075370
b _080753A8
.pool
_080753A4:
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080753A8:
pop {r4}
@ -8490,7 +8490,7 @@ sub_80768F0: @ 80768F0
ands r0, r1
cmp r0, 0
beq _08076904
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_08076904:
pop {r0}
@ -8609,7 +8609,7 @@ sub_80769CC: @ 80769CC
ldr r0, [r2, 0x24]
cmp r0, 0
bne _080769EA
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_080769EA:
pop {r0}

2
asm/rom_80A5C6C.s
View File

@ -5868,7 +5868,7 @@ sub_80A89C8: @ 80A89C8
sub sp, 0x4
lsls r6, r1, 24
lsrs r6, 24
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
mov r10, r0
bl CreateInvisibleSpriteWithCallback
mov r8, r0

36
asm/rom_80C6FA0.s
View File

@ -1269,7 +1269,7 @@ sub_80C7958: @ 80C7958
str r2, [sp, 0x28]
ldr r0, =gDummyObjectRotScalAnimTable
str r0, [sp, 0x2C]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [sp, 0x30]
add r0, sp, 0x4
movs r2, 0x18
@ -1701,7 +1701,7 @@ _080C7D24:
sub_80C7D28: @ 80C7D28
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl sub_80D2AA4
bl TransferPlttBuffer
ldr r0, =gUnknown_02039D08
@ -5869,7 +5869,7 @@ _080CA2E6:
negs r1, r1
ands r1, r0
strb r1, [r4, 0x1]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080CA30E:
pop {r4}
@ -7669,7 +7669,7 @@ _080CB250:
strh r0, [r1]
ldrh r0, [r2, 0x34]
strh r0, [r2, 0x20]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_080CB266:
pop {r0}
@ -7702,7 +7702,7 @@ _080CB28C:
lsrs r0, 16
cmp r0, 0xB6
bls _080CB2A8
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_080CB2A8:
pop {r0}
@ -8690,7 +8690,7 @@ _080CBA7C:
adds r0, 0x10
_080CBA8E:
strh r0, [r3, 0x22]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
ldr r0, =gUnknown_02039D08
ldr r2, [r0]
@ -9040,7 +9040,7 @@ _080CBD34:
ldr r0, =0x00000a6c
adds r1, r0
ldr r2, [r1]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
movs r0, 0
str r0, [r1]
@ -9085,7 +9085,7 @@ _080CBD8E:
ldr r2, =0x00000a6c
adds r0, r1, r2
ldr r2, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
ldr r4, =0x00000c5d
adds r1, r4
@ -9249,7 +9249,7 @@ _080CBEBE:
adds r1, r7
ldr r0, [r1]
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r1, 0x1C]
_080CBEF2:
movs r0, 0x1
@ -11186,7 +11186,7 @@ _080CCF44:
ldrsh r1, [r2, r3]
cmp r0, r1
bne _080CCF5C
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_080CCF5C:
pop {r0}
@ -11698,7 +11698,7 @@ sub_80CD2E8: @ 80CD2E8
strb r0, [r6, 0x5]
adds r5, 0x1C
adds r4, r5
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4]
adds r0, r6, 0
b _080CD362
@ -19209,7 +19209,7 @@ _080D1226:
cmp r0, 0x8
beq _080D124E
ldr r1, [r2, 0x1C]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _080D1268
ldr r0, =sub_80D1AD8
@ -20197,7 +20197,7 @@ sub_80D1A48: @ 80D1A48
lsrs r0, 24
movs r1, 0
bl sub_80D1740
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080D1A68:
pop {r4}
@ -20351,7 +20351,7 @@ _080D1B42:
lsls r2, 24
lsrs r2, 24
bl sub_80D140C
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080D1B8A:
pop {r4}
@ -20508,7 +20508,7 @@ _080D1C5E:
lsls r2, 24
lsrs r2, 24
bl sub_80D140C
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x24]
@ -20535,7 +20535,7 @@ sub_80D1CCC: @ 80D1CCC
negs r1, r1
cmp r0, r1
bge _080D1CFC
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
adds r0, r2, 0
bl sub_80D13C4
@ -26812,7 +26812,7 @@ _080D4DA8:
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080D4DB8:
pop {r4}
@ -26868,7 +26868,7 @@ ObjectCB_ShakeBagVisual: @ 80D4E0C
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080D4E28:
pop {r4}

2
asm/rom_813C5BC.s
View File

@ -373,7 +373,7 @@ sub_813C890: @ 813C890
sub_813C8D8: @ 813C8D8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

28
asm/rom_8158B30.s
View File

@ -1249,7 +1249,7 @@ sub_815955C: @ 815955C
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08159580
bl dp01_tbl6_exec_completed
@ -1288,7 +1288,7 @@ sub_81595AC: @ 81595AC
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081595D0
bl dp01_tbl6_exec_completed
@ -4640,7 +4640,7 @@ _0815B0BC:
strb r0, [r3]
adds r5, 0x1C
adds r1, r5
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r1]
_0815B120:
ldrh r1, [r6, 0xA]
@ -6459,7 +6459,7 @@ sub_815BFF4: @ 815BFF4
adds r6, 0x1C
adds r0, r3, r6
ldr r2, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r2, r0
bne _0815C040
movs r1, 0x3C
@ -6527,7 +6527,7 @@ sub_815C050: @ 815C050
orrs r0, r1
mov r1, r12
strb r0, [r1]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
_0815C09C:
pop {r0}
@ -15100,7 +15100,7 @@ _08160618:
sub_8160624: @ 8160624
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -25929,7 +25929,7 @@ sub_816631C: @ 816631C
sub_8166340: @ 8166340
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
ldr r0, =gUnknown_0203BCAC
ldr r0, [r0]
@ -27736,7 +27736,7 @@ sub_8167338: @ 8167338
ldr r6, =gUnknown_085DFD28
adds r0, r6, 0x2
mov r8, r0
ldr r7, =gUnknown_0202064C
ldr r7, =gSprites + 0x1C
_08167360:
ldr r0, [r5]
adds r0, 0x61
@ -29557,7 +29557,7 @@ _08168398:
_081683A0:
ldrh r0, [r2, 0x30]
strh r0, [r2, 0x20]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_081683A8:
pop {r4}
@ -29791,7 +29791,7 @@ sub_816856C: @ 816856C
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08168590
bl dp01_tbl5_exec_completed
@ -29972,7 +29972,7 @@ _081686D2:
adds r4, 0x1C
adds r0, r4
ldr r3, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r3, r0
bne _081687DC
ldr r0, =gBankSpriteIds
@ -30102,7 +30102,7 @@ sub_8168818: @ 8168818
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08168842
movs r4, 0x1
@ -30380,7 +30380,7 @@ sub_8168A90: @ 8168A90
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08168AB4
bl dp01_tbl5_exec_completed
@ -34085,7 +34085,7 @@ sub_816AA80: @ 816AA80
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
movs r0, 0
movs r1, 0xFF

82
asm/rom_8184DA4.s
View File

@ -2814,7 +2814,7 @@ sub_8186558: @ 8186558
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0818657C
bl sub_81871AC
@ -2839,7 +2839,7 @@ sub_8186590: @ 8186590
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081865B4
bl sub_81871AC
@ -2865,7 +2865,7 @@ sub_81865C8: @ 81865C8
adds r0, 0x1C
adds r0, r2, r0
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0818661A
adds r0, r2, r5
@ -2967,7 +2967,7 @@ _081866A4:
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
mov r8, r2
cmp r1, r0
bne _08186764
@ -2999,7 +2999,7 @@ _081866F8:
adds r5, 0x1C
adds r0, r5
ldr r4, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
mov r8, r2
cmp r4, r0
bne _08186764
@ -3412,7 +3412,7 @@ _08186A6A:
adds r2, 0x1C
adds r0, r2
ldr r3, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r3, r0
bne _08186B26
ldr r0, =gBankSpriteIds
@ -3440,7 +3440,7 @@ _08186AC8:
adds r2, 0x1C
adds r0, r2
ldr r4, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r4, r0
bne _08186B26
ldr r6, =gBankSpriteIds
@ -3614,7 +3614,7 @@ sub_8186C48: @ 8186C48
adds r0, 0x1C
adds r0, r2, r0
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08186CFA
adds r0, r2, r4
@ -3885,7 +3885,7 @@ sub_8186EA4: @ 8186EA4
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08186EF0
ldr r0, =gUnknown_020244D0
@ -3949,7 +3949,7 @@ sub_8186F14: @ 8186F14
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _08186F5E
ldr r0, =nullsub_18
@ -3997,7 +3997,7 @@ sub_8186F94: @ 8186F94
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08187050
ldrb r1, [r3]
@ -4104,7 +4104,7 @@ _081870B6:
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08187120
ldr r0, [r6]
@ -6593,7 +6593,7 @@ sub_81885D8: @ 81885D8
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
movs r0, 0
movs r1, 0xFE
@ -7002,7 +7002,7 @@ sub_8188A4C: @ 8188A4C
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
@ -8775,7 +8775,7 @@ sub_81899B8: @ 81899B8
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081899DC
bl sub_818A514
@ -8801,7 +8801,7 @@ sub_81899F0: @ 81899F0
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08189A40
movs r0, 0
@ -8907,7 +8907,7 @@ _08189ADA:
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08189B42
b _08189B48
@ -8925,7 +8925,7 @@ _08189B0C:
adds r2, 0x1C
adds r0, r2
ldr r4, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r4, r0
bne _08189B42
movs r0, 0x2
@ -9093,7 +9093,7 @@ _08189C80:
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _08189CE6
b _08189CE4
@ -9111,7 +9111,7 @@ _08189CB0:
adds r2, 0x1C
adds r0, r2
ldr r4, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r4, r0
bne _08189CE6
movs r0, 0x2
@ -9435,7 +9435,7 @@ _08189F62:
adds r4, 0x1C
adds r0, r4
ldr r2, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r2, r0
bne _0818A02A
ldr r0, =gBankSpriteIds
@ -9809,7 +9809,7 @@ sub_818A2B4: @ 818A2B4
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0818A306
adds r0, r3, 0
@ -9870,7 +9870,7 @@ sub_818A328: @ 818A328
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0818A364
bl sub_818A514
@ -10016,7 +10016,7 @@ _0818A4A2:
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _0818A4E8
ldr r0, [r6]
@ -12517,7 +12517,7 @@ sub_818BA6C: @ 818BA6C
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
movs r0, 0
movs r1, 0xFF
@ -13034,7 +13034,7 @@ sub_818BFB8: @ 818BFB8
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
@ -21522,7 +21522,7 @@ _081907BC:
asrs r0, 16
cmp r0, 0x28
bne _081907F0
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
b _081907F0
.pool
@ -21576,7 +21576,7 @@ _08190820:
asrs r0, 16
cmp r0, 0x28
bne _08190858
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
b _08190858
.pool
@ -21634,7 +21634,7 @@ _0819088C:
asrs r0, 16
cmp r0, 0x40
bne _081908C0
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
b _081908C0
.pool
@ -21689,7 +21689,7 @@ _081908F6:
asrs r0, 16
cmp r0, 0x40
bne _08190930
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
b _08190930
.pool
@ -29412,7 +29412,7 @@ sub_8194B70: @ 8194B70
movs r0, 0x1A
bl SetGpuReg
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -29540,7 +29540,7 @@ sub_8194CE4: @ 8194CE4
movs r2, 0x1
bl ChangeBgY
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80BA0A8
pop {r0}
@ -32915,7 +32915,7 @@ sub_81968BC: @ 81968BC
cmp r4, 0
bne _081968EC
movs r0, 0
bl DummyObjectCallback
bl SpriteCallbackDummy
_081968EC:
movs r1, 0xFF
lsrs r0, r4, 8
@ -40723,7 +40723,7 @@ sub_819A4C8: @ 819A4C8
sub_819A4E4: @ 819A4E4
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -43948,7 +43948,7 @@ sub_819C040: @ 819C040
adds r1, r2
ldr r1, [r1]
bl _call_via_r1
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_0819C0DC:
pop {r4-r6}
@ -44257,7 +44257,7 @@ _0819C2FC:
adds r0, r1
lsls r0, 2
adds r0, r6
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
mov r10, r1
str r1, [r0]
ldr r5, =0x0000029d
@ -44453,7 +44453,7 @@ sub_819C4B4: @ 819C4B4
adds r0, r1
lsls r0, 2
adds r0, r3
ldr r5, =DummyObjectCallback
ldr r5, =SpriteCallbackDummy
str r5, [r0]
adds r4, r2, r4
ldrb r1, [r4]
@ -44796,7 +44796,7 @@ sub_819C7E0: @ 819C7E0
sub_819C7FC: @ 819C7FC
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -50261,7 +50261,7 @@ sub_819F600: @ 819F600
strh r2, [r1, 0x16]
ldr r1, [r1]
bl _call_via_r1
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_0819F640:
pop {r4}
@ -72295,7 +72295,7 @@ c2_bag_3: @ 81AAD5C
vblank_cb_bag_menu: @ 81AAD78
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -82312,7 +82312,7 @@ sub_81B01B0: @ 81B01B0
sub_81B01CC: @ 81B01CC
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

94
asm/rom_81BAD84.s
View File

@ -121,7 +121,7 @@ sub_81BAE60: @ 81BAE60
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081BAE84
bl dp01_tbl3_exec_completed
@ -147,7 +147,7 @@ sub_81BAE98: @ 81BAE98
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081BAEE8
movs r0, 0
@ -243,7 +243,7 @@ _081BAF6C:
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081BAFD8
b _081BAFD6
@ -262,7 +262,7 @@ _081BAFA0:
adds r4, 0x1C
adds r0, r4
ldr r2, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r2, r0
bne _081BAFD8
movs r0, 0x2
@ -367,7 +367,7 @@ _081BB07A:
adds r5, 0x1C
adds r0, r5
ldr r3, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r3, r0
bne _081BB196
ldr r0, =gBankSpriteIds
@ -1354,7 +1354,7 @@ sub_81BB92C: @ 81BB92C
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081BB97E
adds r0, r3, 0
@ -1415,7 +1415,7 @@ dp01t_35_3_free_vram: @ 81BB9A0
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081BB9DC
bl dp01_tbl3_exec_completed
@ -1561,7 +1561,7 @@ _081BBB1A:
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081BBB60
ldr r0, [r6]
@ -4062,7 +4062,7 @@ sub_81BD0E4: @ 81BD0E4
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
movs r0, 0
movs r1, 0xFF
@ -4524,7 +4524,7 @@ sub_81BD5C8: @ 81BD5C8
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
@ -7765,7 +7765,7 @@ _081BF1CC:
adds r0, 0x1C
adds r0, r2, r0
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
bne _081BF238
adds r0, r2, r3
@ -7819,7 +7819,7 @@ sub_81BF248: @ 81BF248
ldrh r0, [r0, 0x10]
cmp r0, 0xFF
bls _081BF268
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r5, 0x1C]
b _081BF2B0
.pool
@ -8771,7 +8771,7 @@ sub_81BFAB4: @ 81BFAB4
sub_81BFAD0: @ 81BFAD0
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -17651,7 +17651,7 @@ sub_81C48B4: @ 81C48B4
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _081C48E8
movs r0, 0x1
@ -17691,7 +17691,7 @@ sub_81C48F0: @ 81C48F0
adds r1, r6, 0
adds r1, 0x1C
adds r0, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
bl sub_806EE98
ldr r0, [r5]
@ -17828,7 +17828,7 @@ sub_81C4A08: @ 81C4A08
adds r1, r4, 0
adds r1, 0x1C
adds r0, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldrb r1, [r2]
lsls r0, r1, 4
@ -18540,7 +18540,7 @@ sub_81C501C: @ 81C501C
sub_81C5038: @ 81C5038
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -22097,7 +22097,7 @@ sub_81C6F68: @ 81C6F68
adds r0, r4, 0
movs r1, 0
bl StartObjectRotScalAnim
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_081C6F84:
pop {r4}
@ -22664,7 +22664,7 @@ sub_81C7418: @ 81C7418
push {lr}
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_81C7418
@ -23807,7 +23807,7 @@ sub_81C7CCC: @ 81C7CCC
movs r0, 0
bl sub_81C763C
ldr r0, [r0, 0x18]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0, 0x1C]
pop {r1}
bx r1
@ -24210,7 +24210,7 @@ sub_81C8010: @ 81C8010
adds r1, r0, 0
ldr r0, [r1, 0x1C]
ldr r2, [r0, 0x1C]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r2, r0
bne _081C8034
ldr r0, [r1, 0x24]
@ -24446,7 +24446,7 @@ _081C81B6:
_081C81C4:
ldrh r0, [r2, 0x3C]
strh r0, [r2, 0x20]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_081C81CC:
pop {r0}
@ -26279,7 +26279,7 @@ sub_81C9008: @ 81C9008
cmp r4, 0
beq _081C9028
ldr r2, [r5, 0x3C]
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r2, 0x1C]
ldr r0, [r5, 0x40]
str r1, [r0, 0x1C]
@ -28738,7 +28738,7 @@ sub_81CA324: @ 81CA324
bl sub_81C763C
adds r3, r0, 0
movs r2, 0
ldr r4, =DummyObjectCallback
ldr r4, =SpriteCallbackDummy
adds r1, r3, 0
adds r1, 0x2C
_081CA336:
@ -28929,7 +28929,7 @@ sub_81CA474: @ 81CA474
_081CA49A:
ldrh r0, [r2, 0x3C]
strh r0, [r2, 0x20]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_081CA4A2:
pop {r0}
@ -29039,7 +29039,7 @@ _081CA526:
negs r1, r1
ands r0, r1
strb r0, [r4, 0x1]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
b _081CA578
.pool
@ -29511,7 +29511,7 @@ sub_81CA914: @ 81CA914
push {lr}
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl sub_80BA0A8
pop {r0}
bx r0
@ -32994,7 +32994,7 @@ sub_81CC420: @ 81CC420
sub_81CC42C: @ 81CC42C
ldr r0, [r0, 0x20]
ldr r1, [r0, 0x1C]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
eors r1, r0
negs r0, r1
orrs r0, r1
@ -33047,7 +33047,7 @@ _081CC484:
blt _081CC498
movs r0, 0
strh r0, [r4, 0x24]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_081CC498:
pop {r4}
@ -33075,7 +33075,7 @@ sub_81CC4A4: @ 81CC4A4
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
_081CC4CA:
pop {r0}
@ -33329,7 +33329,7 @@ sub_81CC6A4: @ 81CC6A4
push {lr}
bl TransferPlttBuffer
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl sub_81237B4
pop {r0}
bx r0
@ -37716,7 +37716,7 @@ _081CEAE8:
blt _081CEA8C
movs r0, 0x67
strh r0, [r7]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r7, 0x14]
cmp r4, 0x5
bhi _081CEB5C
@ -38087,7 +38087,7 @@ sub_81CEE44: @ 81CEE44
bl sub_81CDC70
adds r4, r0, 0
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
adds r0, r4, 0
bl sub_81D2108
@ -42733,7 +42733,7 @@ sub_81D1234: @ 81D1234
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
eors r1, r0
negs r0, r1
orrs r0, r1
@ -42806,7 +42806,7 @@ _081D12BA:
_081D12C8:
ldrh r0, [r2, 0x34]
strh r0, [r2, 0x20]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_081D12D0:
pop {r0}
@ -43099,7 +43099,7 @@ sub_81D1500: @ 81D1500
sub_81D1524: @ 81D1524
ldr r0, [r0, 0x14]
ldr r1, [r0, 0x1C]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
eors r1, r0
negs r0, r1
orrs r0, r1
@ -43133,7 +43133,7 @@ sub_81D1538: @ 81D1538
orrs r0, r1
mov r1, r12
strb r0, [r1]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
_081D156A:
pop {r0}
@ -47505,7 +47505,7 @@ _081D35D0:
b _081D35DA
.pool
_081D35D8:
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
_081D35DA:
str r0, [r4, 0x1C]
_081D35DC:
@ -50202,7 +50202,7 @@ _081D4B3A:
movs r2, 0x8
orrs r0, r2
strb r0, [r1, 0x5]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r1, 0x1C]
_081D4BC4:
add sp, 0x4
@ -53578,7 +53578,7 @@ sub_81D67D0: @ 81D67D0
sub_81D67EC: @ 81D67EC
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -57223,7 +57223,7 @@ sub_81D86CC: @ 81D86CC
lsls r5, r6, 4
adds r5, r6
lsls r5, 2
ldr r4, =gUnknown_0202065E
ldr r4, =gSprites + 0x2E
adds r0, r5, r4
mov r8, r0
ldr r0, =gUnknown_0862AB2C
@ -58345,7 +58345,7 @@ sub_81D90A8: @ 81D90A8
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_0202065E
ldr r1, =gSprites + 0x2E
mov r10, r1
adds r7, r0, r1
ldr r0, =gUnknown_0862AC90
@ -58693,7 +58693,7 @@ _081D939E:
strh r2, [r4, 0x36]
strh r2, [r4, 0x38]
strh r2, [r4, 0x3A]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
b _081D93D2
.pool
@ -58848,7 +58848,7 @@ sub_81D94D4: @ 81D94D4
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r2, =gUnknown_0202065E
ldr r2, =gSprites + 0x2E
adds r4, r0, r2
subs r2, 0x12
adds r0, r2
@ -61266,7 +61266,7 @@ sub_81DA848: @ 81DA848
ldrsh r0, [r2, r4]
cmp r1, r0
bne _081DA874
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
b _081DA8B4
.pool
@ -61482,7 +61482,7 @@ sub_81DA9BC: @ 81DA9BC
strh r0, [r4, 0x36]
b _081DAA16
_081DAA12:
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_081DAA16:
pop {r4}
@ -61542,7 +61542,7 @@ sub_81DAA74: @ 81DAA74
adds r5, 0x1C
adds r0, r5
ldr r4, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r4, r0
bne _081DAAC4
movs r0, 0x12

12
asm/roulette.s
View File

@ -31,7 +31,7 @@ sub_8140264: @ 8140264
push {r4,lr}
sub sp, 0x4
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_8142814
ldr r4, =gUnknown_0203AB88
@ -1726,7 +1726,7 @@ _08141128:
lsls r0, 2
adds r2, 0x1C
adds r0, r2
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
b _08141180
.pool
@ -6024,7 +6024,7 @@ _0814356E:
adds r3, r0, r4
adds r4, r3, 0
adds r4, 0x40
ldr r1, =gUnknown_02020638
ldr r1, =gSprites + 8
adds r0, r1
ldr r0, [r0]
ldr r1, [r0]
@ -6612,7 +6612,7 @@ _08143A64:
strb r1, [r3]
mov r1, r10
adds r2, r4, r1
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r2]
movs r1, 0
bl StartObjectImageAnim
@ -9165,7 +9165,7 @@ _08144F42:
negs r1, r1
ands r1, r2
strb r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x3C]
@ -9208,7 +9208,7 @@ sub_8144FB0: @ 8144FB0
strh r0, [r4, 0x22]
b _0814501C
_08144FC8:
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
adds r2, r4, 0
adds r2, 0x3E

2
asm/save_failed_screen.s
View File

@ -72,7 +72,7 @@ fullscreen_save_activate: @ 8178F90
sub_8178FC8: @ 8178FC8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

2
asm/script_menu.s
View File

@ -1398,7 +1398,7 @@ sub_80E2900: @ 80E2900
adds r0, r4, 0
adds r0, 0x1C
adds r0, r1, r0
ldr r2, =DummyObjectCallback
ldr r2, =SpriteCallbackDummy
str r2, [r0]
adds r1, r4
ldrb r2, [r1, 0x5]

2
asm/script_pokemon_util_80F87D8.s
View File

@ -806,7 +806,7 @@ _080F8E6C:
adds r0, r3, 0
adds r0, 0x1C
adds r0, r1, r0
ldr r2, =DummyObjectCallback
ldr r2, =SpriteCallbackDummy
str r2, [r0]
adds r1, r3
ldrb r2, [r1, 0x5]

4
asm/shop.s
View File

@ -379,7 +379,7 @@ CB2_BuyMenu: @ 80DFD64
VBlankCB_BuyMenu: @ 80DFD80
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -1791,7 +1791,7 @@ _080E090A:
movs r0, 0x2
str r0, [sp]
adds r0, r4, 0
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
bl AddPseudoFieldObject
lsls r0, 24
lsrs r4, r0, 24

4
asm/slot_machine.s
View File

@ -202,7 +202,7 @@ sub_812A670: @ 812A670
sub_812A688: @ 812A688
push {r4,lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
ldr r4, =gUnknown_0203AB34
ldr r0, [r4]
@ -10444,7 +10444,7 @@ _0812F6E0:
ldrsh r0, [r0, r1]
cmp r0, 0
beq _0812F76C
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
movs r4, 0
str r4, [sp]
movs r0, 0x5

34
asm/sprite.s
View File

@ -936,7 +936,7 @@ _08007074:
adds r5, r0, 0
cmp r5, 0x40
beq _080070D6
ldr r1, =gUnknown_0202064C
ldr r1, =gSprites + 0x1C
adds r0, r6, r1
ldr r1, [r0]
adds r0, r4, 0
@ -1089,10 +1089,10 @@ ClearSpriteCopyRequests: @ 80071B8
ldr r0, =gShouldProcessSpriteCopyRequests
movs r1, 0
strb r1, [r0]
ldr r0, =gUnknown_02021835
ldr r0, =gSpriteCopyRequestCount
strb r1, [r0]
movs r2, 0
ldr r4, =gUnknown_02021838
ldr r4, =gSpriteCopyRequests
movs r3, 0
adds r5, r4, 0x4
_080071CC:
@ -1422,26 +1422,26 @@ _0800741C:
.pool
thumb_func_end Unused_ObjectTileAllocationBitArrayOp
thumb_func_start DummyObjectCallback
@ void DummyObjectCallback(struct obj *object)
DummyObjectCallback: @ 8007428
thumb_func_start SpriteCallbackDummy
@ void SpriteCallbackDummy(struct obj *object)
SpriteCallbackDummy: @ 8007428
bx lr
thumb_func_end DummyObjectCallback
thumb_func_end SpriteCallbackDummy
thumb_func_start ProcessObjectCopyRequests
@ void ProcessObjectCopyRequests()
ProcessObjectCopyRequests: @ 800742C
thumb_func_start ProcessSpriteCopyRequests
@ void ProcessSpriteCopyRequests()
ProcessSpriteCopyRequests: @ 800742C
push {r4-r7,lr}
ldr r0, =gShouldProcessSpriteCopyRequests
ldrb r0, [r0]
cmp r0, 0
beq _08007474
movs r4, 0
ldr r1, =gUnknown_02021835
ldr r1, =gSpriteCopyRequestCount
ldrb r0, [r1]
cmp r0, 0
beq _0800746E
ldr r6, =gUnknown_02021838
ldr r6, =gSpriteCopyRequests
adds r7, r6, 0x4
adds r5, r1, 0
_08007446:
@ -1473,7 +1473,7 @@ _08007474:
pop {r0}
bx r0
.pool
thumb_func_end ProcessObjectCopyRequests
thumb_func_end ProcessSpriteCopyRequests
thumb_func_start AddPicToObjectCopyRequests
@ void AddPicToObjectCopyRequests(u16 picIndex, u16 targetTileNum, struct obj_tiles *pics)
@ -1484,11 +1484,11 @@ AddPicToObjectCopyRequests: @ 8007488
lsrs r2, r0, 16
lsls r1, 16
lsrs r6, r1, 16
ldr r4, =gUnknown_02021835
ldr r4, =gSpriteCopyRequestCount
ldrb r0, [r4]
cmp r0, 0x3F
bhi _080074D8
ldr r3, =gUnknown_02021838
ldr r3, =gSpriteCopyRequests
adds r1, r0, 0
lsls r0, r1, 1
adds r0, r1
@ -1533,11 +1533,11 @@ AddTilesToObjectCopyRequests: @ 80074EC
adds r5, r1, 0
lsls r2, 16
lsrs r6, r2, 16
ldr r3, =gUnknown_02021835
ldr r3, =gSpriteCopyRequestCount
ldrb r0, [r3]
cmp r0, 0x3F
bhi _0800752C
ldr r2, =gUnknown_02021838
ldr r2, =gSpriteCopyRequests
adds r1, r0, 0
lsls r0, r1, 1
adds r0, r1

2
asm/starter_choose.s
View File

@ -27,7 +27,7 @@ _08133EE8:
sub_8133EF8: @ 8133EF8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

2
asm/title_screen.s
View File

@ -466,7 +466,7 @@ title_screen_vblank_callback: @ 80AA780
push {lr}
bl sub_80BA0A8
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
ldr r0, =gUnknown_02022E1A
ldrh r1, [r0]

18
asm/trade.s
View File

@ -1721,7 +1721,7 @@ _080780F6:
sub_807811C: @ 807811C
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -6961,7 +6961,7 @@ sub_807AC24: @ 807AC24
push {lr}
bl sub_807ABCC
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
@ -7207,7 +7207,7 @@ _0807ADE0:
lsls r0, 2
adds r3, 0x1C
adds r0, r3
ldr r1, =DummyObjectCallback
ldr r1, =SpriteCallbackDummy
str r1, [r0]
_0807AE36:
pop {r3}
@ -9091,7 +9091,7 @@ _0807C1DC:
adds r4, 0x1C
adds r0, r4
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _0807C1FC
bl _0807CFB4
@ -10358,7 +10358,7 @@ _0807CCD0:
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _0807CCEE
b _0807CFB4
@ -11153,7 +11153,7 @@ _0807D5B8:
adds r4, 0x1C
adds r0, r4
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _0807D5D8
bl _0807E400
@ -12463,7 +12463,7 @@ _0807E11C:
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
cmp r1, r0
beq _0807E13A
b _0807E400
@ -12988,7 +12988,7 @@ _0807E5B6:
bne _0807E5CE
movs r0, 0x1
strh r0, [r5, 0x3C]
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r5, 0x1C]
_0807E5CE:
pop {r4,r5}
@ -13165,7 +13165,7 @@ _0807E706:
asrs r0, 16
cmp r0, 0x6C
bne _0807E72C
ldr r0, =DummyObjectCallback
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_0807E72C:
pop {r4}

4
asm/trainer_card.s
View File

@ -9,7 +9,7 @@
sub_80C2690: @ 80C2690
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_80C48C8
ldr r0, =gUnknown_02039CE8
@ -5227,7 +5227,7 @@ pokemon_details: @ 80C53AC
bl SetBgAffine
_080C5416:
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
add sp, 0x10
pop {r4-r7}

2
asm/wallclock.s
View File

@ -9,7 +9,7 @@
sub_81347B4: @ 81347B4
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0

2
data/data3.s
View File

@ -1777,7 +1777,7 @@ gNewGameBirchObjectTemplate:: @ 855C244
.4byte gNewGameBirchImageAnimTable
.4byte gNewGameBirchPicTable
.4byte gDummyObjectRotScalAnimTable
.4byte DummyObjectCallback
.4byte SpriteCallbackDummy
.align 2
gFieldEffectObjectPaletteInfo4:: @ 855C25C

6
data/graphics/field_objects/field_effect_objects.inc
View File

@ -261,7 +261,7 @@ gFieldEffectObjectTemplate_Arrow:: @ 850CC5C
.4byte gFieldEffectObjectImageAnimTable_Arrow
.4byte gFieldEffectObjectPicTable_Arrow
.4byte gDummyObjectRotScalAnimTable
.4byte DummyObjectCallback
.4byte SpriteCallbackDummy
.align 2
gFieldEffectObjectPicTable_GroundImpactDust:: @ 850CC74
@ -829,7 +829,7 @@ gFieldEffectObjectTemplate_Unknown21:: @ 850D28C
.4byte gDummyObjectImageAnimTable
.4byte NULL
.4byte gFieldEffectObjectRotScalAnimTable_Unknown21
.4byte DummyObjectCallback
.4byte SpriteCallbackDummy
.align 2
gFieldEffectObjectPicTable_BerryTreeGrowthSparkle:: @ 850D2A4
@ -1001,7 +1001,7 @@ gFieldEffectObjectTemplate_Bird:: @ 850D4A8
.4byte gFieldEffectObjectImageAnimTable_Bird
.4byte gFieldEffectObjectPicTable_Bird
.4byte gDummyObjectRotScalAnimTable
.4byte DummyObjectCallback
.4byte SpriteCallbackDummy
.align 2
gFieldEffectObjectPicTable_ShortGrass:: @ 850D4C0

12
include/global.h
View File

@ -75,6 +75,18 @@ enum
BAG_KEYITEMS
};
struct Coords16
{
s16 x;
s16 y;
};
struct UCoords16
{
u16 x;
u16 y;
};
struct SaveBlock2
{
/*0x00*/ u8 playerName[8];

8
ld_script.txt
View File

@ -58,7 +58,13 @@ SECTIONS {
asm/decompress.o(.text);
asm/rom_8034C54.o(.text);
asm/battle_3.o(.text);
asm/rom_8045FFC.o(.text);
asm/battle_4.o(.text);
asm/battle_5.o(.text);
asm/battle_controller_player.o(.text);
asm/battle_7.o(.text);
asm/battle_controller_opponent.o(.text);
asm/battle_9.o(.text);
asm/battle_controller_linkopponent.o(.text);
asm/pokemon_1.o(.text);
asm/calculate_base_damage.o(.text);
asm/pokemon_2.o(.text);

2
src/sprite.c
View File

@ -1,3 +1,3 @@
#include "global.h"
#include "sprite.h"

15
sym_ewram.txt
View File

@ -11,16 +11,7 @@ gTextPrinters: @ 20201B0
.space 0x480
gSprites: @ 2020630
.space 0x8
gUnknown_02020638: @ 2020638
.space 0x14
gUnknown_0202064C: @ 202064C
.space 0x12
gUnknown_0202065E: @ 202065E
.space 0x1116
.space 0x1144
gSpritePriorities: @ 2021774
.space 0x80
@ -31,10 +22,10 @@ gSpriteOrder: @ 20217F4
gShouldProcessSpriteCopyRequests: @ 2021834
.space 0x1
gUnknown_02021835: @ 2021835
gSpriteCopyRequestCount: @ 2021835
.space 0x3
gUnknown_02021838: @ 2021838
gSpriteCopyRequests: @ 2021838
.space 0x300
gOamLimit: @ 2021B38