summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim_812C144.s32
-rw-r--r--asm/battle_anim_813F0F4.s68
-rw-r--r--asm/ghost.s4
-rw-r--r--asm/ground.s4
-rw-r--r--asm/normal.s36
5 files changed, 72 insertions, 72 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index 03ffc0eda..2aa2f911b 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -3227,7 +3227,7 @@ _0812D9A2:
cmp r0, 0
beq _0812D9F0
ldr r3, _0812D9E4 @ =gSprites
- ldr r4, _0812D9E8 @ =gObjectBankIDs
+ ldr r4, _0812D9E8 @ =gBankSpriteIds
ldr r2, _0812D9D4 @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r4
@@ -3248,11 +3248,11 @@ _0812D9D8: .4byte 0x040000d4
_0812D9DC: .4byte 0x84000200
_0812D9E0: .4byte gSharedMem + 0x19348
_0812D9E4: .4byte gSprites
-_0812D9E8: .4byte gObjectBankIDs
+_0812D9E8: .4byte gBankSpriteIds
_0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18
_0812D9F0:
ldr r3, _0812DA34 @ =gSprites
- ldr r4, _0812DA38 @ =gObjectBankIDs
+ ldr r4, _0812DA38 @ =gBankSpriteIds
ldr r2, _0812DA3C @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r4
@@ -3288,7 +3288,7 @@ _0812DA2A:
b _0812DAFA
.align 2, 0
_0812DA34: .4byte gSprites
-_0812DA38: .4byte gObjectBankIDs
+_0812DA38: .4byte gBankSpriteIds
_0812DA3C: .4byte gAnimBankAttacker
_0812DA40: .4byte gSpriteAffineAnimTable_81E7BEC
_0812DA44: .4byte gTasks
@@ -3401,7 +3401,7 @@ c3_80DFBE4: @ 812DB18
lsrs r0, 24
ldr r4, _0812DB48 @ =gBattleAnimArgs
ldr r3, _0812DB4C @ =gSprites
- ldr r2, _0812DB50 @ =gObjectBankIDs
+ ldr r2, _0812DB50 @ =gBankSpriteIds
ldr r1, _0812DB54 @ =gAnimBankAttacker
ldrb r1, [r1]
adds r1, r2
@@ -3422,7 +3422,7 @@ c3_80DFBE4: @ 812DB18
.align 2, 0
_0812DB48: .4byte gBattleAnimArgs
_0812DB4C: .4byte gSprites
-_0812DB50: .4byte gObjectBankIDs
+_0812DB50: .4byte gBankSpriteIds
_0812DB54: .4byte gAnimBankAttacker
thumb_func_end c3_80DFBE4
@@ -7672,7 +7672,7 @@ sub_812FC68: @ 812FC68
lsls r0, 3
mov r1, r8
adds r4, r0, r1
- ldr r1, _0812FCCC @ =gObjectBankIDs
+ ldr r1, _0812FCCC @ =gBankSpriteIds
ldr r2, _0812FCD0 @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r1
@@ -7709,7 +7709,7 @@ _0812FCAC:
b _0812FD4C
.align 2, 0
_0812FCC8: .4byte gTasks
-_0812FCCC: .4byte gObjectBankIDs
+_0812FCCC: .4byte gBankSpriteIds
_0812FCD0: .4byte gAnimBankAttacker
_0812FCD4: .4byte gBattleAnimArgs
_0812FCD8: .4byte 0xffff8000
@@ -10694,7 +10694,7 @@ _08131384:
cmp r0, 0
beq _081313C6
ldr r3, _081313F8 @ =gSprites
- ldr r2, _081313FC @ =gObjectBankIDs
+ ldr r2, _081313FC @ =gBankSpriteIds
ldrb r0, [r4]
adds r0, r2
ldrb r1, [r0]
@@ -10744,7 +10744,7 @@ _081313E8:
.align 2, 0
_081313F4: .4byte gAnimBankAttacker
_081313F8: .4byte gSprites
-_081313FC: .4byte gObjectBankIDs
+_081313FC: .4byte gBankSpriteIds
_08131400: .4byte gSpriteAffineAnimTable_81E7C18
_08131404: .4byte sub_8131408
thumb_func_end sub_81312E4
@@ -12326,7 +12326,7 @@ _08132084: .4byte gAnimBankAttacker
_08132088: .4byte gAnimBankTarget
_0813208C: .4byte gTasks
_08132090:
- ldr r1, _081320CC @ =gObjectBankIDs
+ ldr r1, _081320CC @ =gBankSpriteIds
ldr r0, _081320D0 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -12357,7 +12357,7 @@ _08132090:
ldrsh r1, [r2, r3]
b _0813215E
.align 2, 0
-_081320CC: .4byte gObjectBankIDs
+_081320CC: .4byte gBankSpriteIds
_081320D0: .4byte gAnimBankAttacker
_081320D4: .4byte gSprites
_081320D8:
@@ -12385,7 +12385,7 @@ _081320EC:
strh r1, [r0, 0x26]
b _08132188
_08132104:
- ldr r1, _08132144 @ =gObjectBankIDs
+ ldr r1, _08132144 @ =gBankSpriteIds
ldr r0, _08132148 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -12418,7 +12418,7 @@ _08132104:
bgt _08132188
b _08132162
.align 2, 0
-_08132144: .4byte gObjectBankIDs
+_08132144: .4byte gBankSpriteIds
_08132148: .4byte gAnimBankAttacker
_0813214C: .4byte gSprites
_08132150:
@@ -12438,7 +12438,7 @@ _08132162:
strh r0, [r2, 0x26]
b _08132188
_0813216A:
- ldr r1, _08132190 @ =gObjectBankIDs
+ ldr r1, _08132190 @ =gBankSpriteIds
ldr r0, _08132194 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -12457,7 +12457,7 @@ _08132188:
pop {r0}
bx r0
.align 2, 0
-_08132190: .4byte gObjectBankIDs
+_08132190: .4byte gBankSpriteIds
_08132194: .4byte gAnimBankAttacker
_08132198: .4byte gSprites
thumb_func_end sub_8131FFC
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index ccb4854af..578704b60 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -818,7 +818,7 @@ sub_813F798: @ 813F798
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
- ldr r1, _0813F7C4 @ =gObjectBankIDs
+ ldr r1, _0813F7C4 @ =gBankSpriteIds
ldr r0, _0813F7C8 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -838,7 +838,7 @@ sub_813F798: @ 813F798
beq _0813F7D6
b _0813F838
.align 2, 0
-_0813F7C4: .4byte gObjectBankIDs
+_0813F7C4: .4byte gBankSpriteIds
_0813F7C8: .4byte gAnimBankAttacker
_0813F7CC: .4byte gTasks
_0813F7D0:
@@ -909,7 +909,7 @@ sub_813F844: @ 813F844
sub sp, 0xC
lsls r0, 24
lsrs r5, r0, 24
- ldr r1, _0813F87C @ =gObjectBankIDs
+ ldr r1, _0813F87C @ =gBankSpriteIds
ldr r4, _0813F880 @ =gAnimBankAttacker
ldrb r0, [r4]
adds r1, r0, r1
@@ -929,7 +929,7 @@ sub_813F844: @ 813F844
ldr r1, _0813F888 @ =gPlayerParty
b _0813F89C
.align 2, 0
-_0813F87C: .4byte gObjectBankIDs
+_0813F87C: .4byte gBankSpriteIds
_0813F880: .4byte gAnimBankAttacker
_0813F884: .4byte gBattlePartyID
_0813F888: .4byte gPlayerParty
@@ -1256,7 +1256,7 @@ sub_813FA94: @ 813FA94
ldr r0, _0813FB68 @ =sub_813FD90
str r0, [r4]
ldr r3, _0813FB6C @ =gSharedMem + 0x17840
- ldr r1, _0813FB70 @ =gObjectBankIDs
+ ldr r1, _0813FB70 @ =gBankSpriteIds
mov r2, r8
ldrb r0, [r2]
adds r0, r1
@@ -1299,7 +1299,7 @@ _0813FB60: .4byte gSprites
_0813FB64: .4byte gAnimBankTarget
_0813FB68: .4byte sub_813FD90
_0813FB6C: .4byte gSharedMem + 0x17840
-_0813FB70: .4byte gObjectBankIDs
+_0813FB70: .4byte gBankSpriteIds
_0813FB74: .4byte gTasks
_0813FB78: .4byte sub_813FB7C
thumb_func_end sub_813FA94
@@ -1419,7 +1419,7 @@ _0813FBE0:
str r0, [r4]
movs r0, 0
bl GetBankByIdentity
- ldr r1, _0813FCB0 @ =gObjectBankIDs
+ ldr r1, _0813FCB0 @ =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1450,7 +1450,7 @@ _0813FCA0: .4byte gBallSpriteTemplates
_0813FCA4: .4byte gSprites
_0813FCA8: .4byte gAnimBankTarget
_0813FCAC: .4byte SpriteCallbackDummy
-_0813FCB0: .4byte gObjectBankIDs
+_0813FCB0: .4byte gBankSpriteIds
_0813FCB4: .4byte gTasks
_0813FCB8: .4byte sub_813FCBC
thumb_func_end sub_813FBB8
@@ -1463,7 +1463,7 @@ sub_813FCBC: @ 813FCBC
ldr r6, _0813FD1C @ =gSprites
movs r0, 0
bl GetBankByIdentity
- ldr r1, _0813FD20 @ =gObjectBankIDs
+ ldr r1, _0813FD20 @ =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1505,7 +1505,7 @@ _0813FD16:
bx r0
.align 2, 0
_0813FD1C: .4byte gSprites
-_0813FD20: .4byte gObjectBankIDs
+_0813FD20: .4byte gBankSpriteIds
_0813FD24: .4byte gTasks
_0813FD28: .4byte sub_813FD90
_0813FD2C: .4byte sub_813FD34
@@ -1520,7 +1520,7 @@ sub_813FD34: @ 813FD34
ldr r6, _0813FD88 @ =gSprites
movs r0, 0
bl GetBankByIdentity
- ldr r4, _0813FD8C @ =gObjectBankIDs
+ ldr r4, _0813FD8C @ =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -1554,7 +1554,7 @@ _0813FD80:
bx r0
.align 2, 0
_0813FD88: .4byte gSprites
-_0813FD8C: .4byte gObjectBankIDs
+_0813FD8C: .4byte gBankSpriteIds
thumb_func_end sub_813FD34
thumb_func_start sub_813FD90
@@ -1688,7 +1688,7 @@ sub_813FE70: @ 813FE70
ldr r0, _0813FEB8 @ =sub_813FEC8
str r0, [r4, 0x1C]
ldr r2, _0813FEBC @ =gSprites
- ldr r1, _0813FEC0 @ =gObjectBankIDs
+ ldr r1, _0813FEC0 @ =gBankSpriteIds
ldr r0, _0813FEC4 @ =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
@@ -1707,7 +1707,7 @@ _0813FEAC:
_0813FEB4: .4byte TaskDummy
_0813FEB8: .4byte sub_813FEC8
_0813FEBC: .4byte gSprites
-_0813FEC0: .4byte gObjectBankIDs
+_0813FEC0: .4byte gBankSpriteIds
_0813FEC4: .4byte gAnimBankTarget
thumb_func_end sub_813FE70
@@ -1715,7 +1715,7 @@ _0813FEC4: .4byte gAnimBankTarget
sub_813FEC8: @ 813FEC8
push {r4-r7,lr}
adds r7, r0, 0
- ldr r1, _0813FF0C @ =gObjectBankIDs
+ ldr r1, _0813FF0C @ =gBankSpriteIds
ldr r0, _0813FF10 @ =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
@@ -1748,7 +1748,7 @@ _0813FEFA:
beq _0813FF1E
b _0813FFDC
.align 2, 0
-_0813FF0C: .4byte gObjectBankIDs
+_0813FF0C: .4byte gBankSpriteIds
_0813FF10: .4byte gAnimBankTarget
_0813FF14: .4byte gTasks
_0813FF18:
@@ -2478,7 +2478,7 @@ _08140490:
cmp r1, r0
bne _081404CC
ldr r5, _081404D8 @ =gSprites
- ldr r4, _081404DC @ =gObjectBankIDs
+ ldr r4, _081404DC @ =gBankSpriteIds
ldrb r0, [r7]
adds r0, r4
ldrb r1, [r0]
@@ -2509,7 +2509,7 @@ _081404CC:
.align 2, 0
_081404D4: .4byte 0x0000013b
_081404D8: .4byte gSprites
-_081404DC: .4byte gObjectBankIDs
+_081404DC: .4byte gBankSpriteIds
_081404E0: .4byte sub_81404E4
thumb_func_end sub_8140454
@@ -2697,7 +2697,7 @@ sub_81405F4: @ 81405F4
bl sub_8141314
_08140646:
ldr r6, _081406B4 @ =gSprites
- ldr r5, _081406B8 @ =gObjectBankIDs
+ ldr r5, _081406B8 @ =gBankSpriteIds
ldr r4, _081406B0 @ =gAnimBankTarget
ldrb r0, [r4]
adds r0, r5
@@ -2748,7 +2748,7 @@ _081406A8: .4byte sub_81406BC
_081406AC: .4byte gLastUsedItem
_081406B0: .4byte gAnimBankTarget
_081406B4: .4byte gSprites
-_081406B8: .4byte gObjectBankIDs
+_081406B8: .4byte gBankSpriteIds
thumb_func_end sub_81405F4
thumb_func_start sub_81406BC
@@ -2770,7 +2770,7 @@ sub_81406BC: @ 81406BC
strb r0, [r2]
_081406DA:
ldr r4, _08140708 @ =gSprites
- ldr r3, _0814070C @ =gObjectBankIDs
+ ldr r3, _0814070C @ =gBankSpriteIds
ldr r2, _08140710 @ =gAnimBankTarget
ldrb r0, [r2]
adds r0, r3
@@ -2792,7 +2792,7 @@ _081406DA:
b _08140734
.align 2, 0
_08140708: .4byte gSprites
-_0814070C: .4byte gObjectBankIDs
+_0814070C: .4byte gBankSpriteIds
_08140710: .4byte gAnimBankTarget
_08140714:
ldr r6, _0814079C @ =0xfffffee0
@@ -2822,7 +2822,7 @@ _08140734:
cmp r5, 0
beq _08140796
ldr r4, _081407A0 @ =gSprites
- ldr r3, _081407A4 @ =gObjectBankIDs
+ ldr r3, _081407A4 @ =gBankSpriteIds
ldr r2, _081407A8 @ =gAnimBankTarget
ldrb r0, [r2]
adds r0, r3
@@ -2867,7 +2867,7 @@ _08140796:
.align 2, 0
_0814079C: .4byte 0xfffffee0
_081407A0: .4byte gSprites
-_081407A4: .4byte gObjectBankIDs
+_081407A4: .4byte gBankSpriteIds
_081407A8: .4byte gAnimBankTarget
_081407AC: .4byte gSharedMem + 0x17840
_081407B0: .4byte sub_81405C8
@@ -4581,7 +4581,7 @@ sub_814151C: @ 814151C
lsrs r7, r0, 24
movs r0, 0
mov r8, r0
- ldr r0, _08141550 @ =gObjectBankIDs
+ ldr r0, _08141550 @ =gBankSpriteIds
ldr r3, _08141554 @ =gAnimBankAttacker
ldrb r2, [r3]
adds r0, r2, r0
@@ -4601,7 +4601,7 @@ sub_814151C: @ 814151C
beq _08141562
b _081416B6
.align 2, 0
-_08141550: .4byte gObjectBankIDs
+_08141550: .4byte gBankSpriteIds
_08141554: .4byte gAnimBankAttacker
_08141558: .4byte gTasks
_0814155C:
@@ -4882,7 +4882,7 @@ _08141744:
.align 2, 0
_08141778: .4byte REG_BLDALPHA
_0814177C:
- ldr r1, _081417C0 @ =gObjectBankIDs
+ ldr r1, _081417C0 @ =gBankSpriteIds
ldr r3, _081417C4 @ =gAnimBankAttacker
ldrb r0, [r3]
adds r0, r1
@@ -4916,7 +4916,7 @@ _081417B8:
pop {r0}
bx r0
.align 2, 0
-_081417C0: .4byte gObjectBankIDs
+_081417C0: .4byte gBankSpriteIds
_081417C4: .4byte gAnimBankAttacker
_081417C8: .4byte gSprites
_081417CC: .4byte 0x06010000
@@ -5509,7 +5509,7 @@ sub_8141C30: @ 8141C30
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80786EC
- ldr r1, _08141CAC @ =gObjectBankIDs
+ ldr r1, _08141CAC @ =gBankSpriteIds
ldr r0, _08141CB0 @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -5529,7 +5529,7 @@ sub_8141C30: @ 8141C30
.align 2, 0
_08141CA4: .4byte gBattleAnimArgs
_08141CA8: .4byte 0x0000ffe0
-_08141CAC: .4byte gObjectBankIDs
+_08141CAC: .4byte gBankSpriteIds
_08141CB0: .4byte gAnimBankAttacker
_08141CB4: .4byte gSprites
_08141CB8: .4byte sub_8141CBC
@@ -5540,7 +5540,7 @@ sub_8141CBC: @ 8141CBC
push {lr}
adds r3, r0, 0
ldr r2, _08141CE4 @ =gSprites
- ldr r1, _08141CE8 @ =gObjectBankIDs
+ ldr r1, _08141CE8 @ =gBankSpriteIds
ldr r0, _08141CEC @ =gAnimBankAttacker
ldrb r0, [r0]
adds r0, r1
@@ -5560,7 +5560,7 @@ _08141CE0:
bx r0
.align 2, 0
_08141CE4: .4byte gSprites
-_08141CE8: .4byte gObjectBankIDs
+_08141CE8: .4byte gBankSpriteIds
_08141CEC: .4byte gAnimBankAttacker
_08141CF0: .4byte sub_8141CF4
thumb_func_end sub_8141CBC
@@ -5596,7 +5596,7 @@ sub_8141D20: @ 8141D20
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, _08141D70 @ =gSprites
- ldr r3, _08141D74 @ =gObjectBankIDs
+ ldr r3, _08141D74 @ =gBankSpriteIds
ldr r2, _08141D78 @ =gAnimBankAttacker
ldrb r0, [r2]
adds r0, r3
@@ -5633,7 +5633,7 @@ _08141D68:
bx r0
.align 2, 0
_08141D70: .4byte gSprites
-_08141D74: .4byte gObjectBankIDs
+_08141D74: .4byte gBankSpriteIds
_08141D78: .4byte gAnimBankAttacker
thumb_func_end sub_8141D20
diff --git a/asm/ghost.s b/asm/ghost.s
index 2934f6dbd..928d940b5 100644
--- a/asm/ghost.s
+++ b/asm/ghost.s
@@ -3257,7 +3257,7 @@ sub_80DF49C: @ 80DF49C
movs r2, 0x4
orrs r1, r2
strb r1, [r3]
- ldr r2, _080DF4E0 @ =gObjectBankIDs
+ ldr r2, _080DF4E0 @ =gBankSpriteIds
ldr r1, _080DF4E4 @ =gAnimBankAttacker
ldrb r1, [r1]
adds r1, r2
@@ -3286,7 +3286,7 @@ sub_80DF49C: @ 80DF49C
strh r1, [r0, 0x22]
bx lr
.align 2, 0
-_080DF4E0: .4byte gObjectBankIDs
+_080DF4E0: .4byte gBankSpriteIds
_080DF4E4: .4byte gAnimBankAttacker
_080DF4E8: .4byte gBattleAnimArgs
_080DF4EC: .4byte sub_80DF4F4
diff --git a/asm/ground.s b/asm/ground.s
index 3d4b69a9f..3be7d74ac 100644
--- a/asm/ground.s
+++ b/asm/ground.s
@@ -1270,7 +1270,7 @@ _080E18CE:
adds r1, r4, 0
adds r1, 0x8
adds r1, r0
- ldr r0, _080E1904 @ =gObjectBankIDs
+ ldr r0, _080E1904 @ =gBankSpriteIds
adds r0, r5, r0
ldrb r0, [r0]
strh r0, [r1]
@@ -1285,7 +1285,7 @@ _080E18F8:
bls _080E18CE
b _080E1924
.align 2, 0
-_080E1904: .4byte gObjectBankIDs
+_080E1904: .4byte gBankSpriteIds
_080E1908:
ldrb r0, [r6]
bl GetAnimBankSpriteId
diff --git a/asm/normal.s b/asm/normal.s
index fffbc3870..f56ca6ec6 100644
--- a/asm/normal.s
+++ b/asm/normal.s
@@ -1214,7 +1214,7 @@ _080E25A0:
bcs _080E25F4
ldr r2, _080E2604 @ =gSprites
mov r12, r2
- ldr r6, _080E2608 @ =gObjectBankIDs
+ ldr r6, _080E2608 @ =gBankSpriteIds
movs r7, 0x3
negs r7, r7
_080E25D2:
@@ -1245,14 +1245,14 @@ _080E25FA:
.align 2, 0
_080E2600: .4byte gNoOfAllBanks
_080E2604: .4byte gSprites
-_080E2608: .4byte gObjectBankIDs
+_080E2608: .4byte gBankSpriteIds
thumb_func_end sub_80E255C
thumb_func_start sub_80E260C
sub_80E260C: @ 80E260C
push {r4-r6,lr}
ldr r6, _080E2680 @ =gSprites
- ldr r4, _080E2684 @ =gObjectBankIDs
+ ldr r4, _080E2684 @ =gBankSpriteIds
ldr r5, _080E2688 @ =gAnimBankAttacker
ldrb r0, [r5]
adds r0, r4
@@ -1309,7 +1309,7 @@ sub_80E260C: @ 80E260C
b _080E26B0
.align 2, 0
_080E2680: .4byte gSprites
-_080E2684: .4byte gObjectBankIDs
+_080E2684: .4byte gBankSpriteIds
_080E2688: .4byte gAnimBankAttacker
_080E268C: .4byte gAnimBankTarget
_080E2690: .4byte gBattleAnimArgs
@@ -2532,7 +2532,7 @@ _080E2FDC:
cmp r0, 0x1
bne _080E3028
ldr r3, _080E3060 @ =gSprites
- ldr r1, _080E3064 @ =gObjectBankIDs
+ ldr r1, _080E3064 @ =gBankSpriteIds
ldrb r0, [r5]
eors r0, r6
adds r0, r1
@@ -2580,7 +2580,7 @@ _080E3054: .4byte 0x00000c08
_080E3058: .4byte REG_BG1CNT
_080E305C: .4byte gAnimBankAttacker
_080E3060: .4byte gSprites
-_080E3064: .4byte gObjectBankIDs
+_080E3064: .4byte gBankSpriteIds
_080E3068: .4byte gSharedMem + 0x19348
_080E306C:
ldr r4, _080E308C @ =gAnimBankAttacker
@@ -2809,7 +2809,7 @@ _080E3208:
ldrsh r0, [r4, r3]
cmp r0, 0x1
bne _080E3288
- ldr r2, _080E32D8 @ =gObjectBankIDs
+ ldr r2, _080E32D8 @ =gBankSpriteIds
ldr r0, _080E32DC @ =gAnimBankAttacker
ldrb r1, [r0]
movs r0, 0x2
@@ -2862,7 +2862,7 @@ _080E32C8: .4byte REG_BLDCNT
_080E32CC: .4byte gSprites
_080E32D0: .4byte 0x040000d4
_080E32D4: .4byte 0x85000200
-_080E32D8: .4byte gObjectBankIDs
+_080E32D8: .4byte gBankSpriteIds
_080E32DC: .4byte gAnimBankAttacker
thumb_func_end sub_80E3194
@@ -3069,7 +3069,7 @@ _080E345E:
cmp r0, 0x1
bne _080E34A4
ldr r1, _080E34D8 @ =gSprites
- ldr r0, _080E34DC @ =gObjectBankIDs
+ ldr r0, _080E34DC @ =gBankSpriteIds
add r0, r8
ldrb r0, [r0]
lsls r2, r0, 4
@@ -3115,7 +3115,7 @@ _080E34CC: .4byte REG_BLDCNT
_080E34D0: .4byte 0x00003f42
_080E34D4: .4byte REG_BG1CNT
_080E34D8: .4byte gSprites
-_080E34DC: .4byte gObjectBankIDs
+_080E34DC: .4byte gBankSpriteIds
_080E34E0: .4byte gSharedMem + 0x19348
_080E34E4:
adds r0, r5, 0
@@ -3149,7 +3149,7 @@ _080E3516:
lsls r0, 16
lsrs r4, r0, 16
_080E3522:
- ldr r6, _080E3570 @ =gObjectBankIDs
+ ldr r6, _080E3570 @ =gBankSpriteIds
adds r0, r5, r6
ldrb r1, [r0]
adds r0, r5, 0
@@ -3184,7 +3184,7 @@ _080E3550:
.align 2, 0
_080E3568: .4byte gBattlePartyID
_080E356C: .4byte gPlayerParty
-_080E3570: .4byte gObjectBankIDs
+_080E3570: .4byte gBankSpriteIds
_080E3574: .4byte gBattleStatMask1_Tilemap
_080E3578:
ldr r0, _080E35B0 @ =gBattleStatMask2_Tilemap
@@ -3344,7 +3344,7 @@ _080E3692:
mov r3, sp
ldrh r3, [r3, 0x20]
strh r3, [r1, 0x14]
- ldr r0, _080E36D8 @ =gObjectBankIDs
+ ldr r0, _080E36D8 @ =gBankSpriteIds
add r0, r8
ldrb r0, [r0]
strh r0, [r1, 0x16]
@@ -3364,7 +3364,7 @@ _080E3692:
bl PlaySE12WithPanning
b _080E36F4
.align 2, 0
-_080E36D8: .4byte gObjectBankIDs
+_080E36D8: .4byte gBankSpriteIds
_080E36DC: .4byte sub_80E3704
_080E36E0:
movs r0, 0x40
@@ -4040,7 +4040,7 @@ _080E3BE6:
lsls r0, 24
cmp r0, 0
beq _080E3C24
- ldr r0, _080E3C44 @ =gObjectBankIDs
+ ldr r0, _080E3C44 @ =gBankSpriteIds
adds r0, r4, r0
ldrb r0, [r0]
lsls r2, r0, 4
@@ -4074,7 +4074,7 @@ _080E3C24:
.align 2, 0
_080E3C3C: .4byte gSprites
_080E3C40: .4byte gAnimBankAttacker
-_080E3C44: .4byte gObjectBankIDs
+_080E3C44: .4byte gBankSpriteIds
_080E3C48: .4byte gBattleAnimArgs
thumb_func_end sub_80E3BDC
@@ -4236,7 +4236,7 @@ _080E3D8A:
lsls r0, 16
lsrs r4, r0, 16
_080E3D96:
- ldr r5, _080E3E50 @ =gObjectBankIDs
+ ldr r5, _080E3E50 @ =gBankSpriteIds
adds r0, r7, r5
ldrb r1, [r0]
adds r0, r7, 0
@@ -4322,7 +4322,7 @@ _080E3DE6:
.align 2, 0
_080E3E48: .4byte gBattlePartyID
_080E3E4C: .4byte gPlayerParty
-_080E3E50: .4byte gObjectBankIDs
+_080E3E50: .4byte gBankSpriteIds
_080E3E54: .4byte gBattle_BG1_X
_080E3E58: .4byte gBattle_BG1_Y
_080E3E5C: .4byte gTasks
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 04:10:39 +0000