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

I hope this fixes the conflicts

Browse Source
This commit is contained in:
golem galvanize
2018-02-07 14:14:08 -05:00
parent 5f7709dc8b 802b505d7b
commit b67afb9490
303 changed files with 14152 additions and 23850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

338
asm/battle_anim_80A5C6C.s
View File

File diff suppressed because it is too large Load Diff

12
asm/battle_anim_80A9C70.s
View File

@@ -17,7 +17,7 @@ sub_80A9C70: @ 80A9C70
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
ldr r0, =gBankSpriteIds
ldr r0, =gBattlerSpriteIds
adds r0, r4, r0
ldrb r6, [r0]
ldr r0, =sub_80A9DB4
@@ -331,10 +331,10 @@ sub_80A9EF4: @ 80A9EF4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r4, =gAnimBankTarget
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
ldr r1, =0xffe00000
@@ -342,7 +342,7 @@ sub_80A9EF4: @ 80A9EF4
lsrs r5, r0, 16
ldrb r0, [r4]
movs r1, 0x3
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
ldr r1, =0xffdc0000
@@ -863,9 +863,9 @@ LaunchStatusAnimation: @ 80AA364
lsrs r4, 24
lsls r1, 24
lsrs r1, 24
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
strb r4, [r0]
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
strb r4, [r0]
ldr r0, =gBattleAnims_Statuses
movs r2, 0

108
asm/battle_anim_80D51AC.s
View File

@@ -12,7 +12,7 @@ sub_80D51AC: @ 80D51AC
lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -165,7 +165,7 @@ sub_80D52D0: @ 80D52D0
bgt _080D52FC
lsls r0, 24
lsrs r0, 24
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@@ -200,23 +200,23 @@ _080D5320:
_080D5324:
movs r0, 0x3
_080D5326:
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _080D533C
movs r6, 0x1
_080D533C:
ldr r0, =gBankSpriteIds
ldr r0, =gBattlerSpriteIds
adds r0, r4, r0
b _080D5350
.pool
_080D5348:
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
_080D5350:
@@ -379,7 +379,7 @@ sub_80D5484: @ 80D5484
lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@@ -603,7 +603,7 @@ sub_80D5644: @ 80D5644
lsrs r4, 24
ldr r5, =gBattleAnimArgs
ldrb r0, [r5]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, =gSprites
@@ -723,7 +723,7 @@ sub_80D5738: @ 80D5738
movs r6, 0x1
ldr r4, =gBattleAnimArgs
ldrb r0, [r4]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
movs r1, 0x8
@@ -842,9 +842,9 @@ sub_80D5830: @ 80D5830
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D584C
@@ -871,9 +871,9 @@ sub_80D5860: @ 80D5860
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5890
@@ -891,8 +891,8 @@ _080D5894:
movs r0, 0
strh r2, [r4, 0x2E]
strh r0, [r4, 0x32]
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -938,7 +938,7 @@ sub_80D58F8: @ 80D58F8
strb r0, [r2]
ldr r5, =gBattleAnimArgs
ldrb r0, [r5, 0x4]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldrh r2, [r5]
@@ -987,13 +987,13 @@ sub_80D5968: @ 80D5968
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D598C
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
b _080D5990
.pool
_080D598C:
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankTarget
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimTarget
_080D5990:
ldrb r0, [r0]
adds r0, r1
@@ -1133,18 +1133,18 @@ sub_80D5A94: @ 80D5A94
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D5AB0
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _080D5AB2
.pool
_080D5AB0:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_080D5AB2:
ldrb r2, [r0]
ldr r0, =gBankSpriteIds
ldr r0, =gBattlerSpriteIds
adds r0, r2, r0
ldrb r6, [r0]
adds r0, r2, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5ADC
@@ -1218,18 +1218,18 @@ sub_80D5B48: @ 80D5B48
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D5B70
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _080D5B72
.pool
_080D5B70:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_080D5B72:
ldrb r1, [r0]
ldr r0, =gBankSpriteIds
ldr r0, =gBattlerSpriteIds
adds r0, r1, r0
ldrb r7, [r0]
adds r0, r1, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5B9C
@@ -1338,9 +1338,9 @@ sub_80D5C50: @ 80D5C50
bl __divsi3
lsls r0, 16
lsrs r7, r0, 16
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5C82
@@ -1352,7 +1352,7 @@ sub_80D5C50: @ 80D5C50
strh r0, [r5, 0xA]
_080D5C82:
ldrb r0, [r5]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r1, =gTasks
lsls r4, r6, 2
adds r4, r6
@@ -1508,7 +1508,7 @@ sub_80D5DB0: @ 80D5DB0
cmp r0, 0
blt _080D5E10
ldrb r0, [r1]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r2, r0, 24
b _080D5E18
@@ -1518,20 +1518,20 @@ _080D5DD8:
beq _080D5DE8
b _080D5E10
_080D5DDE:
ldr r5, =gAnimBankAttacker
ldr r5, =gBattleAnimAttacker
b _080D5DEA
.pool
_080D5DE8:
ldr r5, =gAnimBankTarget
ldr r5, =gBattleAnimTarget
_080D5DEA:
ldrb r0, [r5]
movs r4, 0x2
eors r0, r4
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080D5E10
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
ldrb r0, [r5]
eors r0, r4
adds r0, r1
@@ -1549,9 +1549,9 @@ _080D5E18:
lsls r0, 3
adds r5, r0, r1
strh r2, [r5, 0x8]
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5E44
@@ -1622,9 +1622,9 @@ sub_80D5EB8: @ 80D5EB8
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r6, =gAnimBankAttacker
ldr r6, =gBattleAnimAttacker
ldrb r0, [r6]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5ED4
@@ -1635,7 +1635,7 @@ sub_80D5EB8: @ 80D5EB8
_080D5ED4:
ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x8]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
@@ -1660,7 +1660,7 @@ _080D5ED4:
b _080D5F18
.pool
_080D5F14:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
_080D5F18:
strh r0, [r2, 0x12]
@@ -1722,7 +1722,7 @@ sub_80D5F3C: @ 80D5F3C
.pool
_080D5F94:
ldrb r0, [r4, 0x12]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080D5FBC
@@ -1836,7 +1836,7 @@ sub_80D6064: @ 80D6064
lsrs r4, 24
ldr r6, =gBattleAnimArgs
ldrb r0, [r6, 0x6]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -1939,7 +1939,7 @@ sub_80D6134: @ 80D6134
lsrs r7, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x4]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -1995,14 +1995,14 @@ _080D61B8:
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080D61C8
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _080D61CA
.pool
_080D61C8:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_080D61CA:
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -2057,7 +2057,7 @@ sub_80D622C: @ 80D622C
lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x4]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -2076,14 +2076,14 @@ sub_80D622C: @ 80D622C
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080D6274
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _080D6276
.pool
_080D6274:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_080D6276:
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D6288
@@ -2290,7 +2290,7 @@ _080D63EE:
ldrh r0, [r1, 0x8]
strh r0, [r4, 0x1E]
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x16]

2234
asm/battle_anim_80FE840.s
View File

File diff suppressed because it is too large Load Diff

474
asm/battle_anim_815A0D4.s
View File

File diff suppressed because it is too large Load Diff

160
asm/battle_anim_8170478.s
View File

@@ -16,7 +16,7 @@ sub_8170478: @ 8170478
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x10]
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r4, [r0]
ldr r0, =gBattle_WIN0H
movs r1, 0
@@ -56,7 +56,7 @@ sub_8170478: @ 8170478
movs r1, 0x3
movs r2, 0x1
bl SetAnimBgAttribute
ldr r0, =gHealthBoxesIds
ldr r0, =gHealthboxSpriteIds
adds r4, r0
ldrb r0, [r4]
ldr r1, =gSprites
@@ -212,7 +212,7 @@ sub_8170660: @ 8170660
push {r7}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
mov r8, r0
ldr r1, =gTasks
@@ -373,7 +373,7 @@ _0817076C:
movs r1, 0x1
movs r2, 0
bl SetAnimBgAttribute
ldr r0, =gHealthBoxesIds
ldr r0, =gHealthboxSpriteIds
add r0, r8
ldrb r0, [r0]
lsls r1, r0, 4
@@ -434,7 +434,7 @@ sub_8170834: @ 8170834
adds r7, r1, 0
lsls r2, 24
lsrs r2, 24
ldr r0, =gHealthBoxesIds
ldr r0, =gHealthboxSpriteIds
adds r2, r0
ldrb r0, [r2]
lsls r5, r0, 4
@@ -540,7 +540,7 @@ sub_8170920: @ 8170920
lsrs r4, 24
mov r1, sp
adds r1, 0x1
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r2, [r0]
mov r0, sp
bl sub_8170834
@@ -561,7 +561,7 @@ sub_817094C: @ 817094C
push {r5,r6}
lsls r0, 24
lsrs r0, 24
ldr r1, =gHealthBoxesIds
ldr r1, =gHealthboxSpriteIds
adds r0, r1
ldrb r0, [r0]
ldr r1, =gSprites
@@ -628,7 +628,7 @@ sub_81709EC: @ 81709EC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_817094C
adds r0, r4, 0
@@ -765,8 +765,8 @@ sub_8170B04: @ 8170B04
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r5, [r0]
@@ -851,17 +851,17 @@ sub_8170BB0: @ 8170BB0
sub sp, 0xC
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gBankSpriteIds
ldr r4, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
adds r1, r0, r1
ldrb r1, [r1]
mov r9, r1
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08170BF8
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
ldrb r0, [r4]
lsls r0, 1
adds r0, r1
@@ -872,7 +872,7 @@ sub_8170BB0: @ 8170BB0
b _08170C08
.pool
_08170BF8:
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
ldrb r0, [r4]
lsls r0, 1
adds r0, r1
@@ -904,16 +904,16 @@ _08170C08:
b _08170CEE
.pool
_08170C44:
ldr r5, =gAnimBankAttacker
ldr r5, =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
ldr r2, =gSprites
@@ -1162,18 +1162,18 @@ sub_8170E04: @ 8170E04
adds r6, r4, r1
movs r0, 0x22
strh r0, [r6, 0x2E]
ldr r2, =gAnimBankTarget
ldr r2, =gBattleAnimTarget
mov r8, r2
ldrb r0, [r2]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1186,7 +1186,7 @@ sub_8170E04: @ 8170E04
ldr r0, =gBattleSpritesDataPtr
ldr r0, [r0]
ldr r3, [r0, 0x8]
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
mov r2, r8
ldrb r0, [r2]
adds r0, r1
@@ -1283,7 +1283,7 @@ _08170F54:
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl sub_80A82E4
@@ -1313,18 +1313,18 @@ _08170F54:
adds r6, r4, r0
movs r0, 0x22
strh r0, [r6, 0x2E]
ldr r1, =gAnimBankTarget
ldr r1, =gBattleAnimTarget
mov r8, r1
ldrb r0, [r1]
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1335,8 +1335,8 @@ _08170F54:
ldr r0, =SpriteCallbackDummy
str r0, [r4]
movs r0, 0
bl GetBankByIdentity
ldr r1, =gBankSpriteIds
bl GetBattlerAtPosition
ldr r1, =gBattlerSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1371,8 +1371,8 @@ sub_8171030: @ 8171030
lsrs r5, r0, 24
ldr r6, =gSprites
movs r0, 0
bl GetBankByIdentity
ldr r1, =gBankSpriteIds
bl GetBattlerAtPosition
ldr r1, =gBattlerSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r1
@@ -1422,8 +1422,8 @@ sub_81710A8: @ 81710A8
lsrs r5, r0, 24
ldr r6, =gSprites
movs r0, 0
bl GetBankByIdentity
ldr r4, =gBankSpriteIds
bl GetBattlerAtPosition
ldr r4, =gBattlerSpriteIds
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -1438,7 +1438,7 @@ sub_81710A8: @ 81710A8
cmp r0, 0
bge _081710F4
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -1550,7 +1550,7 @@ _08171188:
movs r2, 0x1
movs r3, 0x1C
bl LaunchBallStarsTask
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r1, [r0]
movs r0, 0
movs r2, 0xE
@@ -1584,8 +1584,8 @@ sub_81711E8: @ 81711E8
ldr r0, =sub_8171240
str r0, [r4, 0x1C]
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankTarget
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -1606,8 +1606,8 @@ _08171224:
sub_8171240: @ 8171240
push {r4-r7,lr}
adds r7, r0, 0
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankTarget
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r0, r1
ldrb r4, [r0]
@@ -2333,7 +2333,7 @@ sub_81717F8: @ 81717F8
push {r7}
sub sp, 0x4
adds r6, r0, 0
ldr r7, =gAnimBankTarget
ldr r7, =gBattleAnimTarget
ldrh r0, [r6, 0x36]
adds r0, 0x1
movs r1, 0
@@ -2390,7 +2390,7 @@ _08171880:
cmp r1, r0
bne _081718BC
ldr r5, =gSprites
ldr r4, =gBankSpriteIds
ldr r4, =gBattlerSpriteIds
ldrb r0, [r7]
adds r0, r4
ldrb r1, [r0]
@@ -2715,7 +2715,7 @@ sub_8171AE4: @ 8171AE4
movs r2, 0x1
movs r3, 0x1C
bl LaunchBallStarsTask
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r1, [r0]
movs r0, 0x1
movs r2, 0xE
@@ -2723,8 +2723,8 @@ sub_8171AE4: @ 8171AE4
bl LaunchBallFadeMonTask
_08171B36:
ldr r6, =gSprites
ldr r5, =gBankSpriteIds
ldr r4, =gAnimBankTarget
ldr r5, =gBattlerSpriteIds
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -2791,8 +2791,8 @@ sub_8171BAC: @ 8171BAC
strb r0, [r2]
_08171BCA:
ldr r4, =gSprites
ldr r3, =gBankSpriteIds
ldr r2, =gAnimBankTarget
ldr r3, =gBattlerSpriteIds
ldr r2, =gBattleAnimTarget
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -2840,8 +2840,8 @@ _08171C24:
cmp r5, 0
beq _08171C8A
ldr r4, =gSprites
ldr r3, =gBankSpriteIds
ldr r2, =gAnimBankTarget
ldr r3, =gBattlerSpriteIds
ldr r2, =gBattleAnimTarget
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -4729,8 +4729,8 @@ sub_8172BF0: @ 8172BF0
lsrs r7, r0, 24
movs r0, 0
mov r8, r0
ldr r0, =gBankSpriteIds
ldr r3, =gAnimBankAttacker
ldr r0, =gBattlerSpriteIds
ldr r3, =gBattleAnimAttacker
ldrb r2, [r3]
adds r0, r2, r0
ldrb r6, [r0]
@@ -4764,7 +4764,7 @@ _08172C36:
adds r0, r4
strh r0, [r5, 0x8]
ldrb r0, [r3]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08172C78
@@ -4838,7 +4838,7 @@ _08172CDA:
adds r0, r2
strh r0, [r5, 0x8]
ldrb r0, [r3]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08172D10
@@ -4877,9 +4877,9 @@ _08172D28:
adds r0, r1
ldrb r1, [r0, 0x8]
strh r1, [r0, 0x8]
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -4949,7 +4949,7 @@ _08172DC0:
beq _08172E4E
b _08172E84
_08172DC6:
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A8364
lsls r0, 24
@@ -5009,8 +5009,8 @@ _08172E14:
strh r0, [r4, 0x26]
b _08172E84
_08172E4E:
ldr r1, =gBankSpriteIds
ldr r4, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
adds r0, r1
ldrb r1, [r0]
@@ -5048,7 +5048,7 @@ sub_8172E9C: @ 8172E9C
ldr r3, =gBattleAnimArgs
ldr r1, =gBattleSpritesDataPtr
ldr r2, [r1]
ldr r1, =gAnimBankAttacker
ldr r1, =gBattleAnimAttacker
ldrb r1, [r1]
ldr r2, [r2]
lsls r1, 2
@@ -5068,7 +5068,7 @@ sub_8172ED0: @ 8172ED0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gAnimBankTarget
ldr r2, =gBattleAnimTarget
ldr r1, =gEffectBank
ldrb r1, [r1]
strb r1, [r2]
@@ -5108,7 +5108,7 @@ sub_8172EF0: @ 8172EF0
bl GetMonData
adds r4, r0, 0
adds r0, r6, 0
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _08172FC8
@@ -5234,12 +5234,12 @@ _0817303A:
ldrb r0, [r4, 0x8]
mov r8, r0
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r5, r0, 24
mov r0, r8
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0x1E
@@ -5347,7 +5347,7 @@ _08173118:
cmp r0, 0
bne _08173160
mov r0, r8
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
movs r1, 0x3F
cmp r0, 0
@@ -5575,11 +5575,11 @@ sub_817330C: @ 817330C
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
ldr r5, =gBattleAnimArgs
lsrs r0, 24
@@ -5587,11 +5587,11 @@ sub_817330C: @ 817330C
adds r0, r1
strh r0, [r4, 0x32]
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -5602,8 +5602,8 @@ sub_817330C: @ 817330C
adds r0, r4, 0
bl sub_80A68D4
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -5627,8 +5627,8 @@ sub_817339C: @ 817339C
push {lr}
adds r3, r0, 0
ldr r2, =gSprites
ldr r1, =gBankSpriteIds
ldr r0, =gAnimBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -5678,8 +5678,8 @@ sub_8173400: @ 8173400
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =gSprites
ldr r3, =gBankSpriteIds
ldr r2, =gAnimBankAttacker
ldr r3, =gBattlerSpriteIds
ldr r2, =gBattleAnimAttacker
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -5732,21 +5732,21 @@ sub_817345C: @ 817345C
.pool
_08173478:
movs r0, 0
bl GetBankByIdentity
ldr r1, =gAnimBankAttacker
bl GetBattlerAtPosition
ldr r1, =gBattleAnimAttacker
strb r0, [r1]
movs r0, 0x1
b _08173498
.pool
_0817348C:
movs r0, 0x1
bl GetBankByIdentity
ldr r1, =gAnimBankAttacker
bl GetBattlerAtPosition
ldr r1, =gBattleAnimAttacker
strb r0, [r1]
movs r0, 0
_08173498:
bl GetBankByIdentity
ldr r1, =gAnimBankTarget
bl GetBattlerAtPosition
ldr r1, =gBattleAnimTarget
strb r0, [r1]
_081734A0:
adds r0, r4, 0
@@ -5812,13 +5812,13 @@ sub_817351C: @ 817351C
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, =gAnimBankAttacker
ldr r3, =gBattleAnimAttacker
ldr r1, =gBattleSpritesDataPtr
ldr r2, [r1]
ldr r1, [r2, 0x8]
ldrh r1, [r1]
strb r1, [r3]
ldr r3, =gAnimBankTarget
ldr r3, =gBattleAnimTarget
ldr r1, [r2, 0x8]
ldrh r1, [r1]
lsrs r1, 8

34
asm/battle_anim_sound_tasks.s
View File

@@ -336,25 +336,25 @@ _08158DD0:
adds r2, r0, 0
cmp r1, 0
bne _08158DEC
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r4, [r0]
b _08158E12
.pool
_08158DEC:
cmp r1, 0x1
bne _08158DFC
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r4, [r0]
b _08158E12
.pool
_08158DFC:
cmp r1, 0x2
bne _08158E08
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _08158E0A
.pool
_08158E08:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_08158E0A:
ldrb r1, [r0]
movs r0, 0x2
@@ -369,7 +369,7 @@ _08158E12:
bne _08158E38
_08158E1E:
adds r0, r4, 0
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _08158E38
@@ -379,11 +379,11 @@ _08158E1E:
.pool
_08158E38:
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08158E5C
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -393,7 +393,7 @@ _08158E38:
b _08158E6A
.pool
_08158E5C:
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -461,25 +461,25 @@ _08158EE0:
adds r2, r0, 0
cmp r1, 0
bne _08158EFC
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r4, [r0]
b _08158F22
.pool
_08158EFC:
cmp r1, 0x1
bne _08158F0C
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
ldrb r4, [r0]
b _08158F22
.pool
_08158F0C:
cmp r1, 0x2
bne _08158F18
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
b _08158F1A
.pool
_08158F18:
ldr r0, =gAnimBankTarget
ldr r0, =gBattleAnimTarget
_08158F1A:
ldrb r1, [r0]
movs r0, 0x2
@@ -494,7 +494,7 @@ _08158F22:
bne _08158F48
_08158F2E:
adds r0, r4, 0
bl IsAnimBankSpriteVisible
bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _08158F48
@@ -504,11 +504,11 @@ _08158F2E:
.pool
_08158F48:
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08158F6C
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -518,7 +518,7 @@ _08158F48:
b _08158F7A
.pool
_08158F6C:
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r1, [r0]
@@ -705,7 +705,7 @@ sub_81590B8: @ 81590B8
.pool
_081590F8:
ldr r1, =gAnimSpeciesByBanks
ldr r0, =gAnimBankAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1

2
asm/battle_frontier_2.s
View File

@@ -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

270
asm/battle_link_817C95C.s
View File

@@ -34,32 +34,32 @@ _0817C988:
movs r1, 0x81
lsls r1, 2
adds r7, r0, r1
ldr r5, =gBankAttacker
ldr r5, =gBattlerAttacker
ldrb r0, [r5]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gBankTarget
ldr r0, =gBattlerTarget
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gEffectBank
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gStringInfo
ldr r0, [r0]
ldrb r0, [r0, 0x7]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
cmp r4, 0
bne _0817CA00
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
ldrb r0, [r5]
lsls r0, 1
adds r0, r2
@@ -70,7 +70,7 @@ _0817C988:
b _0817CA10
.pool
_0817CA00:
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
ldrb r0, [r5]
lsls r0, 1
adds r0, r2
@@ -83,7 +83,7 @@ _0817CA10:
str r1, [sp, 0x8]
cmp r6, 0
bne _0817CA3C
ldr r0, =gBankTarget
ldr r0, =gBattlerTarget
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -94,7 +94,7 @@ _0817CA10:
b _0817CA4C
.pool
_0817CA3C:
ldr r0, =gBankTarget
ldr r0, =gBattlerTarget
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -105,12 +105,12 @@ _0817CA3C:
_0817CA4C:
adds r1, r0
str r1, [sp, 0xC]
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
ldr r1, =gStringInfo
ldr r1, [r1]
ldrh r1, [r1]
bl GetBankMoveSlotId
bl GetBattlerMoveSlotId
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -134,20 +134,20 @@ _0817CA4C:
bl _0817E0A2
.pool
_0817CA9C:
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
mov r8, r0
ldr r0, =gBankTarget
ldr r0, =gBattlerTarget
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r5, r0, 25
ldr r0, =gEffectBank
ldrb r0, [r0]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r3, r0, 25
ldr r1, [sp]
@@ -571,8 +571,8 @@ _0817D0DC:
adds r3, r4
lsls r3, 2
adds r3, r7, r3
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -601,8 +601,8 @@ _0817D124:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -634,8 +634,8 @@ _0817D16C:
adds r0, r4
lsls r0, 2
adds r5, r7, r0
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -715,8 +715,8 @@ _0817D216:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -775,8 +775,8 @@ _0817D296:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -833,8 +833,8 @@ _0817D314:
lsls r0, r4, 4
adds r3, r0
adds r3, r7, r3
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -940,8 +940,8 @@ _0817D3F2:
bne _0817D3FE
bl _0817E0A6
_0817D3FE:
ldr r0, =gBankAttacker
ldr r1, =gBankTarget
ldr r0, =gBattlerAttacker
ldr r1, =gBattlerTarget
ldrb r0, [r0]
ldrb r1, [r1]
cmp r0, r1
@@ -1014,8 +1014,8 @@ _0817D498:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1091,8 +1091,8 @@ _0817D53C:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1161,8 +1161,8 @@ _0817D5CE:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1226,8 +1226,8 @@ _0817D65E:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1301,7 +1301,7 @@ _0817D6F2:
strb r0, [r1]
bl _0817E0A6
_0817D704:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1314,7 +1314,7 @@ _0817D704:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1353,8 +1353,8 @@ _0817D76C:
bne _0817D77E
bl _0817E0A6
_0817D77E:
ldr r6, =gBattlePartyID
ldr r5, =gBankAttacker
ldr r6, =gBattlerPartyIndexes
ldr r5, =gBattlerAttacker
ldrb r0, [r5]
lsls r0, 1
adds r0, r6
@@ -1395,7 +1395,7 @@ _0817D7B2:
b _0817D934
.pool
_0817D7D8:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1408,7 +1408,7 @@ _0817D7D8:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1439,7 +1439,7 @@ _0817D7D8:
b _0817D88C
.pool
_0817D838:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1452,7 +1452,7 @@ _0817D838:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1496,9 +1496,9 @@ _0817D8A4:
bne _0817D8B6
bl _0817E0A6
_0817D8B6:
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
mov r8, r2
ldr r6, =gBankAttacker
ldr r6, =gBattlerAttacker
ldrb r0, [r6]
lsls r0, 1
add r0, r8
@@ -1573,8 +1573,8 @@ _0817D94C:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1627,7 +1627,7 @@ _0817D9AE:
movs r0, 0x9
b _0817E086
_0817D9C2:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1640,7 +1640,7 @@ _0817D9C2:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1671,8 +1671,8 @@ _0817D9C2:
b _0817DB76
.pool
_0817DA24:
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1702,7 +1702,7 @@ _0817DA48:
b _0817E0A6
.pool
_0817DA68:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1715,7 +1715,7 @@ _0817DA68:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1747,8 +1747,8 @@ _0817DA68:
b _0817DB76
.pool
_0817DACC:
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1790,7 +1790,7 @@ _0817DB10:
b _0817E0A6
.pool
_0817DB24:
ldr r5, =gBattlePartyID
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBank
ldrb r0, [r6]
lsls r0, 1
@@ -1803,7 +1803,7 @@ _0817DB24:
lsls r4, 3
adds r3, r4
adds r3, r7, r3
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1838,8 +1838,8 @@ _0817DB76:
b _0817E0A6
.pool
_0817DB90:
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1875,8 +1875,8 @@ _0817DBD4:
lsls r0, r1, 4
adds r3, r0
adds r3, r7, r3
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1943,8 +1943,8 @@ _0817DC62:
adds r2, r6
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2021,8 +2021,8 @@ _0817DCFC:
lsls r0, r4, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2049,8 +2049,8 @@ _0817DD38:
lsls r0, r4, 4
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2121,8 +2121,8 @@ _0817DDC8:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2154,8 +2154,8 @@ _0817DE10:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2253,8 +2253,8 @@ _0817DEDC:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2331,8 +2331,8 @@ _0817DF70:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2413,8 +2413,8 @@ _0817DFE6:
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2557,22 +2557,22 @@ _0817E122:
lsls r1, 2
adds r1, r0, r1
str r1, [sp, 0x8]
ldr r2, =gBankAttacker
ldr r2, =gBattlerAttacker
mov r10, r2
ldrb r0, [r2]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gBankTarget
ldr r0, =gBattlerTarget
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
mov r1, r10
ldrb r0, [r1]
adds r1, r7, 0
bl GetBankMoveSlotId
bl GetBattlerMoveSlotId
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x3
@@ -2593,7 +2593,7 @@ _0817E122:
_0817E184:
mov r2, r10
ldrb r0, [r2]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
lsls r0, 3
@@ -2604,7 +2604,7 @@ _0817E184:
mov r2, r10
ldrb r1, [r2]
lsls r1, 1
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
adds r1, r2
ldrh r2, [r1]
adds r2, 0x1
@@ -2617,7 +2617,7 @@ _0817E184:
strb r1, [r0]
mov r1, r10
ldrb r0, [r1]
bl GetBankIdentity
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
lsls r0, 3
@@ -2685,7 +2685,7 @@ _0817E23C:
mov r1, r10
ldrb r0, [r1]
lsls r0, 1
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
adds r0, r2
ldrh r1, [r0]
adds r1, 0x1
@@ -2723,7 +2723,7 @@ _0817E27A:
mov r1, r10
ldrb r0, [r1]
lsls r0, 1
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
adds r0, r1
ldrh r1, [r0]
adds r1, 0x1
@@ -2812,9 +2812,9 @@ sub_817E32C: @ 817E32C
movs r1, 0x81
lsls r1, 2
adds r4, r0, r1
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r2, r0, 24
cmp r5, 0x12
@@ -3244,14 +3244,14 @@ sub_817E684: @ 817E684
movs r2, 0x81
lsls r2, 2
adds r7, r0, r2
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gBankTarget
ldr r0, =gBattlerTarget
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r3, r0, 24
mov r0, r10
@@ -3297,8 +3297,8 @@ _0817E6F0:
.4byte _0817E760
.4byte _0817E760
_0817E760:
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -3324,13 +3324,13 @@ _0817E760:
_0817E79C:
ldr r1, =gUnknown_0860A834
add r1, r12
ldr r7, =gBattlePartyID
ldr r7, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r4
lsls r2, r0, 4
ldr r4, =0x0000ffff
ldr r1, [r1]
ldr r3, =gBankAttacker
ldr r3, =gBattlerAttacker
ldrh r0, [r1]
cmp r6, r0
bne _0817E7E0
@@ -3708,15 +3708,15 @@ sub_817EA80: @ 817EA80
movs r1, 0x81
lsls r1, 2
adds r5, r0, r1
ldr r3, =gBankAttacker
ldr r3, =gBattlerAttacker
mov r8, r3
ldrb r0, [r3]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gBankTarget
ldr r0, =gBattlerTarget
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r4, 1
@@ -4005,8 +4005,8 @@ _0817ECCC:
ldrb r0, [r0]
lsrs r0, 5
subs r6, r0, 0x1
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4164,8 +4164,8 @@ _0817EE1C:
cmp r7, 0x1
bne _0817EEBC
adds r2, r4, 0
ldr r1, =gBattlePartyID
ldr r0, =gBankAttacker
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4227,7 +4227,7 @@ _0817EE8E:
b _0817EEBC
_0817EE96:
adds r2, r4, 0
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
mov r3, r8
ldrb r0, [r3]
lsls r0, 1
@@ -4269,9 +4269,9 @@ sub_817EECC: @ 817EECC
beq _0817EEE6
b _0817F1FA
_0817EEE6:
ldr r4, =gBankAttacker
ldr r4, =gBattlerAttacker
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4291,7 +4291,7 @@ _0817EEF8:
bgt _0817EF10
b _0817F1FA
_0817EF10:
ldr r0, =gBankTarget
ldr r0, =gBattlerTarget
ldrb r0, [r0]
muls r0, r1
adds r0, r5
@@ -4367,7 +4367,7 @@ _0817EF8A:
beq _0817EF98
b _0817F1FA
_0817EF98:
ldr r2, =gBankAttacker
ldr r2, =gBattlerAttacker
ldrb r0, [r2]
adds r0, r6
ldrb r0, [r0]
@@ -4386,11 +4386,11 @@ _0817EF98:
mov r10, r3
mov r8, r0
add r7, sp, 0x10
ldr r4, =gBankTarget
ldr r4, =gBattlerTarget
mov r9, r4
_0817EFC2:
lsls r1, r5, 1
ldr r6, =gBankAttacker
ldr r6, =gBattlerAttacker
ldrb r0, [r6]
movs r2, 0x58
muls r0, r2
@@ -4411,16 +4411,16 @@ _0817EFC2:
lsls r0, 24
cmp r0, 0
beq _0817F0B4
ldr r4, =gSideAffecting
ldr r4, =gSideStatuses
mov r1, r9
ldrb r0, [r1]
bl GetBankIdentity
bl GetBattlerPosition
movs r1, 0x1
ands r1, r0
lsls r1, 1
adds r1, r4
ldrh r3, [r1]
ldr r2, =gBankAttacker
ldr r2, =gBattlerAttacker
ldrb r0, [r2]
movs r4, 0x58
muls r0, r4
@@ -4437,7 +4437,7 @@ _0817EFC2:
str r4, [sp]
movs r4, 0
str r4, [sp, 0x4]
ldr r6, =gBankAttacker
ldr r6, =gBattlerAttacker
ldrb r4, [r6]
str r4, [sp, 0x8]
mov r6, r9
@@ -4448,7 +4448,7 @@ _0817EFC2:
ldr r4, =gBattleMoveDamage
str r3, [r4]
ldr r1, =gStatuses3
ldr r2, =gBankAttacker
ldr r2, =gBattlerAttacker
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -4472,7 +4472,7 @@ _0817EFC2:
str r0, [r4]
_0817F06A:
ldr r0, =gProtectStructs
ldr r6, =gBankAttacker
ldr r6, =gBattlerAttacker
ldrb r1, [r6]
lsls r1, 4
adds r1, r0
@@ -4513,9 +4513,9 @@ _0817F0B4:
cmp r5, 0x3
ble _0817EFC2
movs r5, 0
ldr r3, =gBankAttacker
ldr r3, =gBattlerAttacker
ldr r6, =gMoveSelectionCursor
ldr r4, =gBattlePartyID
ldr r4, =gBattlerPartyIndexes
mov r8, r4
movs r7, 0x64
mov r9, r7
@@ -4545,9 +4545,9 @@ _0817F0D8:
movs r7, 0
_0817F0F6:
movs r5, 0
ldr r4, =gBankTarget
ldr r4, =gBattlerTarget
ldr r6, =gEnemyParty
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
add r0, r10
ldrb r3, [r0]
@@ -4582,7 +4582,7 @@ _0817F11A:
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
ldr r2, =gBankAttacker
ldr r2, =gBattlerAttacker
ldrb r0, [r2]
lsls r0, 1
add r0, r8
@@ -4598,7 +4598,7 @@ _0817F11A:
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
ldr r4, =gBankAttacker
ldr r4, =gBattlerAttacker
ldrb r3, [r4]
mov r2, r10
adds r0, r3, r2
@@ -4625,7 +4625,7 @@ _0817F1D4:
_0817F1DC:
ldr r2, =gBattleMoveDamage
ldr r1, =gMoveSelectionCursor
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -4695,7 +4695,7 @@ _0817F270:
cmp r2, 0x95
bne _0817F294
ldr r2, =gBattleMons
ldr r0, =gBankAttacker
ldr r0, =gBattlerAttacker
ldrb r1, [r0]
movs r0, 0x58
muls r0, r1
@@ -4793,15 +4793,15 @@ _0817F324:
.pool
thumb_func_end sub_817F2A8
thumb_func_start GetBankMoveSlotId
GetBankMoveSlotId: @ 817F33C
thumb_func_start GetBattlerMoveSlotId
GetBattlerMoveSlotId: @ 817F33C
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r1, 16
lsrs r7, r1, 16
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
ldr r6, =gEnemyParty
cmp r0, 0
@@ -4809,7 +4809,7 @@ GetBankMoveSlotId: @ 817F33C
ldr r6, =gPlayerParty
_0817F356:
movs r4, 0
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r5, 1
adds r5, r0, r1
b _0817F36E
@@ -4835,7 +4835,7 @@ _0817F388:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end GetBankMoveSlotId
thumb_func_end GetBattlerMoveSlotId
thumb_func_start sub_817F394
sub_817F394: @ 817F394

2
asm/battle_tower.s
View File

@@ -5354,7 +5354,7 @@ sub_8164E04: @ 8164E04
adds r0, r2
ldrh r1, [r5]
bl sub_8165B88
ldr r6, =gBattlePartyID
ldr r6, =gBattlerPartyIndexes
ldrh r0, [r6, 0x2]
movs r5, 0x64
muls r0, r5

1538
asm/berry_tag_screen.s
View File

File diff suppressed because it is too large Load Diff

26
asm/contest.s
View File

@@ -1048,7 +1048,7 @@ _080D8004:
bl sub_80DC594
bl sub_80DC5E8
bl sub_80DC7EC
ldr r1, =gBanksByIdentity
ldr r1, =gBattlerPositions
strb r4, [r1]
movs r0, 0x1
strb r0, [r1, 0x1]
@@ -1058,12 +1058,12 @@ _080D8004:
strb r2, [r1, 0x3]
ldr r0, =gBattleTypeFlags
str r4, [r0]
ldr r4, =gBankAttacker
ldr r4, =gBattlerAttacker
strb r2, [r4]
ldr r0, =gBankTarget
ldr r0, =gBattlerTarget
strb r3, [r0]
bl sub_80DB0C4
ldr r2, =gBankSpriteIds
ldr r2, =gBattlerSpriteIds
ldrb r1, [r4]
adds r1, r2
strb r0, [r1]
@@ -2547,8 +2547,8 @@ _080D8DD0:
lsls r4, 3
adds r4, r0
strh r5, [r4, 0xC]
ldr r1, =gBankSpriteIds
ldr r0, =gBankAttacker
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattlerAttacker
ldrb r0, [r0]
adds r0, r1
strb r5, [r0]
@@ -13796,9 +13796,9 @@ sub_80DEA20: @ 80DEA20
push {lr}
ldr r0, =SpriteCallbackDummy
bl CreateInvisibleSpriteWithCallback
ldr r1, =gBankSpriteIds
ldr r1, =gBattlerSpriteIds
strb r0, [r1, 0x3]
ldr r0, =gBankTarget
ldr r0, =gBattlerTarget
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -13817,7 +13817,7 @@ sub_80DEA20: @ 80DEA20
thumb_func_start sub_80DEA5C
sub_80DEA5C: @ 80DEA5C
push {r4,lr}
ldr r0, =gBankSpriteIds
ldr r0, =gBattlerSpriteIds
ldrb r0, [r0, 0x3]
lsls r4, r0, 4
adds r4, r0
@@ -13829,13 +13829,13 @@ sub_80DEA5C: @ 80DEA5C
strh r0, [r4, 0x26]
movs r0, 0x3
movs r1, 0
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
movs r0, 0x3
movs r1, 0x1
bl GetBankPosition
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -13905,12 +13905,12 @@ _080DEAD0:
.4byte _080DEB60
.4byte _080DEB60
_080DEB54:
ldr r1, =gBankTarget
ldr r1, =gBattlerTarget
movs r0, 0x2
b _080DEB64
.pool
_080DEB60:
ldr r1, =gBankTarget
ldr r1, =gBattlerTarget
movs r0, 0x3
_080DEB64:
strb r0, [r1]

6
asm/field_specials.s
View File

@@ -5764,7 +5764,7 @@ sub_813ABD4: @ 813ABD4
adds r0, r4, 0
adds r1, r4, 0
adds r2, r5, 0
bl AddItemIconObject
bl AddItemIconSprite
ldr r4, =gUnknown_0203AB6C
strb r0, [r4]
lsls r0, 24
@@ -7156,14 +7156,14 @@ sub_813B7D8: @ 813B7D8
ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
movs r0, 0
movs r1, 0x1
bl sub_81D6720
bl DoRayquazaScene
b _0813B802
.pool
_0813B7F8:
ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
movs r0, 0x1
movs r1, 0
bl sub_81D6720
bl DoRayquazaScene
_0813B802:
pop {r0}
bx r0

468
asm/item_icon.s
View File

@@ -1,468 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start AllocItemIconTemporaryBuffers
@ bool8 AllocItemIconTemporaryBuffers()
AllocItemIconTemporaryBuffers: @ 81AFDE4
push {r4,r5,lr}
ldr r5, =gUnknown_0203CEBC
movs r0, 0x90
lsls r0, 1
bl Alloc
str r0, [r5]
cmp r0, 0
beq _081AFE1A
ldr r4, =gUnknown_0203CEC0
movs r0, 0x80
lsls r0, 2
bl AllocZeroed
str r0, [r4]
cmp r0, 0
beq _081AFE14
movs r0, 0x1
b _081AFE1C
.pool
_081AFE14:
ldr r0, [r5]
bl Free
_081AFE1A:
movs r0, 0
_081AFE1C:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end AllocItemIconTemporaryBuffers
thumb_func_start FreeItemIconTemporaryBuffers
@ void FreeItemIconTemporaryBuffers()
FreeItemIconTemporaryBuffers: @ 81AFE24
push {lr}
ldr r0, =gUnknown_0203CEBC
ldr r0, [r0]
bl Free
ldr r0, =gUnknown_0203CEC0
ldr r0, [r0]
bl Free
pop {r0}
bx r0
.pool
thumb_func_end FreeItemIconTemporaryBuffers
thumb_func_start CopyItemIconPicTo4x4Buffer
@ void CopyItemIconPicTo4x4Buffer(void *src, void *dest)
CopyItemIconPicTo4x4Buffer: @ 81AFE44
push {r4-r6,lr}
adds r6, r0, 0
adds r5, r1, 0
movs r4, 0
_081AFE4C:
lsls r0, r4, 1
adds r0, r4
lsls r0, 5
adds r0, r6, r0
lsls r1, r4, 7
adds r1, r5, r1
movs r2, 0x30
bl CpuSet
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x2
bls _081AFE4C
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end CopyItemIconPicTo4x4Buffer
thumb_func_start AddItemIconObject
@ u8 AddItemIconObject(u16 tilesTag, u16 paletteTag, u16 itemId)
AddItemIconObject: @ 81AFE70
push {r4-r7,lr}
sub sp, 0x10
lsls r0, 16
lsrs r7, r0, 16
lsls r1, 16
lsrs r6, r1, 16
lsls r2, 16
lsrs r5, r2, 16
bl AllocItemIconTemporaryBuffers
lsls r0, 24
cmp r0, 0
beq _081AFF28
adds r0, r5, 0
movs r1, 0
bl GetItemIconPicOrPalette
ldr r4, =gUnknown_0203CEBC
ldr r1, [r4]
bl LZDecompressWram
ldr r0, [r4]
ldr r4, =gUnknown_0203CEC0
ldr r1, [r4]
bl CopyItemIconPicTo4x4Buffer
ldr r0, [r4]
str r0, [sp]
ldr r4, =0xffff0000
ldr r0, [sp, 0x4]
ands r0, r4
movs r1, 0x80
lsls r1, 2
orrs r0, r1
lsls r2, r7, 16
ldr r1, =0x0000ffff
ands r0, r1
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
bl LoadSpriteSheet
adds r0, r5, 0
movs r1, 0x1
bl GetItemIconPicOrPalette
str r0, [sp, 0x8]
add r0, sp, 0x8
ldr r1, [r0, 0x4]
ands r1, r4
orrs r1, r6
str r1, [r0, 0x4]
bl LoadCompressedObjectPalette
movs r0, 0x18
bl Alloc
adds r5, r0, 0
ldr r0, =gUnknown_08614FF4
adds r1, r5, 0
movs r2, 0xC
bl CpuSet
strh r7, [r5]
strh r6, [r5, 0x2]
adds r0, r5, 0
movs r1, 0
movs r2, 0
movs r3, 0
bl CreateSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl FreeItemIconTemporaryBuffers
adds r0, r5, 0
bl Free
adds r0, r4, 0
b _081AFF2A
.pool
_081AFF28:
movs r0, 0x40
_081AFF2A:
add sp, 0x10
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end AddItemIconObject
thumb_func_start AddItemIconObjectWithCustomObjectTemplate
@ u8 AddItemIconObjectWithCustomObjectTemplate(struct objtemplate *objectTemplate, u16 tilesTag, u16 paletteTag, u16 itemId)
AddItemIconObjectWithCustomObjectTemplate: @ 81AFF34
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x10
mov r8, r0
lsls r1, 16
lsrs r7, r1, 16
lsls r2, 16
lsrs r6, r2, 16
lsls r3, 16
lsrs r5, r3, 16
bl AllocItemIconTemporaryBuffers
lsls r0, 24
cmp r0, 0
beq _081AFFEC
adds r0, r5, 0
movs r1, 0
bl GetItemIconPicOrPalette
ldr r4, =gUnknown_0203CEBC
ldr r1, [r4]
bl LZDecompressWram
ldr r0, [r4]
ldr r4, =gUnknown_0203CEC0
ldr r1, [r4]
bl CopyItemIconPicTo4x4Buffer
ldr r0, [r4]
str r0, [sp]
ldr r4, =0xffff0000
ldr r0, [sp, 0x4]
ands r0, r4
movs r1, 0x80
lsls r1, 2
orrs r0, r1
lsls r2, r7, 16
ldr r1, =0x0000ffff
ands r0, r1
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
bl LoadSpriteSheet
adds r0, r5, 0
movs r1, 0x1
bl GetItemIconPicOrPalette
str r0, [sp, 0x8]
add r0, sp, 0x8
ldr r1, [r0, 0x4]
ands r1, r4
orrs r1, r6
str r1, [r0, 0x4]
bl LoadCompressedObjectPalette
movs r0, 0x18
bl Alloc
adds r5, r0, 0
mov r0, r8
adds r1, r5, 0
movs r2, 0xC
bl CpuSet
strh r7, [r5]
strh r6, [r5, 0x2]
adds r0, r5, 0
movs r1, 0
movs r2, 0
movs r3, 0
bl CreateSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl FreeItemIconTemporaryBuffers
adds r0, r5, 0
bl Free
adds r0, r4, 0
b _081AFFEE
.pool
_081AFFEC:
movs r0, 0x40
_081AFFEE:
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end AddItemIconObjectWithCustomObjectTemplate
thumb_func_start GetItemIconPicOrPalette
@ u32 GetItemIconPicOrPalette(u16 itemId, u8 which)
GetItemIconPicOrPalette: @ 81AFFFC
push {lr}
lsls r0, 16
lsrs r3, r0, 16
lsls r1, 24
lsrs r1, 24
ldr r0, =0x0000ffff
cmp r3, r0
bne _081B0018
ldr r3, =0x00000179
b _081B0022
.pool
_081B0018:
movs r0, 0xBC
lsls r0, 1
cmp r3, r0
bls _081B0022
movs r3, 0
_081B0022:
ldr r2, =gItemIconTable
lsls r0, r1, 2
lsls r1, r3, 3
adds r0, r1
adds r0, r2
ldr r0, [r0]
pop {r1}
bx r1
.pool
thumb_func_end GetItemIconPicOrPalette
thumb_func_start sub_81B0038
sub_81B0038: @ 81B0038
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
ldr r4, [sp, 0x24]
lsls r0, 24
lsrs r0, 24
mov r8, r0
lsls r1, 24
lsrs r1, 24
mov r9, r1
lsls r2, 24
lsrs r7, r2, 24
lsls r3, 24
lsrs r3, 24
str r3, [sp]
lsls r4, 24
lsrs r6, r4, 24
bl reset_brm
ldr r0, =gUnknown_0203CEC4
mov r10, r0
movs r0, 0x8E
lsls r0, 2
bl Alloc
adds r5, r0, 0
mov r1, r10
str r5, [r1]
cmp r5, 0
bne _081B0088
ldr r0, [sp, 0x2C]
bl SetMainCallback2
b _081B0194
.pool
_081B0088:
ldr r3, =gUnknown_0203CEC8
movs r1, 0xF
mov r4, r8
ands r1, r4
ldrb r2, [r3, 0x8]
movs r0, 0x10
negs r0, r0
ands r0, r2
orrs r0, r1
strb r0, [r3, 0x8]
ldr r0, [sp, 0x2C]
str r0, [r3]
movs r4, 0
strb r7, [r3, 0xB]
lsls r2, r6, 2
ldrh r1, [r5, 0xA]
movs r0, 0x3
ands r0, r1
orrs r0, r2
strh r0, [r5, 0xA]
ldr r0, [sp, 0x28]
str r0, [r5]
str r4, [r5, 0x4]
ldrb r1, [r5, 0x8]
movs r0, 0xF
negs r0, r0
ands r0, r1
strb r0, [r5, 0x8]
mov r1, r10
ldr r2, [r1]
ldrh r0, [r2, 0x8]
movs r4, 0xFE
lsls r4, 3
adds r1, r4, 0
orrs r0, r1
strh r0, [r2, 0x8]
ldr r0, [r2, 0x8]
movs r1, 0xFE
lsls r1, 10
orrs r0, r1
str r0, [r2, 0x8]
adds r6, r3, 0
mov r5, r8
cmp r5, 0x4
bne _081B00F0
ldrb r0, [r2, 0x8]
movs r1, 0x1
orrs r0, r1
b _081B00F8
.pool
_081B00F0:
ldrb r1, [r2, 0x8]
movs r0, 0x2
negs r0, r0
ands r0, r1
_081B00F8:
strb r0, [r2, 0x8]
mov r0, r9
cmp r0, 0xFF
beq _081B0114
movs r0, 0x3
mov r1, r9
ands r0, r1
lsls r0, 4
ldrb r2, [r6, 0x8]
movs r1, 0x31
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r6, 0x8]
_081B0114:
movs r2, 0
ldr r5, =gUnknown_0203CEC4
movs r4, 0x86
lsls r4, 2
movs r3, 0
_081B011E:
ldr r0, [r5]
lsls r1, r2, 1
adds r0, r4
adds r0, r1
strh r3, [r0]
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0xF
bls _081B011E
movs r2, 0
ldr r4, =gUnknown_0203CEC4
movs r3, 0xFF
_081B0138:
ldr r0, [r4]
adds r0, 0xC
adds r0, r2
ldrb r1, [r0]
orrs r1, r3
strb r1, [r0]
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0x2
bls _081B0138
ldr r4, [sp]
cmp r4, 0
bne _081B015C
strb r4, [r6, 0x9]
b _081B017E
.pool
_081B015C:
adds r1, r6, 0
movs r0, 0x9
ldrsb r0, [r1, r0]
cmp r0, 0x5
bgt _081B017A
adds r1, r0, 0
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
bl GetMonData
cmp r0, 0
bne _081B017E
_081B017A:
movs r0, 0
strb r0, [r6, 0x9]
_081B017E:
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x5
negs r0, r0
ands r0, r1
strb r0, [r2]
bl CalculatePlayerPartyCount
ldr r0, =c2_811EBD0
bl SetMainCallback2
_081B0194:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B0038
.align 2, 0 @ Don't pad with nop.

20
asm/item_menu_icons.s
View File

@@ -348,7 +348,7 @@ AddBagItemIconObject: @ 80D4F38
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
bl AddItemIconObject
bl AddItemIconSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -527,8 +527,8 @@ _080D5082:
.pool
thumb_func_end sub_80D5070
thumb_func_start sub_80D50D4
sub_80D50D4: @ 80D50D4
thumb_func_start CreateBerryTagSprite
CreateBerryTagSprite: @ 80D50D4
push {r4,r5,lr}
adds r4, r1, 0
adds r5, r2, 0
@@ -554,17 +554,17 @@ sub_80D50D4: @ 80D50D4
pop {r1}
bx r1
.pool
thumb_func_end sub_80D50D4
thumb_func_end CreateBerryTagSprite
thumb_func_start sub_80D510C
sub_80D510C: @ 80D510C
thumb_func_start FreeBerryTagSpritePalette
FreeBerryTagSpritePalette: @ 80D510C
push {lr}
ldr r0, =0x00007544
bl FreeSpritePaletteByTag
pop {r0}
bx r0
.pool
thumb_func_end sub_80D510C
thumb_func_end FreeBerryTagSpritePalette
thumb_func_start sub_80D511C
sub_80D511C: @ 80D511C
@@ -617,8 +617,8 @@ _080D5172:
.pool
thumb_func_end sub_80D511C
thumb_func_start sub_80D518C
sub_80D518C: @ 80D518C
thumb_func_start CreateBerryFlavorCircleSprite
CreateBerryFlavorCircleSprite: @ 80D518C
push {lr}
adds r1, r0, 0
ldr r0, =gUnknown_0857FE10
@@ -632,6 +632,6 @@ sub_80D518C: @ 80D518C
pop {r1}
bx r1
.pool
thumb_func_end sub_80D518C
thumb_func_end CreateBerryFlavorCircleSprite
.align 2, 0 @ Don't pad with nop.

2
asm/link.s
View File

@@ -46462,7 +46462,7 @@ _080214C6:
lsrs r3, 16
ldr r0, =gUnknown_082F436C
adds r1, r2, 0
bl AddItemIconObjectWithCustomObjectTemplate
bl AddCustomItemIconSprite
lsls r0, 24
lsrs r0, 24
mov r2, r9

2
asm/macros/battle_script.inc
View File

@@ -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

218
asm/party_menu.s
View File

@@ -4,6 +4,192 @@
.syntax unified
.text
thumb_func_start sub_81B0038
sub_81B0038: @ 81B0038
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
ldr r4, [sp, 0x24]
lsls r0, 24
lsrs r0, 24
mov r8, r0
lsls r1, 24
lsrs r1, 24
mov r9, r1
lsls r2, 24
lsrs r7, r2, 24
lsls r3, 24
lsrs r3, 24
str r3, [sp]
lsls r4, 24
lsrs r6, r4, 24
bl reset_brm
ldr r0, =gUnknown_0203CEC4
mov r10, r0
movs r0, 0x8E
lsls r0, 2
bl Alloc
adds r5, r0, 0
mov r1, r10
str r5, [r1]
cmp r5, 0
bne _081B0088
ldr r0, [sp, 0x2C]
bl SetMainCallback2
b _081B0194
.pool
_081B0088:
ldr r3, =gUnknown_0203CEC8
movs r1, 0xF
mov r4, r8
ands r1, r4
ldrb r2, [r3, 0x8]
movs r0, 0x10
negs r0, r0
ands r0, r2
orrs r0, r1
strb r0, [r3, 0x8]
ldr r0, [sp, 0x2C]
str r0, [r3]
movs r4, 0
strb r7, [r3, 0xB]
lsls r2, r6, 2
ldrh r1, [r5, 0xA]
movs r0, 0x3
ands r0, r1
orrs r0, r2
strh r0, [r5, 0xA]
ldr r0, [sp, 0x28]
str r0, [r5]
str r4, [r5, 0x4]
ldrb r1, [r5, 0x8]
movs r0, 0xF
negs r0, r0
ands r0, r1
strb r0, [r5, 0x8]
mov r1, r10
ldr r2, [r1]
ldrh r0, [r2, 0x8]
movs r4, 0xFE
lsls r4, 3
adds r1, r4, 0
orrs r0, r1
strh r0, [r2, 0x8]
ldr r0, [r2, 0x8]
movs r1, 0xFE
lsls r1, 10
orrs r0, r1
str r0, [r2, 0x8]
adds r6, r3, 0
mov r5, r8
cmp r5, 0x4
bne _081B00F0
ldrb r0, [r2, 0x8]
movs r1, 0x1
orrs r0, r1
b _081B00F8
.pool
_081B00F0:
ldrb r1, [r2, 0x8]
movs r0, 0x2
negs r0, r0
ands r0, r1
_081B00F8:
strb r0, [r2, 0x8]
mov r0, r9
cmp r0, 0xFF
beq _081B0114
movs r0, 0x3
mov r1, r9
ands r0, r1
lsls r0, 4
ldrb r2, [r6, 0x8]
movs r1, 0x31
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r6, 0x8]
_081B0114:
movs r2, 0
ldr r5, =gUnknown_0203CEC4
movs r4, 0x86
lsls r4, 2
movs r3, 0
_081B011E:
ldr r0, [r5]
lsls r1, r2, 1
adds r0, r4
adds r0, r1
strh r3, [r0]
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0xF
bls _081B011E
movs r2, 0
ldr r4, =gUnknown_0203CEC4
movs r3, 0xFF
_081B0138:
ldr r0, [r4]
adds r0, 0xC
adds r0, r2
ldrb r1, [r0]
orrs r1, r3
strb r1, [r0]
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0x2
bls _081B0138
ldr r4, [sp]
cmp r4, 0
bne _081B015C
strb r4, [r6, 0x9]
b _081B017E
.pool
_081B015C:
adds r1, r6, 0
movs r0, 0x9
ldrsb r0, [r1, r0]
cmp r0, 0x5
bgt _081B017A
adds r1, r0, 0
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
bl GetMonData
cmp r0, 0
bne _081B017E
_081B017A:
movs r0, 0
strb r0, [r6, 0x9]
_081B017E:
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x5
negs r0, r0
ands r0, r1
strb r0, [r2]
bl CalculatePlayerPartyCount
ldr r0, =c2_811EBD0
bl SetMainCallback2
_081B0194:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B0038
thumb_func_start sub_81B01B0
sub_81B01B0: @ 81B01B0
@@ -16041,14 +16227,14 @@ _081B8AF8:
b _081B8B24
_081B8AFC:
adds r0, r4, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _081B8B1E
adds r0, r5, 0
bl sub_81B8F38
lsls r0, 24
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
lsls r1, r4, 1
adds r1, r2
lsrs r0, 24
@@ -16060,7 +16246,7 @@ _081B8B1E:
lsls r0, 24
lsrs r4, r0, 24
_081B8B24:
ldr r0, =gNoOfAllBanks
ldr r0, =gBattlersCount
ldrb r0, [r0]
cmp r4, r0
bcc _081B8AFC
@@ -16115,7 +16301,7 @@ _081B8BA8:
ldr r1, =gUnknown_0203CEE8
movs r0, 0x1
strb r0, [r1]
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBankInMenu
ldrb r0, [r0]
lsls r0, 1
@@ -16150,7 +16336,7 @@ _081B8BFC:
_081B8C20:
ldr r0, =gBankInMenu
ldrb r0, [r0]
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, 1
adds r0, r1
ldrb r0, [r0]
@@ -16228,9 +16414,9 @@ _081B8CBE:
bne _081B8CFC
movs r5, 0x1
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
mov r2, sp
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
adds r0, r1
@@ -16255,16 +16441,16 @@ _081B8CF0:
_081B8CFC:
movs r5, 0x2
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
mov r1, sp
ldr r4, =gBattlePartyID
ldr r4, =gBattlerPartyIndexes
lsls r0, 24
lsrs r0, 23
adds r0, r4
ldrh r0, [r0]
strb r0, [r1]
movs r0, 0x2
bl GetBankByIdentity
bl GetBattlerAtPosition
mov r1, sp
lsls r0, 24
lsrs r0, 23
@@ -16339,24 +16525,24 @@ sub_81B8D88: @ 81B8D88
lsrs r7, r1, 24
lsls r0, 24
lsrs r0, 24
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _081B8DB0
movs r0, 0
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x2
b _081B8DBC
_081B8DB0:
movs r0, 0x1
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
_081B8DBC:
bl GetBankByIdentity
bl GetBattlerAtPosition
lsls r0, 24
lsrs r6, r0, 24
bl sub_81B1250
@@ -16388,7 +16574,7 @@ _081B8DF0:
bne _081B8E28
movs r3, 0x1
mov r2, sp
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r1
ldrh r0, [r0]
@@ -16412,7 +16598,7 @@ _081B8E1A:
_081B8E28:
movs r3, 0x2
mov r1, sp
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r2
ldrh r0, [r0]

2
asm/player_pc.s
View File

@@ -2179,7 +2179,7 @@ sub_816C060: @ 816C060
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
bl AddItemIconObject
bl AddItemIconSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40

2
asm/pokemon_1.s
View File

@@ -581,7 +581,7 @@ _080689E4:
beq _080689CE
_080689F4:
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080689CE

54
asm/pokemon_item_effect.s
View File

@@ -100,7 +100,7 @@ _0806BDBC:
lsrs r0, 24
_0806BDC4:
str r0, [sp, 0x34]
ldr r1, =gStringBank
ldr r1, =gStringBattler
ldr r0, =gBankInMenu
ldrb r2, [r0]
strb r2, [r1]
@@ -114,23 +114,23 @@ _0806BDC4:
lsrs r1, r0, 24
cmp r1, 0
beq _0806BE64
ldr r0, =gActiveBank
ldr r0, =gActiveBattler
strb r2, [r0]
ldrb r0, [r0]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
negs r1, r0
orrs r1, r0
lsrs r1, 31
str r1, [sp, 0x1C]
ldr r0, =gNoOfAllBanks
ldr r0, =gBattlersCount
ldr r4, [sp, 0xC]
subs r4, 0xD
ldrb r0, [r0]
cmp r1, r0
bge _0806BE70
ldr r2, =gBattlePartyID
ldr r2, =gBattlerPartyIndexes
lsls r0, r1, 1
adds r0, r2
ldrh r3, [r0]
@@ -148,7 +148,7 @@ _0806BE3C:
ldr r1, [sp, 0x1C]
adds r1, 0x2
str r1, [sp, 0x1C]
ldr r0, =gNoOfAllBanks
ldr r0, =gBattlersCount
ldrb r0, [r0]
cmp r1, r0
bge _0806BE70
@@ -165,7 +165,7 @@ _0806BE3C:
b _0806BE70
.pool
_0806BE64:
ldr r0, =gActiveBank
ldr r0, =gActiveBattler
strb r1, [r0]
movs r3, 0x4
str r3, [sp, 0x38]
@@ -200,7 +200,7 @@ _0806BE9A:
ands r0, r1
cmp r0, 0
beq _0806BECC
ldr r0, =gActiveBank
ldr r0, =gActiveBattler
ldrb r1, [r0]
lsls r0, r1, 3
subs r0, r1
@@ -297,7 +297,7 @@ _0806BF76:
cmp r0, 0
beq _0806BFA4
ldr r1, =gBattleMons
ldr r0, =gActiveBank
ldr r0, =gActiveBattler
ldrb r2, [r0]
movs r0, 0x58
muls r0, r2
@@ -323,7 +323,7 @@ _0806BFA4:
bl _0806CD4C
_0806BFB2:
ldr r6, =gBattleMons
ldr r5, =gActiveBank
ldr r5, =gActiveBattler
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -362,7 +362,7 @@ _0806BFFC:
cmp r3, 0
beq _0806C042
ldr r7, =gBattleMons
ldr r5, =gActiveBank
ldr r5, =gActiveBattler
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -396,7 +396,7 @@ _0806C042:
bl _0806CD4C
_0806C050:
ldr r6, =gBattleMons
ldr r5, =gActiveBank
ldr r5, =gActiveBattler
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -433,7 +433,7 @@ _0806C08C:
cmp r3, 0
beq _0806C0D2
ldr r7, =gBattleMons
ldr r5, =gActiveBank
ldr r5, =gActiveBattler
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -467,7 +467,7 @@ _0806C0D2:
bl _0806CD4C
_0806C0E0:
ldr r6, =gBattleMons
ldr r5, =gActiveBank
ldr r5, =gActiveBattler
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -506,9 +506,9 @@ _0806C120:
cmp r0, 0
beq _0806C168
ldr r5, =gSideTimers
ldr r4, =gActiveBank
ldr r4, =gActiveBattler
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -519,7 +519,7 @@ _0806C120:
cmp r0, 0
bne _0806C168
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -965,7 +965,7 @@ _0806C4FC:
ldr r3, [sp, 0x38]
cmp r3, 0x4
beq _0806C55C
ldr r2, =gAbsentBankFlags
ldr r2, =gAbsentBattlerFlags
ldr r1, =gBitTable
lsls r0, r3, 2
adds r0, r1
@@ -973,7 +973,7 @@ _0806C4FC:
ldrb r0, [r2]
bics r0, r1
strb r0, [r2]
ldr r1, =gBattlePartyID
ldr r1, =gBattlerPartyIndexes
lsls r0, r3, 1
adds r0, r1
ldrb r0, [r0]
@@ -983,14 +983,14 @@ _0806C4FC:
lsrs r1, 24
ldr r0, [sp, 0x38]
bl CopyPlayerPartyMonToBattleData
ldr r0, =gActiveBank
ldr r0, =gActiveBattler
ldrb r0, [r0]
b _0806C574
.pool
_0806C55C:
ldr r3, =gAbsentBankFlags
ldr r3, =gAbsentBattlerFlags
ldr r1, =gBitTable
ldr r2, =gActiveBank
ldr r2, =gActiveBattler
ldrb r0, [r2]
eors r0, r4
lsls r0, 2
@@ -1001,7 +1001,7 @@ _0806C55C:
strb r0, [r3]
ldrb r0, [r2]
_0806C574:
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0806C5B2
@@ -1135,9 +1135,9 @@ _0806C65E:
ands r0, r3
cmp r0, 0
bne _0806C6EC
ldr r4, =gActiveBank
ldr r4, =gActiveBattler
ldrb r0, [r4]
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0806C6EC
@@ -1155,9 +1155,9 @@ _0806C6AE:
movs r0, 0
movs r1, 0
movs r2, 0
bl EmitGetMonData
bl BtlController_EmitGetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
bl MarkBattlerForControllerExec
strb r5, [r4]
b _0806C6EC
.pool

2
asm/pokemon_summary_screen.s
View File

@@ -5756,7 +5756,7 @@ sub_81C6F90: @ 81C6F90
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
bl AddItemIconObject
bl AddItemIconSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40

5972
asm/rayquaza_scene.s
View File

File diff suppressed because it is too large Load Diff

1342
asm/reset_rtc_screen.s
View File

File diff suppressed because it is too large Load Diff

2
asm/shop.s
View File

@@ -969,7 +969,7 @@ _080E02AE:
ldr r0, =0x0000083e
adds r1, r3, r0
adds r0, r1, 0
bl AddItemIconObject
bl AddItemIconSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40

2
asm/start_menu.s
View File

@@ -170,7 +170,7 @@ _0809F926:
b _0809F940
.pool
_0809F930:
ldr r4, =gUnknown_0203761A
ldr r4, =gUnknown_02037619+1
adds r0, r4, 0
movs r1, 0x2
bl PrintStartMenuActions

2
asm/title_screen.s
View File

@@ -1243,7 +1243,7 @@ c2_reset_rtc_screen_1: @ 80AAF0C
lsls r0, 24
cmp r0, 0
bne _080AAF1E
ldr r0, =sub_809EF88
ldr r0, =CB2_InitResetRtcScreen
bl SetMainCallback2
_080AAF1E:
pop {r0}

41
constants/battle_constants.inc
View File

@@ -45,21 +45,21 @@
.set OPPONENT_TELEPORTED, 0xA
@ identities
.set IDENTITY_PLAYER_MON1, 0
.set IDENTITY_OPPONENT_MON1, 1
.set IDENTITY_PLAYER_MON2, 2
.set IDENTITY_OPPONENT_MON2, 3
.set B_POSITION_PLAYER_LEFT, 0
.set B_POSITION_OPPONENT_LEFT, 1
.set B_POSITION_PLAYER_RIGHT, 2
.set B_POSITION_OPPONENT_RIGHT, 3
@ status 1
.set STATUS_SLEEP, 0x7
.set STATUS_POISON, 0x8
.set STATUS_BURN, 0x10
.set STATUS_FREEZE, 0x20
.set STATUS_PARALYSIS, 0x40
.set STATUS_TOXIC_POISON, 0x80
.set STATUS_TOXIC_COUNTER, 0xF00
.set STATUS1_SLEEP, 0x7
.set STATUS1_POISON, 0x8
.set STATUS1_BURN, 0x10
.set STATUS1_FREEZE, 0x20
.set STATUS1_PARALYSIS, 0x40
.set STATUS1_TOXIC_POISON, 0x80
.set STATUS1_TOXIC_COUNTER, 0xF00
.set STATUS_ANY, STATUS_SLEEP | STATUS_POISON | STATUS_BURN | STATUS_FREEZE | STATUS_PARALYSIS | STATUS_TOXIC_POISON
.set STATUS1_ANY, STATUS1_SLEEP | STATUS1_POISON | STATUS1_BURN | STATUS1_FREEZE | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON
@ status 2
.set STATUS2_CONFUSION, 0x00000007
@@ -160,11 +160,12 @@
.set HITMARKER_x8000000, 0x08000000
@ move flags
.set MOVESTATUS_MISSED, 0x1
.set MOVESTATUS_SUPEREFFECTIVE, 0x2
.set MOVESTATUS_NOTVERYEFFECTIVE, 0x4
.set MOVESTATUS_NOTAFFECTED, 0x8
.set MOVESTATUS_ONEHITKO, 0x10
.set MOVESTATUS_FAILED, 0x20
.set MOVESTATUS_ENDURED, 0x40
.set MOVESTATUS_HUNGON, 0x80
.set MOVE_RESULT_MISSED, 0x1
.set MOVE_RESULT_SUPER_EFFECTIVE, 0x2
.set MOVE_RESULT_NOT_VERY_EFFECTIVE, 0x4
.set MOVE_RESULT_DOESNT_AFFECT_FOE, 0x8
.set MOVE_RESULT_ONE_HIT_KO, 0x10
.set MOVE_RESULT_FAILED, 0x20
.set MOVE_RESULT_FOE_ENDURED, 0x40
.set MOVE_RESULT_FOE_HUNG_ON, 0x80
.set MOVE_RESULT_NO_EFFECT, (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)

52
data/battle_ai_scripts.s
View File

@@ -218,7 +218,7 @@ BattleAIScript_82DC2D4:
get_ability AI_TARGET
if_equal ABILITY_INSOMNIA, Score_Minus10
if_equal ABILITY_VITAL_SPIRIT, Score_Minus10
if_status AI_TARGET, STATUS_ANY, Score_Minus10
if_status AI_TARGET, STATUS1_ANY, Score_Minus10
if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
end
@@ -237,11 +237,11 @@ BattleAIScript_82DC31A:
BattleAIScript_82DC31B:
if_status2 AI_TARGET, STATUS2_NIGHTMARE, Score_Minus10
if_not_status AI_TARGET, STATUS_SLEEP, Score_Minus8
if_not_status AI_TARGET, STATUS1_SLEEP, Score_Minus8
end
BattleAIScript_82DC330:
if_not_status AI_TARGET, STATUS_SLEEP, Score_Minus8
if_not_status AI_TARGET, STATUS1_SLEEP, Score_Minus8
if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
end
@@ -350,7 +350,7 @@ BattleAIScript_82DC48C:
if_equal TYPE_POISON, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_IMMUNITY, Score_Minus10
if_status AI_TARGET, STATUS_ANY, Score_Minus10
if_status AI_TARGET, STATUS1_ANY, Score_Minus10
if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
end
@@ -402,7 +402,7 @@ BattleAIScript_82DC545:
if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_LIMBER, Score_Minus10
if_status AI_TARGET, STATUS_ANY, Score_Minus10
if_status AI_TARGET, STATUS1_ANY, Score_Minus10
if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
end
@@ -428,7 +428,7 @@ BattleAIScript_82DC59D:
end
BattleAIScript_82DC5A5:
if_not_status AI_USER, STATUS_SLEEP, Score_Minus8
if_not_status AI_USER, STATUS1_SLEEP, Score_Minus8
end
BattleAIScript_82DC5B0:
@@ -536,7 +536,7 @@ BattleAIScript_82DC6A9:
BattleAIScript_82DC6B4:
get_ability AI_TARGET
if_equal ABILITY_WATER_VEIL, Score_Minus10
if_status AI_TARGET, STATUS_ANY, Score_Minus10
if_status AI_TARGET, STATUS1_ANY, Score_Minus10
if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
if_type_effectiveness AI_EFFECTIVENESS_x0_5, Score_Minus10
if_type_effectiveness AI_EFFECTIVENESS_x0_25, Score_Minus10
@@ -566,7 +566,7 @@ BattleAIScript_82DC708:
end
BattleAIScript_82DC713:
if_not_status AI_USER, STATUS_POISON | STATUS_BURN | STATUS_PARALYSIS | STATUS_TOXIC_POISON, Score_Minus10
if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, Score_Minus10
end
BattleAIScript_82DC71E:
@@ -1076,7 +1076,7 @@ BattleAIScript_82DCD3D:
score -1
BattleAIScript_82DCD4D:
if_not_status AI_TARGET, STATUS_TOXIC_POISON, BattleAIScript_82DCD6C
if_not_status AI_TARGET, STATUS1_TOXIC_POISON, BattleAIScript_82DCD6C
if_hp_more_than AI_USER, 50, BattleAIScript_82DCD64
if_random_less_than 80, BattleAIScript_82DCD6C
@@ -1263,7 +1263,7 @@ BattleAIScript_82DCF22:
score -2
BattleAIScript_82DCF32:
if_not_status AI_TARGET, STATUS_TOXIC_POISON, BattleAIScript_82DCF44
if_not_status AI_TARGET, STATUS1_TOXIC_POISON, BattleAIScript_82DCF44
if_random_less_than 70, BattleAIScript_82DCF44
score +2
@@ -1520,7 +1520,7 @@ BattleAIScript_82DD228:
end
BattleAIScript_82DD229:
if_status AI_TARGET, STATUS_TOXIC_POISON, BattleAIScript_82DD256
if_status AI_TARGET, STATUS1_TOXIC_POISON, BattleAIScript_82DD256
if_status2 AI_TARGET, STATUS2_CURSED, BattleAIScript_82DD256
if_status3 AI_TARGET, STATUS3_PERISH_SONG, BattleAIScript_82DD256
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DD256
@@ -1673,7 +1673,7 @@ BattleAIScript_82DD381:
goto BattleAIScript_82DD3E9
BattleAIScript_82DD3B9:
if_not_status AI_TARGET, STATUS_ANY, BattleAIScript_82DD3E1
if_not_status AI_TARGET, STATUS1_ANY, BattleAIScript_82DD3E1
goto BattleAIScript_82DD3E9
BattleAIScript_82DD3C8:
@@ -1722,7 +1722,7 @@ BattleAIScript_82DD430:
end
BattleAIScript_82DD431:
if_status AI_TARGET, STATUS_SLEEP, BattleAIScript_82DD4D6
if_status AI_TARGET, STATUS1_SLEEP, BattleAIScript_82DD4D6
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DD4D6
if_status2 AI_TARGET, STATUS2_CONFUSION, BattleAIScript_82DD4D6
if_hp_more_than AI_USER, 30, BattleAIScript_82DD45E
@@ -1901,7 +1901,7 @@ BattleAIScript_82DD582:
end
BattleAIScript_82DD583:
if_status AI_USER, STATUS_SLEEP, Score_Plus10
if_status AI_USER, STATUS1_SLEEP, Score_Plus10
score -5
end
@@ -1952,8 +1952,8 @@ BattleAIScript_82DD60A:
end
BattleAIScript_82DD60B:
if_status AI_TARGET, STATUS_ANY, BattleAIScript_82DD621
if_status_in_party AI_TARGET, STATUS_ANY, BattleAIScript_82DD621
if_status AI_TARGET, STATUS1_ANY, BattleAIScript_82DD621
if_status_in_party AI_TARGET, STATUS1_ANY, BattleAIScript_82DD621
score -5
BattleAIScript_82DD621:
@@ -2012,7 +2012,7 @@ BattleAIScript_82DD693:
BattleAIScript_82DD694:
get_protect_count AI_USER
if_more_than 1, BattleAIScript_82DD75A
if_status AI_USER, STATUS_TOXIC_POISON, BattleAIScript_82DD751
if_status AI_USER, STATUS1_TOXIC_POISON, BattleAIScript_82DD751
if_status2 AI_USER, STATUS2_CURSED, BattleAIScript_82DD751
if_status3 AI_USER, STATUS3_PERISH_SONG, BattleAIScript_82DD751
if_status2 AI_USER, STATUS2_INFATUATION, BattleAIScript_82DD751
@@ -2020,7 +2020,7 @@ BattleAIScript_82DD694:
if_status3 AI_USER, STATUS3_YAWN, BattleAIScript_82DD751
if_has_move_with_effect AI_TARGET, EFFECT_RESTORE_HP, BattleAIScript_82DD751
if_has_move_with_effect AI_TARGET, EFFECT_DEFENSE_CURL, BattleAIScript_82DD751
if_status AI_TARGET, STATUS_TOXIC_POISON, BattleAIScript_82DD730
if_status AI_TARGET, STATUS1_TOXIC_POISON, BattleAIScript_82DD730
if_status2 AI_TARGET, STATUS2_CURSED, BattleAIScript_82DD730
if_status3 AI_TARGET, STATUS3_PERISH_SONG, BattleAIScript_82DD730
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DD730
@@ -2238,7 +2238,7 @@ BattleAIScript_82DD959:
end
BattleAIScript_82DD95A:
if_status AI_TARGET, STATUS_SLEEP, BattleAIScript_82DD9FF
if_status AI_TARGET, STATUS1_SLEEP, BattleAIScript_82DD9FF
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DD9FF
if_status2 AI_TARGET, STATUS2_CONFUSION, BattleAIScript_82DD9FF
if_hp_more_than AI_USER, 30, BattleAIScript_82DD987
@@ -2323,7 +2323,7 @@ BattleAIScript_82DDA2F:
goto BattleAIScript_82DDAB4
BattleAIScript_82DDA3D:
if_status AI_TARGET, STATUS_TOXIC_POISON, BattleAIScript_82DDAAC
if_status AI_TARGET, STATUS1_TOXIC_POISON, BattleAIScript_82DDAAC
if_status2 AI_TARGET, STATUS2_CURSED, BattleAIScript_82DDAAC
if_status3 AI_TARGET, STATUS3_LEECHSEED, BattleAIScript_82DDAAC
get_weather
@@ -2396,7 +2396,7 @@ BattleAIScript_82DDAF5:
end
BattleAIScript_82DDAF6:
if_not_status AI_TARGET, STATUS_POISON | STATUS_BURN | STATUS_PARALYSIS | STATUS_TOXIC_POISON, BattleAIScript_82DDB02
if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, BattleAIScript_82DDB02
score +1
BattleAIScript_82DDB02:
@@ -2405,7 +2405,7 @@ BattleAIScript_82DDB02:
BattleAIScript_82DDB03:
if_type_effectiveness AI_EFFECTIVENESS_x0_25, BattleAIScript_82DDB42
if_type_effectiveness AI_EFFECTIVENESS_x0_5, BattleAIScript_82DDB42
if_status AI_TARGET, STATUS_SLEEP, BattleAIScript_82DDB59
if_status AI_TARGET, STATUS1_SLEEP, BattleAIScript_82DDB59
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DDB49
if_status2 AI_TARGET, STATUS2_CONFUSION, BattleAIScript_82DDB49
is_first_turn_for AI_USER
@@ -2429,7 +2429,7 @@ BattleAIScript_82DDB5B:
end
BattleAIScript_82DDB5C:
if_status AI_TARGET, STATUS_PARALYSIS, BattleAIScript_82DDB6B
if_status AI_TARGET, STATUS1_PARALYSIS, BattleAIScript_82DDB6B
goto BattleAIScript_82DDB6D
BattleAIScript_82DDB6B:
@@ -2571,7 +2571,7 @@ sItemsTable_82DDC6E:
.byte -1
BattleAIScript_82DDC72:
if_status AI_TARGET, STATUS_SLEEP, BattleAIScript_82DDC9D
if_status AI_TARGET, STATUS1_SLEEP, BattleAIScript_82DDC9D
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DDC9D
if_status2 AI_TARGET, STATUS2_CONFUSION, BattleAIScript_82DDC9D
if_random_less_than 180, BattleAIScript_82DDC9D
@@ -2960,7 +2960,7 @@ BattleAIScript_82DDFED:
end
BattleAIScript_82DDFF5:
if_status AI_USER, STATUS_ANY, BattleAIScript_82DE000
if_status AI_USER, STATUS1_ANY, BattleAIScript_82DE000
end
BattleAIScript_82DE000:
@@ -3060,7 +3060,7 @@ BattleAIScript_82DE14A:
BattleAIScript_82DE14F:
get_ability AI_TARGET
if_not_equal ABILITY_GUTS, Score_Minus30_
if_status AI_TARGET, STATUS_ANY, Score_Minus30_
if_status AI_TARGET, STATUS1_ANY, Score_Minus30_
if_hp_less_than AI_USER, 91, Score_Minus30_
goto Score_Plus5

148
data/battle_scripts_1.s
View File

@@ -286,7 +286,7 @@ BattleScript_MoveEnd::
end
BattleScript_MakeMoveMissed::
orbyte gBattleMoveFlags, MOVESTATUS_MISSED
orbyte gMoveResultFlags, MOVE_RESULT_MISSED
BattleScript_PrintMoveMissed::
attackstring
ppreduce
@@ -303,9 +303,9 @@ BattleScript_EffectSleep::
attackstring
ppreduce
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus TARGET, STATUS_SLEEP, BattleScript_AlreadyAsleep
jumpifstatus TARGET, STATUS1_SLEEP, BattleScript_AlreadyAsleep
jumpifcantmakeasleep BattleScript_CantMakeAsleep
jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
@@ -397,7 +397,7 @@ BattleScript_EffectExplosion::
faintifabilitynotdamp
setatkhptozero
waitstate
jumpifbyte NO_COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED, BattleScript_82D8B94
jumpifbyte NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_82D8B94
call BattleScript_82D8BEA
goto BattleScript_82D8B96
BattleScript_82D8B94::
@@ -436,16 +436,16 @@ BattleScript_82D8BCF::
end
BattleScript_82D8BEA::
bicbyte gBattleMoveFlags, MOVESTATUS_MISSED
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
attackanimation
waitanimation
orbyte gBattleMoveFlags, MOVESTATUS_MISSED
orbyte gMoveResultFlags, MOVE_RESULT_MISSED
return
BattleScript_EffectDreamEater::
attackcanceler
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_82D8C0E
jumpifstatus TARGET, STATUS_SLEEP, BattleScript_82D8C18
jumpifstatus TARGET, STATUS1_SLEEP, BattleScript_82D8C18
BattleScript_82D8C0E::
attackstring
ppreduce
@@ -487,7 +487,7 @@ BattleScript_EffectMirrorMove::
pause 0x40
trymirrormove
ppreduce
orbyte gBattleMoveFlags, MOVESTATUS_FAILED
orbyte gMoveResultFlags, MOVE_RESULT_FAILED
printstring STRINGID_MIRRORMOVEFAILED
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -633,7 +633,7 @@ BattleScript_MultiHitLoop::
jumpifhasnohp ATTACKER, BattleScript_MultiHitEnd
jumpifhasnohp TARGET, BattleScript_MultiHitPrintStrings
jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoMultiHit
jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_MultiHitPrintStrings
jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_MultiHitPrintStrings
BattleScript_DoMultiHit::
movevaluescleanup
copybyte cEFFECT_CHOOSER, sMULTIHIT_EFFECT
@@ -656,7 +656,7 @@ BattleScript_DoMultiHit::
addbyte sMULTIHIT_STRING + 4, 0x1
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_MultiHitPrintStrings
jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
decrementmultihit BattleScript_MultiHitLoop
goto BattleScript_MultiHitPrintStrings
BattleScript_MultiHitNoMoreHits::
@@ -712,9 +712,9 @@ BattleScript_EffectToxic::
ppreduce
jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus TARGET, STATUS_POISON, BattleScript_AlreadyPoisoned
jumpifstatus TARGET, STATUS_TOXIC_POISON, BattleScript_AlreadyPoisoned
jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
jumpifstatus TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
jumpifstatus TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected
jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
@@ -735,7 +735,7 @@ BattleScript_AlreadyPoisoned::
goto BattleScript_MoveEnd
BattleScript_ImmunityProtected::
copybyte gEffectBank, gBankTarget
copybyte gEffectBank, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0x0
call BattleScript_PSNPrevention
goto BattleScript_MoveEnd
@@ -759,7 +759,7 @@ BattleScript_EffectRest::
attackcanceler
attackstring
ppreduce
jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_RestIsAlreadyAsleep
jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_RestIsAlreadyAsleep
jumpifcantmakeasleep BattleScript_RestCantSleep
trysetrest BattleScript_AlreadyAtFullHp
pause 0x20
@@ -835,7 +835,7 @@ BattleScript_EffectSuperFang::
attackstring
ppreduce
typecalc
bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
damagetohalftargethp
goto BattleScript_HitFromAtkAnimation
@@ -845,7 +845,7 @@ BattleScript_EffectDragonRage::
attackstring
ppreduce
typecalc
bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
setword gBattleMoveDamage, 40
adjustsetdamage
goto BattleScript_HitFromAtkAnimation
@@ -879,19 +879,19 @@ BattleScript_MoveMissedDoDamage::
pause 0x40
resultmessage
waitmessage 0x40
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_NOTAFFECTED, BattleScript_MoveEnd
jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
printstring STRINGID_PKMNCRASHED
waitmessage 0x40
damagecalc
typecalc
adjustnormaldamage
manipulatedamage ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP
bicbyte gBattleMoveFlags, MOVESTATUS_MISSED
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate ATTACKER
datahpupdate ATTACKER
tryfaintmon ATTACKER, FALSE, NULL
orbyte gBattleMoveFlags, MOVESTATUS_MISSED
orbyte gMoveResultFlags, MOVE_RESULT_MISSED
goto BattleScript_MoveEnd
BattleScript_EffectMist::
@@ -1012,11 +1012,11 @@ BattleScript_EffectPoison::
ppreduce
jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus TARGET, STATUS_POISON, BattleScript_AlreadyPoisoned
jumpifstatus TARGET, STATUS_TOXIC_POISON, BattleScript_AlreadyPoisoned
jumpifstatus TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
jumpifstatus TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected
jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected
jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
@@ -1035,8 +1035,8 @@ BattleScript_EffectParalyze::
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
typecalc
jumpifmovehadnoeffect BattleScript_ButItFailed
jumpifstatus TARGET, STATUS_PARALYSIS, BattleScript_AlreadyParalyzed
jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
jumpifstatus TARGET, STATUS1_PARALYSIS, BattleScript_AlreadyParalyzed
jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
@@ -1055,7 +1055,7 @@ BattleScript_AlreadyParalyzed::
goto BattleScript_MoveEnd
BattleScript_LimberProtected::
copybyte gEffectBank, gBankTarget
copybyte gEffectBank, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0x0
call BattleScript_PRLZPrevention
goto BattleScript_MoveEnd
@@ -1221,7 +1221,7 @@ BattleScript_EffectLevelDamage::
attackstring
ppreduce
typecalc
bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
dmgtolevel
adjustsetdamage
goto BattleScript_HitFromAtkAnimation
@@ -1232,7 +1232,7 @@ BattleScript_EffectPsywave::
attackstring
ppreduce
typecalc
bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
psywavedamageeffect
adjustsetdamage
goto BattleScript_HitFromAtkAnimation
@@ -1279,7 +1279,7 @@ BattleScript_EffectPainSplit::
BattleScript_EffectSnore::
attackcanceler
jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_SnoreIsAsleep
jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_SnoreIsAsleep
attackstring
ppreduce
goto BattleScript_ButItFailed
@@ -1333,7 +1333,7 @@ BattleScript_EffectSketch::
BattleScript_EffectSleepTalk::
attackcanceler
jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_SleepTalkIsAsleep
jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_SleepTalkIsAsleep
attackstring
ppreduce
goto BattleScript_ButItFailed
@@ -1415,7 +1415,7 @@ BattleScript_TripleKickLoop::
jumpifhasnohp ATTACKER, BattleScript_TripleKickEnd
jumpifhasnohp TARGET, BattleScript_TripleKickNoMoreHits
jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoTripleKickAttack
jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_TripleKickNoMoreHits
jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_TripleKickNoMoreHits
BattleScript_DoTripleKickAttack::
accuracycheck BattleScript_TripleKickNoMoreHits, ACC_CURR_MOVE
movevaluescleanup
@@ -1440,18 +1440,18 @@ BattleScript_DoTripleKickAttack::
waitmessage 0x1
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_TripleKickPrintStrings
jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
decrementmultihit BattleScript_TripleKickLoop
goto BattleScript_TripleKickPrintStrings
BattleScript_TripleKickNoMoreHits::
pause 0x20
jumpifbyte EQUAL, sMULTIHIT_STRING + 4, 0x0, BattleScript_TripleKickPrintStrings
bicbyte gBattleMoveFlags, MOVESTATUS_MISSED
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
BattleScript_TripleKickPrintStrings::
resultmessage
waitmessage 0x40
jumpifbyte EQUAL, sMULTIHIT_STRING + 4, 0x0, BattleScript_TripleKickEnd
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_NOTAFFECTED, BattleScript_TripleKickEnd
jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_TripleKickEnd
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 0x6
printstring STRINGID_HITXTIMES
waitmessage 0x40
@@ -1487,7 +1487,7 @@ BattleScript_EffectNightmare::
ppreduce
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus2 TARGET, STATUS2_NIGHTMARE, BattleScript_ButItFailed
jumpifstatus TARGET, STATUS_SLEEP, BattleScript_NightmareWorked
jumpifstatus TARGET, STATUS1_SLEEP, BattleScript_NightmareWorked
goto BattleScript_ButItFailed
BattleScript_NightmareWorked::
attackanimation
@@ -1513,7 +1513,7 @@ BattleScript_EffectCurse::
jumpifstat ATTACKER, NOT_EQUAL, ATK, 0xC, BattleScript_CurseTrySpeed
jumpifstat ATTACKER, EQUAL, DEF, 0xC, BattleScript_ButItFailed
BattleScript_CurseTrySpeed::
copybyte gBankTarget, gBankAttacker
copybyte gBattlerTarget, gBattlerAttacker
setbyte sANIM_TURN, 0x1
attackanimation
waitanimation
@@ -1534,7 +1534,7 @@ BattleScript_CurseTryDefence::
BattleScript_CurseEnd::
goto BattleScript_MoveEnd
BattleScript_GhostCurse::
jumpifbytenotequal gBankAttacker, gBankTarget, BattleScript_DoGhostCurse
jumpifbytenotequal gBattlerAttacker, gBattlerTarget, BattleScript_DoGhostCurse
getmovetarget ATTACKER
BattleScript_DoGhostCurse::
attackcanceler
@@ -1603,7 +1603,7 @@ BattleScript_PerishSongLoop::
jumpifability SCRIPTING_BANK, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
BattleScript_PerishSongLoopIncrement::
addbyte sBANK, 0x1
jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_PerishSongLoop
jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop
goto BattleScript_MoveEnd
BattleScript_PerishSongNotAffected::
@@ -1748,7 +1748,7 @@ BattleScript_EffectSonicboom::
attackstring
ppreduce
typecalc
bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
setword gBattleMoveDamage, 20
adjustsetdamage
goto BattleScript_HitFromAtkAnimation
@@ -2085,14 +2085,14 @@ BattleScript_ButItFailedPpReduce::
ppreduce
BattleScript_ButItFailed::
pause 0x20
orbyte gBattleMoveFlags, MOVESTATUS_FAILED
orbyte gMoveResultFlags, MOVE_RESULT_FAILED
resultmessage
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_NotAffected::
pause 0x20
orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED
orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
resultmessage
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -2204,10 +2204,10 @@ BattleScript_EffectWillOWisp::
attackstring
ppreduce
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus TARGET, STATUS_BURN, BattleScript_AlreadyBurned
jumpifstatus TARGET, STATUS1_BURN, BattleScript_AlreadyBurned
jumpiftype TARGET, TYPE_FIRE, BattleScript_NotAffected
jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_WaterVeilPrevents
jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
@@ -2217,7 +2217,7 @@ BattleScript_EffectWillOWisp::
goto BattleScript_MoveEnd
BattleScript_WaterVeilPrevents::
copybyte gEffectBank, gBankTarget
copybyte gEffectBank, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0x0
call BattleScript_BRNPrevention
goto BattleScript_MoveEnd
@@ -2275,7 +2275,7 @@ BattleScript_82DA15A::
goto BattleScript_MoveEnd
BattleScript_EffectFacade::
jumpifstatus ATTACKER, STATUS_POISON | STATUS_BURN | STATUS_PARALYSIS | STATUS_TOXIC_POISON, BattleScript_FacadeDoubleDmg
jumpifstatus ATTACKER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, BattleScript_FacadeDoubleDmg
goto BattleScript_EffectHit
BattleScript_FacadeDoubleDmg::
@@ -2293,7 +2293,7 @@ BattleScript_EffectFocusPunch::
BattleScript_EffectSmellingsalt::
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectHit
setmoveeffect EFFECT_REMOVE_PARALYSIS | CERTAIN
jumpifstatus TARGET, STATUS_PARALYSIS, BattleScript_SmellingsaltDoubleDmg
jumpifstatus TARGET, STATUS1_PARALYSIS, BattleScript_SmellingsaltDoubleDmg
goto BattleScript_EffectHit
BattleScript_SmellingsaltDoubleDmg::
@@ -2452,7 +2452,7 @@ BattleScript_EffectBrickBreak::
typecalc
adjustnormaldamage
jumpifbyte EQUAL, sANIM_TURN, 0x0, BattleScript_BrickBreakAnim
bicbyte gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE
BattleScript_BrickBreakAnim::
attackanimation
waitanimation
@@ -2511,7 +2511,7 @@ BattleScript_EffectEndeavor::
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation
bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
copyword gBattleMoveDamage, gHpDealt
adjustsetdamage
goto BattleScript_HitFromAtkAnimation
@@ -2598,11 +2598,11 @@ BattleScript_EffectTeeterDance::
attackcanceler
attackstring
ppreduce
setbyte gBankTarget, 0x0
setbyte gBattlerTarget, 0x0
BattleScript_TeeterDanceLoop::
movevaluescleanup
setmoveeffect EFFECT_CONFUSION
jumpifbyteequal gBankAttacker, gBankTarget, BattleScript_TeeterDanceLoopIncrement
jumpifbyteequal gBattlerAttacker, gBattlerTarget, BattleScript_TeeterDanceLoopIncrement
jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_TeeterDanceOwnTempoPrevents
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_TeeterDanceSubstitutePrevents
jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_TeeterDanceAlreadyConfused
@@ -2618,8 +2618,8 @@ BattleScript_TeeterDanceDoMoveEndIncrement::
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
BattleScript_TeeterDanceLoopIncrement::
addbyte gBankTarget, 0x1
jumpifbytenotequal gBankTarget, gNoOfAllBanks, BattleScript_TeeterDanceLoop
addbyte gBattlerTarget, 0x1
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TeeterDanceLoop
end
BattleScript_TeeterDanceOwnTempoPrevents::
@@ -2706,7 +2706,7 @@ BattleScript_TickleEnd::
BattleScript_CantLowerMultipleStats::
pause 0x20
orbyte gBattleMoveFlags, MOVESTATUS_FAILED
orbyte gMoveResultFlags, MOVE_RESULT_FAILED
printstring STRINGID_STATSWONTDECREASE2
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -2792,7 +2792,7 @@ BattleScript_CalmMindEnd::
BattleScript_CantRaiseMultipleStats::
pause 0x20
orbyte gBattleMoveFlags, MOVESTATUS_FAILED
orbyte gMoveResultFlags, MOVE_RESULT_FAILED
printstring STRINGID_STATSWONTINCREASE2
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -2935,7 +2935,7 @@ BattleScript_82DA908::
switchinanim GBANK_1, FALSE
waitstate
switchineffects 5
jumpifbytenotequal gBank1, gNoOfAllBanks, BattleScript_82DA908
jumpifbytenotequal gBank1, gBattlersCount, BattleScript_82DA908
BattleScript_82DA92C::
end2
@@ -2950,7 +2950,7 @@ BattleScript_LocalBattleWonLoseTexts::
waitstate
printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleWonReward
trainerslideout IDENTITY_OPPONENT_MON1
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein GBANK_1
waitstate
@@ -2991,7 +2991,7 @@ BattleScript_LocalBattleLostPrintTrainersWinText::
jumpifbattletype BATTLE_TYPE_x800000, BattleScript_LocalBattleLostDoTrainer2WinText
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleLostEnd_
BattleScript_LocalBattleLostDoTrainer2WinText::
trainerslideout IDENTITY_OPPONENT_MON1
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein GBANK_1
waitstate
@@ -3007,7 +3007,7 @@ BattleScript_82DAA0B::
trainerslidein ATTACKER
waitstate
printstring STRINGID_TRAINER1WINTEXT
trainerslideout IDENTITY_OPPONENT_MON1
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein GBANK_1
waitstate
@@ -3035,7 +3035,7 @@ BattleScript_82DAA5C::
trainerslidein ATTACKER
waitstate
printstring STRINGID_TRAINER1LOSETEXT
trainerslideout IDENTITY_OPPONENT_MON1
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein GBANK_1
waitstate
@@ -3058,7 +3058,7 @@ BattleScript_82DAAAE::
waitstate
printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DAACB
trainerslideout IDENTITY_OPPONENT_MON1
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein GBANK_1
waitstate
@@ -3228,7 +3228,7 @@ BattleScript_DamagingWeatherContinues::
playanimation2 ATTACKER, sANIM_ARG1, NULL
setbyte gBattleCommunication, 0x0
BattleScript_DamagingWeatherLoop::
copyarraywithindex gBankAttacker, gBanksByTurnOrder, gBattleCommunication, 0x1
copyarraywithindex gBattlerAttacker, gBattleTurnOrder, gBattleCommunication, 0x1
weatherdamage
jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement
printfromtable gSandStormHailDmgStringIds
@@ -3243,7 +3243,7 @@ BattleScript_DamagingWeatherLoop::
BattleScript_DamagingWeatherLoopIncrement::
jumpifbyte NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamagingWeatherContinuesEnd
addbyte gBattleCommunication, 0x1
jumpifbytenotequal gBattleCommunication, gNoOfAllBanks, BattleScript_DamagingWeatherLoop
jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_DamagingWeatherLoop
BattleScript_DamagingWeatherContinuesEnd::
bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
end2
@@ -3322,7 +3322,7 @@ BattleScript_BideAttack::
waitmessage 0x40
accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE
typecalc
bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
copyword gBattleMoveDamage, sBIDE_DMG
adjustsetdamage
setbyte sANIM_TURN, 0x1
@@ -3521,7 +3521,7 @@ BattleScript_RapidSpinAway::
BattleScript_WrapFree::
printstring STRINGID_PKMNGOTFREE
waitmessage 0x40
copybyte gBankTarget, sBANK
copybyte gBattlerTarget, sBANK
return
BattleScript_LeechSeedFree::
@@ -3564,16 +3564,16 @@ BattleScript_FutureAttackEnd::
moveend 0x1, 0x0
setbyte sMOVEEND_STATE, 0xB
moveend 0x2, 0xE
setbyte gBattleMoveFlags, 0
setbyte gMoveResultFlags, 0
end2
BattleScript_FutureAttackMiss::
pause 0x20
setbyte gBattleMoveFlags, 0
orbyte gBattleMoveFlags, MOVESTATUS_FAILED
setbyte gMoveResultFlags, 0
orbyte gMoveResultFlags, MOVE_RESULT_FAILED
resultmessage
waitmessage 0x40
setbyte gBattleMoveFlags, 0
setbyte gMoveResultFlags, 0
end2
BattleScript_NoMovesLeft::
@@ -4032,7 +4032,7 @@ BattleScript_WeatherFormChanges::
BattleScript_WeatherFormChangesLoop::
trycastformdatachange
addbyte sBANK, 0x1
jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_WeatherFormChangesLoop
jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop
return
BattleScript_CastformChange::
@@ -4053,7 +4053,7 @@ BattleScript_82DB4B8::
BattleScript_82DB4BE::
pause 0x20
BattleScript_82DB4C1::
setbyte gBankTarget, 0x0
setbyte gBattlerTarget, 0x0
setstatchanger ATK, 1, TRUE
BattleScript_82DB4CD::
trygetintimidatetarget BattleScript_82DB51B
@@ -4068,7 +4068,7 @@ BattleScript_82DB4CD::
printstring STRINGID_PKMNCUTSATTACKWITH
waitmessage 0x40
BattleScript_82DB510::
addbyte gBankTarget, 0x1
addbyte gBattlerTarget, 0x1
goto BattleScript_82DB4CD
BattleScript_82DB51B::
return
@@ -4117,7 +4117,7 @@ BattleScript_MoveHPDrain::
datahpupdate TARGET
printstring STRINGID_PKMNRESTOREDHPUSING
waitmessage 0x40
orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED
orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd
BattleScript_MonMadeMoveUseless_PPLoss::
@@ -4127,7 +4127,7 @@ BattleScript_MonMadeMoveUseless::
pause 0x20
printstring STRINGID_PKMNSXMADEYUSELESS
waitmessage 0x40
orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED
orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd
BattleScript_FlashFireBoost_PPLoss::
@@ -4474,7 +4474,7 @@ BattleScript_82DB887::
waitmessage 0x40
BattleScript_82DB89D::
addbyte gBattleCommunication + 1, 0x1
jumpifbytenotequal gBattleCommunication + 1, gNoOfAllBanks, BattleScript_82DB887
jumpifbytenotequal gBattleCommunication + 1, gBattlersCount, BattleScript_82DB887
setbyte gBattleCommunication, 0x0
setbyte gBattleCommunication + 1, 0x0
end2

34
data/berry_tag_screen.s
View File

@@ -1,34 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085EFCF0:: @ 85EFCF0
.4byte 0x000001f0, 0x000011e1, 0x000021d2, 0x000031c3
.align 2
gUnknown_085EFD00:: @ 85EFD00
.incbin "graphics/interface/berry_tag_screen.gbapal"
.align 2
gUnknown_085EFD20:: @ 85EFD20 struct TextColor
.byte 0x00, 0x02, 0x03
.byte 0x0F, 0x0E, 0x0D
.align 2
gUnknown_085EFD28:: @ 85EFD28
window_template 0x01, 0x0b, 0x04, 0x08, 0x02, 0x0f, 0x0045
window_template 0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055
window_template 0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d
window_template 0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101
null_window_template
.align 2
gBerryFirmnessStringPointers:: @ 85EFD50
.4byte gBerryFirmnessString_VerySoft
.4byte gBerryFirmnessString_Soft
.4byte gBerryFirmnessString_Hard
.4byte gBerryFirmnessString_VeryHard
.4byte gBerryFirmnessString_SuperHard

172
data/graphics/berries/berry_graphics.inc
View File

@@ -1,343 +1,343 @@
.align 2
gBerryPic_Cheri:: @ 8D9C3A8
.incbin "graphics/berries/pics/cheri.4bpp.lz"
.incbin "graphics/berries/cheri.4bpp.lz"
.align 2
gBerryPic_Oran:: @ 8D9C4FC
.incbin "graphics/berries/pics/oran.4bpp.lz"
.incbin "graphics/berries/oran.4bpp.lz"
.align 2
gBerryPic_Pecha:: @ 8D9C670
.incbin "graphics/berries/pics/pecha.4bpp.lz"
.incbin "graphics/berries/pecha.4bpp.lz"
.align 2
gBerryPic_Rawst:: @ 8D9C7E4
.incbin "graphics/berries/pics/rawst.4bpp.lz"
.incbin "graphics/berries/rawst.4bpp.lz"
.align 2
gBerryPic_Aspear:: @ 8D9C97C
.incbin "graphics/berries/pics/aspear.4bpp.lz"
.incbin "graphics/berries/aspear.4bpp.lz"
.align 2
gBerryPic_Leppa:: @ 8D9CB24
.incbin "graphics/berries/pics/leppa.4bpp.lz"
.incbin "graphics/berries/leppa.4bpp.lz"
.align 2
gBerryPic_Chesto:: @ 8D9CC94
.incbin "graphics/berries/pics/chesto.4bpp.lz"
.incbin "graphics/berries/chesto.4bpp.lz"
.align 2
gBerryPic_Persim:: @ 8D9CE78
.incbin "graphics/berries/pics/persim.4bpp.lz"
.incbin "graphics/berries/persim.4bpp.lz"
.align 2
gBerryPic_Lum:: @ 8D9CFC8
.incbin "graphics/berries/pics/lum.4bpp.lz"
.incbin "graphics/berries/lum.4bpp.lz"
.align 2
gBerryPic_Sitrus:: @ 8D9D0E4
.incbin "graphics/berries/pics/sitrus.4bpp.lz"
.incbin "graphics/berries/sitrus.4bpp.lz"
.align 2
gBerryPic_Figy:: @ 8D9D288
.incbin "graphics/berries/pics/figy.4bpp.lz"
.incbin "graphics/berries/figy.4bpp.lz"
.align 2
gBerryPic_Wiki:: @ 8D9D434
.incbin "graphics/berries/pics/wiki.4bpp.lz"
.incbin "graphics/berries/wiki.4bpp.lz"
.align 2
gBerryPic_Mago:: @ 8D9D628
.incbin "graphics/berries/pics/mago.4bpp.lz"
.incbin "graphics/berries/mago.4bpp.lz"
.align 2
gBerryPic_Aguav:: @ 8D9D7DC
.incbin "graphics/berries/pics/aguav.4bpp.lz"
.incbin "graphics/berries/aguav.4bpp.lz"
.align 2
gBerryPic_Iapapa:: @ 8D9D950
.incbin "graphics/berries/pics/iapapa.4bpp.lz"
.incbin "graphics/berries/iapapa.4bpp.lz"
.align 2
gBerryPic_Razz:: @ 8D9DC08
.incbin "graphics/berries/pics/razz.4bpp.lz"
.incbin "graphics/berries/razz.4bpp.lz"
.align 2
gBerryPic_Bluk:: @ 8D9DE38
.incbin "graphics/berries/pics/bluk.4bpp.lz"
.incbin "graphics/berries/bluk.4bpp.lz"
.align 2
gBerryPic_Nanab:: @ 8D9E020
.incbin "graphics/berries/pics/nanab.4bpp.lz"
.incbin "graphics/berries/nanab.4bpp.lz"
.align 2
gBerryPic_Wepear:: @ 8D9E194
.incbin "graphics/berries/pics/wepear.4bpp.lz"
.incbin "graphics/berries/wepear.4bpp.lz"
.align 2
gBerryPic_Pinap:: @ 8D9E35C
.incbin "graphics/berries/pics/pinap.4bpp.lz"
.incbin "graphics/berries/pinap.4bpp.lz"
.align 2
gBerryPic_Pomeg:: @ 8D9E570
.incbin "graphics/berries/pics/pomeg.4bpp.lz"
.incbin "graphics/berries/pomeg.4bpp.lz"
.align 2
gBerryPic_Kelpsy:: @ 8D9E718
.incbin "graphics/berries/pics/kelpsy.4bpp.lz"
.incbin "graphics/berries/kelpsy.4bpp.lz"
.align 2
gBerryPic_Qualot:: @ 8D9E8C0
.incbin "graphics/berries/pics/qualot.4bpp.lz"
.incbin "graphics/berries/qualot.4bpp.lz"
.align 2
gBerryPic_Hondew:: @ 8D9EA8C
.incbin "graphics/berries/pics/hondew.4bpp.lz"
.incbin "graphics/berries/hondew.4bpp.lz"
.align 2
gBerryPic_Grepa:: @ 8D9ECE4
.incbin "graphics/berries/pics/grepa.4bpp.lz"
.incbin "graphics/berries/grepa.4bpp.lz"
.align 2
gBerryPic_Tamato:: @ 8D9EE74
.incbin "graphics/berries/pics/tamato.4bpp.lz"
.incbin "graphics/berries/tamato.4bpp.lz"
.align 2
gBerryPic_Cornn:: @ 8D9F138
.incbin "graphics/berries/pics/cornn.4bpp.lz"
.incbin "graphics/berries/cornn.4bpp.lz"
.align 2
gBerryPic_Magost:: @ 8D9F33C
.incbin "graphics/berries/pics/magost.4bpp.lz"
.incbin "graphics/berries/magost.4bpp.lz"
.align 2
gBerryPic_Rabuta:: @ 8D9F4E0
.incbin "graphics/berries/pics/rabuta.4bpp.lz"
.incbin "graphics/berries/rabuta.4bpp.lz"
.align 2
gBerryPic_Nomel:: @ 8D9F7D4
.incbin "graphics/berries/pics/nomel.4bpp.lz"
.incbin "graphics/berries/nomel.4bpp.lz"
.align 2
gBerryPic_Spelon:: @ 8D9F9B0
.incbin "graphics/berries/pics/spelon.4bpp.lz"
.incbin "graphics/berries/spelon.4bpp.lz"
.align 2
gBerryPic_Pamtre:: @ 8D9FBA0
.incbin "graphics/berries/pics/pamtre.4bpp.lz"
.incbin "graphics/berries/pamtre.4bpp.lz"
.align 2
gBerryPic_Watmel:: @ 8D9FDF0
.incbin "graphics/berries/pics/watmel.4bpp.lz"
.incbin "graphics/berries/watmel.4bpp.lz"
.align 2
gBerryPic_Durin:: @ 8DA00D4
.incbin "graphics/berries/pics/durin.4bpp.lz"
.incbin "graphics/berries/durin.4bpp.lz"
.align 2
gBerryPic_Belue:: @ 8DA04A0
.incbin "graphics/berries/pics/belue.4bpp.lz"
.incbin "graphics/berries/belue.4bpp.lz"
.align 2
gBerryPic_Liechi:: @ 8DA0778
.incbin "graphics/berries/pics/liechi.4bpp.lz"
.incbin "graphics/berries/liechi.4bpp.lz"
.align 2
gBerryPic_Ganlon:: @ 8DA09D0
.incbin "graphics/berries/pics/ganlon.4bpp.lz"
.incbin "graphics/berries/ganlon.4bpp.lz"
.align 2
gBerryPic_Salac:: @ 8DA0B68
.incbin "graphics/berries/pics/salac.4bpp.lz"
.incbin "graphics/berries/salac.4bpp.lz"
.align 2
gBerryPic_Petaya:: @ 8DA0DAC
.incbin "graphics/berries/pics/petaya.4bpp.lz"
.incbin "graphics/berries/petaya.4bpp.lz"
.align 2
gBerryPic_Apicot:: @ 8DA1054
.incbin "graphics/berries/pics/apicot.4bpp.lz"
.incbin "graphics/berries/apicot.4bpp.lz"
.align 2
gBerryPic_Lansat:: @ 8DA11E4
.incbin "graphics/berries/pics/lansat.4bpp.lz"
.incbin "graphics/berries/lansat.4bpp.lz"
.align 2
gBerryPic_Starf:: @ 8DA13D8
.incbin "graphics/berries/pics/starf.4bpp.lz"
.incbin "graphics/berries/starf.4bpp.lz"
.align 2
gBerryPic_Enigma:: @ 8DA15A8
.incbin "graphics/berries/pics/enigma.4bpp.lz"
.incbin "graphics/berries/enigma.4bpp.lz"
.align 2
gBerryPalette_Cheri:: @ 8DA17C0
.incbin "graphics/berries/palettes/cheri.gbapal.lz"
.incbin "graphics/berries/cheri.gbapal.lz"
.align 2
gBerryPalette_Oran:: @ 8DA17E8
.incbin "graphics/berries/palettes/oran.gbapal.lz"
.incbin "graphics/berries/oran.gbapal.lz"
.align 2
gBerryPalette_Pecha:: @ 8DA1810
.incbin "graphics/berries/palettes/pecha.gbapal.lz"
.incbin "graphics/berries/pecha.gbapal.lz"
.align 2
gBerryPalette_Rawst:: @ 8DA1838
.incbin "graphics/berries/palettes/rawst.gbapal.lz"
.incbin "graphics/berries/rawst.gbapal.lz"
.align 2
gBerryPalette_Aspear:: @ 8DA1860
.incbin "graphics/berries/palettes/aspear.gbapal.lz"
.incbin "graphics/berries/aspear.gbapal.lz"
.align 2
gBerryPalette_Leppa:: @ 8DA1888
.incbin "graphics/berries/palettes/leppa.gbapal.lz"
.incbin "graphics/berries/leppa.gbapal.lz"
.align 2
gBerryPalette_Chesto:: @ 8DA18B0
.incbin "graphics/berries/palettes/chesto.gbapal.lz"
.incbin "graphics/berries/chesto.gbapal.lz"
.align 2
gBerryPalette_Persim:: @ 8DA18D8
.incbin "graphics/berries/palettes/persim.gbapal.lz"
.incbin "graphics/berries/persim.gbapal.lz"
.align 2
gBerryPalette_Lum:: @ 8DA1900
.incbin "graphics/berries/palettes/lum.gbapal.lz"
.incbin "graphics/berries/lum.gbapal.lz"
.align 2
gBerryPalette_Sitrus:: @ 8DA1928
.incbin "graphics/berries/palettes/sitrus.gbapal.lz"
.incbin "graphics/berries/sitrus.gbapal.lz"
.align 2
gBerryPalette_Figy:: @ 8DA1950
.incbin "graphics/berries/palettes/figy.gbapal.lz"
.incbin "graphics/berries/figy.gbapal.lz"
.align 2
gBerryPalette_Wiki:: @ 8DA1978
.incbin "graphics/berries/palettes/wiki.gbapal.lz"
.incbin "graphics/berries/wiki.gbapal.lz"
.align 2
gBerryPalette_Mago:: @ 8DA19A0
.incbin "graphics/berries/palettes/mago.gbapal.lz"
.incbin "graphics/berries/mago.gbapal.lz"
.align 2
gBerryPalette_Aguav:: @ 8DA19C8
.incbin "graphics/berries/palettes/aguav.gbapal.lz"
.incbin "graphics/berries/aguav.gbapal.lz"
.align 2
gBerryPalette_Iapapa:: @ 8DA19F0
.incbin "graphics/berries/palettes/iapapa.gbapal.lz"
.incbin "graphics/berries/iapapa.gbapal.lz"
.align 2
gBerryPalette_Razz:: @ 8DA1A18
.incbin "graphics/berries/palettes/razz.gbapal.lz"
.incbin "graphics/berries/razz.gbapal.lz"
.align 2
gBerryPalette_Bluk:: @ 8DA1A40
.incbin "graphics/berries/palettes/bluk.gbapal.lz"
.incbin "graphics/berries/bluk.gbapal.lz"
.align 2
gBerryPalette_Nanab:: @ 8DA1A68
.incbin "graphics/berries/palettes/nanab.gbapal.lz"
.incbin "graphics/berries/nanab.gbapal.lz"
.align 2
gBerryPalette_Wepear:: @ 8DA1A90
.incbin "graphics/berries/palettes/wepear.gbapal.lz"
.incbin "graphics/berries/wepear.gbapal.lz"
.align 2
gBerryPalette_Pinap:: @ 8DA1AB8
.incbin "graphics/berries/palettes/pinap.gbapal.lz"
.incbin "graphics/berries/pinap.gbapal.lz"
.align 2
gBerryPalette_Pomeg:: @ 8DA1AE0
.incbin "graphics/berries/palettes/pomeg.gbapal.lz"
.incbin "graphics/berries/pomeg.gbapal.lz"
.align 2
gBerryPalette_Kelpsy:: @ 8DA1B08
.incbin "graphics/berries/palettes/kelpsy.gbapal.lz"
.incbin "graphics/berries/kelpsy.gbapal.lz"
.align 2
gBerryPalette_Qualot:: @ 8DA1B30
.incbin "graphics/berries/palettes/qualot.gbapal.lz"
.incbin "graphics/berries/qualot.gbapal.lz"
.align 2
gBerryPalette_Hondew:: @ 8DA1B58
.incbin "graphics/berries/palettes/hondew.gbapal.lz"
.incbin "graphics/berries/hondew.gbapal.lz"
.align 2
gBerryPalette_Grepa:: @ 8DA1B80
.incbin "graphics/berries/palettes/grepa.gbapal.lz"
.incbin "graphics/berries/grepa.gbapal.lz"
.align 2
gBerryPalette_Tamato:: @ 8DA1BA8
.incbin "graphics/berries/palettes/tamato.gbapal.lz"
.incbin "graphics/berries/tamato.gbapal.lz"
.align 2
gBerryPalette_Cornn:: @ 8DA1BD0
.incbin "graphics/berries/palettes/cornn.gbapal.lz"
.incbin "graphics/berries/cornn.gbapal.lz"
.align 2
gBerryPalette_Magost:: @ 8DA1BF8
.incbin "graphics/berries/palettes/magost.gbapal.lz"
.incbin "graphics/berries/magost.gbapal.lz"
.align 2
gBerryPalette_Rabuta:: @ 8DA1C20
.incbin "graphics/berries/palettes/rabuta.gbapal.lz"
.incbin "graphics/berries/rabuta.gbapal.lz"
.align 2
gBerryPalette_Nomel:: @ 8DA1C48
.incbin "graphics/berries/palettes/nomel.gbapal.lz"
.incbin "graphics/berries/nomel.gbapal.lz"
.align 2
gBerryPalette_Spelon:: @ 8DA1C70
.incbin "graphics/berries/palettes/spelon.gbapal.lz"
.incbin "graphics/berries/spelon.gbapal.lz"
.align 2
gBerryPalette_Pamtre:: @ 8DA1C98
.incbin "graphics/berries/palettes/pamtre.gbapal.lz"
.incbin "graphics/berries/pamtre.gbapal.lz"
.align 2
gBerryPalette_Watmel:: @ 8DA1CC0
.incbin "graphics/berries/palettes/watmel.gbapal.lz"
.incbin "graphics/berries/watmel.gbapal.lz"
.align 2
gBerryPalette_Durin:: @ 8DA1CE8
.incbin "graphics/berries/palettes/durin.gbapal.lz"
.incbin "graphics/berries/durin.gbapal.lz"
.align 2
gBerryPalette_Belue:: @ 8DA1D10
.incbin "graphics/berries/palettes/belue.gbapal.lz"
.incbin "graphics/berries/belue.gbapal.lz"
.align 2
gBerryPalette_Liechi:: @ 8DA1D38
.incbin "graphics/berries/palettes/liechi.gbapal.lz"
.incbin "graphics/berries/liechi.gbapal.lz"
.align 2
gBerryPalette_Ganlon:: @ 8DA1D60
.incbin "graphics/berries/palettes/ganlon.gbapal.lz"
.incbin "graphics/berries/ganlon.gbapal.lz"
.align 2
gBerryPalette_Salac:: @ 8DA1D88
.incbin "graphics/berries/palettes/salac.gbapal.lz"
.incbin "graphics/berries/salac.gbapal.lz"
.align 2
gBerryPalette_Petaya:: @ 8DA1DB0
.incbin "graphics/berries/palettes/petaya.gbapal.lz"
.incbin "graphics/berries/petaya.gbapal.lz"
.align 2
gBerryPalette_Apicot:: @ 8DA1DD8
.incbin "graphics/berries/palettes/apicot.gbapal.lz"
.incbin "graphics/berries/apicot.gbapal.lz"
.align 2
gBerryPalette_Lansat:: @ 8DA1E00
.incbin "graphics/berries/palettes/lansat.gbapal.lz"
.incbin "graphics/berries/lansat.gbapal.lz"
.align 2
gBerryPalette_Starf:: @ 8DA1E28
.incbin "graphics/berries/palettes/starf.gbapal.lz"
.incbin "graphics/berries/starf.gbapal.lz"
.align 2
gBerryPalette_Enigma:: @ 8DA1E50
.incbin "graphics/berries/palettes/enigma.gbapal.lz"
.incbin "graphics/berries/enigma.gbapal.lz"

15
data/item_icon.s
View File

@@ -6,18 +6,3 @@
@ 8614410
.include "data/graphics/items/item_icon_table.inc"
gUnknown_08614FE0:: @ 8614FE0
.2byte 0
.2byte 0x8000
.2byte 0x2400
.2byte 0
gUnknown_08614FE8:: @ 8614FE8
obj_image_anim_frame 0, 0
obj_image_anim_end
gUnknown_08614FF0:: @ 8614FF0
.4byte gUnknown_08614FE8
gUnknown_08614FF4:: @ 8614FF4
spr_template 0, 0, gUnknown_08614FE0, gUnknown_08614FF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy

78
data/reset_rtc_screen.s
View File

@@ -1,78 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_08510404:: @ 8510404 struct BgTemplate
.4byte 0x000001f0
.align 2
gUnknown_08510408:: @ 8510408
window_template 0x00, 0x01, 0x01, 0x13, 0x09, 0x0f, 0x0155
window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x00e9
null_window_template
.align 2
gUnknown_08510420:: @ 8510420
window_template 0x00, 0x04, 0x09, 0x15, 0x02, 0x0f, 0x00bf
.align 2
gUnknown_08510428:: @ 8510428
.byte 3, 0, 1, 0, 15, 39, 0, 2, 0, 0, 0, 0
.byte 4, 0, 0, 0, 23, 0, 1, 3, 0, 0, 0, 0
.byte 5, 0, 0, 0, 59, 0, 2, 4, 0, 0, 0, 0
.byte 6, 0, 0, 0, 59, 0, 3, 5, 0, 0, 0, 0
.byte 7, 0, 0, 0, 0, 0, 4, 0, 6, 0, 0, 0
.align 2
gOamData_08510464:: @ 8510464
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.align 2
gResetRtcScreen_DownArrowGfx:: @ 851046C
.incbin "graphics/misc/reset_rtc_screen_downarrow.4bpp"
.align 2
gResetRtcScreen_RightArrowGfx:: @ 851048C
.incbin "graphics/misc/reset_rtc_screen_rightarrow.4bpp"
.align 2
gResetRtcScreen_ArrowPal: @ 85104AC
.incbin "graphics/misc/reset_rtc_screen_arrow.gbapal"
.align 2
gSpriteImageTable_85104B4:: @ 85104B4
obj_frame_tiles gResetRtcScreen_DownArrowGfx, 0x20
obj_frame_tiles gResetRtcScreen_RightArrowGfx, 0x20
.align 2
gUnknown_085104C4:: @ 85104C4
obj_pal gResetRtcScreen_ArrowPal, 0x1000
.align 2
gSpriteAnim_85104CC:: @ 85104CC
obj_image_anim_frame 0, 30
obj_image_anim_jump 0
.align 2
gSpriteAnim_85104D4: @ 85104D4
obj_image_anim_frame 0, 30, OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_jump 0
.align 2
gSpriteAnim_85104DC:: @ 85104DC
obj_image_anim_frame 1, 30
obj_image_anim_jump 0
.align 2
gSpriteAnimTable_85104E4:: @ 85104E4
.4byte gSpriteAnim_85104CC
.4byte gSpriteAnim_85104D4
.4byte gSpriteAnim_85104DC
.align 2
gSpriteTemplate_85104F0:: @ 85104F0
spr_template 0xFFFF, 0x1000, gOamData_08510464, gSpriteAnimTable_85104E4, gSpriteImageTable_85104B4, gDummySpriteAffineAnimTable, SpriteCallbackDummy

20
data/save.s
View File

@@ -1,20 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gSaveSectionOffsets:: @ 85CDC00
.2byte 0, 0xF2C
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF08
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF80
.2byte 0x3E00, 0xF80
.2byte 0x4D80, 0xF80
.2byte 0x5D00, 0xF80
.2byte 0x6C80, 0xF80
.2byte 0x7C00, 0x7D0

19
graphics/battle_anims/sprites/smokescreen_impact.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
98 148 49
57 98 197
0 0 0
0 0 0
0 0 0
164 156 106
197 197 148
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

19
graphics/battle_interface/ball_display.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
57 57 57
255 255 255
213 205 189
131 131 139
74 65 90
82 106 90
255 180 123
246 148 115
222 106 90
115 255 172
90 213 131
255 230 57
205 172 8
255 90 57
172 65 74

19
graphics/battle_interface/ball_status_bar.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
65 65 65
255 255 222
222 213 180
197 189 115
123 148 131
82 106 98
32 57 0
57 82 65
255 230 0
255 156 148
65 205 255
0 0 255
0 255 0
255 0 0
106 148 255

19
graphics/battle_interface/unk_battlebox.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
255 255 255
255 255 255
106 90 115
0 0 0
213 230 255
189 205 238
238 238 255
106 172 197
90 139 180
123 197 205
0 0 0
0 0 0
123 197 255
0 0 139
255 131 131
164 0 0

19
graphics/battle_interface/unused_window.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
82 106 98
180 197 213
148 139 139
106 98 90
255 189 57
230 148 65
255 255 255
115 255 172
74 205 123
32 164 82
0 123 41
255 255 213
131 205 238
213 230 230
82 139 189

0
graphics/berries/pics/aguav.png → graphics/berries/aguav.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 380 B

0
graphics/berries/pics/apicot.png → graphics/berries/apicot.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 397 B

0
graphics/berries/pics/aspear.png → graphics/berries/aspear.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 422 B

After

Width:  |  Height:  |  Size: 422 B

0
graphics/berries/pics/belue.png → graphics/berries/belue.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 644 B

After

Width:  |  Height:  |  Size: 644 B

0
graphics/berries/pics/bluk.png → graphics/berries/bluk.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 444 B

After

Width:  |  Height:  |  Size: 444 B

0
graphics/berries/pics/cheri.png → graphics/berries/cheri.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 355 B

0
graphics/berries/pics/chesto.png → graphics/berries/chesto.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 458 B

After

Width:  |  Height:  |  Size: 458 B

0
graphics/berries/pics/cornn.png → graphics/berries/cornn.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 485 B

0
graphics/berries/pics/durin.png → graphics/berries/durin.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 801 B

After

Width:  |  Height:  |  Size: 801 B

0
graphics/berries/pics/enigma.png → graphics/berries/enigma.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 497 B

After

Width:  |  Height:  |  Size: 497 B

0
graphics/berries/pics/figy.png → graphics/berries/figy.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 418 B

After

Width:  |  Height:  |  Size: 418 B

0
graphics/berries/pics/ganlon.png → graphics/berries/ganlon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 387 B

0
graphics/berries/pics/grepa.png → graphics/berries/grepa.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 397 B

0
graphics/berries/pics/hondew.png → graphics/berries/hondew.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 534 B

After

Width:  |  Height:  |  Size: 534 B

0
graphics/berries/pics/iapapa.png → graphics/berries/iapapa.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 624 B

After

Width:  |  Height:  |  Size: 624 B

0
graphics/berries/pics/kelpsy.png → graphics/berries/kelpsy.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 412 B

After

Width:  |  Height:  |  Size: 412 B

0
graphics/berries/pics/lansat.png → graphics/berries/lansat.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 474 B

0
graphics/berries/pics/leppa.png → graphics/berries/leppa.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

0
graphics/berries/pics/liechi.png → graphics/berries/liechi.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 561 B

After

Width:  |  Height:  |  Size: 561 B

0
graphics/berries/pics/lum.png → graphics/berries/lum.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 289 B

0
graphics/berries/pics/mago.png → graphics/berries/mago.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 409 B

After

Width:  |  Height:  |  Size: 409 B

0
graphics/berries/pics/magost.png → graphics/berries/magost.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 392 B

0
graphics/berries/pics/nanab.png → graphics/berries/nanab.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 363 B

0
graphics/berries/pics/nomel.png → graphics/berries/nomel.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 430 B

After

Width:  |  Height:  |  Size: 430 B

0
graphics/berries/pics/oran.png → graphics/berries/oran.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 340 B

19
graphics/berries/palettes/aguav.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
230 255 156
197 238 131
164 222 106
131 205 82
98 189 57
74 148 41
57 115 32
41 82 24
255 238 189
222 197 148
189 164 106
156 131 74
197 197 139
148 172 98
90 139 82

19
graphics/berries/palettes/apicot.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 197
238 238 255
189 205 238
148 180 230
106 148 222
65 123 213
65 98 148
222 255 131
197 230 123
172 213 115
148 189 106
123 172 98
90 131 82
57 164 156
255 230 98
205 164 98

19
graphics/berries/palettes/aspear.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
246 238 222
246 238 189
246 238 156
246 238 123
230 213 115
213 197 106
197 180 98
180 156 90
164 139 82
148 123 74
180 189 148
156 164 131
131 139 123
106 123 115
0 0 0

19
graphics/berries/palettes/belue.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 197
164 172 197
148 148 180
131 123 172
123 98 156
106 74 148
98 57 139
82 41 82
255 213 164
230 189 148
205 164 131
180 139 123
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/bluk.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 197
189 205 213
164 156 197
139 115 180
115 74 172
98 57 139
90 49 106
82 41 82
180 139 123
148 106 82
115 74 41
0 0 0
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/cheri.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
255 255 123
246 180 98
246 106 74
246 41 49
213 49 41
180 57 32
148 65 24
115 82 24
189 238 131
156 205 115
123 172 98
90 139 82
115 90 74
82 90 49
57 98 32

19
graphics/berries/palettes/chesto.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 197
148 205 255
123 172 238
98 148 222
82 123 213
65 98 180
57 74 148
230 197 164
213 172 148
197 156 131
180 131 115
164 115 98
148 98 82
156 205 115
74 106 197
90 139 82

19
graphics/berries/palettes/cornn.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 197
189 205 213
164 156 197
139 115 180
115 74 172
98 57 139
90 49 106
82 41 82
180 139 123
180 189 123
115 74 41
49 90 0
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/durin.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 246
230 255 156
197 238 131
164 222 106
131 205 82
98 189 57
98 164 57
98 139 57
255 246 197
255 222 148
139 98 49
222 172 98
189 148 98
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/enigma.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 246 246
148 131 123
115 98 98
82 74 74
57 49 49
24 24 24
0 0 0
246 238 222
222 205 197
205 180 172
180 156 156
164 131 131
148 106 115
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/figy.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 197 246
255 255 123
246 180 98
246 106 74
246 41 49
213 41 49
180 41 49
255 246 205
230 213 172
205 189 139
180 164 115
123 106 74
197 123 90
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/ganlon.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 197
222 255 255
189 230 255
164 197 238
139 172 222
115 148 213
90 123 197
65 98 189
65 65 123
246 238 164
222 205 139
205 180 123
180 156 106
164 131 90
123 172 98
90 139 82

19
graphics/berries/palettes/grepa.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
246 238 222
246 230 180
246 230 148
246 222 106
255 222 74
222 197 65
197 172 65
172 148 65
148 123 65
123 98 65
172 255 74
131 213 65
90 180 65
49 148 65
238 205 65

19
graphics/berries/palettes/hondew.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 246
230 255 156
197 238 131
164 222 106
131 205 82
98 189 57
98 164 57
98 139 57
255 246 197
255 222 148
255 197 98
222 172 98
189 148 98
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/iapapa.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 197 197
246 238 222
246 238 172
238 213 148
230 197 131
222 180 115
213 164 98
205 148 82
139 90 57
230 164 90
238 123 74
255 90 57
222 90 57
197 90 57
172 90 57
90 139 82

19
graphics/berries/palettes/kelpsy.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 197
189 205 213
164 156 197
139 115 180
115 74 172
98 57 139
90 49 106
82 41 82
180 139 123
148 106 82
115 74 41
0 0 0
189 222 255
156 197 230
131 172 205
106 148 189

19
graphics/berries/palettes/lansat.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 246 246
189 222 148
148 197 123
115 180 106
82 164 90
49 148 74
255 222 164
246 180 139
238 148 115
230 106 90
222 74 65
213 41 49
189 41 49
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/leppa.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
255 255 123
246 180 98
246 106 74
246 41 49
213 41 49
180 41 49
148 41 49
197 148 98
189 238 131
156 205 115
123 172 98
90 139 82
115 90 74
82 90 49
57 98 32

19
graphics/berries/palettes/liechi.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 246 246
255 255 123
246 180 98
246 106 74
246 41 49
213 41 49
180 41 49
255 255 255
238 230 213
222 205 172
205 180 131
197 164 90
255 205 131
238 164 98
222 123 65
213 90 32

19
graphics/berries/palettes/lum.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
98 246 246
255 255 222
238 255 189
230 255 156
197 230 131
172 205 115
148 180 90
123 156 74
115 115 74
106 82 74
0 0 0
0 0 0
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/mago.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
255 222 205
246 189 180
246 164 156
246 139 139
197 106 106
148 74 74
98 41 49
255 246 197
230 205 148
213 164 106
197 131 65
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/magost.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
255 222 205
246 189 180
246 164 156
246 139 139
222 123 123
197 106 106
180 90 90
255 246 197
230 131 131
246 148 148
197 131 65
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/nanab.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
255 222 205
246 189 180
246 164 156
246 139 139
197 106 106
148 74 74
98 41 49
255 246 197
230 205 148
213 164 106
197 131 65
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/nomel.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
246 238 222
246 230 180
246 230 148
246 222 106
255 222 74
238 197 65
222 180 65
205 156 65
189 139 65
123 98 65
172 255 74
131 213 65
90 180 65
246 205 65
238 205 65

19
graphics/berries/palettes/oran.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 197
189 205 213
156 172 213
123 148 213
90 123 213
65 98 213
65 82 180
65 65 148
74 49 115
148 106 82
115 74 41
0 0 0
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/pamtre.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
189 205 213
172 180 205
156 148 189
131 106 180
115 74 172
98 57 139
90 49 106
82 41 82
238 189 213
205 164 172
180 139 139
156 115 106
131 90 74
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/pecha.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
255 255 255
255 222 197
255 197 148
222 172 123
197 148 106
172 123 90
148 98 74
0 0 0
255 205 172
238 180 131
123 246 0
90 213 0
57 180 0
24 148 0
0 0 0

19
graphics/berries/palettes/persim.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
255 222 205
246 189 180
246 164 156
246 139 139
197 106 106
148 74 74
98 41 49
0 0 0
0 0 0
0 0 0
90 98 82
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/petaya.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 246 246
255 197 205
246 164 180
246 131 156
246 106 139
189 74 90
139 41 49
230 197 148
205 172 123
189 148 98
172 123 74
156 98 49
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/pinap.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
246 238 222
246 238 189
246 238 156
246 238 123
222 205 106
197 180 98
172 156 90
148 123 74
123 98 65
106 74 57
148 255 172
115 213 148
82 180 123
49 148 98
0 0 0

19
graphics/berries/palettes/pomeg.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
255 255 123
246 180 98
246 106 74
246 41 49
213 49 41
180 57 32
148 65 24
115 82 24
189 238 131
156 205 115
123 172 98
90 139 82
115 90 74
82 90 49
57 98 32

19
graphics/berries/palettes/qualot.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
255 222 205
246 189 180
246 164 156
246 139 139
197 106 106
148 74 74
98 41 49
255 246 197
230 205 148
213 164 106
197 131 65
189 238 131
156 205 115
123 172 98
90 139 82

19
graphics/berries/palettes/rabuta.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
197 197 246
230 255 156
197 238 131
164 222 106
131 205 82
98 189 57
98 164 57
98 139 57
255 246 197
230 213 172
205 189 156
180 164 131
156 139 115
139 115 98
90 106 57
90 139 82

19
graphics/berries/palettes/rawst.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 98 246
255 255 255
213 230 222
172 205 189
131 189 156
90 164 123
49 148 98
49 131 82
57 115 74
65 98 65
74 82 57
98 197 0
49 148 0
0 98 0
148 205 0
0 0 0

19
graphics/berries/palettes/razz.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
148 246 246
255 255 123
246 180 98
246 106 74
246 41 49
213 49 41
180 57 32
148 65 24
115 82 24
189 238 131
156 205 115
123 172 98
90 139 82
115 90 74
82 90 49
57 98 32

Some files were not shown because too many files have changed in this diff Show More