summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim_80A5C6C.s30
-rwxr-xr-xasm/battle_anim_80D51AC.s2
-rw-r--r--asm/battle_anim_80FE840.s32
-rw-r--r--asm/battle_anim_8170478.s20
-rwxr-xr-xasm/battle_frontier_2.s2
-rw-r--r--asm/battle_link_817C95C.s24
-rw-r--r--asm/contest.s8
-rw-r--r--asm/macros/battle_script.inc2
-rwxr-xr-xasm/party_menu.s14
-rw-r--r--asm/pokemon_item_effect.s4
10 files changed, 69 insertions, 69 deletions
diff --git a/asm/battle_anim_80A5C6C.s b/asm/battle_anim_80A5C6C.s
index 1c19805a0..b543a5ec2 100644
--- a/asm/battle_anim_80A5C6C.s
+++ b/asm/battle_anim_80A5C6C.s
@@ -1830,13 +1830,13 @@ GetBankPosition: @ 80A6A44
.pool
thumb_func_end GetBankPosition
- thumb_func_start GetBankByIdentity
-GetBankByIdentity: @ 80A6A54
+ thumb_func_start GetBankByPosition
+GetBankByPosition: @ 80A6A54
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
movs r1, 0
- ldr r0, =gNoOfAllBanks
+ ldr r0, =gBattleBanksCount
ldrb r2, [r0]
cmp r1, r2
bcs _080A6A7E
@@ -1860,7 +1860,7 @@ _080A6A7E:
pop {r1}
bx r1
.pool
- thumb_func_end GetBankByIdentity
+ thumb_func_end GetBankByPosition
thumb_func_start IsBankSpritePresent
IsBankSpritePresent: @ 80A6A90
@@ -3496,7 +3496,7 @@ _080A76F2:
cmp r5, 0
beq _080A771A
movs r0, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
@@ -3504,7 +3504,7 @@ _080A76F2:
cmp r0, 0
beq _080A771A
movs r0, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -3514,7 +3514,7 @@ _080A771A:
cmp r6, 0
beq _080A7746
movs r0, 0x2
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
@@ -3522,7 +3522,7 @@ _080A771A:
cmp r0, 0
beq _080A7746
movs r0, 0x2
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3534,7 +3534,7 @@ _080A7746:
cmp r7, 0
beq _080A7772
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
@@ -3542,7 +3542,7 @@ _080A7746:
cmp r0, 0
beq _080A7772
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3555,7 +3555,7 @@ _080A7772:
cmp r0, 0
beq _080A77A0
movs r0, 0x3
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
@@ -3563,7 +3563,7 @@ _080A7772:
cmp r0, 0
beq _080A77A0
movs r0, 0x3
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3592,7 +3592,7 @@ sub_80A77B4: @ 80A77B4
push {lr}
lsls r0, 24
lsrs r0, 24
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -4959,7 +4959,7 @@ _080A825C:
sub_80A8278: @ 80A8278
push {r4-r6,lr}
movs r5, 0
- ldr r0, =gNoOfAllBanks
+ ldr r0, =gBattleBanksCount
ldrb r0, [r0]
cmp r5, r0
bge _080A82D2
@@ -4998,7 +4998,7 @@ _080A8286:
strb r2, [r0, 0x5]
_080A82C8:
adds r5, 0x1
- ldr r0, =gNoOfAllBanks
+ ldr r0, =gBattleBanksCount
ldrb r0, [r0]
cmp r5, r0
blt _080A8286
diff --git a/asm/battle_anim_80D51AC.s b/asm/battle_anim_80D51AC.s
index 3ee1786ad..3b1e9dcce 100755
--- a/asm/battle_anim_80D51AC.s
+++ b/asm/battle_anim_80D51AC.s
@@ -200,7 +200,7 @@ _080D5320:
_080D5324:
movs r0, 0x3
_080D5326:
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s
index c94826f40..c63918719 100644
--- a/asm/battle_anim_80FE840.s
+++ b/asm/battle_anim_80FE840.s
@@ -7539,7 +7539,7 @@ sub_8102434: @ 8102434
lsls r0, 24
lsrs r7, r0, 24
movs r4, 0
- ldr r0, =gNoOfAllBanks
+ ldr r0, =gBattleBanksCount
ldrb r0, [r0]
cmp r4, r0
bcs _08102490
@@ -7576,7 +7576,7 @@ _08102482:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gNoOfAllBanks
+ ldr r0, =gBattleBanksCount
ldrb r0, [r0]
cmp r4, r0
bcc _08102448
@@ -7605,7 +7605,7 @@ _081024B2:
lsls r0, 24
lsrs r4, r0, 24
_081024C2:
- ldr r0, =gNoOfAllBanks
+ ldr r0, =gBattleBanksCount
ldrb r0, [r0]
cmp r4, r0
bcc _081024B2
@@ -21049,14 +21049,14 @@ sub_8109198: @ 8109198
cmp r4, r0
bne _081091DE
movs r0, 0x2
- bl GetBankByIdentity
+ bl GetBankByPosition
ldrb r1, [r5]
lsls r0, 24
lsrs r0, 24
cmp r1, r0
beq _081091D6
movs r0, 0x3
- bl GetBankByIdentity
+ bl GetBankByPosition
ldrb r1, [r5]
lsls r0, 24
lsrs r0, 24
@@ -28050,7 +28050,7 @@ sub_810C9E4: @ 810C9E4
ldrh r0, [r4, 0x2]
lsls r0, 20
lsrs r0, 24
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
@@ -33064,7 +33064,7 @@ _0810F212:
bne _0810F2B8
_0810F22E:
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r4, r0, 24
adds r7, r4, 0
@@ -33193,7 +33193,7 @@ sub_810F340: @ 810F340
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r4, r0, 24
movs r1, 0x3C
@@ -33370,7 +33370,7 @@ sub_810F46C: @ 810F46C
cmp r0, 0
bne _0810F502
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
@@ -33441,7 +33441,7 @@ sub_810F524: @ 810F524
cmp r0, 0
bne _0810F57C
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
@@ -43586,7 +43586,7 @@ _08114902:
beq _0811492E
_08114908:
adds r0, r4, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@@ -45846,7 +45846,7 @@ sub_8115B0C: @ 8115B0C
strh r1, [r0, 0x12]
strh r5, [r0, 0x18]
movs r4, 0
- ldr r0, =gNoOfAllBanks
+ ldr r0, =gBattleBanksCount
ldrb r1, [r0]
mov r9, r3
mov r8, r2
@@ -46650,7 +46650,7 @@ _0811618A:
cmp r0, 0x1
bhi _081161DC
movs r4, 0
- ldr r5, =gNoOfAllBanks
+ ldr r5, =gBattleBanksCount
ldrb r0, [r5]
cmp r4, r0
bcs _081161DC
@@ -50065,7 +50065,7 @@ sub_8117E94: @ 8117E94
lsls r0, 24
lsrs r0, 24
ldr r2, =gAnimBankAttacker
- ldr r1, =gBankTarget
+ ldr r1, =gBankDefender
ldrb r1, [r1]
strb r1, [r2]
ldr r2, =gAnimBankTarget
@@ -50117,7 +50117,7 @@ sub_8117F10: @ 8117F10
lsls r0, 24
lsrs r0, 24
ldr r2, =gAnimBankTarget
- ldr r1, =gBankTarget
+ ldr r1, =gBankDefender
ldrb r1, [r1]
strb r1, [r2]
bl DestroyAnimVisualTask
@@ -52078,7 +52078,7 @@ sub_8118FBC: @ 8118FBC
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
ldr r1, =gMonSpritesGfxPtr
diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s
index a7893ee94..956b30186 100644
--- a/asm/battle_anim_8170478.s
+++ b/asm/battle_anim_8170478.s
@@ -1283,7 +1283,7 @@ _08170F54:
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
bl sub_80A82E4
@@ -1335,7 +1335,7 @@ _08170F54:
ldr r0, =SpriteCallbackDummy
str r0, [r4]
movs r0, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
ldr r1, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@@ -1371,7 +1371,7 @@ sub_8171030: @ 8171030
lsrs r5, r0, 24
ldr r6, =gSprites
movs r0, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
ldr r1, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@@ -1422,7 +1422,7 @@ sub_81710A8: @ 81710A8
lsrs r5, r0, 24
ldr r6, =gSprites
movs r0, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
ldr r4, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@@ -1438,7 +1438,7 @@ sub_81710A8: @ 81710A8
cmp r0, 0
bge _081710F4
movs r0, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -5575,7 +5575,7 @@ sub_817330C: @ 817330C
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -5587,7 +5587,7 @@ sub_817330C: @ 817330C
adds r0, r1
strh r0, [r4, 0x32]
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -5732,7 +5732,7 @@ sub_817345C: @ 817345C
.pool
_08173478:
movs r0, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
ldr r1, =gAnimBankAttacker
strb r0, [r1]
movs r0, 0x1
@@ -5740,12 +5740,12 @@ _08173478:
.pool
_0817348C:
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
ldr r1, =gAnimBankAttacker
strb r0, [r1]
movs r0, 0
_08173498:
- bl GetBankByIdentity
+ bl GetBankByPosition
ldr r1, =gAnimBankTarget
strb r0, [r1]
_081734A0:
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index 23f870d4d..899b6f5d3 100755
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -21034,7 +21034,7 @@ sub_81A5718: @ 81A5718
b _081A57D8
.pool
_081A576C:
- ldr r0, =gBattleMoveFlags
+ ldr r0, =gMoveResultFlags
ldrb r1, [r0]
movs r0, 0x29
ands r0, r1
diff --git a/asm/battle_link_817C95C.s b/asm/battle_link_817C95C.s
index d656946b4..f1a398ad6 100644
--- a/asm/battle_link_817C95C.s
+++ b/asm/battle_link_817C95C.s
@@ -39,7 +39,7 @@ _0817C988:
bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gBankTarget
+ ldr r0, =gBankDefender
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -83,7 +83,7 @@ _0817CA10:
str r1, [sp, 0x8]
cmp r6, 0
bne _0817CA3C
- ldr r0, =gBankTarget
+ ldr r0, =gBankDefender
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -94,7 +94,7 @@ _0817CA10:
b _0817CA4C
.pool
_0817CA3C:
- ldr r0, =gBankTarget
+ ldr r0, =gBankDefender
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -140,7 +140,7 @@ _0817CA9C:
lsls r0, 24
lsrs r0, 25
mov r8, r0
- ldr r0, =gBankTarget
+ ldr r0, =gBankDefender
ldrb r0, [r0]
bl GetBankPosition
lsls r0, 24
@@ -941,7 +941,7 @@ _0817D3F2:
bl _0817E0A6
_0817D3FE:
ldr r0, =gBankAttacker
- ldr r1, =gBankTarget
+ ldr r1, =gBankDefender
ldrb r0, [r0]
ldrb r1, [r1]
cmp r0, r1
@@ -2564,7 +2564,7 @@ _0817E122:
lsls r0, 24
lsrs r0, 24
mov r9, r0
- ldr r0, =gBankTarget
+ ldr r0, =gBankDefender
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -3249,7 +3249,7 @@ sub_817E684: @ 817E684
bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gBankTarget
+ ldr r0, =gBankDefender
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -3714,7 +3714,7 @@ sub_817EA80: @ 817EA80
bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gBankTarget
+ ldr r0, =gBankDefender
ldrb r0, [r0]
bl GetBankSide
lsls r0, 24
@@ -4291,7 +4291,7 @@ _0817EEF8:
bgt _0817EF10
b _0817F1FA
_0817EF10:
- ldr r0, =gBankTarget
+ ldr r0, =gBankDefender
ldrb r0, [r0]
muls r0, r1
adds r0, r5
@@ -4386,7 +4386,7 @@ _0817EF98:
mov r10, r3
mov r8, r0
add r7, sp, 0x10
- ldr r4, =gBankTarget
+ ldr r4, =gBankDefender
mov r9, r4
_0817EFC2:
lsls r1, r5, 1
@@ -4411,7 +4411,7 @@ _0817EFC2:
lsls r0, 24
cmp r0, 0
beq _0817F0B4
- ldr r4, =gSideAffecting
+ ldr r4, =gSideStatuses
mov r1, r9
ldrb r0, [r1]
bl GetBankPosition
@@ -4545,7 +4545,7 @@ _0817F0D8:
movs r7, 0
_0817F0F6:
movs r5, 0
- ldr r4, =gBankTarget
+ ldr r4, =gBankDefender
ldr r6, =gEnemyParty
ldr r0, =gBankAttacker
ldrb r0, [r0]
diff --git a/asm/contest.s b/asm/contest.s
index c35a29733..48766fb68 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -1060,7 +1060,7 @@ _080D8004:
str r4, [r0]
ldr r4, =gBankAttacker
strb r2, [r4]
- ldr r0, =gBankTarget
+ ldr r0, =gBankDefender
strb r3, [r0]
bl sub_80DB0C4
ldr r2, =gBankSpriteIds
@@ -13798,7 +13798,7 @@ sub_80DEA20: @ 80DEA20
bl CreateInvisibleSpriteWithCallback
ldr r1, =gBankSpriteIds
strb r0, [r1, 0x3]
- ldr r0, =gBankTarget
+ ldr r0, =gBankDefender
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -13905,12 +13905,12 @@ _080DEAD0:
.4byte _080DEB60
.4byte _080DEB60
_080DEB54:
- ldr r1, =gBankTarget
+ ldr r1, =gBankDefender
movs r0, 0x2
b _080DEB64
.pool
_080DEB60:
- ldr r1, =gBankTarget
+ ldr r1, =gBankDefender
movs r0, 0x3
_080DEB64:
strb r0, [r1]
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index a16b59366..c5ffb5abc 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -1389,7 +1389,7 @@
.endm
.macro jumpifmovehadnoeffect jumpptr
- jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr
+ jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_NO_EFFECT, \jumpptr
.endm
.macro jumpifbattletype flags, jumpptr
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 844043a95..5a371d387 100755
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -16060,7 +16060,7 @@ _081B8B1E:
lsls r0, 24
lsrs r4, r0, 24
_081B8B24:
- ldr r0, =gNoOfAllBanks
+ ldr r0, =gBattleBanksCount
ldrb r0, [r0]
cmp r4, r0
bcc _081B8AFC
@@ -16228,7 +16228,7 @@ _081B8CBE:
bne _081B8CFC
movs r5, 0x1
movs r0, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
mov r2, sp
ldr r1, =gBattlePartyID
lsls r0, 24
@@ -16255,7 +16255,7 @@ _081B8CF0:
_081B8CFC:
movs r5, 0x2
movs r0, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
mov r1, sp
ldr r4, =gBattlePartyID
lsls r0, 24
@@ -16264,7 +16264,7 @@ _081B8CFC:
ldrh r0, [r0]
strb r0, [r1]
movs r0, 0x2
- bl GetBankByIdentity
+ bl GetBankByPosition
mov r1, sp
lsls r0, 24
lsrs r0, 23
@@ -16344,19 +16344,19 @@ sub_81B8D88: @ 81B8D88
cmp r0, 0
bne _081B8DB0
movs r0, 0
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x2
b _081B8DBC
_081B8DB0:
movs r0, 0x1
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
_081B8DBC:
- bl GetBankByIdentity
+ bl GetBankByPosition
lsls r0, 24
lsrs r6, r0, 24
bl sub_81B1250
diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s
index 49b205967..fb8ea0d3c 100644
--- a/asm/pokemon_item_effect.s
+++ b/asm/pokemon_item_effect.s
@@ -124,7 +124,7 @@ _0806BDC4:
orrs r1, r0
lsrs r1, 31
str r1, [sp, 0x1C]
- ldr r0, =gNoOfAllBanks
+ ldr r0, =gBattleBanksCount
ldr r4, [sp, 0xC]
subs r4, 0xD
ldrb r0, [r0]
@@ -148,7 +148,7 @@ _0806BE3C:
ldr r1, [sp, 0x1C]
adds r1, 0x2
str r1, [sp, 0x1C]
- ldr r0, =gNoOfAllBanks
+ ldr r0, =gBattleBanksCount
ldrb r0, [r0]
cmp r1, r0
bge _0806BE70
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 06:53:39 +0000