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

Merge branch 'master' into link

Browse Source
This commit is contained in:
PikalaxALT
2018-02-11 19:22:06 -05:00
parent f39053ee30 14a76793e5
commit ea347199a2
429 changed files with 56348 additions and 62508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim_80A5C6C.s
+169 -169
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80A9C70.s
+6 -6
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
asm/battle_anim_80D51AC.s
+54 -54
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]
asm/battle_anim_80FE840.s
+1124 -1124
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_815A0D4.s
+237 -237
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_8170478.s
+81 -81
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,8 +5068,8 @@ sub_8172ED0: @ 8172ED0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gAnimBankTarget
ldr r1, =gEffectBank
ldr r2, =gBattleAnimTarget
ldr r1, =gEffectBattler
ldrb r1, [r1]
strb r1, [r2]
bl DestroyAnimVisualTask
@@ -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
asm/battle_anim_sound_tasks.s
+17 -17
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
asm/battle_frontier_1.s
+40 -2
View File
@@ -7171,7 +7171,7 @@ _0819270A:
ldr r4, [sp, 0x24]
cmp r4, r0
bne _08192784
ldr r0, =gTrainerClassToNameIndex
ldr r0, =gFacilityClassToTrainerClass
adds r0, 0x3C
ldrb r5, [r0]
b _081927A2
@@ -12991,7 +12991,7 @@ sub_8195938: @ 8195938
push {r4,lr}
adds r3, r0, 0
movs r2, 0
ldr r4, =gTrainers + TRAINER_TUCKER * 0x28 + 0x4 @ Tucker's name
ldr r4, =(gTrainers + 806 * 0x28 + 0x4) @ TRAINER_TUCKER name
_08195940:
adds r0, r3, r2
adds r1, r2, r4
@@ -16009,6 +16009,44 @@ _0819715C:
pop {r0}
bx r0
.pool
thumb_func_end sub_8197080
thumb_func_start sub_8197184
sub_8197184: @ 8197184
push {r4,r5,lr}
adds r4, r1, 0
adds r5, r2, 0
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl GetWindowAttribute
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_0860EA6C
movs r2, 0x80
lsls r2, 1
lsls r4, 16
lsrs r4, 16
adds r3, r4, 0
bl LoadBgTiles
ldr r0, =gUnknown_0860EA4C
lsls r5, 20
lsrs r5, 16
adds r1, r5, 0
movs r2, 0x20
bl LoadPalette
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8197184
thumb_func_start sub_81971C4
sub_81971C4: @ 81971C4
push {lr}
bl sub_819645C
pop {r0}
bx r0
thumb_func_end sub_81971C4
.align 2, 0 @ Don't pad with nop.
asm/battle_frontier_2.s
+76 -12
View File
@@ -5,6 +5,70 @@
.text
thumb_func_start sub_819A44C
sub_819A44C: @ 819A44C
push {r4,r5,lr}
adds r5, r0, 0
ldrb r4, [r5, 0x5]
lsrs r4, 4
movs r0, 0x65
bl IndexOfSpritePaletteTag
lsls r0, 24
lsls r4, 16
lsrs r4, 16
lsrs r0, 24
cmp r4, r0
bne _0819A4BA
adds r0, r5, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _0819A4B0
ldrh r1, [r5, 0x2E]
movs r2, 0x2E
ldrsh r0, [r5, r2]
cmp r0, 0
beq _0819A484
subs r0, r1, 0x1
strh r0, [r5, 0x2E]
b _0819A4C2
_0819A484:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
bl __umodsi3
lsls r0, 16
cmp r0, 0
bne _0819A4A6
adds r0, r5, 0
movs r1, 0
bl StartSpriteAnim
movs r0, 0x20
strh r0, [r5, 0x2E]
b _0819A4C2
_0819A4A6:
adds r0, r5, 0
movs r1, 0x1
bl StartSpriteAnim
b _0819A4C2
_0819A4B0:
adds r0, r5, 0
movs r1, 0x1
bl StartSpriteAnimIfDifferent
b _0819A4C2
_0819A4BA:
adds r0, r5, 0
movs r1, 0
bl StartSpriteAnimIfDifferent
_0819A4C2:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_819A44C
thumb_func_start sub_819A4C8
sub_819A4C8: @ 819A4C8
push {lr}
@@ -12385,7 +12449,7 @@ sub_81A0C9C: @ 81A0C9C
bl sub_808BCF4
movs r0, 0
movs r1, 0x1
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
bl sub_81A0A70
pop {r0}
bx r0
@@ -14586,7 +14650,7 @@ sub_81A1EA8: @ 81A1EA8
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -14874,7 +14938,7 @@ sub_81A2134: @ 81A2134
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -15227,7 +15291,7 @@ sub_81A2460: @ 81A2460
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -15475,7 +15539,7 @@ sub_81A2698: @ 81A2698
strb r0, [r6]
ldrb r0, [r6]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r6]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -15778,7 +15842,7 @@ sub_81A2968: @ 81A2968
strb r0, [r5]
ldrb r0, [r5]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r5]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -16153,7 +16217,7 @@ sub_81A2C94: @ 81A2C94
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -16448,7 +16512,7 @@ sub_81A2F38: @ 81A2F38
strb r0, [r5]
ldrb r0, [r5]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r5]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -16526,7 +16590,7 @@ sub_81A2FF8: @ 81A2FF8
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -19573,7 +19637,7 @@ sub_81A4AA0: @ 81A4AA0
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -21034,7 +21098,7 @@ sub_81A5718: @ 81A5718
b _081A57D8
.pool
_081A576C:
ldr r0, =gBattleMoveFlags
ldr r0, =gMoveResultFlags
ldrb r1, [r0]
movs r0, 0x29
ands r0, r1
@@ -29783,7 +29847,7 @@ GetTrainerEncounterMusicIdInBattlePyramind: @ 81A9F3C
lsls r0, 16
lsrs r0, 16
movs r4, 0
ldr r3, =gTrainerClassToNameIndex
ldr r3, =gFacilityClassToTrainerClass
ldr r1, =gUnknown_0203BC88
ldr r2, [r1]
movs r1, 0x34
asm/battle_link_817C95C.s
+143 -143
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
ldr r0, =gEffectBattler
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
ldr r0, =gEffectBattler
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,8 +1301,8 @@ _0817D6F2:
strb r0, [r1]
bl _0817E0A6
_0817D704:
ldr r5, =gBattlePartyID
ldr r6, =gEffectBank
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -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,8 +1395,8 @@ _0817D7B2:
b _0817D934
.pool
_0817D7D8:
ldr r5, =gBattlePartyID
ldr r6, =gEffectBank
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -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,8 +1439,8 @@ _0817D7D8:
b _0817D88C
.pool
_0817D838:
ldr r5, =gBattlePartyID
ldr r6, =gEffectBank
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -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,8 +1627,8 @@ _0817D9AE:
movs r0, 0x9
b _0817E086
_0817D9C2:
ldr r5, =gBattlePartyID
ldr r6, =gEffectBank
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -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,8 +1702,8 @@ _0817DA48:
b _0817E0A6
.pool
_0817DA68:
ldr r5, =gBattlePartyID
ldr r6, =gEffectBank
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -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,8 +1790,8 @@ _0817DB10:
b _0817E0A6
.pool
_0817DB24:
ldr r5, =gBattlePartyID
ldr r6, =gEffectBank
ldr r5, =gBattlerPartyIndexes
ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -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
asm/battle_records.s
+1 -1
View File
@@ -667,7 +667,7 @@ sub_813C4BC: @ 813C4BC
strb r0, [r6]
ldrb r0, [r6]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r6]
movs r1, 0x11
bl FillWindowPixelBuffer
asm/battle_tower.s
+17 -17
View File
@@ -1340,7 +1340,7 @@ GetFrontierTrainerFrontSpriteId: @ 8162AA0
lsls r0, 1
cmp r4, r0
bne _08162AD0
ldr r1, =gUnknown_0831F578
ldr r1, =gFacilityClassToPicIndex
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000bed
@@ -1362,7 +1362,7 @@ _08162AE4:
ldr r0, =0x0000012b
cmp r4, r0
bhi _08162B08
ldr r2, =gUnknown_0831F578
ldr r2, =gFacilityClassToPicIndex
ldr r0, =gUnknown_0203BC88
ldr r1, [r0]
movs r0, 0x34
@@ -1383,7 +1383,7 @@ _08162B08:
ands r0, r1
cmp r0, 0
beq _08162B38
ldr r4, =gUnknown_0831F578
ldr r4, =gFacilityClassToPicIndex
bl sub_818649C
lsls r0, 24
lsrs r0, 24
@@ -1391,7 +1391,7 @@ _08162B08:
b _08162BC8
.pool
_08162B38:
ldr r3, =gUnknown_0831F578
ldr r3, =gFacilityClassToPicIndex
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =0xfffffed4
@@ -1413,7 +1413,7 @@ _08162B64:
ands r0, r1
cmp r0, 0
bne _08162BB0
ldr r4, =gUnknown_0831F578
ldr r4, =gFacilityClassToPicIndex
ldr r3, =gUnknown_08610970
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
@@ -1436,7 +1436,7 @@ _08162B64:
b _08162BC8
.pool
_08162BB0:
ldr r5, =gUnknown_0831F578
ldr r5, =gFacilityClassToPicIndex
ldr r4, =gUnknown_08610970
bl sub_81864A8
lsls r0, 24
@@ -1467,7 +1467,7 @@ GetFrontierOpponentClass: @ 8162BD8
lsls r0, 1
cmp r4, r0
bne _08162C08
ldr r1, =gTrainerClassToNameIndex
ldr r1, =gFacilityClassToTrainerClass
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000bed
@@ -1499,7 +1499,7 @@ _08162C38:
ldr r0, =0x0000012b
cmp r4, r0
bhi _08162C60
ldr r2, =gTrainerClassToNameIndex
ldr r2, =gFacilityClassToTrainerClass
ldr r0, =gUnknown_0203BC88
ldr r1, [r0]
movs r0, 0x34
@@ -1521,7 +1521,7 @@ _08162C60:
ands r0, r1
cmp r0, 0
beq _08162C90
ldr r4, =gTrainerClassToNameIndex
ldr r4, =gFacilityClassToTrainerClass
bl sub_818649C
lsls r0, 24
lsrs r0, 24
@@ -1530,7 +1530,7 @@ _08162C60:
b _08162D1E
.pool
_08162C90:
ldr r3, =gTrainerClassToNameIndex
ldr r3, =gFacilityClassToTrainerClass
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =0xfffffed4
@@ -1553,7 +1553,7 @@ _08162CBC:
ands r0, r1
cmp r0, 0
beq _08162CF4
ldr r5, =gTrainerClassToNameIndex
ldr r5, =gFacilityClassToTrainerClass
ldr r4, =gUnknown_08610970
bl sub_81864A8
lsls r0, 24
@@ -1568,7 +1568,7 @@ _08162CBC:
b _08162D1E
.pool
_08162CF4:
ldr r4, =gTrainerClassToNameIndex
ldr r4, =gFacilityClassToTrainerClass
ldr r3, =gUnknown_08610970
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
@@ -1736,7 +1736,7 @@ _08162E68:
ldr r0, =0x00000c03
cmp r5, r0
bne _08162E88
ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 @ Steven's name
ldr r2, =gTrainers + 804 * 0x28 + 0x4 @ TRAINER_STEVEN name
_08162E70:
adds r0, r6, r4
adds r1, r4, r2
@@ -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
@@ -5845,7 +5845,7 @@ _08165206:
thumb_func_start GetEreaderTrainerFrontSpriteId
GetEreaderTrainerFrontSpriteId: @ 8165244
ldr r1, =gUnknown_0831F578
ldr r1, =gFacilityClassToPicIndex
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000bed
@@ -5859,7 +5859,7 @@ GetEreaderTrainerFrontSpriteId: @ 8165244
thumb_func_start GetEreaderTrainerClassId
GetEreaderTrainerClassId: @ 8165264
ldr r1, =gTrainerClassToNameIndex
ldr r1, =gFacilityClassToTrainerClass
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000bed
@@ -6193,7 +6193,7 @@ _081654DE:
adds r4, r0
adds r0, r4, 0
movs r1, 0x7
ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 @ Steven's name
ldr r2, =gTrainers + 804 * 0x28 + 0x4 @ TRAINER_STEVEN name
bl SetMonData
movs r0, 0
str r0, [sp, 0x44]
asm/berry_tag_screen.s
-1538
View File
File diff suppressed because it is too large Load Diff
asm/contest.s
+13 -13
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]
asm/field_specials.s
+3 -3
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
asm/intro.s
+4 -4
View File
@@ -59,7 +59,7 @@ sub_816CC54: @ 816CC54
lsls r0, 24
cmp r0, 0
bne _0816CC66
ldr r0, =c2_title_screen_1
ldr r0, =CB2_InitTitleScreen
bl SetMainCallback2
_0816CC66:
pop {r0}
@@ -337,13 +337,13 @@ _0816CEFA:
.pool
thumb_func_end c2_copyright_1
thumb_func_start c2_show_copyright_and_intro_again_2
c2_show_copyright_and_intro_again_2: @ 816CF0C
thumb_func_start CB2_InitCopyrightScreenAfterTitleScreen
CB2_InitCopyrightScreenAfterTitleScreen: @ 816CF0C
push {lr}
bl do_copyright_screen
pop {r0}
bx r0
thumb_func_end c2_show_copyright_and_intro_again_2
thumb_func_end CB2_InitCopyrightScreenAfterTitleScreen
thumb_func_start task_intro_1
@ void task_intro_1(int task_id)
asm/item_icon.s
-468
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.
asm/item_menu.s
+1 -1
View File
@@ -4524,7 +4524,7 @@ ItemMenu_CheckTag: @ 81AD378
lsrs r0, 24
ldr r1, =gUnknown_0203CE54
ldr r2, [r1]
ldr r1, =sub_8177C14
ldr r1, =DoBerryTagScreen
str r1, [r2]
bl unknown_ItemMenu_Confirm
pop {r0}
asm/item_menu_icons.s
+10 -10
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.
asm/macros/battle_script.inc
+5 -5
View File
@@ -1373,11 +1373,11 @@
.endm
.macro jumpifmove move, jumpptr
jumpifhalfword EQUAL, gCurrentMove, \move, \jumpptr
jumpifhalfword CMP_EQUAL, gCurrentMove, \move, \jumpptr
.endm
.macro jumpifnotmove move, jumpptr
jumpifhalfword NOT_EQUAL, gCurrentMove, \move, \jumpptr
jumpifhalfword CMP_NOT_EQUAL, gCurrentMove, \move, \jumpptr
.endm
.macro jumpifstatus3 bank, status, jumpptr
@@ -1389,13 +1389,13 @@
.endm
.macro jumpifmovehadnoeffect jumpptr
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_NO_EFFECT, \jumpptr
.endm
.macro jumpifbattletype flags, jumpptr
jumpifword COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
jumpifword CMP_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
.endm
.macro jumpifnotbattletype flags, jumpptr
jumpifword NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
.endm
asm/main_menu.s
+1 -1
View File
@@ -1608,7 +1608,7 @@ _08030578:
ldr r0, =gUnknown_02022D06
strh r4, [r0]
bl FreeAllWindowBuffers
ldr r0, =c2_title_screen_1
ldr r0, =CB2_InitTitleScreen
bl SetMainCallback2
adds r0, r5, 0
bl DestroyTask
asm/mauville_old_man.s
+1 -1
View File
@@ -800,7 +800,7 @@ sub_8120708: @ 8120708
adds r5, r0, 0
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
movs r4, 0x1
str r4, [sp]
str r4, [sp, 0x4]
asm/menu.s
-5505
View File
File diff suppressed because it is too large Load Diff
asm/new_menu_helpers.s
-1178
View File
File diff suppressed because it is too large Load Diff
asm/party_menu.s
+204 -18
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,8 +16301,8 @@ _081B8BA8:
ldr r1, =gUnknown_0203CEE8
movs r0, 0x1
strb r0, [r1]
ldr r1, =gBattlePartyID
ldr r0, =gBankInMenu
ldr r1, =gBattlerPartyIndexes
ldr r0, =gBattlerInMenuId
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -16148,9 +16334,9 @@ _081B8BFC:
b _081B8C42
.pool
_081B8C20:
ldr r0, =gBankInMenu
ldr r0, =gBattlerInMenuId
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]
asm/player_pc.s
+4 -4
View File
@@ -463,7 +463,7 @@ sub_816B21C: @ 816B21C
adds r4, r0, 0
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -599,7 +599,7 @@ mapldr_080EBC0C: @ 816B33C
bl sub_81973A4
movs r0, 0
movs r1, 0x1
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldr r0, =sub_816B368
movs r1, 0
bl CreateTask
@@ -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
@@ -2540,7 +2540,7 @@ bx_battle_menu_t3: @ 816C3A4
bne _0816C3F2
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
movs r1, 0x6
ldrsh r0, [r5, r1]
cmp r0, 0
asm/pokemon_1.s
+2 -2
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
@@ -827,7 +827,7 @@ _08068BE0:
ldrb r0, [r1, 0x13]
lsls r0, 3
orrs r2, r0
ldr r1, =gTrainerClassToNameIndex
ldr r1, =gFacilityClassToTrainerClass
ldr r0, =gUnknown_08329D54
lsls r2, 1
adds r2, r0
asm/pokemon_item_effect.s
+29 -29
View File
@@ -77,7 +77,7 @@ ExecuteTableBasedItemEffect: @ 806BD28
cmp r0, 0
beq _0806BDA8
ldr r2, =gEnigmaBerries
ldr r0, =gBankInMenu
ldr r0, =gBattlerInMenuId
ldrb r1, [r0]
lsls r0, r1, 3
subs r0, r1
@@ -100,8 +100,8 @@ _0806BDBC:
lsrs r0, 24
_0806BDC4:
str r0, [sp, 0x34]
ldr r1, =gStringBank
ldr r0, =gBankInMenu
ldr r1, =gPotentialItemEffectBattler
ldr r0, =gBattlerInMenuId
ldrb r2, [r0]
strb r2, [r1]
ldr r0, =gMain
@@ -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
asm/pokemon_storage_system.s
+2 -2
View File
@@ -211,7 +211,7 @@ _080C72AC:
bl sub_81973A4
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -627,7 +627,7 @@ sub_80C75FC: @ 80C75FC
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
adds r0, r4, 0
movs r1, 0x5
mov r2, r8
asm/pokemon_summary_screen.s
+1 -1
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
asm/pokenav.s
+4 -4
View File
@@ -7890,7 +7890,7 @@ _081CAF34:
adds r0, r5, 0
bl sub_81D1BD0
adds r4, r0, 0
ldr r0, =gUnknown_0831F578
ldr r0, =gFacilityClassToPicIndex
adds r0, r4, r0
ldrb r0, [r0]
b _081CAF6C
@@ -28880,7 +28880,7 @@ sub_81D5530: @ 81D5530
lsls r1, 24
adds r0, r1
lsrs r0, 24
ldr r2, =gTrainerClassToNameIndex
ldr r2, =gFacilityClassToTrainerClass
ldr r1, =gUnknown_0203CF58
ldr r1, [r1]
adds r1, 0x16
@@ -28947,7 +28947,7 @@ sub_81D5588: @ 81D5588
adds r3, r0
ldrb r4, [r3, 0x1B]
bl sub_81D5710
ldr r0, =gUnknown_0831F578
ldr r0, =gFacilityClassToPicIndex
adds r4, r0
ldrb r0, [r4]
pop {r4}
@@ -30656,7 +30656,7 @@ sub_81D63C8: @ 81D63C8
ldrb r4, [r3, 0x1B]
bl sub_81D5710
movs r2, 0
ldr r0, =gTrainerClassToNameIndex
ldr r0, =gFacilityClassToTrainerClass
adds r4, r0
ldrb r3, [r4]
ldr r1, =gUnknown_0862A3B4
asm/rayquaza_scene.s
-5972
View File
File diff suppressed because it is too large Load Diff
asm/record_mixing.s
+1 -1
View File
@@ -461,7 +461,7 @@ sub_80E70F4: @ 80E70F4
adds r4, r0, 0
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
movs r0, 0x1
str r0, [sp]
movs r0, 0
asm/reset_rtc_screen.s
-1342
View File
File diff suppressed because it is too large Load Diff
asm/rom_8011DC0.s
+15 -15
View File
@@ -481,7 +481,7 @@ _08012938:
bl CopyWindowToVram
ldrb r0, [r6, 0xF]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0
ldr r1, =gUnknown_082F015C
@@ -497,7 +497,7 @@ _08012938:
strb r0, [r6, 0x12]
ldrb r0, [r6, 0x11]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r6, 0x11]
bl PutWindowTilemap
ldrb r0, [r6, 0x11]
@@ -1962,7 +1962,7 @@ _0801360C:
bl CopyWindowToVram
ldrb r0, [r6, 0xB]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0
ldr r1, =gUnknown_082F0204
@@ -1978,7 +1978,7 @@ _0801360C:
strb r0, [r6, 0xE]
ldrb r0, [r6, 0xD]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r6, 0xD]
bl PutWindowTilemap
ldrb r0, [r6, 0xD]
@@ -8275,7 +8275,7 @@ sub_8017020: @ 8017020
bl sub_81973A4
movs r0, 0
movs r1, 0x1
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldr r0, =gStringVar4
adds r1, r4, 0
bl StringExpandPlaceholders
@@ -8320,7 +8320,7 @@ _08017076:
bl sub_81973A4
movs r0, 0
movs r1, 0x1
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldr r0, =gStringVar4
adds r1, r5, 0
bl StringExpandPlaceholders
@@ -8412,7 +8412,7 @@ sub_8017118: @ 8017118
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
adds r0, r4, 0
movs r1, 0xFF
bl FillWindowPixelBuffer
@@ -8508,7 +8508,7 @@ _080171DC:
strb r0, [r5]
ldrb r0, [r5]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0
ldr r1, [sp, 0x24]
@@ -8621,7 +8621,7 @@ _080172C8:
strb r0, [r6]
ldrb r0, [r6]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldr r0, =gMultiuseListMenuTemplate
adds r2, r0, 0
ldr r1, [sp, 0x24]
@@ -11106,7 +11106,7 @@ sub_80186A4: @ 80186A4
movs r0, 0x3
bl GetBgTilemapBuffer
bl Free
ldr r0, =c2_title_screen_1
ldr r0, =CB2_InitTitleScreen
bl SetMainCallback2
pop {r0}
bx r0
@@ -28701,7 +28701,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
@@ -31662,7 +31662,7 @@ _08022D38:
_08022D42:
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldrb r1, [r5, 0x1]
movs r0, 0x2
mov r8, r0
@@ -34260,7 +34260,7 @@ _080241A6:
beq _0802421E
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldr r2, =gText_SavingDontTurnOffPower
movs r0, 0
str r0, [sp]
@@ -34617,7 +34617,7 @@ _0802445A:
_08024460:
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldrh r1, [r5, 0x14]
cmp r1, 0x3
bne _08024490
@@ -46350,7 +46350,7 @@ _0802A3A4:
_0802A3AE:
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldr r2, =gText_SavingDontTurnOffPower
str r4, [sp]
movs r0, 0x2
asm/roulette.s
+14 -14
View File
@@ -508,7 +508,7 @@ _081406E0:
ldr r4, =gUnknown_0203AB8C
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
ldr r2, =gUnknown_082A5B89
movs r1, 0x1
@@ -740,7 +740,7 @@ sub_8140914: @ 8140914
ldr r5, =gUnknown_0203AB8C
ldrb r0, [r5]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r5]
ldr r2, =gUnknown_082A5C13
movs r1, 0x1
@@ -2631,7 +2631,7 @@ sub_814189C: @ 814189C
ldr r4, =gUnknown_0203AB8C
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
ldr r2, =gUnknown_082A5BD7
b _08141902
@@ -2643,7 +2643,7 @@ _081418EC:
ldr r4, =gUnknown_0203AB8C
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
ldr r2, =gUnknown_082A5BCB
_08141902:
@@ -2667,7 +2667,7 @@ _08141928:
ldr r4, =gUnknown_0203AB8C
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
ldr r2, =gUnknown_082A5BE0
movs r1, 0x1
@@ -2805,7 +2805,7 @@ sub_8141A18: @ 8141A18
ldr r5, =gUnknown_0203AB8C
ldrb r0, [r5]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r5]
movs r1, 0x1
str r1, [sp]
@@ -3001,7 +3001,7 @@ _08141BB0:
ldr r4, =gUnknown_0203AB8C
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
ldr r2, =gUnknown_082A5C21
movs r1, 0x1
@@ -3028,7 +3028,7 @@ _08141C58:
ldr r4, =gUnknown_0203AB8C
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
ldr r2, =gUnknown_082A5C61
movs r1, 0x1
@@ -3060,7 +3060,7 @@ _08141CBC:
ldr r4, =gUnknown_0203AB8C
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
ldr r2, =gUnknown_082A5C04
movs r1, 0x1
@@ -3147,7 +3147,7 @@ _08141D44:
ldr r4, =gUnknown_0203AB8C
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
ldr r2, =gUnknown_082A5C61
movs r1, 0x1
@@ -4667,7 +4667,7 @@ sub_81429F0: @ 81429F0
bl StringExpandPlaceholders
movs r0, 0
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
str r5, [sp]
movs r0, 0xFF
str r0, [sp, 0x4]
@@ -4744,7 +4744,7 @@ sub_8142A88: @ 8142A88
beq _08142B28
movs r0, 0
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldr r2, =gUnknown_082A5B6B
str r7, [sp]
movs r0, 0xFF
@@ -4768,7 +4768,7 @@ _08142B28:
bl StringExpandPlaceholders
movs r0, 0
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
@@ -4798,7 +4798,7 @@ _08142B78:
bl StringExpandPlaceholders
movs r0, 0
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
str r7, [sp]
movs r0, 0xFF
str r0, [sp, 0x4]
asm/shop.s
+1 -1
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
asm/slot_machine.s
+4 -4
View File
@@ -975,7 +975,7 @@ sub_812ACF4: @ 812ACF4
sub sp, 0xC
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldr r2, =gText_YouDontHaveThreeCoins
movs r0, 0x1
str r0, [sp]
@@ -1543,7 +1543,7 @@ sub_812B158: @ 812B158
sub sp, 0xC
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldr r2, =gText_QuitTheGame
movs r0, 0x1
str r0, [sp]
@@ -1633,7 +1633,7 @@ sub_812B214: @ 812B214
sub sp, 0xC
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldr r2, =gText_YouveGot9999Coins
movs r0, 0x1
str r0, [sp]
@@ -1686,7 +1686,7 @@ sub_812B280: @ 812B280
sub sp, 0xC
movs r0, 0
movs r1, 0
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldr r2, =gText_YouveRunOutOfCoins
movs r0, 0x1
str r0, [sp]
asm/start_menu.s
+3 -3
View File
@@ -148,7 +148,7 @@ _0809F8E4:
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldr r1, =gUnknown_02037619
movs r0, 0
strb r0, [r1, 0x1]
@@ -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
@@ -1832,7 +1832,7 @@ _080A06EC:
strb r0, [r6]
ldrb r0, [r6]
movs r1, 0
bl sub_81973FC
bl NewMenuHelpers_DrawStdWindowFrame
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
asm/title_screen.s
-1321
View File
File diff suppressed because it is too large Load Diff
asm/trade.s
+1 -2
View File
@@ -1,7 +1,6 @@
.include "asm/macros.inc"
.include "constants/gba_constants.inc"
.include "constants/misc_constants.inc"
.include "constants/species_constants.inc"
.syntax unified
@@ -2400,7 +2399,7 @@ _08078726:
bne _08078766
adds r0, r4, 0
movs r1, 0x2
ldr r2, =gSpeciesNames + SPECIES_SHEDINJA * POKEMON_NAME_LENGTH
ldr r2, =gSpeciesNames + 303 * POKEMON_NAME_LENGTH @ SPECIES_SHEDINJA
bl SetMonData
_08078766:
adds r4, 0x64
asm/trainer_card.s
+1 -1
View File
@@ -409,7 +409,7 @@ _080C2A2C:
bl sub_800AC34
movs r0, 0
movs r1, 0x1
bl sub_81973C4
bl NewMenuHelpers_DrawDialogueFrame
ldr r2, =gText_WaitingTrainerFinishReading
movs r0, 0x1
str r0, [sp]
common_syms/battle_main.txt
+9
View File
@@ -0,0 +1,9 @@
gPreBattleCallback1
gBattleMainFunc
gBattleResults
gLeveledUpInBattle
gBattlerControllerFuncs
gHealthboxSpriteIds
gMultiUsePlayerCursor
gNumberOfMovesToChoose
gUnknown_03005D7C
constants/battle_constants.inc
-170
View File
@@ -1,170 +0,0 @@
@ battle types
.set BATTLE_TYPE_DOUBLE , 0x0001
.set BATTLE_TYPE_LINK, 0x0002
.set BATTLE_TYPE_WILD, 0x0004
.set BATTLE_TYPE_TRAINER, 0x0008
.set BATTLE_TYPE_FIRST_BATTLE, 0x0010
.set BATTLE_TYPE_20, 0x0020
.set BATTLE_TYPE_MULTI, 0x0040
.set BATTLE_TYPE_SAFARI, 0x0080
.set BATTLE_TYPE_BATTLE_TOWER, 0x0100
.set BATTLE_TYPE_WALLY_TUTORIAL, 0x0200
.set BATTLE_TYPE_ROAMER, 0x0400
.set BATTLE_TYPE_EREADER_TRAINER, 0x0800
.set BATTLE_TYPE_KYOGRE_GROUDON, 0x1000
.set BATTLE_TYPE_LEGENDARY, 0x2000
.set BATTLE_TYPE_REGI, 0x4000
.set BATTLE_TYPE_TWO_OPPONENTS, 0x8000
.set BATTLE_TYPE_DOME, 0x10000
.set BATTLE_TYPE_PALACE, 0x20000
.set BATTLE_TYPE_ARENA, 0x40000
.set BATTLE_TYPE_FACTORY, 0x80000
.set BATTLE_TYPE_PIKE, 0x100000
.set BATTLE_TYPE_PYRAMID, 0x200000
.set BATTLE_TYPE_INGAME_PARTNER, 0x400000
.set BATTLE_TYPE_x800000, 0x800000
.set BATTLE_TYPE_RECORDED, 0x1000000
.set BATTLE_TYPE_x2000000, 0x2000000
.set BATTLE_TYPE_x4000000, 0x4000000
.set BATTLE_TYPE_SECRET_BASE, 0x8000000
.set BATTLE_TYPE_GROUDON, 0x10000000
.set BATTLE_TYPE_KYOGRE, 0x20000000
.set BATTLE_TYPE_RAYQUAZA, 0x40000000
.set BATTLE_TYPE_x80000000, 0x80000000
@ battle outcomes
.set WON, 0x1
.set LOST, 0x2
.set DREW, 0x3
.set RAN, 0x4
.set PLAYER_TELEPORTED, 0x5
.set MON_FLED, 0x6
.set CAUGHT, 0x7
.set OUT_OF_BALLS, 0x8
.set FORFEITED, 0x9
.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
@ 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 STATUS_ANY, STATUS_SLEEP | STATUS_POISON | STATUS_BURN | STATUS_FREEZE | STATUS_PARALYSIS | STATUS_TOXIC_POISON
@ status 2
.set STATUS2_CONFUSION, 0x00000007
.set STATUS2_FLINCHED, 0x00000008
.set STATUS2_UPROAR, 0x00000070
.set STATUS2_BIDE, 0x00000300
.set STATUS2_LOCK_CONFUSE, 0x00000C00
.set STATUS2_MULTIPLETURNS, 0x00001000
.set STATUS2_WRAPPED, 0x0000E000
.set STATUS2_INFATUATION, 0x000F0000
.set STATUS2_FOCUS_ENERGY, 0x00100000
.set STATUS2_TRANSFORMED, 0x00200000
.set STATUS2_RECHARGE, 0x00400000
.set STATUS2_RAGE, 0x00800000
.set STATUS2_SUBSTITUTE, 0x01000000
.set STATUS2_DESTINY_BOND, 0x02000000
.set STATUS2_ESCAPE_PREVENTION, 0x04000000
.set STATUS2_NIGHTMARE, 0x08000000
.set STATUS2_CURSED, 0x10000000
.set STATUS2_FORESIGHT, 0x20000000
.set STATUS2_DEFENSE_CURL, 0x40000000
.set STATUS2_TORMENT, 0x80000000
@ status 3
.set STATUS3_LEECHSEED_BANK, 0x3
.set STATUS3_LEECHSEED, 0x4
.set STATUS3_ALWAYS_HITS, 0x18
.set STATUS3_PERISH_SONG, 0x20
.set STATUS3_ON_AIR, 0x40
.set STATUS3_UNDERGROUND, 0x80
.set STATUS3_MINIMIZED, 0x100
.set STATUS3_ROOTED, 0x400
.set STATUS3_CHARGED_UP, 0x200
.set STATUS3_YAWN, 0x1800
.set STATUS3_IMPRISONED_OTHERS, 0x2000
.set STATUS3_GRUDGE, 0x4000
.set STATUS3_CANT_SCORE_A_CRIT, 0x8000
.set STATUS3_MUDSPORT, 0x10000
.set STATUS3_WATERSPORT, 0x20000
.set STATUS3_UNDERWATER, 0x40000
.set STATUS3_INTIMIDATE_POKES, 0x80000
.set STATUS3_TRACE, 0x100000
@ side status
.set SIDE_STATUS_REFLECT, 0x1
.set SIDE_STATUS_LIGHTSCREEN, 0x2
.set SIDE_STATUS_X4, 0x4
.set SIDE_STATUS_SPIKES, 0x10
.set SIDE_STATUS_SAFEGUARD, 0x20
.set SIDE_STATUS_FUTUREATTACK, 0x40
.set SIDE_STATUS_MIST, 0x100
.set SIDE_STATUS_SPIKES_DAMAGED, 0x200
@ stats
.set HP, 0x0
.set ATK, 0x1
.set DEF, 0x2
.set SPEED, 0x3
.set SPATK, 0x4
.set SPDEF, 0x5
.set ACC, 0x6
.set EVASION, 0x7
@ weather flags
.set WEATHER_RAIN_TEMPORARY, 0x01
.set WEATHER_RAIN_DOWNPOUR, 0x02
.set WEATHER_RAIN_PERMANENT, 0x04
.set WEATHER_SANDSTORM_TEMPORARY, 0x08
.set WEATHER_SANDSTORM_PERMANENT, 0x10
.set WEATHER_SUN_TEMPORARY, 0x20
.set WEATHER_SUN_PERMANENT, 0x40
.set WEATHER_HAIL, 0x80
@ hitmarker
.set HITMARKER_x10, 0x00000010
.set HITMARKER_x20, 0x00000020
.set HITMARKER_DESTINYBOND, 0x00000040
.set HITMARKER_NO_ANIMATIONS, 0x00000080
.set HITMARKER_IGNORE_SUBSTITUTE, 0x00000100
.set HITMARKER_NO_ATTACKSTRING, 0x00000200
.set HITMARKER_ATTACKSTRING_PRINTED, 0x00000400
.set HITMARKER_NO_PPDEDUCT, 0x00000800
.set HITMARKER_PURSUIT_TRAP, 0x00001000
.set HITMARKER_IGNORE_SAFEGUARD, 0x00002000
.set HITMARKER_SYNCHRONISE_EFFECT, 0x00004000
.set HITMARKER_RUN, 0x00008000
.set HITMARKER_IGNORE_ON_AIR, 0x00010000
.set HITMARKER_IGNORE_UNDERGROUND, 0x00020000
.set HITMARKER_IGNORE_UNDERWATER, 0x00040000
.set HITMARKER_UNABLE_TO_USE_MOVE, 0x00080000
.set HITMARKER_x100000, 0x00100000
.set HITMARKER_x200000, 0x00200000
.set HITMARKER_x400000, 0x00400000
.set HITMARKER_x800000, 0x00800000
.set HITMARKER_GRUDGE, 0x01000000
.set HITMARKER_OBEYS, 0x02000000
.set HITMARKER_x4000000, 0x04000000
.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
constants/battle_script_constants.inc
-169
View File
@@ -1,169 +0,0 @@
@ animation ids
.set ANIM_CASTFORM_CHANGE, 0x0
.set ANIM_STATS_CHANGE, 0x1
.set ANIM_SUBSTITUTE_FADE, 0x2
.set ANIM_SUBSTITUTE_APPEAR, 0x3
.set ANIM_x4, 0x4
.set ANIM_ITEM_KNOCKOFF, 0x5
.set ANIM_TURN_TRAP, 0x6
.set ANIM_ITEM_EFFECT, 0x7
.set ANIM_SMOKEBALL_ESCAPE, 0x8
.set ANIM_HANGED_ON, 0x9
.set ANIM_RAIN_CONTINUES, 0xA
.set ANIM_SUN_CONTINUES, 0xB
.set ANIM_SANDSTORM_CONTINUES, 0xC
.set ANIM_HAIL_CONTINUES, 0xD
.set ANIM_LEECH_SEED_DRAIN, 0xE
.set ANIM_MON_HIT, 0xF
.set ANIM_ITEM_STEAL, 0x10
.set ANIM_SNATCH_MOVE, 0x11
.set ANIM_FUTURE_SIGHT_HIT, 0x12
.set ANIM_DOOM_DESIRE_HIT, 0x13
.set ANIM_x14, 0x14
.set ANIM_INGRAIN_HEAL, 0x15
.set ANIM_WISH_HEAL, 0x16
@ atk 80
.set ATK80_DMG_CHANGE_SIGN, 0x0
.set ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP, 0x1
.set ATK80_DMG_DOUBLED, 0x2
@ compare operands
.set EQUAL, 0x0
.set NOT_EQUAL, 0x1
.set GREATER_THAN, 0x2
.set LESS_THAN, 0x3
.set COMMON_BITS, 0x4
.set NO_COMMON_BITS, 0x5
@ move effects
.set EFFECT_SLEEP, 0x1
.set EFFECT_POISON, 0x2
.set EFFECT_BURN, 0x3
.set EFFECT_FREEZE, 0x4
.set EFFECT_PARALYSIS, 0x5
.set EFFECT_TOXIC, 0x6
.set EFFECT_CONFUSION, 0x7
.set EFFECT_FLINCH, 0x8
.set EFFECT_TRI_ATTACK, 0x9
.set EFFECT_UPROAR, 0xA
.set EFFECT_PAYDAY, 0xB
.set EFFECT_CHARGING, 0xC
.set EFFECT_WRAP, 0xD
.set EFFECT_RECOIL_25, 0xE
.set EFFECT_ATK_PLUS_1, 0xF
.set EFFECT_DEF_PLUS_1, 0x10
.set EFFECT_SPD_PLUS_1, 0x11
.set EFFECT_SP_ATK_PLUS_1, 0x12
.set EFFECT_SP_DEF_PLUS_1, 0x13
.set EFFECT_ACC_PLUS_1, 0x14
.set EFFECT_EVS_PLUS_1, 0x15
.set EFFECT_ATK_MINUS_1, 0x16
.set EFFECT_DEF_MINUS_1, 0x17
.set EFFECT_SPD_MINUS_1, 0x18
.set EFFECT_SP_ATK_MINUS_1, 0x19
.set EFFECT_SP_DEF_MINUS_1, 0x1A
.set EFFECT_ACC_MINUS_1, 0x1B
.set EFFECT_EVS_MINUS_1, 0x1C
.set EFFECT_RECHARGE, 0x1D
.set EFFECT_RAGE, 0x1E
.set EFFECT_STEAL_ITEM, 0x1F
.set EFFECT_PREVENT_ESCAPE, 0x20
.set EFFECT_NIGHTMARE, 0x21
.set EFFECT_ALL_STATS_UP, 0x22
.set EFFECT_RAPIDSPIN, 0x23
.set EFFECT_REMOVE_PARALYSIS, 0x24
.set EFFECT_ATK_DEF_DOWN, 0x25
.set EFFECT_RECOIL_33_PARALYSIS, 0x26
.set EFFECT_ATK_PLUS_2, 0x27
.set EFFECT_DEF_PLUS_2, 0x28
.set EFFECT_SPD_PLUS_2, 0x29
.set EFFECT_SP_ATK_PLUS_2, 0x2A
.set EFFECT_SP_DEF_PLUS_2, 0x2B
.set EFFECT_ACC_PLUS_2, 0x2C
.set EFFECT_EVS_PLUS_2, 0x2D
.set EFFECT_ATK_MINUS_2, 0x2E
.set EFFECT_DEF_MINUS_2, 0x2F
.set EFFECT_SPD_MINUS_2, 0x30
.set EFFECT_SP_ATK_MINUS_2, 0x31
.set EFFECT_SP_DEF_MINUS_2, 0x32
.set EFFECT_ACC_MINUS_2, 0x33
.set EFFECT_EVS_MINUS_2, 0x34
.set EFFECT_THRASH, 0x35
.set EFFECT_KNOCK_OFF, 0x36
.set EFFECT_NOTHING_37, 0x37
.set EFFECT_NOTHING_38, 0x38
.set EFFECT_NOTHING_39, 0x39
.set EFFECT_NOTHING_3A, 0x3A
.set EFFECT_SP_ATK_TWO_DOWN, 0x3B
.set EFFECT_NOTHING_3C, 0x3C
.set EFFECT_NOTHING_3D, 0x3D
.set EFFECT_NOTHING_3E, 0x3E
.set EFFECT_NOTHING_3F, 0x3F
.set AFFECTS_USER, 0x40
.set CERTAIN, 0x80
@ accuracy calc
.set NO_ACC_CALC, 0xFFFE
.set NO_ACC_CALC_CHECK_LOCK_ON, 0xFFFF
.set ACC_CURR_MOVE, 0x0
@ bank values
.set TARGET, 0x0
.set ATTACKER, 0x1
.set EFFECT_BANK, 0x2
.set GBANK_1, 0x3
.set ATTACKER_WITH_PARTNER, 0x4 @ only for cmd98
.set BANK0, 0x7
.set SCRIPTING_BANK, 0xA
.set OPPONENT1, 0xC
@ various
.set VARIOUS_CANCEL_MULTI_TURN_MOVES, 0
.set VARIOUS_SET_MAGIC_COAT_TARGET, 1
.set VARIOUS_IS_RUNNING_IMPOSSIBLE, 2
.set VARIOUS_GET_MOVE_TARGET, 3
.set VARIOUS_RESET_INTIMIDATE_TRACE_BITS, 5
.set VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP, 6
.set VARIOUS_EMIT_YESNOBOX, 13
.set VARIOUS_WAIT_CRY, 18
.set VARIOUS_RETURN_OPPONENT_MON1, 19
.set VARIOUS_RETURN_OPPONENT_MON2, 20
.set VARIOUS_SET_TELEPORT_OUTCOME, 25
.set VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC, 26
@ jumpifcant switch flag argument
.set ATK4F_DONT_CHECK_STATUSES, 0x80
@ battle scripting struct
.equiv sPAINSPLIT_HP, gBattleScripting
.equiv sBIDE_DMG, gBattleScripting + 4
.equiv sMULTIHIT_STRING, gBattleScripting + 8
.equiv sDMG_MULTIPLIER, gBattleScripting + 0xE
.equiv sTWOTURN_STRINGID, gBattleScripting + 0xF
.equiv sANIM_ARG1, gBattleScripting + 0x10
.equiv sANIM_ARG2, gBattleScripting + 0x11
.equiv sTRIPLE_KICK_POWER, gBattleScripting + 0x12
.equiv sMOVEEND_STATE, gBattleScripting + 0x14
.equiv sBANK_WITH_ABILITY, gBattleScripting + 0x15
.equiv sMULTIHIT_EFFECT, gBattleScripting + 0x16
.equiv sBANK, gBattleScripting + 0x17
.equiv sANIM_TURN, gBattleScripting + 0x18
.equiv sANIM_TARGETS_HIT, gBattleScripting + 0x19
.equiv sSTATCHANGER, gBattleScripting + 0x1A
.equiv sFIELD_1B, gBattleScripting + 0x1B
.equiv sGIVEEXP_STATE, gBattleScripting + 0x1C
.equiv sBATTLE_STYLE, gBattleScripting + 0x1D
.equiv sLVLBOX_STATE, gBattleScripting + 0x1E
.equiv sLEARNMOVE_STATE, gBattleScripting + 0x1F
.equiv sFIELD_20, gBattleScripting + 0x20
.equiv sRESHOW_MAIN_STATE, gBattleScripting + 0x21
.equiv sRESHOW_HELPER_STATE, gBattleScripting + 0x22
.equiv sFIELD_23, gBattleScripting + 0x23
.equiv sFIELD_24, gBattleScripting + 0x24
.equiv sMULTIPLAYER_ID, gBattleScripting + 0x25
@ battle communication struct
.equiv cEFFECT_CHOOSER, gBattleCommunication + 3
.equiv cMULTISTRING_CHOOSER, gBattleCommunication + 5
constants/battle_text.inc
-375
View File
@@ -1,375 +0,0 @@
.set STRINGID_INTROMSG, 0
.set STRINGID_INTROSENDOUT, 1
.set STRINGID_RETURNMON, 2
.set STRINGID_SWITCHINMON, 3
.set STRINGID_USEDMOVE, 4
.set STRINGID_BATTLEEND, 5
.set STRINGID_TRAINER1LOSETEXT, 12
.set STRINGID_PKMNGAINEDEXP, 13
.set STRINGID_PKMNGREWTOLV, 14
.set STRINGID_PKMNLEARNEDMOVE, 15
.set STRINGID_TRYTOLEARNMOVE1, 16
.set STRINGID_TRYTOLEARNMOVE2, 17
.set STRINGID_TRYTOLEARNMOVE3, 18
.set STRINGID_PKMNFORGOTMOVE, 19
.set STRINGID_STOPLEARNINGMOVE, 20
.set STRINGID_DIDNOTLEARNMOVE, 21
.set STRINGID_PKMNLEARNEDMOVE2, 22
.set STRINGID_ATTACKMISSED, 23
.set STRINGID_PKMNPROTECTEDITSELF, 24
.set STRINGID_STATSWONTINCREASE2, 25
.set STRINGID_AVOIDEDDAMAGE, 26
.set STRINGID_ITDOESNTAFFECT, 27
.set STRINGID_ATTACKERFAINTED, 28
.set STRINGID_TARGETFAINTED, 29
.set STRINGID_PLAYERGOTMONEY, 30
.set STRINGID_PLAYERWHITEOUT, 31
.set STRINGID_PLAYERWHITEOUT2, 32
.set STRINGID_PREVENTSESCAPE, 33
.set STRINGID_HITXTIMES, 34
.set STRINGID_PKMNFELLASLEEP, 35
.set STRINGID_PKMNMADESLEEP, 36
.set STRINGID_PKMNALREADYASLEEP, 37
.set STRINGID_PKMNALREADYASLEEP2, 38
.set STRINGID_PKMNWASNTAFFECTED, 39
.set STRINGID_PKMNWASPOISONED, 40
.set STRINGID_PKMNPOISONEDBY, 41
.set STRINGID_PKMNHURTBYPOISON, 42
.set STRINGID_PKMNALREADYPOISONED, 43
.set STRINGID_PKMNBADLYPOISONED, 44
.set STRINGID_PKMNENERGYDRAINED, 45
.set STRINGID_PKMNWASBURNED, 46
.set STRINGID_PKMNBURNEDBY, 47
.set STRINGID_PKMNHURTBYBURN, 48
.set STRINGID_PKMNWASFROZEN, 49
.set STRINGID_PKMNFROZENBY, 50
.set STRINGID_PKMNISFROZEN, 51
.set STRINGID_PKMNWASDEFROSTED, 52
.set STRINGID_PKMNWASDEFROSTED2, 53
.set STRINGID_PKMNWASDEFROSTEDBY, 54
.set STRINGID_PKMNWASPARALYZED, 55
.set STRINGID_PKMNWASPARALYZEDBY, 56
.set STRINGID_PKMNISPARALYZED, 57
.set STRINGID_PKMNISALREADYPARALYZED, 58
.set STRINGID_PKMNHEALEDPARALYSIS, 59
.set STRINGID_PKMNDREAMEATEN, 60
.set STRINGID_STATSWONTINCREASE, 61
.set STRINGID_STATSWONTDECREASE, 62
.set STRINGID_TEAMSTOPPEDWORKING, 63
.set STRINGID_FOESTOPPEDWORKING, 64
.set STRINGID_PKMNISCONFUSED, 65
.set STRINGID_PKMNHEALEDCONFUSION, 66
.set STRINGID_PKMNWASCONFUSED, 67
.set STRINGID_PKMNALREADYCONFUSED, 68
.set STRINGID_PKMNFELLINLOVE, 69
.set STRINGID_PKMNINLOVE, 70
.set STRINGID_PKMNIMMOBILIZEDBYLOVE, 71
.set STRINGID_PKMNBLOWNAWAY, 72
.set STRINGID_PKMNCHANGEDTYPE, 73
.set STRINGID_PKMNFLINCHED, 74
.set STRINGID_PKMNREGAINEDHEALTH, 75
.set STRINGID_PKMNHPFULL, 76
.set STRINGID_PKMNRAISEDSPDEF, 77
.set STRINGID_PKMNRAISEDDEF, 78
.set STRINGID_PKMNCOVEREDBYVEIL, 79
.set STRINGID_PKMNUSEDSAFEGUARD, 80
.set STRINGID_PKMNSAFEGUARDEXPIRED, 81
.set STRINGID_PKMNWENTTOSLEEP, 82
.set STRINGID_PKMNSLEPTHEALTHY, 83
.set STRINGID_PKMNWHIPPEDWHIRLWIND, 84
.set STRINGID_PKMNTOOKSUNLIGHT, 85
.set STRINGID_PKMNLOWEREDHEAD, 86
.set STRINGID_PKMNISGLOWING, 87
.set STRINGID_PKMNFLEWHIGH, 88
.set STRINGID_PKMNDUGHOLE, 89
.set STRINGID_PKMNSQUEEZEDBYBIND, 90
.set STRINGID_PKMNTRAPPEDINVORTEX, 91
.set STRINGID_PKMNWRAPPEDBY, 92
.set STRINGID_PKMNCLAMPED, 93
.set STRINGID_PKMNHURTBY, 94
.set STRINGID_PKMNFREEDFROM, 95
.set STRINGID_PKMNCRASHED, 96
.set STRINGID_PKMNSHROUDEDINMIST, 97
.set STRINGID_PKMNPROTECTEDBYMIST, 98
.set STRINGID_PKMNGETTINGPUMPED, 99
.set STRINGID_PKMNHITWITHRECOIL, 100
.set STRINGID_PKMNPROTECTEDITSELF2, 101
.set STRINGID_PKMNBUFFETEDBYSANDSTORM, 102
.set STRINGID_PKMNPELTEDBYHAIL, 103
.set STRINGID_PKMNSEEDED, 104
.set STRINGID_PKMNEVADEDATTACK, 105
.set STRINGID_PKMNSAPPEDBYLEECHSEED, 106
.set STRINGID_PKMNFASTASLEEP, 107
.set STRINGID_PKMNWOKEUP, 108
.set STRINGID_PKMNUPROARKEPTAWAKE, 109
.set STRINGID_PKMNWOKEUPINUPROAR, 110
.set STRINGID_PKMNCAUSEDUPROAR, 111
.set STRINGID_PKMNMAKINGUPROAR, 112
.set STRINGID_PKMNCALMEDDOWN, 113
.set STRINGID_PKMNCANTSLEEPINUPROAR, 114
.set STRINGID_PKMNSTOCKPILED, 115
.set STRINGID_PKMNCANTSTOCKPILE, 116
.set STRINGID_PKMNCANTSLEEPINUPROAR2, 117
.set STRINGID_UPROARKEPTPKMNAWAKE, 118
.set STRINGID_PKMNSTAYEDAWAKEUSING, 119
.set STRINGID_PKMNSTORINGENERGY, 120
.set STRINGID_PKMNUNLEASHEDENERGY, 121
.set STRINGID_PKMNFATIGUECONFUSION, 122
.set STRINGID_PKMNPICKEDUPITEM, 123
.set STRINGID_PKMNUNAFFECTED, 124
.set STRINGID_PKMNTRANSFORMEDINTO, 125
.set STRINGID_PKMNMADESUBSTITUTE, 126
.set STRINGID_PKMNHASSUBSTITUTE, 127
.set STRINGID_SUBSTITUTEDAMAGED, 128
.set STRINGID_PKMNSUBSTITUTEFADED, 129
.set STRINGID_PKMNMUSTRECHARGE, 130
.set STRINGID_PKMNRAGEBUILDING, 131
.set STRINGID_PKMNMOVEWASDISABLED, 132
.set STRINGID_PKMNMOVEISDISABLED, 133
.set STRINGID_PKMNMOVEDISABLEDNOMORE, 134
.set STRINGID_PKMNGOTENCORE, 135
.set STRINGID_PKMNENCOREENDED, 136
.set STRINGID_PKMNTOOKAIM, 137
.set STRINGID_PKMNSKETCHEDMOVE, 138
.set STRINGID_PKMNTRYINGTOTAKEFOE, 139
.set STRINGID_PKMNTOOKFOE, 140
.set STRINGID_PKMNREDUCEDPP, 141
.set STRINGID_PKMNSTOLEITEM, 142
.set STRINGID_TARGETCANTESCAPENOW, 143
.set STRINGID_PKMNFELLINTONIGHTMARE, 144
.set STRINGID_PKMNLOCKEDINNIGHTMARE, 145
.set STRINGID_PKMNLAIDCURSE, 146
.set STRINGID_PKMNAFFLICTEDBYCURSE, 147
.set STRINGID_SPIKESSCATTERED, 148
.set STRINGID_PKMNHURTBYSPIKES, 149
.set STRINGID_PKMNIDENTIFIED, 150
.set STRINGID_PKMNPERISHCOUNTFELL, 151
.set STRINGID_PKMNBRACEDITSELF, 152
.set STRINGID_PKMNENDUREDHIT, 153
.set STRINGID_MAGNITUDESTRENGTH, 154
.set STRINGID_PKMNCUTHPMAXEDATTACK, 155
.set STRINGID_PKMNCOPIEDSTATCHANGES, 156
.set STRINGID_PKMNGOTFREE, 157
.set STRINGID_PKMNSHEDLEECHSEED, 158
.set STRINGID_PKMNBLEWAWAYSPIKES, 159
.set STRINGID_PKMNFLEDFROMBATTLE, 160
.set STRINGID_PKMNFORESAWATTACK, 161
.set STRINGID_PKMNTOOKATTACK, 162
.set STRINGID_PKMNATTACK, 163
.set STRINGID_PKMNCENTERATTENTION, 164
.set STRINGID_PKMNCHARGINGPOWER, 165
.set STRINGID_NATUREPOWERTURNEDINTO, 166
.set STRINGID_PKMNSTATUSNORMAL, 167
.set STRINGID_PKMNHASNOMOVESLEFT, 168
.set STRINGID_PKMNSUBJECTEDTOTORMENT, 169
.set STRINGID_PKMNCANTUSEMOVETORMENT, 170
.set STRINGID_PKMNTIGHTENINGFOCUS, 171
.set STRINGID_PKMNFELLFORTAUNT, 172
.set STRINGID_PKMNCANTUSEMOVETAUNT, 173
.set STRINGID_PKMNREADYTOHELP, 174
.set STRINGID_PKMNSWITCHEDITEMS, 175
.set STRINGID_PKMNCOPIEDFOE, 176
.set STRINGID_PKMNMADEWISH, 177
.set STRINGID_PKMNWISHCAMETRUE, 178
.set STRINGID_PKMNPLANTEDROOTS, 179
.set STRINGID_PKMNABSORBEDNUTRIENTS, 180
.set STRINGID_PKMNANCHOREDITSELF, 181
.set STRINGID_PKMNWASMADEDROWSY, 182
.set STRINGID_PKMNKNOCKEDOFF, 183
.set STRINGID_PKMNSWAPPEDABILITIES, 184
.set STRINGID_PKMNSEALEDOPPONENTMOVE, 185
.set STRINGID_PKMNCANTUSEMOVESEALED, 186
.set STRINGID_PKMNWANTSGRUDGE, 187
.set STRINGID_PKMNLOSTPPGRUDGE, 188
.set STRINGID_PKMNSHROUDEDITSELF, 189
.set STRINGID_PKMNMOVEBOUNCED, 190
.set STRINGID_PKMNWAITSFORTARGET, 191
.set STRINGID_PKMNSNATCHEDMOVE, 192
.set STRINGID_PKMNMADEITRAIN, 193
.set STRINGID_PKMNRAISEDSPEED, 194
.set STRINGID_PKMNPROTECTEDBY, 195
.set STRINGID_PKMNPREVENTSUSAGE, 196
.set STRINGID_PKMNRESTOREDHPUSING, 197
.set STRINGID_PKMNCHANGEDTYPEWITH, 198
.set STRINGID_PKMNPREVENTSPARALYSISWITH, 199
.set STRINGID_PKMNPREVENTSROMANCEWITH, 200
.set STRINGID_PKMNPREVENTSPOISONINGWITH, 201
.set STRINGID_PKMNPREVENTSCONFUSIONWITH, 202
.set STRINGID_PKMNRAISEDFIREPOWERWITH, 203
.set STRINGID_PKMNANCHORSITSELFWITH, 204
.set STRINGID_PKMNCUTSATTACKWITH, 205
.set STRINGID_PKMNPREVENTSSTATLOSSWITH, 206
.set STRINGID_PKMNHURTSWITH, 207
.set STRINGID_PKMNTRACED, 208
.set STRINGID_STATSHARPLY, 209
.set STRINGID_STATROSE, 210
.set STRINGID_STATHARSHLY, 211
.set STRINGID_STATFELL, 212
.set STRINGID_PKMNSSTATCHANGED, 213
.set STRINGID_PKMNSSTATCHANGED2, 214
.set STRINGID_PKMNSSTATCHANGED3, 215
.set STRINGID_PKMNSSTATCHANGED4, 216
.set STRINGID_CRITICALHIT, 217
.set STRINGID_ONEHITKO, 218
.set STRINGID_123POOF, 219
.set STRINGID_ANDELLIPSIS, 220
.set STRINGID_NOTVERYEFFECTIVE, 221
.set STRINGID_SUPEREFFECTIVE, 222
.set STRINGID_GOTAWAYSAFELY, 223
.set STRINGID_WILDPKMNFLED, 224
.set STRINGID_NORUNNINGFROMTRAINERS, 225
.set STRINGID_CANTESCAPE, 226
.set STRINGID_DONTLEAVEBIRCH, 227
.set STRINGID_BUTNOTHINGHAPPENED, 228
.set STRINGID_BUTITFAILED, 229
.set STRINGID_ITHURTCONFUSION, 230
.set STRINGID_MIRRORMOVEFAILED, 231
.set STRINGID_STARTEDTORAIN, 232
.set STRINGID_DOWNPOURSTARTED, 233
.set STRINGID_RAINCONTINUES, 234
.set STRINGID_DOWNPOURCONTINUES, 235
.set STRINGID_RAINSTOPPED, 236
.set STRINGID_SANDSTORMBREWED, 237
.set STRINGID_SANDSTORMRAGES, 238
.set STRINGID_SANDSTORMSUBSIDED, 239
.set STRINGID_SUNLIGHTGOTBRIGHT, 240
.set STRINGID_SUNLIGHTSTRONG, 241
.set STRINGID_SUNLIGHTFADED, 242
.set STRINGID_STARTEDHAIL, 243
.set STRINGID_HAILCONTINUES, 244
.set STRINGID_HAILSTOPPED, 245
.set STRINGID_FAILEDTOSPITUP, 246
.set STRINGID_FAILEDTOSWALLOW, 247
.set STRINGID_WINDBECAMEHEATWAVE, 248
.set STRINGID_STATCHANGESGONE, 249
.set STRINGID_COINSSCATTERED, 250
.set STRINGID_TOOWEAKFORSUBSTITUTE, 251
.set STRINGID_SHAREDPAIN, 252
.set STRINGID_BELLCHIMED, 253
.set STRINGID_FAINTINTHREE, 254
.set STRINGID_NOPPLEFT, 255
.set STRINGID_BUTNOPPLEFT, 256
.set STRINGID_PLAYERUSEDITEM, 257
.set STRINGID_WALLYUSEDITEM, 258
.set STRINGID_TRAINERBLOCKEDBALL, 259
.set STRINGID_DONTBEATHIEF, 260
.set STRINGID_ITDODGEDBALL, 261
.set STRINGID_YOUMISSEDPKMN, 262
.set STRINGID_PKMNBROKEFREE, 263
.set STRINGID_ITAPPEAREDCAUGHT, 264
.set STRINGID_AARGHALMOSTHADIT, 265
.set STRINGID_SHOOTSOCLOSE, 266
.set STRINGID_GOTCHAPKMNCAUGHT, 267
.set STRINGID_GOTCHAPKMNCAUGHT2, 268
.set STRINGID_GIVENICKNAMECAPTURED, 269
.set STRINGID_PKMNSENTTOPC, 270
.set STRINGID_PKMNDATAADDEDTODEX, 271
.set STRINGID_ITISRAINING, 272
.set STRINGID_SANDSTORMISRAGING, 273
.set STRINGID_CANTESCAPE2, 274
.set STRINGID_PKMNIGNORESASLEEP, 275
.set STRINGID_PKMNIGNOREDORDERS, 276
.set STRINGID_PKMNBEGANTONAP, 277
.set STRINGID_PKMNLOAFING, 278
.set STRINGID_PKMNWONTOBEY, 279
.set STRINGID_PKMNTURNEDAWAY, 280
.set STRINGID_PKMNPRETENDNOTNOTICE, 281
.set STRINGID_ENEMYABOUTTOSWITCHPKMN, 282
.set STRINGID_CREPTCLOSER, 283
.set STRINGID_CANTGETCLOSER, 284
.set STRINGID_PKMNWATCHINGCAREFULLY, 285
.set STRINGID_PKMNCURIOUSABOUTX, 286
.set STRINGID_PKMNENTHRALLEDBYX, 287
.set STRINGID_PKMNIGNOREDX, 288
.set STRINGID_THREWPOKEBLOCKATPKMN, 289
.set STRINGID_OUTOFSAFARIBALLS, 290
.set STRINGID_PKMNSITEMCUREDPARALYSIS, 291
.set STRINGID_PKMNSITEMCUREDPOISON, 292
.set STRINGID_PKMNSITEMHEALEDBURN, 293
.set STRINGID_PKMNSITEMDEFROSTEDIT, 294
.set STRINGID_PKMNSITEMWOKEIT, 295
.set STRINGID_PKMNSITEMSNAPPEDOUT, 296
.set STRINGID_PKMNSITEMCUREDPROBLEM, 297
.set STRINGID_PKMNSITEMRESTOREDHEALTH, 298
.set STRINGID_PKMNSITEMRESTOREDPP, 299
.set STRINGID_PKMNSITEMRESTOREDSTATUS, 300
.set STRINGID_PKMNSITEMRESTOREDHPALITTLE, 301
.set STRINGID_ITEMALLOWSONLYYMOVE, 302
.set STRINGID_PKMNHUNGONWITHX, 303
.set STRINGID_EMPTYSTRING3, 304
.set STRINGID_PKMNSXPREVENTSBURNS, 305
.set STRINGID_PKMNSXBLOCKSY, 306
.set STRINGID_PKMNSXRESTOREDHPALITTLE2, 307
.set STRINGID_PKMNSXWHIPPEDUPSANDSTORM, 308
.set STRINGID_PKMNSXPREVENTSYLOSS, 309
.set STRINGID_PKMNSXINFATUATEDY, 310
.set STRINGID_PKMNSXMADEYINEFFECTIVE, 311
.set STRINGID_PKMNSXCUREDYPROBLEM, 312
.set STRINGID_ITSUCKEDLIQUIDOOZE, 313
.set STRINGID_PKMNTRANSFORMED, 314
.set STRINGID_ELECTRICITYWEAKENED, 315
.set STRINGID_FIREWEAKENED, 316
.set STRINGID_PKMNHIDUNDERWATER, 317
.set STRINGID_PKMNSPRANGUP, 318
.set STRINGID_HMMOVESCANTBEFORGOTTEN, 319
.set STRINGID_XFOUNDONEY, 320
.set STRINGID_PLAYERDEFEATEDTRAINER1, 321
.set STRINGID_SOOTHINGAROMA, 322
.set STRINGID_ITEMSCANTBEUSEDNOW, 323
.set STRINGID_FORXCOMMAYZ, 324
.set STRINGID_USINGXTHEYOFZN, 325
.set STRINGID_PKMNUSEDXTOGETPUMPED, 326
.set STRINGID_PKMNSXMADEYUSELESS, 327
.set STRINGID_PKMNTRAPPEDBYSANDTOMB, 328
.set STRINGID_EMPTYSTRING4, 329
.set STRINGID_ABOOSTED, 330
.set STRINGID_PKMNSXINTENSIFIEDSUN, 331
.set STRINGID_PKMNMAKESGROUNDMISS, 332
.set STRINGID_YOUTHROWABALLNOWRIGHT, 333
.set STRINGID_PKMNSXTOOKATTACK, 334
.set STRINGID_PKMNCHOSEXASDESTINY, 335
.set STRINGID_PKMNLOSTFOCUS, 336
.set STRINGID_USENEXTPKMN, 337
.set STRINGID_PKMNFLEDUSINGITS, 338
.set STRINGID_PKMNFLEDUSING, 339
.set STRINGID_PKMNWASDRAGGEDOUT, 340
.set STRINGID_PREVENTEDFROMWORKING, 341
.set STRINGID_PKMNSITEMNORMALIZEDSTATUS, 342
.set STRINGID_TRAINER1USEDITEM, 343
.set STRINGID_BOXISFULL, 344
.set STRINGID_PKMNAVOIDEDATTACK, 345
.set STRINGID_PKMNSXMADEITINEFFECTIVE, 346
.set STRINGID_PKMNSXPREVENTSFLINCHING, 347
.set STRINGID_PKMNALREADYHASBURN, 348
.set STRINGID_STATSWONTDECREASE2, 349
.set STRINGID_PKMNSXBLOCKSY2, 350
.set STRINGID_PKMNSXWOREOFF, 351
.set STRINGID_PKMNRAISEDDEFALITTLE, 352
.set STRINGID_PKMNRAISEDSPDEFALITTLE, 353
.set STRINGID_THEWALLSHATTERED, 354
.set STRINGID_PKMNSXPREVENTSYSZ, 355
.set STRINGID_PKMNSXCUREDITSYPROBLEM, 356
.set STRINGID_ATTACKERCANTESCAPE, 357
.set STRINGID_PKMNOBTAINEDX, 358
.set STRINGID_PKMNOBTAINEDX2, 359
.set STRINGID_PKMNOBTAINEDXYOBTAINEDZ, 360
.set STRINGID_BUTNOEFFECT, 361
.set STRINGID_PKMNSXHADNOEFFECTONY, 362
.set STRINGID_TWOENEMIESDEFEATED, 363
.set STRINGID_TRAINER2LOSETEXT, 364
.set STRINGID_PKMNINCAPABLEOFPOWER, 365
.set STRINGID_GLINTAPPEARSINEYE, 366
.set STRINGID_PKMNGETTINGINTOPOSITION, 367
.set STRINGID_PKMNBEGANGROWLINGDEEPLY, 368
.set STRINGID_PKMNEAGERFORMORE, 369
.set STRINGID_DEFEATEDOPPONENTBYREFEREE, 370
.set STRINGID_LOSTTOOPPONENTBYREFEREE, 371
.set STRINGID_TIEDOPPONENTBYREFEREE, 372
.set STRINGID_QUESTIONFORFEITMATCH, 373
.set STRINGID_FORFEITEDMATCH, 374
.set STRINGID_PKMNTRANSFERREDSOMEONESPC, 375
.set STRINGID_PKMNTRANSFERREDLANETTESPC, 376
.set STRINGID_PKMNBOXSOMEONESPCFULL, 377
.set STRINGID_PKMNBOXLANETTESPCFULL, 378
.set STRINGID_TRAINER1WINTEXT, 379
.set STRINGID_TRAINER2WINTEXT, 380
constants/constants.inc
-2
View File
@@ -1,11 +1,9 @@
.include "constants/gba_constants.inc"
.include "constants/misc_constants.inc"
.include "constants/type_constants.inc"
.include "constants/contest_constants.inc"
.include "constants/pokemon_data_constants.inc"
.include "constants/item_data_constants.inc"
.include "constants/battle_move_constants.inc"
.include "constants/trainer_constants.inc"
.include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc"
.include "constants/berry_constants.inc"
constants/pokemon_data_constants.inc
-43
View File
@@ -1,29 +1,3 @@
.set NATURE_HARDY, 0
.set NATURE_LONELY, 1
.set NATURE_BRAVE, 2
.set NATURE_ADAMANT, 3
.set NATURE_NAUGHTY, 4
.set NATURE_BOLD, 5
.set NATURE_DOCILE, 6
.set NATURE_RELAXED, 7
.set NATURE_IMPISH, 8
.set NATURE_LAX, 9
.set NATURE_TIMID, 10
.set NATURE_HASTY, 11
.set NATURE_SERIOUS, 12
.set NATURE_JOLLY, 13
.set NATURE_NAIVE, 14
.set NATURE_MODEST, 15
.set NATURE_MILD, 16
.set NATURE_QUIET, 17
.set NATURE_BASHFUL, 18
.set NATURE_RASH, 19
.set NATURE_CALM, 20
.set NATURE_GENTLE, 21
.set NATURE_SASSY, 22
.set NATURE_CAREFUL, 23
.set NATURE_QUIRKY, 24
.set GROWTH_MEDIUM_FAST, 0x00
.set GROWTH_ERRATIC, 0x01
.set GROWTH_FLUCTUATING, 0x02
@@ -31,23 +5,6 @@
.set GROWTH_FAST, 0x04
.set GROWTH_SLOW, 0x05
.set EGG_GROUP_NONE, 0x00
.set EGG_GROUP_MONSTER, 0x01
.set EGG_GROUP_WATER_1, 0x02
.set EGG_GROUP_BUG, 0x03
.set EGG_GROUP_FLYING, 0x04
.set EGG_GROUP_FIELD, 0x05
.set EGG_GROUP_FAIRY, 0x06
.set EGG_GROUP_GRASS, 0x07
.set EGG_GROUP_HUMAN_LIKE, 0x08
.set EGG_GROUP_WATER_3, 0x09
.set EGG_GROUP_MINERAL, 0x0a
.set EGG_GROUP_AMORPHOUS, 0x0b
.set EGG_GROUP_WATER_2, 0x0c
.set EGG_GROUP_DITTO, 0x0d
.set EGG_GROUP_DRAGON, 0x0e
.set EGG_GROUP_UNDISCOVERED, 0x0f
.set BODY_COLOR_RED, 0x00
.set BODY_COLOR_BLUE, 0x01
.set BODY_COLOR_YELLOW, 0x02
constants/species_constants.inc
-387
View File
@@ -1,387 +0,0 @@
.set SPECIES_BULBASAUR, 0x001
.set SPECIES_IVYSAUR, 0x002
.set SPECIES_VENUSAUR, 0x003
.set SPECIES_CHARMANDER, 0x004
.set SPECIES_CHARMELEON, 0x005
.set SPECIES_CHARIZARD, 0x006
.set SPECIES_SQUIRTLE, 0x007
.set SPECIES_WARTORTLE, 0x008
.set SPECIES_BLASTOISE, 0x009
.set SPECIES_CATERPIE, 0x00a
.set SPECIES_METAPOD, 0x00b
.set SPECIES_BUTTERFREE, 0x00c
.set SPECIES_WEEDLE, 0x00d
.set SPECIES_KAKUNA, 0x00e
.set SPECIES_BEEDRILL, 0x00f
.set SPECIES_PIDGEY, 0x010
.set SPECIES_PIDGEOTTO, 0x011
.set SPECIES_PIDGEOT, 0x012
.set SPECIES_RATTATA, 0x013
.set SPECIES_RATICATE, 0x014
.set SPECIES_SPEAROW, 0x015
.set SPECIES_FEAROW, 0x016
.set SPECIES_EKANS, 0x017
.set SPECIES_ARBOK, 0x018
.set SPECIES_PIKACHU, 0x019
.set SPECIES_RAICHU, 0x01a
.set SPECIES_SANDSHREW, 0x01b
.set SPECIES_SANDSLASH, 0x01c
.set SPECIES_NIDORAN_F, 0x01d
.set SPECIES_NIDORINA, 0x01e
.set SPECIES_NIDOQUEEN, 0x01f
.set SPECIES_NIDORAN_M, 0x020
.set SPECIES_NIDORINO, 0x021
.set SPECIES_NIDOKING, 0x022
.set SPECIES_CLEFAIRY, 0x023
.set SPECIES_CLEFABLE, 0x024
.set SPECIES_VULPIX, 0x025
.set SPECIES_NINETALES, 0x026
.set SPECIES_JIGGLYPUFF, 0x027
.set SPECIES_WIGGLYTUFF, 0x028
.set SPECIES_ZUBAT, 0x029
.set SPECIES_GOLBAT, 0x02a
.set SPECIES_ODDISH, 0x02b
.set SPECIES_GLOOM, 0x02c
.set SPECIES_VILEPLUME, 0x02d
.set SPECIES_PARAS, 0x02e
.set SPECIES_PARASECT, 0x02f
.set SPECIES_VENONAT, 0x030
.set SPECIES_VENOMOTH, 0x031
.set SPECIES_DIGLETT, 0x032
.set SPECIES_DUGTRIO, 0x033
.set SPECIES_MEOWTH, 0x034
.set SPECIES_PERSIAN, 0x035
.set SPECIES_PSYDUCK, 0x036
.set SPECIES_GOLDUCK, 0x037
.set SPECIES_MANKEY, 0x038
.set SPECIES_PRIMEAPE, 0x039
.set SPECIES_GROWLITHE, 0x03a
.set SPECIES_ARCANINE, 0x03b
.set SPECIES_POLIWAG, 0x03c
.set SPECIES_POLIWHIRL, 0x03d
.set SPECIES_POLIWRATH, 0x03e
.set SPECIES_ABRA, 0x03f
.set SPECIES_KADABRA, 0x040
.set SPECIES_ALAKAZAM, 0x041
.set SPECIES_MACHOP, 0x042
.set SPECIES_MACHOKE, 0x043
.set SPECIES_MACHAMP, 0x044
.set SPECIES_BELLSPROUT, 0x045
.set SPECIES_WEEPINBELL, 0x046
.set SPECIES_VICTREEBEL, 0x047
.set SPECIES_TENTACOOL, 0x048
.set SPECIES_TENTACRUEL, 0x049
.set SPECIES_GEODUDE, 0x04a
.set SPECIES_GRAVELER, 0x04b
.set SPECIES_GOLEM, 0x04c
.set SPECIES_PONYTA, 0x04d
.set SPECIES_RAPIDASH, 0x04e
.set SPECIES_SLOWPOKE, 0x04f
.set SPECIES_SLOWBRO, 0x050
.set SPECIES_MAGNEMITE, 0x051
.set SPECIES_MAGNETON, 0x052
.set SPECIES_FARFETCH_D, 0x053
.set SPECIES_DODUO, 0x054
.set SPECIES_DODRIO, 0x055
.set SPECIES_SEEL, 0x056
.set SPECIES_DEWGONG, 0x057
.set SPECIES_GRIMER, 0x058
.set SPECIES_MUK, 0x059
.set SPECIES_SHELLDER, 0x05a
.set SPECIES_CLOYSTER, 0x05b
.set SPECIES_GASTLY, 0x05c
.set SPECIES_HAUNTER, 0x05d
.set SPECIES_GENGAR, 0x05e
.set SPECIES_ONIX, 0x05f
.set SPECIES_DROWZEE, 0x060
.set SPECIES_HYPNO, 0x061
.set SPECIES_KRABBY, 0x062
.set SPECIES_KINGLER, 0x063
.set SPECIES_VOLTORB, 0x064
.set SPECIES_ELECTRODE, 0x065
.set SPECIES_EXEGGCUTE, 0x066
.set SPECIES_EXEGGUTOR, 0x067
.set SPECIES_CUBONE, 0x068
.set SPECIES_MAROWAK, 0x069
.set SPECIES_HITMONLEE, 0x06a
.set SPECIES_HITMONCHAN, 0x06b
.set SPECIES_LICKITUNG, 0x06c
.set SPECIES_KOFFING, 0x06d
.set SPECIES_WEEZING, 0x06e
.set SPECIES_RHYHORN, 0x06f
.set SPECIES_RHYDON, 0x070
.set SPECIES_CHANSEY, 0x071
.set SPECIES_TANGELA, 0x072
.set SPECIES_KANGASKHAN, 0x073
.set SPECIES_HORSEA, 0x074
.set SPECIES_SEADRA, 0x075
.set SPECIES_GOLDEEN, 0x076
.set SPECIES_SEAKING, 0x077
.set SPECIES_STARYU, 0x078
.set SPECIES_STARMIE, 0x079
.set SPECIES_MR_MIME, 0x07a
.set SPECIES_SCYTHER, 0x07b
.set SPECIES_JYNX, 0x07c
.set SPECIES_ELECTABUZZ, 0x07d
.set SPECIES_MAGMAR, 0x07e
.set SPECIES_PINSIR, 0x07f
.set SPECIES_TAUROS, 0x080
.set SPECIES_MAGIKARP, 0x081
.set SPECIES_GYARADOS, 0x082
.set SPECIES_LAPRAS, 0x083
.set SPECIES_DITTO, 0x084
.set SPECIES_EEVEE, 0x085
.set SPECIES_VAPOREON, 0x086
.set SPECIES_JOLTEON, 0x087
.set SPECIES_FLAREON, 0x088
.set SPECIES_PORYGON, 0x089
.set SPECIES_OMANYTE, 0x08a
.set SPECIES_OMASTAR, 0x08b
.set SPECIES_KABUTO, 0x08c
.set SPECIES_KABUTOPS, 0x08d
.set SPECIES_AERODACTYL, 0x08e
.set SPECIES_SNORLAX, 0x08f
.set SPECIES_ARTICUNO, 0x090
.set SPECIES_ZAPDOS, 0x091
.set SPECIES_MOLTRES, 0x092
.set SPECIES_DRATINI, 0x093
.set SPECIES_DRAGONAIR, 0x094
.set SPECIES_DRAGONITE, 0x095
.set SPECIES_MEWTWO, 0x096
.set SPECIES_MEW, 0x097
.set SPECIES_CHIKORITA, 0x098
.set SPECIES_BAYLEEF, 0x099
.set SPECIES_MEGANIUM, 0x09a
.set SPECIES_CYNDAQUIL, 0x09b
.set SPECIES_QUILAVA, 0x09c
.set SPECIES_TYPHLOSION, 0x09d
.set SPECIES_TOTODILE, 0x09e
.set SPECIES_CROCONAW, 0x09f
.set SPECIES_FERALIGATR, 0x0a0
.set SPECIES_SENTRET, 0x0a1
.set SPECIES_FURRET, 0x0a2
.set SPECIES_HOOTHOOT, 0x0a3
.set SPECIES_NOCTOWL, 0x0a4
.set SPECIES_LEDYBA, 0x0a5
.set SPECIES_LEDIAN, 0x0a6
.set SPECIES_SPINARAK, 0x0a7
.set SPECIES_ARIADOS, 0x0a8
.set SPECIES_CROBAT, 0x0a9
.set SPECIES_CHINCHOU, 0x0aa
.set SPECIES_LANTURN, 0x0ab
.set SPECIES_PICHU, 0x0ac
.set SPECIES_CLEFFA, 0x0ad
.set SPECIES_IGGLYBUFF, 0x0ae
.set SPECIES_TOGEPI, 0x0af
.set SPECIES_TOGETIC, 0x0b0
.set SPECIES_NATU, 0x0b1
.set SPECIES_XATU, 0x0b2
.set SPECIES_MAREEP, 0x0b3
.set SPECIES_FLAAFFY, 0x0b4
.set SPECIES_AMPHAROS, 0x0b5
.set SPECIES_BELLOSSOM, 0x0b6
.set SPECIES_MARILL, 0x0b7
.set SPECIES_AZUMARILL, 0x0b8
.set SPECIES_SUDOWOODO, 0x0b9
.set SPECIES_POLITOED, 0x0ba
.set SPECIES_HOPPIP, 0x0bb
.set SPECIES_SKIPLOOM, 0x0bc
.set SPECIES_JUMPLUFF, 0x0bd
.set SPECIES_AIPOM, 0x0be
.set SPECIES_SUNKERN, 0x0bf
.set SPECIES_SUNFLORA, 0x0c0
.set SPECIES_YANMA, 0x0c1
.set SPECIES_WOOPER, 0x0c2
.set SPECIES_QUAGSIRE, 0x0c3
.set SPECIES_ESPEON, 0x0c4
.set SPECIES_UMBREON, 0x0c5
.set SPECIES_MURKROW, 0x0c6
.set SPECIES_SLOWKING, 0x0c7
.set SPECIES_MISDREAVUS, 0x0c8
.set SPECIES_UNOWN, 0x0c9
.set SPECIES_WOBBUFFET, 0x0ca
.set SPECIES_GIRAFARIG, 0x0cb
.set SPECIES_PINECO, 0x0cc
.set SPECIES_FORRETRESS, 0x0cd
.set SPECIES_DUNSPARCE, 0x0ce
.set SPECIES_GLIGAR, 0x0cf
.set SPECIES_STEELIX, 0x0d0
.set SPECIES_SNUBBULL, 0x0d1
.set SPECIES_GRANBULL, 0x0d2
.set SPECIES_QWILFISH, 0x0d3
.set SPECIES_SCIZOR, 0x0d4
.set SPECIES_SHUCKLE, 0x0d5
.set SPECIES_HERACROSS, 0x0d6
.set SPECIES_SNEASEL, 0x0d7
.set SPECIES_TEDDIURSA, 0x0d8
.set SPECIES_URSARING, 0x0d9
.set SPECIES_SLUGMA, 0x0da
.set SPECIES_MAGCARGO, 0x0db
.set SPECIES_SWINUB, 0x0dc
.set SPECIES_PILOSWINE, 0x0dd
.set SPECIES_CORSOLA, 0x0de
.set SPECIES_REMORAID, 0x0df
.set SPECIES_OCTILLERY, 0x0e0
.set SPECIES_DELIBIRD, 0x0e1
.set SPECIES_MANTINE, 0x0e2
.set SPECIES_SKARMORY, 0x0e3
.set SPECIES_HOUNDOUR, 0x0e4
.set SPECIES_HOUNDOOM, 0x0e5
.set SPECIES_KINGDRA, 0x0e6
.set SPECIES_PHANPY, 0x0e7
.set SPECIES_DONPHAN, 0x0e8
.set SPECIES_PORYGON2, 0x0e9
.set SPECIES_STANTLER, 0x0ea
.set SPECIES_SMEARGLE, 0x0eb
.set SPECIES_TYROGUE, 0x0ec
.set SPECIES_HITMONTOP, 0x0ed
.set SPECIES_SMOOCHUM, 0x0ee
.set SPECIES_ELEKID, 0x0ef
.set SPECIES_MAGBY, 0x0f0
.set SPECIES_MILTANK, 0x0f1
.set SPECIES_BLISSEY, 0x0f2
.set SPECIES_RAIKOU, 0x0f3
.set SPECIES_ENTEI, 0x0f4
.set SPECIES_SUICUNE, 0x0f5
.set SPECIES_LARVITAR, 0x0f6
.set SPECIES_PUPITAR, 0x0f7
.set SPECIES_TYRANITAR, 0x0f8
.set SPECIES_LUGIA, 0x0f9
.set SPECIES_HO_OH, 0x0fa
.set SPECIES_CELEBI, 0x0fb
.set SPECIES_TREECKO, 0x115
.set SPECIES_GROVYLE, 0x116
.set SPECIES_SCEPTILE, 0x117
.set SPECIES_TORCHIC, 0x118
.set SPECIES_COMBUSKEN, 0x119
.set SPECIES_BLAZIKEN, 0x11a
.set SPECIES_MUDKIP, 0x11b
.set SPECIES_MARSHTOMP, 0x11c
.set SPECIES_SWAMPERT, 0x11d
.set SPECIES_POOCHYENA, 0x11e
.set SPECIES_MIGHTYENA, 0x11f
.set SPECIES_ZIGZAGOON, 0x120
.set SPECIES_LINOONE, 0x121
.set SPECIES_WURMPLE, 0x122
.set SPECIES_SILCOON, 0x123
.set SPECIES_BEAUTIFLY, 0x124
.set SPECIES_CASCOON, 0x125
.set SPECIES_DUSTOX, 0x126
.set SPECIES_LOTAD, 0x127
.set SPECIES_LOMBRE, 0x128
.set SPECIES_LUDICOLO, 0x129
.set SPECIES_SEEDOT, 0x12a
.set SPECIES_NUZLEAF, 0x12b
.set SPECIES_SHIFTRY, 0x12c
.set SPECIES_NINCADA, 0x12d
.set SPECIES_NINJASK, 0x12e
.set SPECIES_SHEDINJA, 0x12f
.set SPECIES_TAILLOW, 0x130
.set SPECIES_SWELLOW, 0x131
.set SPECIES_SHROOMISH, 0x132
.set SPECIES_BRELOOM, 0x133
.set SPECIES_SPINDA, 0x134
.set SPECIES_WINGULL, 0x135
.set SPECIES_PELIPPER, 0x136
.set SPECIES_SURSKIT, 0x137
.set SPECIES_MASQUERAIN, 0x138
.set SPECIES_WAILMER, 0x139
.set SPECIES_WAILORD, 0x13a
.set SPECIES_SKITTY, 0x13b
.set SPECIES_DELCATTY, 0x13c
.set SPECIES_KECLEON, 0x13d
.set SPECIES_BALTOY, 0x13e
.set SPECIES_CLAYDOL, 0x13f
.set SPECIES_NOSEPASS, 0x140
.set SPECIES_TORKOAL, 0x141
.set SPECIES_SABLEYE, 0x142
.set SPECIES_BARBOACH, 0x143
.set SPECIES_WHISCASH, 0x144
.set SPECIES_LUVDISC, 0x145
.set SPECIES_CORPHISH, 0x146
.set SPECIES_CRAWDAUNT, 0x147
.set SPECIES_FEEBAS, 0x148
.set SPECIES_MILOTIC, 0x149
.set SPECIES_CARVANHA, 0x14a
.set SPECIES_SHARPEDO, 0x14b
.set SPECIES_TRAPINCH, 0x14c
.set SPECIES_VIBRAVA, 0x14d
.set SPECIES_FLYGON, 0x14e
.set SPECIES_MAKUHITA, 0x14f
.set SPECIES_HARIYAMA, 0x150
.set SPECIES_ELECTRIKE, 0x151
.set SPECIES_MANECTRIC, 0x152
.set SPECIES_NUMEL, 0x153
.set SPECIES_CAMERUPT, 0x154
.set SPECIES_SPHEAL, 0x155
.set SPECIES_SEALEO, 0x156
.set SPECIES_WALREIN, 0x157
.set SPECIES_CACNEA, 0x158
.set SPECIES_CACTURNE, 0x159
.set SPECIES_SNORUNT, 0x15a
.set SPECIES_GLALIE, 0x15b
.set SPECIES_LUNATONE, 0x15c
.set SPECIES_SOLROCK, 0x15d
.set SPECIES_AZURILL, 0x15e
.set SPECIES_SPOINK, 0x15f
.set SPECIES_GRUMPIG, 0x160
.set SPECIES_PLUSLE, 0x161
.set SPECIES_MINUN, 0x162
.set SPECIES_MAWILE, 0x163
.set SPECIES_MEDITITE, 0x164
.set SPECIES_MEDICHAM, 0x165
.set SPECIES_SWABLU, 0x166
.set SPECIES_ALTARIA, 0x167
.set SPECIES_WYNAUT, 0x168
.set SPECIES_DUSKULL, 0x169
.set SPECIES_DUSCLOPS, 0x16a
.set SPECIES_ROSELIA, 0x16b
.set SPECIES_SLAKOTH, 0x16c
.set SPECIES_VIGOROTH, 0x16d
.set SPECIES_SLAKING, 0x16e
.set SPECIES_GULPIN, 0x16f
.set SPECIES_SWALOT, 0x170
.set SPECIES_TROPIUS, 0x171
.set SPECIES_WHISMUR, 0x172
.set SPECIES_LOUDRED, 0x173
.set SPECIES_EXPLOUD, 0x174
.set SPECIES_CLAMPERL, 0x175
.set SPECIES_HUNTAIL, 0x176
.set SPECIES_GOREBYSS, 0x177
.set SPECIES_ABSOL, 0x178
.set SPECIES_SHUPPET, 0x179
.set SPECIES_BANETTE, 0x17a
.set SPECIES_SEVIPER, 0x17b
.set SPECIES_ZANGOOSE, 0x17c
.set SPECIES_RELICANTH, 0x17d
.set SPECIES_ARON, 0x17e
.set SPECIES_LAIRON, 0x17f
.set SPECIES_AGGRON, 0x180
.set SPECIES_CASTFORM, 0x181
.set SPECIES_VOLBEAT, 0x182
.set SPECIES_ILLUMISE, 0x183
.set SPECIES_LILEEP, 0x184
.set SPECIES_CRADILY, 0x185
.set SPECIES_ANORITH, 0x186
.set SPECIES_ARMALDO, 0x187
.set SPECIES_RALTS, 0x188
.set SPECIES_KIRLIA, 0x189
.set SPECIES_GARDEVOIR, 0x18a
.set SPECIES_BAGON, 0x18b
.set SPECIES_SHELGON, 0x18c
.set SPECIES_SALAMENCE, 0x18d
.set SPECIES_BELDUM, 0x18e
.set SPECIES_METANG, 0x18f
.set SPECIES_METAGROSS, 0x190
.set SPECIES_REGIROCK, 0x191
.set SPECIES_REGICE, 0x192
.set SPECIES_REGISTEEL, 0x193
.set SPECIES_KYOGRE, 0x194
.set SPECIES_GROUDON, 0x195
.set SPECIES_RAYQUAZA, 0x196
.set SPECIES_LATIAS, 0x197
.set SPECIES_LATIOS, 0x198
.set SPECIES_JIRACHI, 0x199
.set SPECIES_DEOXYS, 0x19a
.set SPECIES_CHIMECHO, 0x19b
.set SPECIES_EGG, 0x19c
constants/trainer_constants.inc
-1122
View File
File diff suppressed because it is too large Load Diff
constants/type_constants.inc
-18
View File
@@ -1,18 +0,0 @@
.set TYPE_NORMAL, 0x00
.set TYPE_FIGHTING, 0x01
.set TYPE_FLYING, 0x02
.set TYPE_POISON, 0x03
.set TYPE_GROUND, 0x04
.set TYPE_ROCK, 0x05
.set TYPE_BUG, 0x06
.set TYPE_GHOST, 0x07
.set TYPE_STEEL, 0x08
.set TYPE_UNKNOWN, 0x09
.set TYPE_FIRE, 0x0a
.set TYPE_WATER, 0x0b
.set TYPE_GRASS, 0x0c
.set TYPE_ELECTRIC, 0x0d
.set TYPE_PSYCHIC, 0x0e
.set TYPE_ICE, 0x0f
.set TYPE_DRAGON, 0x10
.set TYPE_DARK, 0x11
data/base_stats.inc
-8635
View File
File diff suppressed because it is too large Load Diff
data/battle_ai_scripts.s
+156 -156
View File
@@ -1,11 +1,11 @@
.include "include/constants/battle_ai.h"
.include "include/constants/abilities.h"
.include "include/constants/items.h"
.include "include/constants/moves.h"
.include "include/constants/battle_move_effects.h"
.include "include/constants/hold_effects.h"
.include "constants/battle_constants.inc"
.include "constants/type_constants.inc"
#include "constants/battle.h"
#include "constants/battle_ai.h"
#include "constants/abilities.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/battle_move_effects.h"
#include "constants/hold_effects.h"
#include "constants/pokemon.h"
.include "asm/macros/battle_ai_script.inc"
.section script_data, "aw", %progbits
@@ -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
@@ -249,64 +249,64 @@ BattleAIScript_82DC341:
if_hp_less_than AI_USER, 51, Score_Minus10
BattleAIScript_82DC348:
if_stat_level_equal AI_USER, ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
end
BattleAIScript_82DC351:
if_stat_level_equal AI_USER, DEF, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10
end
BattleAIScript_82DC35A:
if_stat_level_equal AI_USER, SPEED, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus10
end
BattleAIScript_82DC363:
if_stat_level_equal AI_USER, SPATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10
end
BattleAIScript_82DC36C:
if_stat_level_equal AI_USER, SPDEF, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus10
end
BattleAIScript_82DC375:
if_stat_level_equal AI_USER, ACC, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_ACC, 12, Score_Minus10
end
BattleAIScript_82DC37E:
if_stat_level_equal AI_USER, EVASION, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_EVASION, 12, Score_Minus10
end
BattleAIScript_82DC387:
if_stat_level_equal AI_TARGET, ATK, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_HYPER_CUTTER, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC39C:
if_stat_level_equal AI_TARGET, DEF, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC3A9:
if_stat_level_equal AI_TARGET, SPEED, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_SPEED, 0, Score_Minus10
if_ability AI_TARGET, ABILITY_SPEED_BOOST, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC3BF:
if_stat_level_equal AI_TARGET, SPATK, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC3CC:
if_stat_level_equal AI_TARGET, SPDEF, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_SPDEF, 0, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC3D9:
if_stat_level_equal AI_TARGET, ACC, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_ACC, 0, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_KEEN_EYE, Score_Minus10
goto BattleAIScript_82DC3F6
BattleAIScript_82DC3EE:
if_stat_level_equal AI_TARGET, EVASION, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_EVASION, 0, Score_Minus10
BattleAIScript_82DC3F6:
get_ability AI_TARGET
@@ -315,20 +315,20 @@ BattleAIScript_82DC3F6:
end
BattleAIScript_82DC405:
if_stat_level_less_than AI_USER, ATK, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, DEF, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, SPEED, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, SPATK, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, SPDEF, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, ACC, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, EVASION, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, ATK, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, DEF, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, SPEED, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, SPATK, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, SPDEF, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, ACC, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, EVASION, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, STAT_ATK, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, STAT_DEF, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, STAT_SPEED, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, STAT_SPATK, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, STAT_SPDEF, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, STAT_ACC, 6, BattleAIScript_82DC47A
if_stat_level_less_than AI_USER, STAT_EVASION, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, STAT_ATK, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, STAT_DEF, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, STAT_SPEED, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, STAT_SPATK, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, STAT_SPDEF, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, STAT_ACC, 6, BattleAIScript_82DC47A
if_stat_level_more_than AI_TARGET, STAT_EVASION, 6, BattleAIScript_82DC47A
goto Score_Minus10
BattleAIScript_82DC47A:
@@ -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:
@@ -436,8 +436,8 @@ BattleAIScript_82DC5B0:
end
BattleAIScript_82DC5BB:
if_stat_level_equal AI_USER, ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, DEF, 12, Score_Minus8
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8
end
BattleAIScript_82DC5CC:
@@ -484,8 +484,8 @@ BattleAIScript_82DC635:
end
BattleAIScript_82DC640:
if_stat_level_equal AI_TARGET, ATK, 0, Score_Minus10
if_stat_level_equal AI_TARGET, SPATK, 0, Score_Minus8
if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus8
BattleAIScript_82DC650:
count_usable_party_mons AI_USER
@@ -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:
@@ -574,18 +574,18 @@ BattleAIScript_82DC71E:
end
BattleAIScript_82DC729:
if_stat_level_equal AI_TARGET, ATK, 0, Score_Minus10
if_stat_level_equal AI_TARGET, DEF, 0, Score_Minus8
if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus8
end
BattleAIScript_82DC73A:
if_stat_level_equal AI_USER, DEF, 12, Score_Minus10
if_stat_level_equal AI_USER, SPDEF, 12, Score_Minus8
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8
end
BattleAIScript_82DC74B:
if_stat_level_equal AI_USER, ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, DEF, 12, Score_Minus8
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8
end
BattleAIScript_82DC75C:
@@ -593,13 +593,13 @@ BattleAIScript_82DC75C:
end
BattleAIScript_82DC767:
if_stat_level_equal AI_USER, SPATK, 12, Score_Minus10
if_stat_level_equal AI_USER, SPDEF, 12, Score_Minus8
if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8
end
BattleAIScript_82DC778:
if_stat_level_equal AI_USER, ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, SPEED, 12, Score_Minus8
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus8
end
Score_Minus1:
@@ -805,9 +805,9 @@ BattleAIScript_82DCAC7:
end
BattleAIScript_82DCAC8:
if_stat_level_less_than AI_TARGET, EVASION, 7, BattleAIScript_82DCAE2
if_stat_level_less_than AI_TARGET, STAT_EVASION, 7, BattleAIScript_82DCAE2
score -1
if_stat_level_less_than AI_TARGET, EVASION, 10, BattleAIScript_82DCAE2
if_stat_level_less_than AI_TARGET, STAT_EVASION, 10, BattleAIScript_82DCAE2
if_random_less_than 128, BattleAIScript_82DCAE2
score -1
@@ -906,7 +906,7 @@ sMovesTable_82DCB6C:
.2byte -1
BattleAIScript_82DCBBC:
if_stat_level_less_than AI_USER, ATK, 9, BattleAIScript_82DCBD1
if_stat_level_less_than AI_USER, STAT_ATK, 9, BattleAIScript_82DCBD1
if_random_less_than 100, BattleAIScript_82DCBE0
score -1
goto BattleAIScript_82DCBE0
@@ -928,7 +928,7 @@ BattleAIScript_82DCBF6:
end
BattleAIScript_82DCBF7:
if_stat_level_less_than AI_USER, DEF, 9, BattleAIScript_82DCC0C
if_stat_level_less_than AI_USER, STAT_DEF, 9, BattleAIScript_82DCC0C
if_random_less_than 100, BattleAIScript_82DCC1B
score -1
goto BattleAIScript_82DCC1B
@@ -986,7 +986,7 @@ BattleAIScript_82DCC72:
end
BattleAIScript_82DCC73:
if_stat_level_less_than AI_USER, SPATK, 9, BattleAIScript_82DCC88
if_stat_level_less_than AI_USER, STAT_SPATK, 9, BattleAIScript_82DCC88
if_random_less_than 100, BattleAIScript_82DCC97
score -1
goto BattleAIScript_82DCC97
@@ -1008,7 +1008,7 @@ BattleAIScript_82DCCAD:
end
BattleAIScript_82DCCAE:
if_stat_level_less_than AI_USER, SPDEF, 9, BattleAIScript_82DCCC3
if_stat_level_less_than AI_USER, STAT_SPDEF, 9, BattleAIScript_82DCCC3
if_random_less_than 100, BattleAIScript_82DCCD2
score -1
goto BattleAIScript_82DCCD2
@@ -1054,7 +1054,7 @@ sTypesTable_82DCD0A:
.byte -1
BattleAIScript_82DCD14:
if_stat_level_less_than AI_USER, ACC, 9, BattleAIScript_82DCD24
if_stat_level_less_than AI_USER, STAT_ACC, 9, BattleAIScript_82DCD24
if_random_less_than 50, BattleAIScript_82DCD24
score -2
@@ -1071,12 +1071,12 @@ BattleAIScript_82DCD2E:
score +3
BattleAIScript_82DCD3D:
if_stat_level_less_than AI_USER, EVASION, 9, BattleAIScript_82DCD4D
if_stat_level_less_than AI_USER, STAT_EVASION, 9, BattleAIScript_82DCD4D
if_random_less_than 128, BattleAIScript_82DCD4D
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
@@ -1101,7 +1101,7 @@ BattleAIScript_82DCD90:
BattleAIScript_82DCDA2:
if_hp_more_than AI_USER, 70, BattleAIScript_82DCDC7
if_stat_level_equal AI_USER, EVASION, 6, BattleAIScript_82DCDC7
if_stat_level_equal AI_USER, STAT_EVASION, 6, BattleAIScript_82DCDC7
if_hp_less_than AI_USER, 40, BattleAIScript_82DCDC5
if_hp_less_than AI_TARGET, 40, BattleAIScript_82DCDC5
if_random_less_than 70, BattleAIScript_82DCDC7
@@ -1113,10 +1113,10 @@ BattleAIScript_82DCDC7:
end
BattleAIScript_82DCDC8:
if_stat_level_more_than AI_TARGET, EVASION, 10, BattleAIScript_82DCDED
if_stat_level_less_than AI_USER, ACC, 2, BattleAIScript_82DCDED
if_stat_level_more_than AI_TARGET, EVASION, 8, BattleAIScript_82DCDEF
if_stat_level_less_than AI_USER, ACC, 4, BattleAIScript_82DCDEF
if_stat_level_more_than AI_TARGET, STAT_EVASION, 10, BattleAIScript_82DCDED
if_stat_level_less_than AI_USER, STAT_ACC, 2, BattleAIScript_82DCDED
if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, BattleAIScript_82DCDEF
if_stat_level_less_than AI_USER, STAT_ACC, 4, BattleAIScript_82DCDEF
goto BattleAIScript_82DCDF7
BattleAIScript_82DCDED:
@@ -1130,13 +1130,13 @@ BattleAIScript_82DCDF7:
end
BattleAIScript_82DCDF8:
if_stat_level_equal AI_TARGET, ATK, 6, BattleAIScript_82DCE1B
if_stat_level_equal AI_TARGET, STAT_ATK, 6, BattleAIScript_82DCE1B
score -1
if_hp_more_than AI_USER, 90, BattleAIScript_82DCE0B
score -1
BattleAIScript_82DCE0B:
if_stat_level_more_than AI_TARGET, ATK, 3, BattleAIScript_82DCE1B
if_stat_level_more_than AI_TARGET, STAT_ATK, 3, BattleAIScript_82DCE1B
if_random_less_than 50, BattleAIScript_82DCE1B
score -2
@@ -1166,7 +1166,7 @@ sTypesTable_82DCE43:
BattleAIScript_82DCE4A:
if_hp_less_than AI_USER, 70, BattleAIScript_82DCE59
if_stat_level_more_than AI_TARGET, DEF, 3, BattleAIScript_82DCE61
if_stat_level_more_than AI_TARGET, STAT_DEF, 3, BattleAIScript_82DCE61
BattleAIScript_82DCE59:
if_random_less_than 50, BattleAIScript_82DCE61
@@ -1198,13 +1198,13 @@ BattleAIScript_82DCE96:
end
BattleAIScript_82DCE97:
if_stat_level_equal AI_TARGET, ATK, 6, BattleAIScript_82DCEBA
if_stat_level_equal AI_TARGET, STAT_ATK, 6, BattleAIScript_82DCEBA
score -1
if_hp_more_than AI_USER, 90, BattleAIScript_82DCEAA
score -1
BattleAIScript_82DCEAA:
if_stat_level_more_than AI_TARGET, SPATK, 3, BattleAIScript_82DCEBA
if_stat_level_more_than AI_TARGET, STAT_SPATK, 3, BattleAIScript_82DCEBA
if_random_less_than 50, BattleAIScript_82DCEBA
score -2
@@ -1236,7 +1236,7 @@ sTypesTable_82DCEE2:
BattleAIScript_82DCEEB:
if_hp_less_than AI_USER, 70, BattleAIScript_82DCEFA
if_stat_level_more_than AI_TARGET, SPDEF, 3, BattleAIScript_82DCF02
if_stat_level_more_than AI_TARGET, STAT_SPDEF, 3, BattleAIScript_82DCF02
BattleAIScript_82DCEFA:
if_random_less_than 50, BattleAIScript_82DCF02
@@ -1258,12 +1258,12 @@ BattleAIScript_82DCF1A:
score -1
BattleAIScript_82DCF22:
if_stat_level_more_than AI_USER, ACC, 4, BattleAIScript_82DCF32
if_stat_level_more_than AI_USER, STAT_ACC, 4, BattleAIScript_82DCF32
if_random_less_than 80, BattleAIScript_82DCF32
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
@@ -1284,7 +1284,7 @@ BattleAIScript_82DCF68:
BattleAIScript_82DCF7A:
if_hp_more_than AI_USER, 70, BattleAIScript_82DCF9F
if_stat_level_equal AI_TARGET, ACC, 6, BattleAIScript_82DCF9F
if_stat_level_equal AI_TARGET, STAT_ACC, 6, BattleAIScript_82DCF9F
if_hp_less_than AI_USER, 40, BattleAIScript_82DCF9D
if_hp_less_than AI_TARGET, 40, BattleAIScript_82DCF9D
if_random_less_than 70, BattleAIScript_82DCF9F
@@ -1297,7 +1297,7 @@ BattleAIScript_82DCF9F:
BattleAIScript_82DCFA0:
if_hp_less_than AI_USER, 70, BattleAIScript_82DCFAF
if_stat_level_more_than AI_TARGET, EVASION, 3, BattleAIScript_82DCFB7
if_stat_level_more_than AI_TARGET, STAT_EVASION, 3, BattleAIScript_82DCFB7
BattleAIScript_82DCFAF:
if_random_less_than 50, BattleAIScript_82DCFB7
@@ -1311,16 +1311,16 @@ BattleAIScript_82DCFC0:
end
BattleAIScript_82DCFC1:
if_stat_level_more_than AI_USER, ATK, 8, BattleAIScript_82DD016
if_stat_level_more_than AI_USER, DEF, 8, BattleAIScript_82DD016
if_stat_level_more_than AI_USER, SPATK, 8, BattleAIScript_82DD016
if_stat_level_more_than AI_USER, SPDEF, 8, BattleAIScript_82DD016
if_stat_level_more_than AI_USER, EVASION, 8, BattleAIScript_82DD016
if_stat_level_less_than AI_TARGET, ATK, 4, BattleAIScript_82DD016
if_stat_level_less_than AI_TARGET, DEF, 4, BattleAIScript_82DD016
if_stat_level_less_than AI_TARGET, SPATK, 4, BattleAIScript_82DD016
if_stat_level_less_than AI_TARGET, SPDEF, 4, BattleAIScript_82DD016
if_stat_level_less_than AI_TARGET, ACC, 4, BattleAIScript_82DD016
if_stat_level_more_than AI_USER, STAT_ATK, 8, BattleAIScript_82DD016
if_stat_level_more_than AI_USER, STAT_DEF, 8, BattleAIScript_82DD016
if_stat_level_more_than AI_USER, STAT_SPATK, 8, BattleAIScript_82DD016
if_stat_level_more_than AI_USER, STAT_SPDEF, 8, BattleAIScript_82DD016
if_stat_level_more_than AI_USER, STAT_EVASION, 8, BattleAIScript_82DD016
if_stat_level_less_than AI_TARGET, STAT_ATK, 4, BattleAIScript_82DD016
if_stat_level_less_than AI_TARGET, STAT_DEF, 4, BattleAIScript_82DD016
if_stat_level_less_than AI_TARGET, STAT_SPATK, 4, BattleAIScript_82DD016
if_stat_level_less_than AI_TARGET, STAT_SPDEF, 4, BattleAIScript_82DD016
if_stat_level_less_than AI_TARGET, STAT_ACC, 4, BattleAIScript_82DD016
goto BattleAIScript_82DD01E
BattleAIScript_82DD016:
@@ -1328,16 +1328,16 @@ BattleAIScript_82DD016:
score -3
BattleAIScript_82DD01E:
if_stat_level_more_than AI_TARGET, ATK, 8, BattleAIScript_82DD07B
if_stat_level_more_than AI_TARGET, DEF, 8, BattleAIScript_82DD07B
if_stat_level_more_than AI_TARGET, SPATK, 8, BattleAIScript_82DD07B
if_stat_level_more_than AI_TARGET, SPDEF, 8, BattleAIScript_82DD07B
if_stat_level_more_than AI_TARGET, EVASION, 8, BattleAIScript_82DD07B
if_stat_level_less_than AI_USER, ATK, 4, BattleAIScript_82DD07B
if_stat_level_less_than AI_USER, DEF, 4, BattleAIScript_82DD07B
if_stat_level_less_than AI_USER, SPATK, 4, BattleAIScript_82DD07B
if_stat_level_less_than AI_USER, SPDEF, 4, BattleAIScript_82DD07B
if_stat_level_less_than AI_USER, ACC, 4, BattleAIScript_82DD07B
if_stat_level_more_than AI_TARGET, STAT_ATK, 8, BattleAIScript_82DD07B
if_stat_level_more_than AI_TARGET, STAT_DEF, 8, BattleAIScript_82DD07B
if_stat_level_more_than AI_TARGET, STAT_SPATK, 8, BattleAIScript_82DD07B
if_stat_level_more_than AI_TARGET, STAT_SPDEF, 8, BattleAIScript_82DD07B
if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, BattleAIScript_82DD07B
if_stat_level_less_than AI_USER, STAT_ATK, 4, BattleAIScript_82DD07B
if_stat_level_less_than AI_USER, STAT_DEF, 4, BattleAIScript_82DD07B
if_stat_level_less_than AI_USER, STAT_SPATK, 4, BattleAIScript_82DD07B
if_stat_level_less_than AI_USER, STAT_SPDEF, 4, BattleAIScript_82DD07B
if_stat_level_less_than AI_USER, STAT_ACC, 4, BattleAIScript_82DD07B
if_random_less_than 50, BattleAIScript_82DD083
score -1
goto BattleAIScript_82DD083
@@ -1357,11 +1357,11 @@ BattleAIScript_82DD08D:
end
BattleAIScript_82DD08E:
if_stat_level_more_than AI_TARGET, ATK, 8, BattleAIScript_82DD0BD
if_stat_level_more_than AI_TARGET, DEF, 8, BattleAIScript_82DD0BD
if_stat_level_more_than AI_TARGET, SPATK, 8, BattleAIScript_82DD0BD
if_stat_level_more_than AI_TARGET, SPDEF, 8, BattleAIScript_82DD0BD
if_stat_level_more_than AI_TARGET, EVASION, 8, BattleAIScript_82DD0BD
if_stat_level_more_than AI_TARGET, STAT_ATK, 8, BattleAIScript_82DD0BD
if_stat_level_more_than AI_TARGET, STAT_DEF, 8, BattleAIScript_82DD0BD
if_stat_level_more_than AI_TARGET, STAT_SPATK, 8, BattleAIScript_82DD0BD
if_stat_level_more_than AI_TARGET, STAT_SPDEF, 8, BattleAIScript_82DD0BD
if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, BattleAIScript_82DD0BD
score -3
goto BattleAIScript_82DD0C5
@@ -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
@@ -1569,7 +1569,7 @@ BattleAIScript_82DD2B7:
end
BattleAIScript_82DD2B8:
if_stat_level_more_than AI_TARGET, ATK, 3, BattleAIScript_82DD2D0
if_stat_level_more_than AI_TARGET, STAT_ATK, 3, BattleAIScript_82DD2D0
score +3
get_turn_count
if_not_equal 0, BattleAIScript_82DD2D2
@@ -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:
@@ -1987,17 +1987,17 @@ BattleAIScript_82DD645:
if_equal TYPE_GHOST, BattleAIScript_82DD68A
get_user_type2
if_equal TYPE_GHOST, BattleAIScript_82DD68A
if_stat_level_more_than AI_USER, DEF, 9, BattleAIScript_82DD693
if_stat_level_more_than AI_USER, STAT_DEF, 9, BattleAIScript_82DD693
if_random_less_than 128, BattleAIScript_82DD665
score +1
BattleAIScript_82DD665:
if_stat_level_more_than AI_USER, DEF, 7, BattleAIScript_82DD693
if_stat_level_more_than AI_USER, STAT_DEF, 7, BattleAIScript_82DD693
if_random_less_than 128, BattleAIScript_82DD675
score +1
BattleAIScript_82DD675:
if_stat_level_more_than AI_USER, DEF, 6, BattleAIScript_82DD693
if_stat_level_more_than AI_USER, STAT_DEF, 6, BattleAIScript_82DD693
if_random_less_than 128, BattleAIScript_82DD693
score +1
goto BattleAIScript_82DD693
@@ -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
@@ -2062,7 +2062,7 @@ BattleAIScript_82DD75D:
if_equal TYPE_GHOST, BattleAIScript_82DD77C
get_user_type2
if_equal TYPE_GHOST, BattleAIScript_82DD77C
if_stat_level_more_than AI_USER, EVASION, 8, BattleAIScript_82DD782
if_stat_level_more_than AI_USER, STAT_EVASION, 8, BattleAIScript_82DD782
score -2
goto BattleAIScript_82DD78A
@@ -2092,11 +2092,11 @@ BattleAIScript_82DD7A8:
end
BattleAIScript_82DD7A9:
if_stat_level_more_than AI_USER, ATK, 8, BattleAIScript_82DD7D6
if_stat_level_more_than AI_USER, DEF, 8, BattleAIScript_82DD7D6
if_stat_level_more_than AI_USER, SPATK, 8, BattleAIScript_82DD7D6
if_stat_level_more_than AI_USER, SPDEF, 8, BattleAIScript_82DD7D6
if_stat_level_more_than AI_USER, EVASION, 8, BattleAIScript_82DD7D6
if_stat_level_more_than AI_USER, STAT_ATK, 8, BattleAIScript_82DD7D6
if_stat_level_more_than AI_USER, STAT_DEF, 8, BattleAIScript_82DD7D6
if_stat_level_more_than AI_USER, STAT_SPATK, 8, BattleAIScript_82DD7D6
if_stat_level_more_than AI_USER, STAT_SPDEF, 8, BattleAIScript_82DD7D6
if_stat_level_more_than AI_USER, STAT_EVASION, 8, BattleAIScript_82DD7D6
goto BattleAIScript_82DD7FC
BattleAIScript_82DD7D6:
@@ -2113,11 +2113,11 @@ BattleAIScript_82DD7EF:
goto BattleAIScript_82DD844
BattleAIScript_82DD7FC:
if_stat_level_more_than AI_USER, ATK, 7, BattleAIScript_82DD829
if_stat_level_more_than AI_USER, DEF, 7, BattleAIScript_82DD829
if_stat_level_more_than AI_USER, SPATK, 7, BattleAIScript_82DD829
if_stat_level_more_than AI_USER, SPDEF, 7, BattleAIScript_82DD829
if_stat_level_more_than AI_USER, EVASION, 7, BattleAIScript_82DD829
if_stat_level_more_than AI_USER, STAT_ATK, 7, BattleAIScript_82DD829
if_stat_level_more_than AI_USER, STAT_DEF, 7, BattleAIScript_82DD829
if_stat_level_more_than AI_USER, STAT_SPATK, 7, BattleAIScript_82DD829
if_stat_level_more_than AI_USER, STAT_SPDEF, 7, BattleAIScript_82DD829
if_stat_level_more_than AI_USER, STAT_EVASION, 7, BattleAIScript_82DD829
goto BattleAIScript_82DD842
BattleAIScript_82DD829:
@@ -2208,19 +2208,19 @@ BattleAIScript_82DD8F1:
end
BattleAIScript_82DD8F2:
if_stat_level_more_than AI_TARGET, ATK, 8, BattleAIScript_82DD91F
if_stat_level_more_than AI_TARGET, DEF, 8, BattleAIScript_82DD91F
if_stat_level_more_than AI_TARGET, SPATK, 8, BattleAIScript_82DD91F
if_stat_level_more_than AI_TARGET, SPDEF, 8, BattleAIScript_82DD91F
if_stat_level_more_than AI_TARGET, EVASION, 8, BattleAIScript_82DD91F
if_stat_level_more_than AI_TARGET, STAT_ATK, 8, BattleAIScript_82DD91F
if_stat_level_more_than AI_TARGET, STAT_DEF, 8, BattleAIScript_82DD91F
if_stat_level_more_than AI_TARGET, STAT_SPATK, 8, BattleAIScript_82DD91F
if_stat_level_more_than AI_TARGET, STAT_SPDEF, 8, BattleAIScript_82DD91F
if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, BattleAIScript_82DD91F
goto BattleAIScript_82DD957
BattleAIScript_82DD91F:
if_stat_level_less_than AI_USER, ATK, 7, BattleAIScript_82DD954
if_stat_level_less_than AI_USER, DEF, 7, BattleAIScript_82DD954
if_stat_level_less_than AI_USER, SPATK, 7, BattleAIScript_82DD954
if_stat_level_less_than AI_USER, SPDEF, 7, BattleAIScript_82DD954
if_stat_level_less_than AI_USER, EVASION, 7, BattleAIScript_82DD952
if_stat_level_less_than AI_USER, STAT_ATK, 7, BattleAIScript_82DD954
if_stat_level_less_than AI_USER, STAT_DEF, 7, BattleAIScript_82DD954
if_stat_level_less_than AI_USER, STAT_SPATK, 7, BattleAIScript_82DD954
if_stat_level_less_than AI_USER, STAT_SPDEF, 7, BattleAIScript_82DD954
if_stat_level_less_than AI_USER, STAT_EVASION, 7, BattleAIScript_82DD952
if_random_less_than 50, BattleAIScript_82DD959
goto BattleAIScript_82DD957
@@ -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:
@@ -2515,7 +2515,7 @@ sAbilitiesTable_82DDBDF:
BattleAIScript_82DDBF0:
if_type_effectiveness AI_EFFECTIVENESS_x0_25, BattleAIScript_82DDC1D
if_type_effectiveness AI_EFFECTIVENESS_x0_5, BattleAIScript_82DDC1D
if_stat_level_less_than AI_USER, ATK, 6, BattleAIScript_82DDC1D
if_stat_level_less_than AI_USER, STAT_ATK, 6, BattleAIScript_82DDC1D
if_target_faster BattleAIScript_82DDC16
if_hp_more_than AI_USER, 40, BattleAIScript_82DDC1D
goto BattleAIScript_82DDC1F
@@ -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
@@ -2930,12 +2930,12 @@ sMovesTable_82DDF75:
BattleAIScript_82DDF7B:
get_turn_count
if_equal 0, Score_Minus2
if_stat_level_more_than AI_USER, ATK, 8, Score_Plus3
if_stat_level_more_than AI_USER, ATK, 7, Score_Plus2
if_stat_level_more_than AI_USER, ATK, 6, Score_Plus1
if_stat_level_more_than AI_USER, SPATK, 8, Score_Plus3
if_stat_level_more_than AI_USER, SPATK, 7, Score_Plus2
if_stat_level_more_than AI_USER, SPATK, 6, Score_Plus1
if_stat_level_more_than AI_USER, STAT_ATK, 8, Score_Plus3
if_stat_level_more_than AI_USER, STAT_ATK, 7, Score_Plus2
if_stat_level_more_than AI_USER, STAT_ATK, 6, Score_Plus1
if_stat_level_more_than AI_USER, STAT_SPATK, 8, Score_Plus3
if_stat_level_more_than AI_USER, STAT_SPATK, 7, Score_Plus2
if_stat_level_more_than AI_USER, STAT_SPATK, 6, Score_Plus1
end
BattleAIScript_82DDFB3:
@@ -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
@@ -3073,7 +3073,7 @@ BattleAIScript_82DE178:
goto Score_Minus30_
BattleAIScript_82DE185:
if_stat_level_more_than AI_TARGET, ATK, 7, BattleAIScript_82DE18F
if_stat_level_more_than AI_TARGET, STAT_ATK, 7, BattleAIScript_82DE18F
score +3
BattleAIScript_82DE18F:
data/battle_anim_scripts.s
+1 -1
View File
@@ -1,7 +1,7 @@
#include "constants/battle_anim.h"
#include "constants/rgb.h"
#include "constants/songs.h"
.include "asm/macros/battle_anim_script.inc"
.include "include/constants/battle_anim.h"
.section script_data, "aw", %progbits
data/battle_frontier/battle_frontier_trainers.inc
+300 -300
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/fallarbor_battle_tent_trainers.inc
+30 -30
View File
@@ -1,7 +1,7 @@
.align 2
gFallarborBattleTentTrainers:: @ 85DF084
@ 0
.4byte TRAINER_CLASS_AROMA_LADY
.4byte FACILITY_CLASS_AROMA_LADY
.string "AMBER$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -27,7 +27,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Amber
@ 1
.4byte TRAINER_CLASS_RUIN_MANIAC
.4byte FACILITY_CLASS_RUIN_MANIAC
.string "JAVIER$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -53,7 +53,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Javier
@ 2
.4byte TRAINER_CLASS_TUBER_1
.4byte FACILITY_CLASS_TUBER_1
.string "NATALIE$", 8
@ pre-battle speech
.2byte EC_WORD_THE
@@ -79,7 +79,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Natalie
@ 3
.4byte TRAINER_CLASS_TUBER_2
.4byte FACILITY_CLASS_TUBER_2
.string "TREVE$", 8
@ pre-battle speech
.2byte EC_WORD_LOOK
@@ -105,7 +105,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Treve
@ 4
.4byte TRAINER_CLASS_LADY
.4byte FACILITY_CLASS_LADY
.string "ARIANNA$", 8
@ pre-battle speech
.2byte EC_WORD_IF_I_WIN
@@ -131,7 +131,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Arianna
@ 5
.4byte TRAINER_CLASS_BEAUTY
.4byte FACILITY_CLASS_BEAUTY
.string "JADYN$", 8
@ pre-battle speech
.2byte EC_WORD_MY
@@ -157,7 +157,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Jadyn
@ 6
.4byte TRAINER_CLASS_RICH_BOY
.4byte FACILITY_CLASS_RICH_BOY
.string "GERARDO$", 8
@ pre-battle speech
.2byte EC_WORD_I_AM
@@ -183,7 +183,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Gerardo
@ 7
.4byte TRAINER_CLASS_POKEMANIAC
.4byte FACILITY_CLASS_POKEMANIAC
.string "JONN$", 8
@ pre-battle speech
.2byte EC_WORD_THE
@@ -209,7 +209,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Jonn
@ 8
.4byte TRAINER_CLASS_SWIMMER_M
.4byte FACILITY_CLASS_SWIMMER_M
.string "ESTEBAN$", 8
@ pre-battle speech
.2byte EC_WORD_YOU_RE
@@ -235,7 +235,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Esteban
@ 9
.4byte TRAINER_CLASS_CAMPER
.4byte FACILITY_CLASS_CAMPER
.string "JAMESON$", 8
@ pre-battle speech
.2byte EC_WORD_MY
@@ -261,7 +261,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Jameson
@ 10
.4byte TRAINER_CLASS_BUG_MANIAC
.4byte FACILITY_CLASS_BUG_MANIAC
.string "ALANZO$", 8
@ pre-battle speech
.2byte EC_MOVE2(FORESIGHT)
@@ -287,7 +287,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Alanzo
@ 11
.4byte TRAINER_CLASS_GENTLEMAN
.4byte FACILITY_CLASS_GENTLEMAN
.string "HOWARD$", 8
@ pre-battle speech
.2byte EC_WORD_YOUR
@@ -313,7 +313,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Howard
@ 12
.4byte TRAINER_CLASS_GUITARIST
.4byte FACILITY_CLASS_GUITARIST
.string "CONRAD$", 8
@ pre-battle speech
.2byte EC_WORD_YOUR
@@ -339,7 +339,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Conrad
@ 13
.4byte TRAINER_CLASS_SCHOOL_KID_2
.4byte FACILITY_CLASS_SCHOOL_KID_2
.string "MAKENNA$", 8
@ pre-battle speech
.2byte EC_WORD_SHOW
@@ -365,7 +365,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Makenna
@ 14
.4byte TRAINER_CLASS_COOLTRAINER_1
.4byte FACILITY_CLASS_COOLTRAINER_1
.string "BRAYAN$", 8
@ pre-battle speech
.2byte EC_WORD_CAN
@@ -391,7 +391,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Brayan
@ 15
.4byte TRAINER_CLASS_COOLTRAINER_2
.4byte FACILITY_CLASS_COOLTRAINER_2
.string "MARIANA$", 8
@ pre-battle speech
.2byte EC_WORD_A
@@ -417,7 +417,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Mariana
@ 16
.4byte TRAINER_CLASS_POKEFAN_1
.4byte FACILITY_CLASS_POKEFAN_1
.string "SHELDON$", 8
@ pre-battle speech
.2byte EC_WORD_A
@@ -443,7 +443,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Sheldon
@ 17
.4byte TRAINER_CLASS_POKEFAN_2
.4byte FACILITY_CLASS_POKEFAN_2
.string "GIANNA$", 8
@ pre-battle speech
.2byte EC_WORD_AHAHA
@@ -469,7 +469,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Gianna
@ 18
.4byte TRAINER_CLASS_EXPERT_1
.4byte FACILITY_CLASS_EXPERT_1
.string "YAHIR$", 8
@ pre-battle speech
.2byte EC_WORD_YOU
@@ -495,7 +495,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Yahir
@ 19
.4byte TRAINER_CLASS_EXPERT_2
.4byte FACILITY_CLASS_EXPERT_2
.string "BRITNEY$", 8
@ pre-battle speech
.2byte EC_WORD_IT
@@ -521,7 +521,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Britney
@ 20
.4byte TRAINER_CLASS_YOUNGSTER
.4byte FACILITY_CLASS_YOUNGSTER
.string "HECTER$", 8
@ pre-battle speech
.2byte EC_WORD_MY
@@ -547,7 +547,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Hecter
@ 21
.4byte TRAINER_CLASS_FISHERMAN
.4byte FACILITY_CLASS_FISHERMAN
.string "TANNOR$", 8
@ pre-battle speech
.2byte EC_WORD_YOU
@@ -573,7 +573,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Tannor
@ 22
.4byte TRAINER_CLASS_BIRD_KEEPER
.4byte FACILITY_CLASS_BIRD_KEEPER
.string "BENJI$", 8
@ pre-battle speech
.2byte EC_WORD_YOU
@@ -599,7 +599,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Benji
@ 23
.4byte TRAINER_CLASS_NINJA_BOY
.4byte FACILITY_CLASS_NINJA_BOY
.string "RORY$", 8
@ pre-battle speech
.2byte EC_WORD_DON_T
@@ -625,7 +625,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Rory
@ 24
.4byte TRAINER_CLASS_PARASOL_LADY
.4byte FACILITY_CLASS_PARASOL_LADY
.string "ELEANOR$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -651,7 +651,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Eleanor
@ 25
.4byte TRAINER_CLASS_SWIMMER_F
.4byte FACILITY_CLASS_SWIMMER_F
.string "EVELYN$", 8
@ pre-battle speech
.2byte EC_WORD_MY
@@ -677,7 +677,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Evelyn
@ 26
.4byte TRAINER_CLASS_PICNICKER
.4byte FACILITY_CLASS_PICNICKER
.string "ARIELLE$", 8
@ pre-battle speech
.2byte EC_WORD_IT_S
@@ -703,7 +703,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Arielle
@ 27
.4byte TRAINER_CLASS_SAILOR
.4byte FACILITY_CLASS_SAILOR
.string "CONNAR$", 8
@ pre-battle speech
.2byte EC_WORD_I_AM
@@ -729,7 +729,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Connar
@ 28
.4byte TRAINER_CLASS_COLLECTOR
.4byte FACILITY_CLASS_COLLECTOR
.string "MAURICE$", 8
@ pre-battle speech
.2byte EC_WORD_THERE
@@ -755,7 +755,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
.4byte gFallarborBattleTentTrainerMons_Maurice
@ 29
.4byte TRAINER_CLASS_LASS
.4byte FACILITY_CLASS_LASS
.string "KIANNA$", 8
@ pre-battle speech
.2byte EC_WORD_I
data/battle_frontier/slateport_battle_tent_trainers.inc
+30 -30
View File
@@ -1,7 +1,7 @@
.align 2
gSlateportBattleTentTrainers:: @ 85DDA14
@ 0
.4byte TRAINER_CLASS_AROMA_LADY
.4byte FACILITY_CLASS_AROMA_LADY
.string "JOLIE$", 8
@ pre-battle speech
.2byte EC_WORD_WHAT
@@ -27,7 +27,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Jolie
@ 1
.4byte TRAINER_CLASS_RUIN_MANIAC
.4byte FACILITY_CLASS_RUIN_MANIAC
.string "MALACHI$", 8
@ pre-battle speech
.2byte EC_WORD_BAD
@@ -53,7 +53,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Malachi
@ 2
.4byte TRAINER_CLASS_TUBER_1
.4byte FACILITY_CLASS_TUBER_1
.string "KELSIE$", 8
@ pre-battle speech
.2byte EC_WORD_GO
@@ -79,7 +79,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Kelsie
@ 3
.4byte TRAINER_CLASS_TUBER_2
.4byte FACILITY_CLASS_TUBER_2
.string "DAVON$", 8
@ pre-battle speech
.2byte EC_WORD_YEAH_YEAH
@@ -105,7 +105,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Davon
@ 4
.4byte TRAINER_CLASS_LADY
.4byte FACILITY_CLASS_LADY
.string "GLENDA$", 8
@ pre-battle speech
.2byte EC_WORD_CONVERSATION
@@ -131,7 +131,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Glenda
@ 5
.4byte TRAINER_CLASS_BEAUTY
.4byte FACILITY_CLASS_BEAUTY
.string "HELENA$", 8
@ pre-battle speech
.2byte EC_WORD_DOES
@@ -157,7 +157,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Helena
@ 6
.4byte TRAINER_CLASS_RICH_BOY
.4byte FACILITY_CLASS_RICH_BOY
.string "RODOLFO$", 8
@ pre-battle speech
.2byte EC_WORD_GO
@@ -183,7 +183,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Rodolfo
@ 7
.4byte TRAINER_CLASS_POKEMANIAC
.4byte FACILITY_CLASS_POKEMANIAC
.string "DAVION$", 8
@ pre-battle speech
.2byte EC_WORD_GRAAAH
@@ -209,7 +209,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Davion
@ 8
.4byte TRAINER_CLASS_SWIMMER_M
.4byte FACILITY_CLASS_SWIMMER_M
.string "KENDALL$", 8
@ pre-battle speech
.2byte EC_WORD_A_LITTLE
@@ -235,7 +235,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Kendall
@ 9
.4byte TRAINER_CLASS_CAMPER
.4byte FACILITY_CLASS_CAMPER
.string "COLTEN$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -261,7 +261,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Colten
@ 10
.4byte TRAINER_CLASS_BUG_MANIAC
.4byte FACILITY_CLASS_BUG_MANIAC
.string "IRVIN$", 8
@ pre-battle speech
.2byte EC_WORD_HAVE
@@ -287,7 +287,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Irvin
@ 11
.4byte TRAINER_CLASS_GENTLEMAN
.4byte FACILITY_CLASS_GENTLEMAN
.string "SHAUN$", 8
@ pre-battle speech
.2byte EC_WORD_LISTEN
@@ -313,7 +313,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Shaun
@ 12
.4byte TRAINER_CLASS_GUITARIST
.4byte FACILITY_CLASS_GUITARIST
.string "KYLER$", 8
@ pre-battle speech
.2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS
@@ -339,7 +339,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Kyler
@ 13
.4byte TRAINER_CLASS_SCHOOL_KID_2
.4byte FACILITY_CLASS_SCHOOL_KID_2
.string "MAGGIE$", 8
@ pre-battle speech
.2byte EC_POKEMON(VULPIX)
@@ -365,7 +365,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Maggie
@ 14
.4byte TRAINER_CLASS_COOLTRAINER_1
.4byte FACILITY_CLASS_COOLTRAINER_1
.string "STEPHON$", 8
@ pre-battle speech
.2byte EC_WORD_I_AM
@@ -391,7 +391,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Stephon
@ 15
.4byte TRAINER_CLASS_COOLTRAINER_2
.4byte FACILITY_CLASS_COOLTRAINER_2
.string "REBECCA$", 8
@ pre-battle speech
.2byte EC_WORD_THAT
@@ -417,7 +417,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Rebecca
@ 16
.4byte TRAINER_CLASS_POKEFAN_1
.4byte FACILITY_CLASS_POKEFAN_1
.string "REGGIE$", 8
@ pre-battle speech
.2byte EC_WORD_POKEMON
@@ -443,7 +443,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Reggie
@ 17
.4byte TRAINER_CLASS_POKEFAN_2
.4byte FACILITY_CLASS_POKEFAN_2
.string "JANAE$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -469,7 +469,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Janae
@ 18
.4byte TRAINER_CLASS_EXPERT_1
.4byte FACILITY_CLASS_EXPERT_1
.string "CAIDEN$", 8
@ pre-battle speech
.2byte EC_WORD_MY
@@ -495,7 +495,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Caiden
@ 19
.4byte TRAINER_CLASS_EXPERT_2
.4byte FACILITY_CLASS_EXPERT_2
.string "KIRSTEN$", 8
@ pre-battle speech
.2byte EC_WORD_HUH_QUES
@@ -521,7 +521,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Kirsten
@ 20
.4byte TRAINER_CLASS_YOUNGSTER
.4byte FACILITY_CLASS_YOUNGSTER
.string "KURTIS$", 8
@ pre-battle speech
.2byte EC_WORD_SORRY
@@ -547,7 +547,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Kurtis
@ 21
.4byte TRAINER_CLASS_FISHERMAN
.4byte FACILITY_CLASS_FISHERMAN
.string "STEFAN$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -573,7 +573,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Stefan
@ 22
.4byte TRAINER_CLASS_BIRD_KEEPER
.4byte FACILITY_CLASS_BIRD_KEEPER
.string "AVERY$", 8
@ pre-battle speech
.2byte EC_WORD_TOYS
@@ -599,7 +599,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Avery
@ 23
.4byte TRAINER_CLASS_NINJA_BOY
.4byte FACILITY_CLASS_NINJA_BOY
.string "DWANE$", 8
@ pre-battle speech
.2byte EC_WORD_MMM
@@ -625,7 +625,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Dwane
@ 24
.4byte TRAINER_CLASS_PARASOL_LADY
.4byte FACILITY_CLASS_PARASOL_LADY
.string "MCKENNA$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -651,7 +651,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Mckenna
@ 25
.4byte TRAINER_CLASS_SWIMMER_F
.4byte FACILITY_CLASS_SWIMMER_F
.string "CAMRYN$", 8
@ pre-battle speech
.2byte EC_WORD_MR
@@ -677,7 +677,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Camryn
@ 26
.4byte TRAINER_CLASS_PICNICKER
.4byte FACILITY_CLASS_PICNICKER
.string "NATASHA$", 8
@ pre-battle speech
.2byte EC_WORD_COME_OVER
@@ -703,7 +703,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Natasha
@ 27
.4byte TRAINER_CLASS_SAILOR
.4byte FACILITY_CLASS_SAILOR
.string "AUSTYN$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -729,7 +729,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Austyn
@ 28
.4byte TRAINER_CLASS_COLLECTOR
.4byte FACILITY_CLASS_COLLECTOR
.string "DONOVAN$", 8
@ pre-battle speech
.2byte EC_WORD_OH
@@ -755,7 +755,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
.4byte gSlateportBattleTentTrainerMons_Donovan
@ 29
.4byte TRAINER_CLASS_LASS
.4byte FACILITY_CLASS_LASS
.string "TAMIA$", 8
@ pre-battle speech
.2byte EC_WORD_I_AM
data/battle_frontier/verdanturf_battle_tent_trainers.inc
+30 -30
View File
@@ -1,7 +1,7 @@
.align 2
gVerdanturfBattleTentTrainers:: @ 85DE610
@ 0
.4byte TRAINER_CLASS_AROMA_LADY
.4byte FACILITY_CLASS_AROMA_LADY
.string "BRENNA$", 8
@ pre-battle speech
.2byte EC_WORD_NO
@@ -27,7 +27,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Brenna
@ 1
.4byte TRAINER_CLASS_RUIN_MANIAC
.4byte FACILITY_CLASS_RUIN_MANIAC
.string "DILAN$", 8
@ pre-battle speech
.2byte EC_WORD_YOU
@@ -53,7 +53,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Dilan
@ 2
.4byte TRAINER_CLASS_TUBER_1
.4byte FACILITY_CLASS_TUBER_1
.string "ELIANA$", 8
@ pre-battle speech
.2byte EC_WORD_I_AM
@@ -79,7 +79,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Eliana
@ 3
.4byte TRAINER_CLASS_TUBER_2
.4byte FACILITY_CLASS_TUBER_2
.string "MARKUS$", 8
@ pre-battle speech
.2byte EC_WORD_I_AM
@@ -105,7 +105,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Markus
@ 4
.4byte TRAINER_CLASS_LADY
.4byte FACILITY_CLASS_LADY
.string "CAITLYN$", 8
@ pre-battle speech
.2byte EC_WORD_I_AM
@@ -131,7 +131,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Caitlyn
@ 5
.4byte TRAINER_CLASS_BEAUTY
.4byte FACILITY_CLASS_BEAUTY
.string "DESIREE$", 8
@ pre-battle speech
.2byte EC_WORD_DOESN_T
@@ -157,7 +157,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Desiree
@ 6
.4byte TRAINER_CLASS_RICH_BOY
.4byte FACILITY_CLASS_RICH_BOY
.string "RONALD$", 8
@ pre-battle speech
.2byte EC_WORD_COME_ON
@@ -183,7 +183,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Ronald
@ 7
.4byte TRAINER_CLASS_POKEMANIAC
.4byte FACILITY_CLASS_POKEMANIAC
.string "ASHTEN$", 8
@ pre-battle speech
.2byte EC_WORD_OH_YEAH
@@ -209,7 +209,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Ashten
@ 8
.4byte TRAINER_CLASS_SWIMMER_M
.4byte FACILITY_CLASS_SWIMMER_M
.string "GERARD$", 8
@ pre-battle speech
.2byte EC_WORD_LOOK
@@ -235,7 +235,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Gerard
@ 9
.4byte TRAINER_CLASS_CAMPER
.4byte FACILITY_CLASS_CAMPER
.string "BRADLY$", 8
@ pre-battle speech
.2byte EC_WORD_IT_S
@@ -261,7 +261,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Bradly
@ 10
.4byte TRAINER_CLASS_BUG_MANIAC
.4byte FACILITY_CLASS_BUG_MANIAC
.string "DENNIS$", 8
@ pre-battle speech
.2byte EC_WORD_ARE
@@ -287,7 +287,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Dennis
@ 11
.4byte TRAINER_CLASS_GENTLEMAN
.4byte FACILITY_CLASS_GENTLEMAN
.string "PRESTIN$", 8
@ pre-battle speech
.2byte EC_WORD_THIS
@@ -313,7 +313,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Prestin
@ 12
.4byte TRAINER_CLASS_GUITARIST
.4byte FACILITY_CLASS_GUITARIST
.string "ERNESTO$", 8
@ pre-battle speech
.2byte EC_WORD_THIS
@@ -339,7 +339,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Ernesto
@ 13
.4byte TRAINER_CLASS_SCHOOL_KID_2
.4byte FACILITY_CLASS_SCHOOL_KID_2
.string "NALA$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -365,7 +365,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Nala
@ 14
.4byte TRAINER_CLASS_COOLTRAINER_1
.4byte FACILITY_CLASS_COOLTRAINER_1
.string "DARNELL$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -391,7 +391,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Darnell
@ 15
.4byte TRAINER_CLASS_COOLTRAINER_2
.4byte FACILITY_CLASS_COOLTRAINER_2
.string "ASHLYN$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -417,7 +417,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Ashlyn
@ 16
.4byte TRAINER_CLASS_POKEFAN_1
.4byte FACILITY_CLASS_POKEFAN_1
.string "ADDISON$", 8
@ pre-battle speech
.2byte EC_WORD_YES
@@ -443,7 +443,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Addison
@ 17
.4byte TRAINER_CLASS_POKEFAN_2
.4byte FACILITY_CLASS_POKEFAN_2
.string "JUSTINE$", 8
@ pre-battle speech
.2byte EC_WORD_YES
@@ -469,7 +469,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Justine
@ 18
.4byte TRAINER_CLASS_EXPERT_1
.4byte FACILITY_CLASS_EXPERT_1
.string "TYSON$", 8
@ pre-battle speech
.2byte EC_WORD_YOU_RE
@@ -495,7 +495,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Tyson
@ 19
.4byte TRAINER_CLASS_EXPERT_2
.4byte FACILITY_CLASS_EXPERT_2
.string "LAILA$", 8
@ pre-battle speech
.2byte EC_WORD_A
@@ -521,7 +521,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Laila
@ 20
.4byte TRAINER_CLASS_YOUNGSTER
.4byte FACILITY_CLASS_YOUNGSTER
.string "WAREN$", 8
@ pre-battle speech
.2byte EC_WORD_DANGER
@@ -547,7 +547,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Waren
@ 21
.4byte TRAINER_CLASS_FISHERMAN
.4byte FACILITY_CLASS_FISHERMAN
.string "TOBIAS$", 8
@ pre-battle speech
.2byte EC_MOVE2(BARRIER)
@@ -573,7 +573,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Tobias
@ 22
.4byte TRAINER_CLASS_BIRD_KEEPER
.4byte FACILITY_CLASS_BIRD_KEEPER
.string "JOSIAH$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -599,7 +599,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Josiah
@ 23
.4byte TRAINER_CLASS_NINJA_BOY
.4byte FACILITY_CLASS_NINJA_BOY
.string "DION$", 8
@ pre-battle speech
.2byte EC_WORD_IT_S
@@ -625,7 +625,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Dion
@ 24
.4byte TRAINER_CLASS_PARASOL_LADY
.4byte FACILITY_CLASS_PARASOL_LADY
.string "KENZIE$", 8
@ pre-battle speech
.2byte EC_WORD_THE
@@ -651,7 +651,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Kenzie
@ 25
.4byte TRAINER_CLASS_SWIMMER_F
.4byte FACILITY_CLASS_SWIMMER_F
.string "LILLIAN$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -677,7 +677,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Lillian
@ 26
.4byte TRAINER_CLASS_PICNICKER
.4byte FACILITY_CLASS_PICNICKER
.string "LESLEY$", 8
@ pre-battle speech
.2byte EC_WORD_YOU
@@ -703,7 +703,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Lesley
@ 27
.4byte TRAINER_CLASS_SAILOR
.4byte FACILITY_CLASS_SAILOR
.string "MARQUIS$", 8
@ pre-battle speech
.2byte EC_WORD_NONE
@@ -729,7 +729,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Marquis
@ 28
.4byte TRAINER_CLASS_COLLECTOR
.4byte FACILITY_CLASS_COLLECTOR
.string "FREDDY$", 8
@ pre-battle speech
.2byte EC_WORD_I
@@ -755,7 +755,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
.4byte gVerdanturfBattleTentTrainerMons_Freddy
@ 29
.4byte TRAINER_CLASS_LASS
.4byte FACILITY_CLASS_LASS
.string "CECILIA$", 8
@ pre-battle speech
.2byte EC_WORD_MY
data/battle_moves.inc
+1 -1
View File
@@ -1917,7 +1917,7 @@ gBattleMoves:: @ 831C898
@ Curse
.byte 0x6d @ effect
.byte 0 @ power
.byte TYPE_UNKNOWN
.byte TYPE_MYSTERY
.byte 0 @ accuracy
.byte 10 @ PP
.byte 0 @ side effect chance
data/battle_scripts_1.s
+779 -777
View File
File diff suppressed because it is too large Load Diff
data/battle_scripts_2.s
+19 -18
View File
@@ -1,11 +1,12 @@
#include "constants/battle.h"
#include "constants/battle_script_commands.h"
#include "constants/battle_anim.h"
#include "constants/battle_string_ids.h"
#include "constants/items.h"
#include "constants/songs.h"
.include "asm/macros.inc"
.include "asm/macros/battle_script.inc"
.include "constants/constants.inc"
.include "constants/battle_constants.inc"
.include "constants/battle_script_constants.inc"
.include "constants/battle_text.inc"
.section script_data, "aw", %progbits
@@ -46,7 +47,7 @@ gBattlescriptsForSafariActions:: @ 82DBD58
.4byte BattleScript_82DBEE3
BattleScript_BallThrow::
jumpifword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
printstring STRINGID_PLAYERUSEDITEM
handleballthrow
@@ -56,11 +57,11 @@ BattleScript_BallThrowByWally::
BattleScript_SafariBallThrow::
printstring STRINGID_PLAYERUSEDITEM
updatestatusicon ATTACKER
updatestatusicon BS_ATTACKER
handleballthrow
BattleScript_SuccessBallThrow::
jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo
jumpifhalfword CMP_EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo
incrementgamestat 0xB
BattleScript_PrintCaughtMonInfo::
printstring STRINGID_GOTCHAPKMNCAUGHT
@@ -81,22 +82,22 @@ BattleScript_TryNicknameCaughtMon::
BattleScript_GiveCaughtMonEnd::
givecaughtmon
BattleScript_SuccessBallThrowEnd::
setbyte gBattleOutcome, CAUGHT
setbyte gBattleOutcome, B_OUTCOME_CAUGHT
finishturn
BattleScript_WallyBallThrow::
printstring STRINGID_GOTCHAPKMNCAUGHT2
setbyte gBattleOutcome, CAUGHT
setbyte gBattleOutcome, B_OUTCOME_CAUGHT
finishturn
BattleScript_ShakeBallThrow::
printfromtable gBallEscapeStringIds
waitmessage 0x40
jumpifword NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
jumpifbyte NOT_EQUAL, gNumSafariBalls, 0x0, BattleScript_ShakeBallThrowEnd
jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0x0, BattleScript_ShakeBallThrowEnd
printstring STRINGID_OUTOFSAFARIBALLS
waitmessage 0x40
setbyte gBattleOutcome, OUT_OF_BALLS
setbyte gBattleOutcome, B_OUTCOME_NO_SAFARI_BALLS
BattleScript_ShakeBallThrowEnd::
finishaction
@@ -121,11 +122,11 @@ BattleScript_OpponentUsesHealItem::
waitmessage 0x40
useitemonopponent
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate ATTACKER
datahpupdate ATTACKER
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage 0x40
updatestatusicon ATTACKER
updatestatusicon BS_ATTACKER
setbyte sMOVEEND_STATE, 0xF
moveend 0x1, 0x0
finishaction
@@ -139,7 +140,7 @@ BattleScript_OpponentUsesStatusCureItem::
useitemonopponent
printfromtable gTrainerItemCuredStatusStringIds
waitmessage 0x40
updatestatusicon ATTACKER
updatestatusicon BS_ATTACKER
setbyte sMOVEEND_STATE, 0xF
moveend 0x1, 0x0
finishaction
@@ -172,7 +173,7 @@ BattleScript_OpponentUsesGuardSpecs::
BattleScript_RunByUsingItem::
playse SE_NIGERU
setbyte gBattleOutcome, RAN
setbyte gBattleOutcome, B_OUTCOME_RAN
finishturn
BattleScript_ActionWatchesCarefully::
@@ -188,7 +189,7 @@ BattleScript_ActionGetNear::
BattleScript_ActionThrowPokeblock::
printstring STRINGID_THREWPOKEBLOCKATPKMN
waitmessage 0x40
playanimation ATTACKER, ANIM_x4, NULL
playanimation BS_ATTACKER, B_ANIM_x4, NULL
printfromtable gSafariPokeblockResultStringIds
waitmessage 0x40
end2
@@ -198,7 +199,7 @@ BattleScript_82DBEE3::
waitmessage 0x40
returnatktoball
waitstate
trainerslidein TARGET
trainerslidein BS_TARGET
waitstate
printstring STRINGID_YOUTHROWABALLNOWRIGHT
waitmessage 0x40
data/battle_tower.s
+2
View File
@@ -2,6 +2,8 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
data/berry_tag_screen.s
-34
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
data/contest.s
+3 -3
View File
@@ -1,7 +1,7 @@
.include "asm/macros.inc"
#include "constants/species.h"
#include "constants/moves.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "constants/species_constants.inc"
.include "include/constants/moves.h"
.section .rodata
.align 2, 0
data/contest_opponents.inc
+1 -1
View File
@@ -879,7 +879,7 @@
.4byte 0x0
.4byte 0x0
.4byte 0xffff
.2byte SPECIES_FARFETCH_D
.2byte SPECIES_FARFETCHD
.string "FETCHIN$ "
.string "RAUL$ "
.byte 66
data/data2b.s
+2
View File
@@ -1,6 +1,8 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
data/data2c.s
+1 -180
View File
@@ -2,6 +2,7 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -9,189 +10,9 @@
.align 2
@ 831C898
.include "data/battle_moves.inc"
@ 0x31d93c
@ unreferenced unknown data
.byte 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00
@ 831D94C
.include "data/pokedex_order.inc"
@ 831E2F0
.include "data/spinda_spot_graphics.inc"
@ 831E380
.include "data/item_effect_info.inc"
@ 831E818
.include "data/nature_stat_table.inc"
@ 831E898
.include "data/tm_hm_learnsets.inc"
@ 831F578
.include "data/trainer_pic_indices.inc"
@ 831F5CA
.include "data/trainer_class_name_indices.inc"
@ 831F61C
.include "data/cry_id_table.inc"
@ 831F72C
.include "data/experience_tables.inc"
@ 83203CC
.include "data/base_stats.inc"
@ 83230DC
.include "data/level_up_learnsets.inc"
@ 832531C
.include "data/evolution_table.inc"
@ 832937C
.include "data/level_up_learnset_pointers.inc"
@ 83299EC
.include "data/graphics/pokemon/front_anim_ids_table.inc"
@ 8329B87
.include "data/graphics/pokemon/animation_delay_table.inc"
.align 1
gUnknown_08329D22:: @ 8329D22
@ Masks for getting PP Up count, also PP Max values
.byte 0x03, 0x0c, 0x30, 0xc0
.align 1
gUnknown_08329D26:: @ 8329D26
@ Masks for setting PP Up count
.byte 0xfc, 0xf3, 0xcf, 0x3f
.align 1
gUnknown_08329D2A:: @ 8329D2A
@ Values added to PP Up count
.byte 0x01, 0x04, 0x10, 0x40
.align 1
gStatStageRatios:: @ 8329D2E
.byte 0x0a, 0x28
.byte 0x0a, 0x23
.byte 0x0a, 0x1e
.byte 0x0a, 0x19
.byte 0x0a, 0x14
.byte 0x0a, 0x0f
.byte 0x0a, 0x0a
.byte 0x0f, 0x0a
.byte 0x14, 0x0a
.byte 0x19, 0x0a
.byte 0x1e, 0x0a
.byte 0x23, 0x0a
.byte 0x28, 0x0a
.align 1
gUnknown_08329D48:: @ 8329D48
.2byte 0x0032, 0x005f, 0x005a, 0x00b4, 0x005f, 0x005a
.align 1
gUnknown_08329D54:: @ 8329D54
.2byte 0x0003, 0x000a, 0x001b, 0x002b, 0x001e, 0x0043, 0x0042, 0x0019
.2byte 0x0012, 0x000c, 0x001c, 0x0047, 0x001f, 0x0036, 0x0002, 0x0014
.align 1
gHoldEffectToType:: @ 8329D74
.byte 0x1f, 0x06
.byte 0x2a, 0x08
.byte 0x2e, 0x04
.byte 0x2f, 0x05
.byte 0x30, 0x0c
.byte 0x31, 0x11
.byte 0x32, 0x01
.byte 0x33, 0x0d
.byte 0x34, 0x0b
.byte 0x35, 0x02
.byte 0x36, 0x03
.byte 0x37, 0x0f
.byte 0x38, 0x07
.byte 0x39, 0x0e
.byte 0x3a, 0x0a
.byte 0x3b, 0x10
.byte 0x3c, 0x00
.byte 0x00, 0x00
.align 2
gUnknown_08329D98:: @ 8329D98
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3A8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF3C8, gUnknown_082FF694, oac_poke_opponent
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3E8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF408, gUnknown_082FF694, oac_poke_opponent
.align 2
gUnknown_08329DF8:: @ 8329DF8
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF428, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF448, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF468, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF490, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4B8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4D8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4F8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF518, gUnknown_082FF618, sub_8039BB4
gSecretBaseTrainerClasses:: @ 8329EB8
.byte TRAINER_CLASS_YOUNGSTER, TRAINER_CLASS_BUG_CATCHER, TRAINER_CLASS_RICH_BOY, TRAINER_CLASS_CAMPER, TRAINER_CLASS_COOLTRAINER_1
.byte TRAINER_CLASS_LASS, TRAINER_CLASS_SCHOOL_KID_2, TRAINER_CLASS_LADY, TRAINER_CLASS_PICNICKER, TRAINER_CLASS_COOLTRAINER_2
gUnknown_08329EC2:: @ 8329EC2
.byte 0x1a, 0x1b, 0x1c, 0x1d, 0x1f, 0x1e
gUnknown_08329EC8:: @ 8329EC8
.byte 1, 1, 3, 2, 4, 6
gUnknown_08329ECE:: @ 8329ECE
@ Happiness deltas
.byte 0x05, 0x03, 0x02
.byte 0x05, 0x03, 0x02
.byte 0x01, 0x01, 0x00
.byte 0x03, 0x02, 0x01
.byte 0x01, 0x01, 0x00
.byte 0x01, 0x01, 0x01
.byte 0xff, 0xff, 0xff
.byte 0xfb, 0xfb, 0xf6
.byte 0xfb, 0xfb, 0xf6
.align 1
gHMMoves:: @ 8329EEA
.2byte MOVE_CUT
.2byte MOVE_FLY
.2byte MOVE_SURF
.2byte MOVE_STRENGTH
.2byte MOVE_FLASH
.2byte MOVE_ROCK_SMASH
.2byte MOVE_WATERFALL
.2byte MOVE_DIVE
.2byte 0xffff
.align 1
gAlteringCaveWildMonHeldItems:: @ 8329EFC
.2byte 0, ITEM_NONE
.2byte SPECIES_MAREEP, ITEM_GANLON_BERRY
.2byte SPECIES_PINECO, ITEM_APICOT_BERRY
.2byte SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM
.2byte SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY
.2byte SPECIES_AIPOM, ITEM_BERRY_JUICE
.2byte SPECIES_SHUCKLE, ITEM_BERRY_JUICE
.2byte SPECIES_STANTLER, ITEM_PETAYA_BERRY
.2byte SPECIES_SMEARGLE, ITEM_SALAC_BERRY
.align 2
gUnknown_08329F20:: @ 8329F20
.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08329F28:: @ 8329F28
spr_template 0xffff, 0xffff, gUnknown_08329F20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/data2e.s
+151
View File
@@ -0,0 +1,151 @@
#include "constants/abilities.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@ 83299EC
.include "data/graphics/pokemon/front_anim_ids_table.inc"
@ 8329B87
.include "data/graphics/pokemon/animation_delay_table.inc"
.align 1
gUnknown_08329D22:: @ 8329D22
@ Masks for getting PP Up count, also PP Max values
.byte 0x03, 0x0c, 0x30, 0xc0
.align 1
gUnknown_08329D26:: @ 8329D26
@ Masks for setting PP Up count
.byte 0xfc, 0xf3, 0xcf, 0x3f
.align 1
gUnknown_08329D2A:: @ 8329D2A
@ Values added to PP Up count
.byte 0x01, 0x04, 0x10, 0x40
.align 1
gStatStageRatios:: @ 8329D2E
.byte 0x0a, 0x28
.byte 0x0a, 0x23
.byte 0x0a, 0x1e
.byte 0x0a, 0x19
.byte 0x0a, 0x14
.byte 0x0a, 0x0f
.byte 0x0a, 0x0a
.byte 0x0f, 0x0a
.byte 0x14, 0x0a
.byte 0x19, 0x0a
.byte 0x1e, 0x0a
.byte 0x23, 0x0a
.byte 0x28, 0x0a
.align 1
gUnknown_08329D48:: @ 8329D48
.2byte 0x0032, 0x005f, 0x005a, 0x00b4, 0x005f, 0x005a
.align 1
gUnknown_08329D54:: @ 8329D54
.2byte 0x0003, 0x000a, 0x001b, 0x002b, 0x001e, 0x0043, 0x0042, 0x0019
.2byte 0x0012, 0x000c, 0x001c, 0x0047, 0x001f, 0x0036, 0x0002, 0x0014
.align 1
gHoldEffectToType:: @ 8329D74
.byte 0x1f, 0x06
.byte 0x2a, 0x08
.byte 0x2e, 0x04
.byte 0x2f, 0x05
.byte 0x30, 0x0c
.byte 0x31, 0x11
.byte 0x32, 0x01
.byte 0x33, 0x0d
.byte 0x34, 0x0b
.byte 0x35, 0x02
.byte 0x36, 0x03
.byte 0x37, 0x0f
.byte 0x38, 0x07
.byte 0x39, 0x0e
.byte 0x3a, 0x0a
.byte 0x3b, 0x10
.byte 0x3c, 0x00
.byte 0x00, 0x00
.align 2
gUnknown_08329D98:: @ 8329D98
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3A8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF3C8, gUnknown_082FF694, oac_poke_opponent
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3E8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF408, gUnknown_082FF694, oac_poke_opponent
.align 2
gUnknown_08329DF8:: @ 8329DF8
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF428, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF448, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF468, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF490, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4B8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4D8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4F8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF518, gUnknown_082FF618, sub_8039BB4
gSecretBaseTrainerClasses:: @ 8329EB8
.byte FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_BUG_CATCHER, FACILITY_CLASS_RICH_BOY, FACILITY_CLASS_CAMPER, FACILITY_CLASS_COOLTRAINER_1
.byte FACILITY_CLASS_LASS, FACILITY_CLASS_SCHOOL_KID_2, FACILITY_CLASS_LADY, FACILITY_CLASS_PICNICKER, FACILITY_CLASS_COOLTRAINER_2
gUnknown_08329EC2:: @ 8329EC2
.byte 0x1a, 0x1b, 0x1c, 0x1d, 0x1f, 0x1e
gUnknown_08329EC8:: @ 8329EC8
.byte 1, 1, 3, 2, 4, 6
gUnknown_08329ECE:: @ 8329ECE
@ Happiness deltas
.byte 0x05, 0x03, 0x02
.byte 0x05, 0x03, 0x02
.byte 0x01, 0x01, 0x00
.byte 0x03, 0x02, 0x01
.byte 0x01, 0x01, 0x00
.byte 0x01, 0x01, 0x01
.byte 0xff, 0xff, 0xff
.byte 0xfb, 0xfb, 0xf6
.byte 0xfb, 0xfb, 0xf6
.align 1
gHMMoves:: @ 8329EEA
.2byte MOVE_CUT
.2byte MOVE_FLY
.2byte MOVE_SURF
.2byte MOVE_STRENGTH
.2byte MOVE_FLASH
.2byte MOVE_ROCK_SMASH
.2byte MOVE_WATERFALL
.2byte MOVE_DIVE
.2byte 0xffff
.align 1
gAlteringCaveWildMonHeldItems:: @ 8329EFC
.2byte 0, ITEM_NONE
.2byte SPECIES_MAREEP, ITEM_GANLON_BERRY
.2byte SPECIES_PINECO, ITEM_APICOT_BERRY
.2byte SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM
.2byte SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY
.2byte SPECIES_AIPOM, ITEM_BERRY_JUICE
.2byte SPECIES_SHUCKLE, ITEM_BERRY_JUICE
.2byte SPECIES_STANTLER, ITEM_PETAYA_BERRY
.2byte SPECIES_SMEARGLE, ITEM_SALAC_BERRY
.align 2
gUnknown_08329F20:: @ 8329F20
.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08329F28:: @ 8329F28
spr_template 0xffff, 0xffff, gUnknown_08329F20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/event_scripts.s
+1
View File
@@ -4,6 +4,7 @@
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/vars.h"
#include "constants/trainers.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
data/evolution_table.inc
-1420
View File
File diff suppressed because it is too large Load Diff
data/experience_tables.inc
-11
View File
@@ -1,11 +0,0 @@
.align 2
gExperienceTables:: @ 831F72C
.include "data/experience_tables/medium_fast_growth_rate.inc"
.include "data/experience_tables/erratic_growth_rate.inc"
.include "data/experience_tables/fluctuating_growth_rate.inc"
.include "data/experience_tables/medium_slow_growth_rate.inc"
.include "data/experience_tables/fast_growth_rate.inc"
.include "data/experience_tables/slow_growth_rate.inc"
@ TODO: find out if these copies are used
.include "data/experience_tables/medium_fast_growth_rate.inc"
.include "data/experience_tables/medium_fast_growth_rate.inc"
data/experience_tables/erratic_growth_rate.inc
-101
View File
@@ -1,101 +0,0 @@
.4byte 0 @ 0
.4byte 1 @ 1
.4byte 15 @ 2
.4byte 52 @ 3
.4byte 122 @ 4
.4byte 237 @ 5
.4byte 406 @ 6
.4byte 637 @ 7
.4byte 942 @ 8
.4byte 1326 @ 9
.4byte 1800 @ 10
.4byte 2369 @ 11
.4byte 3041 @ 12
.4byte 3822 @ 13
.4byte 4719 @ 14
.4byte 5737 @ 15
.4byte 6881 @ 16
.4byte 8155 @ 17
.4byte 9564 @ 18
.4byte 11111 @ 19
.4byte 12800 @ 20
.4byte 14632 @ 21
.4byte 16610 @ 22
.4byte 18737 @ 23
.4byte 21012 @ 24
.4byte 23437 @ 25
.4byte 26012 @ 26
.4byte 28737 @ 27
.4byte 31610 @ 28
.4byte 34632 @ 29
.4byte 37800 @ 30
.4byte 41111 @ 31
.4byte 44564 @ 32
.4byte 48155 @ 33
.4byte 51881 @ 34
.4byte 55737 @ 35
.4byte 59719 @ 36
.4byte 63822 @ 37
.4byte 68041 @ 38
.4byte 72369 @ 39
.4byte 76800 @ 40
.4byte 81326 @ 41
.4byte 85942 @ 42
.4byte 90637 @ 43
.4byte 95406 @ 44
.4byte 100237 @ 45
.4byte 105122 @ 46
.4byte 110052 @ 47
.4byte 115015 @ 48
.4byte 120001 @ 49
.4byte 125000 @ 50
.4byte 131324 @ 51
.4byte 137795 @ 52
.4byte 144410 @ 53
.4byte 151165 @ 54
.4byte 158056 @ 55
.4byte 165079 @ 56
.4byte 172229 @ 57
.4byte 179503 @ 58
.4byte 186894 @ 59
.4byte 194400 @ 60
.4byte 202013 @ 61
.4byte 209728 @ 62
.4byte 217540 @ 63
.4byte 225443 @ 64
.4byte 233431 @ 65
.4byte 241496 @ 66
.4byte 249633 @ 67
.4byte 257834 @ 68
.4byte 267406 @ 69
.4byte 276458 @ 70
.4byte 286328 @ 71
.4byte 296358 @ 72
.4byte 305767 @ 73
.4byte 316074 @ 74
.4byte 326531 @ 75
.4byte 336255 @ 76
.4byte 346965 @ 77
.4byte 357812 @ 78
.4byte 367807 @ 79
.4byte 378880 @ 80
.4byte 390077 @ 81
.4byte 400293 @ 82
.4byte 411686 @ 83
.4byte 423190 @ 84
.4byte 433572 @ 85
.4byte 445239 @ 86
.4byte 457001 @ 87
.4byte 467489 @ 88
.4byte 479378 @ 89
.4byte 491346 @ 90
.4byte 501878 @ 91
.4byte 513934 @ 92
.4byte 526049 @ 93
.4byte 536557 @ 94
.4byte 548720 @ 95
.4byte 560922 @ 96
.4byte 571333 @ 97
.4byte 583539 @ 98
.4byte 591882 @ 99
.4byte 600000 @ 100
data/experience_tables/fast_growth_rate.inc
-101
View File
@@ -1,101 +0,0 @@
.4byte 0 @ 0
.4byte 1 @ 1
.4byte 6 @ 2
.4byte 21 @ 3
.4byte 51 @ 4
.4byte 100 @ 5
.4byte 172 @ 6
.4byte 274 @ 7
.4byte 409 @ 8
.4byte 583 @ 9
.4byte 800 @ 10
.4byte 1064 @ 11
.4byte 1382 @ 12
.4byte 1757 @ 13
.4byte 2195 @ 14
.4byte 2700 @ 15
.4byte 3276 @ 16
.4byte 3930 @ 17
.4byte 4665 @ 18
.4byte 5487 @ 19
.4byte 6400 @ 20
.4byte 7408 @ 21
.4byte 8518 @ 22
.4byte 9733 @ 23
.4byte 11059 @ 24
.4byte 12500 @ 25
.4byte 14060 @ 26
.4byte 15746 @ 27
.4byte 17561 @ 28
.4byte 19511 @ 29
.4byte 21600 @ 30
.4byte 23832 @ 31
.4byte 26214 @ 32
.4byte 28749 @ 33
.4byte 31443 @ 34
.4byte 34300 @ 35
.4byte 37324 @ 36
.4byte 40522 @ 37
.4byte 43897 @ 38
.4byte 47455 @ 39
.4byte 51200 @ 40
.4byte 55136 @ 41
.4byte 59270 @ 42
.4byte 63605 @ 43
.4byte 68147 @ 44
.4byte 72900 @ 45
.4byte 77868 @ 46
.4byte 83058 @ 47
.4byte 88473 @ 48
.4byte 94119 @ 49
.4byte 100000 @ 50
.4byte 106120 @ 51
.4byte 112486 @ 52
.4byte 119101 @ 53
.4byte 125971 @ 54
.4byte 133100 @ 55
.4byte 140492 @ 56
.4byte 148154 @ 57
.4byte 156089 @ 58
.4byte 164303 @ 59
.4byte 172800 @ 60
.4byte 181584 @ 61
.4byte 190662 @ 62
.4byte 200037 @ 63
.4byte 209715 @ 64
.4byte 219700 @ 65
.4byte 229996 @ 66
.4byte 240610 @ 67
.4byte 251545 @ 68
.4byte 262807 @ 69
.4byte 274400 @ 70
.4byte 286328 @ 71
.4byte 298598 @ 72
.4byte 311213 @ 73
.4byte 324179 @ 74
.4byte 337500 @ 75
.4byte 351180 @ 76
.4byte 365226 @ 77
.4byte 379641 @ 78
.4byte 394431 @ 79
.4byte 409600 @ 80
.4byte 425152 @ 81
.4byte 441094 @ 82
.4byte 457429 @ 83
.4byte 474163 @ 84
.4byte 491300 @ 85
.4byte 508844 @ 86
.4byte 526802 @ 87
.4byte 545177 @ 88
.4byte 563975 @ 89
.4byte 583200 @ 90
.4byte 602856 @ 91
.4byte 622950 @ 92
.4byte 643485 @ 93
.4byte 664467 @ 94
.4byte 685900 @ 95
.4byte 707788 @ 96
.4byte 730138 @ 97
.4byte 752953 @ 98
.4byte 776239 @ 99
.4byte 800000 @ 100
data/experience_tables/fluctuating_growth_rate.inc
-101
View File
@@ -1,101 +0,0 @@
.4byte 0 @ 0
.4byte 1 @ 1
.4byte 4 @ 2
.4byte 13 @ 3
.4byte 32 @ 4
.4byte 65 @ 5
.4byte 112 @ 6
.4byte 178 @ 7
.4byte 276 @ 8
.4byte 393 @ 9
.4byte 540 @ 10
.4byte 745 @ 11
.4byte 967 @ 12
.4byte 1230 @ 13
.4byte 1591 @ 14
.4byte 1957 @ 15
.4byte 2457 @ 16
.4byte 3046 @ 17
.4byte 3732 @ 18
.4byte 4526 @ 19
.4byte 5440 @ 20
.4byte 6482 @ 21
.4byte 7666 @ 22
.4byte 9003 @ 23
.4byte 10506 @ 24
.4byte 12187 @ 25
.4byte 14060 @ 26
.4byte 16140 @ 27
.4byte 18439 @ 28
.4byte 20974 @ 29
.4byte 23760 @ 30
.4byte 26811 @ 31
.4byte 30146 @ 32
.4byte 33780 @ 33
.4byte 37731 @ 34
.4byte 42017 @ 35
.4byte 46656 @ 36
.4byte 50653 @ 37
.4byte 55969 @ 38
.4byte 60505 @ 39
.4byte 66560 @ 40
.4byte 71677 @ 41
.4byte 78533 @ 42
.4byte 84277 @ 43
.4byte 91998 @ 44
.4byte 98415 @ 45
.4byte 107069 @ 46
.4byte 114205 @ 47
.4byte 123863 @ 48
.4byte 131766 @ 49
.4byte 142500 @ 50
.4byte 151222 @ 51
.4byte 163105 @ 52
.4byte 172697 @ 53
.4byte 185807 @ 54
.4byte 196322 @ 55
.4byte 210739 @ 56
.4byte 222231 @ 57
.4byte 238036 @ 58
.4byte 250562 @ 59
.4byte 267840 @ 60
.4byte 281456 @ 61
.4byte 300293 @ 62
.4byte 315059 @ 63
.4byte 335544 @ 64
.4byte 351520 @ 65
.4byte 373744 @ 66
.4byte 390991 @ 67
.4byte 415050 @ 68
.4byte 433631 @ 69
.4byte 459620 @ 70
.4byte 479600 @ 71
.4byte 507617 @ 72
.4byte 529063 @ 73
.4byte 559209 @ 74
.4byte 582187 @ 75
.4byte 614566 @ 76
.4byte 639146 @ 77
.4byte 673863 @ 78
.4byte 700115 @ 79
.4byte 737280 @ 80
.4byte 765275 @ 81
.4byte 804997 @ 82
.4byte 834809 @ 83
.4byte 877201 @ 84
.4byte 908905 @ 85
.4byte 954084 @ 86
.4byte 987754 @ 87
.4byte 1035837 @ 88
.4byte 1071552 @ 89
.4byte 1122660 @ 90
.4byte 1160499 @ 91
.4byte 1214753 @ 92
.4byte 1254796 @ 93
.4byte 1312322 @ 94
.4byte 1354652 @ 95
.4byte 1415577 @ 96
.4byte 1460276 @ 97
.4byte 1524731 @ 98
.4byte 1571884 @ 99
.4byte 1640000 @ 100
data/experience_tables/medium_fast_growth_rate.inc
-101
View File
@@ -1,101 +0,0 @@
.4byte 0 @ 0
.4byte 1 @ 1
.4byte 8 @ 2
.4byte 27 @ 3
.4byte 64 @ 4
.4byte 125 @ 5
.4byte 216 @ 6
.4byte 343 @ 7
.4byte 512 @ 8
.4byte 729 @ 9
.4byte 1000 @ 10
.4byte 1331 @ 11
.4byte 1728 @ 12
.4byte 2197 @ 13
.4byte 2744 @ 14
.4byte 3375 @ 15
.4byte 4096 @ 16
.4byte 4913 @ 17
.4byte 5832 @ 18
.4byte 6859 @ 19
.4byte 8000 @ 20
.4byte 9261 @ 21
.4byte 10648 @ 22
.4byte 12167 @ 23
.4byte 13824 @ 24
.4byte 15625 @ 25
.4byte 17576 @ 26
.4byte 19683 @ 27
.4byte 21952 @ 28
.4byte 24389 @ 29
.4byte 27000 @ 30
.4byte 29791 @ 31
.4byte 32768 @ 32
.4byte 35937 @ 33
.4byte 39304 @ 34
.4byte 42875 @ 35
.4byte 46656 @ 36
.4byte 50653 @ 37
.4byte 54872 @ 38
.4byte 59319 @ 39
.4byte 64000 @ 40
.4byte 68921 @ 41
.4byte 74088 @ 42
.4byte 79507 @ 43
.4byte 85184 @ 44
.4byte 91125 @ 45
.4byte 97336 @ 46
.4byte 103823 @ 47
.4byte 110592 @ 48
.4byte 117649 @ 49
.4byte 125000 @ 50
.4byte 132651 @ 51
.4byte 140608 @ 52
.4byte 148877 @ 53
.4byte 157464 @ 54
.4byte 166375 @ 55
.4byte 175616 @ 56
.4byte 185193 @ 57
.4byte 195112 @ 58
.4byte 205379 @ 59
.4byte 216000 @ 60
.4byte 226981 @ 61
.4byte 238328 @ 62
.4byte 250047 @ 63
.4byte 262144 @ 64
.4byte 274625 @ 65
.4byte 287496 @ 66
.4byte 300763 @ 67
.4byte 314432 @ 68
.4byte 328509 @ 69
.4byte 343000 @ 70
.4byte 357911 @ 71
.4byte 373248 @ 72
.4byte 389017 @ 73
.4byte 405224 @ 74
.4byte 421875 @ 75
.4byte 438976 @ 76
.4byte 456533 @ 77
.4byte 474552 @ 78
.4byte 493039 @ 79
.4byte 512000 @ 80
.4byte 531441 @ 81
.4byte 551368 @ 82
.4byte 571787 @ 83
.4byte 592704 @ 84
.4byte 614125 @ 85
.4byte 636056 @ 86
.4byte 658503 @ 87
.4byte 681472 @ 88
.4byte 704969 @ 89
.4byte 729000 @ 90
.4byte 753571 @ 91
.4byte 778688 @ 92
.4byte 804357 @ 93
.4byte 830584 @ 94
.4byte 857375 @ 95
.4byte 884736 @ 96
.4byte 912673 @ 97
.4byte 941192 @ 98
.4byte 970299 @ 99
.4byte 1000000 @ 100
data/experience_tables/medium_slow_growth_rate.inc
-101
View File
@@ -1,101 +0,0 @@
.4byte 0 @ 0
.4byte 1 @ 1
.4byte 9 @ 2
.4byte 57 @ 3
.4byte 96 @ 4
.4byte 135 @ 5
.4byte 179 @ 6
.4byte 236 @ 7
.4byte 314 @ 8
.4byte 419 @ 9
.4byte 560 @ 10
.4byte 742 @ 11
.4byte 973 @ 12
.4byte 1261 @ 13
.4byte 1612 @ 14
.4byte 2035 @ 15
.4byte 2535 @ 16
.4byte 3120 @ 17
.4byte 3798 @ 18
.4byte 4575 @ 19
.4byte 5460 @ 20
.4byte 6458 @ 21
.4byte 7577 @ 22
.4byte 8825 @ 23
.4byte 10208 @ 24
.4byte 11735 @ 25
.4byte 13411 @ 26
.4byte 15244 @ 27
.4byte 17242 @ 28
.4byte 19411 @ 29
.4byte 21760 @ 30
.4byte 24294 @ 31
.4byte 27021 @ 32
.4byte 29949 @ 33
.4byte 33084 @ 34
.4byte 36435 @ 35
.4byte 40007 @ 36
.4byte 43808 @ 37
.4byte 47846 @ 38
.4byte 52127 @ 39
.4byte 56660 @ 40
.4byte 61450 @ 41
.4byte 66505 @ 42
.4byte 71833 @ 43
.4byte 77440 @ 44
.4byte 83335 @ 45
.4byte 89523 @ 46
.4byte 96012 @ 47
.4byte 102810 @ 48
.4byte 109923 @ 49
.4byte 117360 @ 50
.4byte 125126 @ 51
.4byte 133229 @ 52
.4byte 141677 @ 53
.4byte 150476 @ 54
.4byte 159635 @ 55
.4byte 169159 @ 56
.4byte 179056 @ 57
.4byte 189334 @ 58
.4byte 199999 @ 59
.4byte 211060 @ 60
.4byte 222522 @ 61
.4byte 234393 @ 62
.4byte 246681 @ 63
.4byte 259392 @ 64
.4byte 272535 @ 65
.4byte 286115 @ 66
.4byte 300140 @ 67
.4byte 314618 @ 68
.4byte 329555 @ 69
.4byte 344960 @ 70
.4byte 360838 @ 71
.4byte 377197 @ 72
.4byte 394045 @ 73
.4byte 411388 @ 74
.4byte 429235 @ 75
.4byte 447591 @ 76
.4byte 466464 @ 77
.4byte 485862 @ 78
.4byte 505791 @ 79
.4byte 526260 @ 80
.4byte 547274 @ 81
.4byte 568841 @ 82
.4byte 590969 @ 83
.4byte 613664 @ 84
.4byte 636935 @ 85
.4byte 660787 @ 86
.4byte 685228 @ 87
.4byte 710266 @ 88
.4byte 735907 @ 89
.4byte 762160 @ 90
.4byte 789030 @ 91
.4byte 816525 @ 92
.4byte 844653 @ 93
.4byte 873420 @ 94
.4byte 902835 @ 95
.4byte 932903 @ 96
.4byte 963632 @ 97
.4byte 995030 @ 98
.4byte 1027103 @ 99
.4byte 1059860 @ 100
data/experience_tables/slow_growth_rate.inc
-101
View File
@@ -1,101 +0,0 @@
.4byte 0 @ 0
.4byte 1 @ 1
.4byte 10 @ 2
.4byte 33 @ 3
.4byte 80 @ 4
.4byte 156 @ 5
.4byte 270 @ 6
.4byte 428 @ 7
.4byte 640 @ 8
.4byte 911 @ 9
.4byte 1250 @ 10
.4byte 1663 @ 11
.4byte 2160 @ 12
.4byte 2746 @ 13
.4byte 3430 @ 14
.4byte 4218 @ 15
.4byte 5120 @ 16
.4byte 6141 @ 17
.4byte 7290 @ 18
.4byte 8573 @ 19
.4byte 10000 @ 20
.4byte 11576 @ 21
.4byte 13310 @ 22
.4byte 15208 @ 23
.4byte 17280 @ 24
.4byte 19531 @ 25
.4byte 21970 @ 26
.4byte 24603 @ 27
.4byte 27440 @ 28
.4byte 30486 @ 29
.4byte 33750 @ 30
.4byte 37238 @ 31
.4byte 40960 @ 32
.4byte 44921 @ 33
.4byte 49130 @ 34
.4byte 53593 @ 35
.4byte 58320 @ 36
.4byte 63316 @ 37
.4byte 68590 @ 38
.4byte 74148 @ 39
.4byte 80000 @ 40
.4byte 86151 @ 41
.4byte 92610 @ 42
.4byte 99383 @ 43
.4byte 106480 @ 44
.4byte 113906 @ 45
.4byte 121670 @ 46
.4byte 129778 @ 47
.4byte 138240 @ 48
.4byte 147061 @ 49
.4byte 156250 @ 50
.4byte 165813 @ 51
.4byte 175760 @ 52
.4byte 186096 @ 53
.4byte 196830 @ 54
.4byte 207968 @ 55
.4byte 219520 @ 56
.4byte 231491 @ 57
.4byte 243890 @ 58
.4byte 256723 @ 59
.4byte 270000 @ 60
.4byte 283726 @ 61
.4byte 297910 @ 62
.4byte 312558 @ 63
.4byte 327680 @ 64
.4byte 343281 @ 65
.4byte 359370 @ 66
.4byte 375953 @ 67
.4byte 393040 @ 68
.4byte 410636 @ 69
.4byte 428750 @ 70
.4byte 447388 @ 71
.4byte 466560 @ 72
.4byte 486271 @ 73
.4byte 506530 @ 74
.4byte 527343 @ 75
.4byte 548720 @ 76
.4byte 570666 @ 77
.4byte 593190 @ 78
.4byte 616298 @ 79
.4byte 640000 @ 80
.4byte 664301 @ 81
.4byte 689210 @ 82
.4byte 714733 @ 83
.4byte 740880 @ 84
.4byte 767656 @ 85
.4byte 795070 @ 86
.4byte 823128 @ 87
.4byte 851840 @ 88
.4byte 881211 @ 89
.4byte 911250 @ 90
.4byte 941963 @ 91
.4byte 973360 @ 92
.4byte 1005446 @ 93
.4byte 1038230 @ 94
.4byte 1071718 @ 95
.4byte 1105920 @ 96
.4byte 1140841 @ 97
.4byte 1176490 @ 98
.4byte 1212873 @ 99
.4byte 1250000 @ 100
data/graphics/berries/berry_graphics.inc
+86 -86
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"
data/item_effect_info.inc
-824
View File
@@ -1,824 +0,0 @@
gPotionItemEffectInfo:: @ 831E380
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 20
gAntidoteItemEffectInfo:: @ 831E387
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x10
.byte 0x00
.byte 0x00
gBurnHealItemEffectInfo:: @ 831E38D
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x08
.byte 0x00
.byte 0x00
gIceHealItemEffectInfo:: @ 831E393
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 0x00
gAwakeningItemEffectInfo:: @ 831E399
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x20
.byte 0x00
.byte 0x00
gParalyzeHealItemEffectInfo:: @ 831E39F
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x02
.byte 0x00
.byte 0x00
gFullRestoreItemEffectInfo:: @ 831E3A5
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x3f
.byte 0x04
.byte 0x00
.byte 0xff
gMaxPotionItemEffectInfo:: @ 831E3AC
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 0xff
gHyperPotionItemEffectInfo:: @ 831E3B3
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 200
gSuperPotionItemEffectInfo:: @ 831E3BA
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 50
gFullHealItemEffectInfo:: @ 831E3C1
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x3f
.byte 0x00
.byte 0x00
gReviveItemEffectInfo:: @ 831E3C7
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x44
.byte 0x00
.byte 0xfe
gMaxReviveItemEffectInfo:: @ 831E3CE
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x44
.byte 0x00
.byte 0xff
gFreshWaterItemEffectInfo:: @ 831E3D5
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 50
gSodaPopItemEffectInfo:: @ 831E3DC
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 60
gLemonadeItemEffectInfo:: @ 831E3E3
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 80
gMoomooMilkItemEffectInfo:: @ 831E3EA
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 100
gEnergyPowderItemEffectInfo:: @ 831E3F1
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0xe0
.byte 50
.byte 0xfb
.byte 0xfb
.byte 0xf6
gEnergyRootItemEffectInfo:: @ 831E3FB
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0xe0
.byte 200
.byte 0xf6
.byte 0xf6
.byte 0xf1
gHealPowderItemEffectInfo:: @ 831E405
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x3f
.byte 0x00
.byte 0xe0
.byte 0xfb
.byte 0xfb
.byte 0xf6
gRevivalHerbItemEffectInfo:: @ 831E40E
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x44
.byte 0xe0
.byte 0xff
.byte 0xf1
.byte 0xf1
.byte 0xec
gEtherItemEffectInfo:: @ 831E418
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x18
.byte 0x00
.byte 0x0a
gMaxEtherItemEffectInfo:: @ 831E41F
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x18
.byte 0x00
.byte 0x7f
gElixirItemEffectInfo:: @ 831E426
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x08
.byte 0x00
.byte 0x0a
gMaxElixirItemEffectInfo:: @ 831E42D
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x08
.byte 0x00
.byte 0x7f
gLavaCookieItemEffectInfo:: @ 831E434
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x3f
.byte 0x00
.byte 0x00
gBlueFluteItemEffectInfo:: @ 831E43A
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x20
.byte 0x00
.byte 0x00
gYellowFluteItemEffectInfo:: @ 831E440
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x01
.byte 0x00
.byte 0x00
gRedFluteItemEffectInfo:: @ 831E446
.byte 0x80
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
gBerryJuiceItemEffectInfo:: @ 831E44C
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 20
gSacredAshItemEffectInfo:: @ 831E453
.byte 0x40
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x44
.byte 0x00
.byte 0xff
gHPUpItemEffectInfo:: @ 831E45A
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x01
.byte 0xe0
.byte 0x0a
.byte 0x05
.byte 0x03
.byte 0x02
gProteinItemEffectInfo:: @ 831E464
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x02
.byte 0xe0
.byte 0x0a
.byte 0x05
.byte 0x03
.byte 0x02
gIronItemEffectInfo:: @ 831E46E
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0xe1
.byte 0x0a
.byte 0x05
.byte 0x03
.byte 0x02
gCarbosItemEffectInfo:: @ 831E478
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0xe2
.byte 0x0a
.byte 0x05
.byte 0x03
.byte 0x02
gCalciumItemEffectInfo:: @ 831E482
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0xe8
.byte 0x0a
.byte 0x05
.byte 0x03
.byte 0x02
gRareCandyItemEffectInfo:: @ 831E48C
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x40
.byte 0x44
.byte 0xe0
.byte 0xfd
.byte 0x05
.byte 0x03
.byte 0x02
gPPUpItemEffectInfo:: @ 831E496
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x20
.byte 0xe0
.byte 0x05
.byte 0x03
.byte 0x02
gZincItemEffectInfo:: @ 831E49F
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0xe4
.byte 0x0a
.byte 0x05
.byte 0x03
.byte 0x02
gPPMaxItemEffectInfo:: @ 831E4A9
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0xf0
.byte 0x05
.byte 0x03
.byte 0x02
gGuardSpecItemEffectInfo:: @ 831E4B2
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x80
.byte 0x00
.byte 0x60
.byte 0x01
.byte 0x01
gDireHitItemEffectInfo:: @ 831E4BA
.byte 0x20
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x60
.byte 0x01
.byte 0x01
gXAttackItemEffectInfo:: @ 831E4C2
.byte 0x01
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x60
.byte 0x01
.byte 0x01
gXDefendItemEffectInfo:: @ 831E4CA
.byte 0x00
.byte 0x10
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x60
.byte 0x01
.byte 0x01
gXSpeedItemEffectInfo:: @ 831E4D2
.byte 0x00
.byte 0x01
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x60
.byte 0x01
.byte 0x01
gXAccuracyItemEffectInfo:: @ 831E4DA
.byte 0x00
.byte 0x00
.byte 0x10
.byte 0x00
.byte 0x00
.byte 0x60
.byte 0x01
.byte 0x01
gXSpecialItemEffectInfo:: @ 831E4E2
.byte 0x00
.byte 0x00
.byte 0x01
.byte 0x00
.byte 0x00
.byte 0x60
.byte 0x01
.byte 0x01
gSunStoneItemEffectInfo:: @ 831E4EA
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x80
.byte 0x00
gMoonStoneItemEffectInfo:: @ 831E4F0
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x80
.byte 0x00
gFireStoneItemEffectInfo:: @ 831E4F6
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x80
.byte 0x00
gThunderStoneItemEffectInfo:: @ 831E4FC
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x80
.byte 0x00
gWaterStoneItemEffectInfo:: @ 831E502
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x80
.byte 0x00
gLeafStoneItemEffectInfo:: @ 831E508
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x80
.byte 0x00
gCheriBerryItemEffectInfo:: @ 831E50E
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x02
.byte 0x00
.byte 0x00
gChestoBerryItemEffectInfo:: @ 831E514
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x20
.byte 0x00
.byte 0x00
gPechaBerryItemEffectInfo:: @ 831E51A
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x10
.byte 0x00
.byte 0x00
gRawstBerryItemEffectInfo:: @ 831E520
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x08
.byte 0x00
.byte 0x00
gAspearBerryItemEffectInfo:: @ 831E526
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 0x00
gLeppaBerryItemEffectInfo:: @ 831E52C
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x18
.byte 0x00
.byte 0x0a
gOranBerryItemEffectInfo:: @ 831E533
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 10
gPersimBerryItemEffectInfo:: @ 831E53A
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x01
.byte 0x00
.byte 0x00
gLumBerryItemEffectInfo:: @ 831E540
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x3f
.byte 0x00
.byte 0x00
gSitrusBerryItemEffectInfo:: @ 831E546
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x04
.byte 0x00
.byte 30
gPomegBerryItemEffectInfo:: @ 831E54D
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x01
.byte 0xe0
.byte 0xf6
.byte 0x0a
.byte 0x05
.byte 0x02
gKelpsyBerryItemEffectInfo:: @ 831E557
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x02
.byte 0xe0
.byte 0xf6
.byte 0x0a
.byte 0x05
.byte 0x02
gQualotBerryItemEffectInfo:: @ 831E561
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0xe1
.byte 0xf6
.byte 0x0a
.byte 0x05
.byte 0x02
gHondewBerryItemEffectInfo:: @ 831E56B
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0xe8
.byte 0xf6
.byte 0x0a
.byte 0x05
.byte 0x02
gGrepaBerryItemEffectInfo:: @ 831E575
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0xe4
.byte 0xf6
.byte 0x0a
.byte 0x05
.byte 0x02
gTamatoBerryItemEffectInfo:: @ 831E57F
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0xe2
.byte 0xf6
.byte 0x0a
.byte 0x05
.byte 0x02
.align 2
gItemEffectTable:: @ 831E58C
.4byte gPotionItemEffectInfo
.4byte gAntidoteItemEffectInfo
.4byte gBurnHealItemEffectInfo
.4byte gIceHealItemEffectInfo
.4byte gAwakeningItemEffectInfo
.4byte gParalyzeHealItemEffectInfo
.4byte gFullRestoreItemEffectInfo
.4byte gMaxPotionItemEffectInfo
.4byte gHyperPotionItemEffectInfo
.4byte gSuperPotionItemEffectInfo
.4byte gFullHealItemEffectInfo
.4byte gReviveItemEffectInfo
.4byte gMaxReviveItemEffectInfo
.4byte gFreshWaterItemEffectInfo
.4byte gSodaPopItemEffectInfo
.4byte gLemonadeItemEffectInfo
.4byte gMoomooMilkItemEffectInfo
.4byte gEnergyPowderItemEffectInfo
.4byte gEnergyRootItemEffectInfo
.4byte gHealPowderItemEffectInfo
.4byte gRevivalHerbItemEffectInfo
.4byte gEtherItemEffectInfo
.4byte gMaxEtherItemEffectInfo
.4byte gElixirItemEffectInfo
.4byte gMaxElixirItemEffectInfo
.4byte gLavaCookieItemEffectInfo
.4byte gBlueFluteItemEffectInfo
.4byte gYellowFluteItemEffectInfo
.4byte gRedFluteItemEffectInfo
.4byte 0
.4byte 0
.4byte gBerryJuiceItemEffectInfo
.4byte gSacredAshItemEffectInfo
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte gHPUpItemEffectInfo
.4byte gProteinItemEffectInfo
.4byte gIronItemEffectInfo
.4byte gCarbosItemEffectInfo
.4byte gCalciumItemEffectInfo
.4byte gRareCandyItemEffectInfo
.4byte gPPUpItemEffectInfo
.4byte gZincItemEffectInfo
.4byte gPPMaxItemEffectInfo
.4byte 0
.4byte gGuardSpecItemEffectInfo
.4byte gDireHitItemEffectInfo
.4byte gXAttackItemEffectInfo
.4byte gXDefendItemEffectInfo
.4byte gXSpeedItemEffectInfo
.4byte gXAccuracyItemEffectInfo
.4byte gXSpecialItemEffectInfo
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte gSunStoneItemEffectInfo
.4byte gMoonStoneItemEffectInfo
.4byte gFireStoneItemEffectInfo
.4byte gThunderStoneItemEffectInfo
.4byte gWaterStoneItemEffectInfo
.4byte gLeafStoneItemEffectInfo
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte gCheriBerryItemEffectInfo
.4byte gChestoBerryItemEffectInfo
.4byte gPechaBerryItemEffectInfo
.4byte gRawstBerryItemEffectInfo
.4byte gAspearBerryItemEffectInfo
.4byte gLeppaBerryItemEffectInfo
.4byte gOranBerryItemEffectInfo
.4byte gPersimBerryItemEffectInfo
.4byte gLumBerryItemEffectInfo
.4byte gSitrusBerryItemEffectInfo
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte gPomegBerryItemEffectInfo
.4byte gKelpsyBerryItemEffectInfo
.4byte gQualotBerryItemEffectInfo
.4byte gHondewBerryItemEffectInfo
.4byte gGrepaBerryItemEffectInfo
.4byte gTamatoBerryItemEffectInfo
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
data/item_icon.s
-15
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
data/item_menu_icons.s
+1 -1
View File
@@ -1,4 +1,4 @@
#include "constants/items.h"
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
data/level_up_learnset_pointers.inc
-414
View File
@@ -1,414 +0,0 @@
.align 2
gLevelUpLearnsets:: @ 832937C
.4byte gBulbasaurLevelUpLearnset
.4byte gBulbasaurLevelUpLearnset
.4byte gIvysaurLevelUpLearnset
.4byte gVenusaurLevelUpLearnset
.4byte gCharmanderLevelUpLearnset
.4byte gCharmeleonLevelUpLearnset
.4byte gCharizardLevelUpLearnset
.4byte gSquirtleLevelUpLearnset
.4byte gWartortleLevelUpLearnset
.4byte gBlastoiseLevelUpLearnset
.4byte gCaterpieLevelUpLearnset
.4byte gMetapodLevelUpLearnset
.4byte gButterfreeLevelUpLearnset
.4byte gWeedleLevelUpLearnset
.4byte gKakunaLevelUpLearnset
.4byte gBeedrillLevelUpLearnset
.4byte gPidgeyLevelUpLearnset
.4byte gPidgeottoLevelUpLearnset
.4byte gPidgeotLevelUpLearnset
.4byte gRattataLevelUpLearnset
.4byte gRaticateLevelUpLearnset
.4byte gSpearowLevelUpLearnset
.4byte gFearowLevelUpLearnset
.4byte gEkansLevelUpLearnset
.4byte gArbokLevelUpLearnset
.4byte gPikachuLevelUpLearnset
.4byte gRaichuLevelUpLearnset
.4byte gSandshrewLevelUpLearnset
.4byte gSandslashLevelUpLearnset
.4byte gNidoranFLevelUpLearnset
.4byte gNidorinaLevelUpLearnset
.4byte gNidoqueenLevelUpLearnset
.4byte gNidoranMLevelUpLearnset
.4byte gNidorinoLevelUpLearnset
.4byte gNidokingLevelUpLearnset
.4byte gClefairyLevelUpLearnset
.4byte gClefableLevelUpLearnset
.4byte gVulpixLevelUpLearnset
.4byte gNinetalesLevelUpLearnset
.4byte gJigglypuffLevelUpLearnset
.4byte gWigglytuffLevelUpLearnset
.4byte gZubatLevelUpLearnset
.4byte gGolbatLevelUpLearnset
.4byte gOddishLevelUpLearnset
.4byte gGloomLevelUpLearnset
.4byte gVileplumeLevelUpLearnset
.4byte gParasLevelUpLearnset
.4byte gParasectLevelUpLearnset
.4byte gVenonatLevelUpLearnset
.4byte gVenomothLevelUpLearnset
.4byte gDiglettLevelUpLearnset
.4byte gDugtrioLevelUpLearnset
.4byte gMeowthLevelUpLearnset
.4byte gPersianLevelUpLearnset
.4byte gPsyduckLevelUpLearnset
.4byte gGolduckLevelUpLearnset
.4byte gMankeyLevelUpLearnset
.4byte gPrimeapeLevelUpLearnset
.4byte gGrowlitheLevelUpLearnset
.4byte gArcanineLevelUpLearnset
.4byte gPoliwagLevelUpLearnset
.4byte gPoliwhirlLevelUpLearnset
.4byte gPoliwrathLevelUpLearnset
.4byte gAbraLevelUpLearnset
.4byte gKadabraLevelUpLearnset
.4byte gAlakazamLevelUpLearnset
.4byte gMachopLevelUpLearnset
.4byte gMachokeLevelUpLearnset
.4byte gMachampLevelUpLearnset
.4byte gBellsproutLevelUpLearnset
.4byte gWeepinbellLevelUpLearnset
.4byte gVictreebelLevelUpLearnset
.4byte gTentacoolLevelUpLearnset
.4byte gTentacruelLevelUpLearnset
.4byte gGeodudeLevelUpLearnset
.4byte gGravelerLevelUpLearnset
.4byte gGolemLevelUpLearnset
.4byte gPonytaLevelUpLearnset
.4byte gRapidashLevelUpLearnset
.4byte gSlowpokeLevelUpLearnset
.4byte gSlowbroLevelUpLearnset
.4byte gMagnemiteLevelUpLearnset
.4byte gMagnetonLevelUpLearnset
.4byte gFarfetchdLevelUpLearnset
.4byte gDoduoLevelUpLearnset
.4byte gDodrioLevelUpLearnset
.4byte gSeelLevelUpLearnset
.4byte gDewgongLevelUpLearnset
.4byte gGrimerLevelUpLearnset
.4byte gMukLevelUpLearnset
.4byte gShellderLevelUpLearnset
.4byte gCloysterLevelUpLearnset
.4byte gGastlyLevelUpLearnset
.4byte gHaunterLevelUpLearnset
.4byte gGengarLevelUpLearnset
.4byte gOnixLevelUpLearnset
.4byte gDrowzeeLevelUpLearnset
.4byte gHypnoLevelUpLearnset
.4byte gKrabbyLevelUpLearnset
.4byte gKinglerLevelUpLearnset
.4byte gVoltorbLevelUpLearnset
.4byte gElectrodeLevelUpLearnset
.4byte gExeggcuteLevelUpLearnset
.4byte gExeggutorLevelUpLearnset
.4byte gCuboneLevelUpLearnset
.4byte gMarowakLevelUpLearnset
.4byte gHitmonleeLevelUpLearnset
.4byte gHitmonchanLevelUpLearnset
.4byte gLickitungLevelUpLearnset
.4byte gKoffingLevelUpLearnset
.4byte gWeezingLevelUpLearnset
.4byte gRhyhornLevelUpLearnset
.4byte gRhydonLevelUpLearnset
.4byte gChanseyLevelUpLearnset
.4byte gTangelaLevelUpLearnset
.4byte gKangaskhanLevelUpLearnset
.4byte gHorseaLevelUpLearnset
.4byte gSeadraLevelUpLearnset
.4byte gGoldeenLevelUpLearnset
.4byte gSeakingLevelUpLearnset
.4byte gStaryuLevelUpLearnset
.4byte gStarmieLevelUpLearnset
.4byte gMrmimeLevelUpLearnset
.4byte gScytherLevelUpLearnset
.4byte gJynxLevelUpLearnset
.4byte gElectabuzzLevelUpLearnset
.4byte gMagmarLevelUpLearnset
.4byte gPinsirLevelUpLearnset
.4byte gTaurosLevelUpLearnset
.4byte gMagikarpLevelUpLearnset
.4byte gGyaradosLevelUpLearnset
.4byte gLaprasLevelUpLearnset
.4byte gDittoLevelUpLearnset
.4byte gEeveeLevelUpLearnset
.4byte gVaporeonLevelUpLearnset
.4byte gJolteonLevelUpLearnset
.4byte gFlareonLevelUpLearnset
.4byte gPorygonLevelUpLearnset
.4byte gOmanyteLevelUpLearnset
.4byte gOmastarLevelUpLearnset
.4byte gKabutoLevelUpLearnset
.4byte gKabutopsLevelUpLearnset
.4byte gAerodactylLevelUpLearnset
.4byte gSnorlaxLevelUpLearnset
.4byte gArticunoLevelUpLearnset
.4byte gZapdosLevelUpLearnset
.4byte gMoltresLevelUpLearnset
.4byte gDratiniLevelUpLearnset
.4byte gDragonairLevelUpLearnset
.4byte gDragoniteLevelUpLearnset
.4byte gMewtwoLevelUpLearnset
.4byte gMewLevelUpLearnset
.4byte gChikoritaLevelUpLearnset
.4byte gBayleefLevelUpLearnset
.4byte gMeganiumLevelUpLearnset
.4byte gCyndaquilLevelUpLearnset
.4byte gQuilavaLevelUpLearnset
.4byte gTyphlosionLevelUpLearnset
.4byte gTotodileLevelUpLearnset
.4byte gCroconawLevelUpLearnset
.4byte gFeraligatrLevelUpLearnset
.4byte gSentretLevelUpLearnset
.4byte gFurretLevelUpLearnset
.4byte gHoothootLevelUpLearnset
.4byte gNoctowlLevelUpLearnset
.4byte gLedybaLevelUpLearnset
.4byte gLedianLevelUpLearnset
.4byte gSpinarakLevelUpLearnset
.4byte gAriadosLevelUpLearnset
.4byte gCrobatLevelUpLearnset
.4byte gChinchouLevelUpLearnset
.4byte gLanturnLevelUpLearnset
.4byte gPichuLevelUpLearnset
.4byte gCleffaLevelUpLearnset
.4byte gIgglybuffLevelUpLearnset
.4byte gTogepiLevelUpLearnset
.4byte gTogeticLevelUpLearnset
.4byte gNatuLevelUpLearnset
.4byte gXatuLevelUpLearnset
.4byte gMareepLevelUpLearnset
.4byte gFlaaffyLevelUpLearnset
.4byte gAmpharosLevelUpLearnset
.4byte gBellossomLevelUpLearnset
.4byte gMarillLevelUpLearnset
.4byte gAzumarillLevelUpLearnset
.4byte gSudowoodoLevelUpLearnset
.4byte gPolitoedLevelUpLearnset
.4byte gHoppipLevelUpLearnset
.4byte gSkiploomLevelUpLearnset
.4byte gJumpluffLevelUpLearnset
.4byte gAipomLevelUpLearnset
.4byte gSunkernLevelUpLearnset
.4byte gSunfloraLevelUpLearnset
.4byte gYanmaLevelUpLearnset
.4byte gWooperLevelUpLearnset
.4byte gQuagsireLevelUpLearnset
.4byte gEspeonLevelUpLearnset
.4byte gUmbreonLevelUpLearnset
.4byte gMurkrowLevelUpLearnset
.4byte gSlowkingLevelUpLearnset
.4byte gMisdreavusLevelUpLearnset
.4byte gUnownLevelUpLearnset
.4byte gWobbuffetLevelUpLearnset
.4byte gGirafarigLevelUpLearnset
.4byte gPinecoLevelUpLearnset
.4byte gForretressLevelUpLearnset
.4byte gDunsparceLevelUpLearnset
.4byte gGligarLevelUpLearnset
.4byte gSteelixLevelUpLearnset
.4byte gSnubbullLevelUpLearnset
.4byte gGranbullLevelUpLearnset
.4byte gQwilfishLevelUpLearnset
.4byte gScizorLevelUpLearnset
.4byte gShuckleLevelUpLearnset
.4byte gHeracrossLevelUpLearnset
.4byte gSneaselLevelUpLearnset
.4byte gTeddiursaLevelUpLearnset
.4byte gUrsaringLevelUpLearnset
.4byte gSlugmaLevelUpLearnset
.4byte gMagcargoLevelUpLearnset
.4byte gSwinubLevelUpLearnset
.4byte gPiloswineLevelUpLearnset
.4byte gCorsolaLevelUpLearnset
.4byte gRemoraidLevelUpLearnset
.4byte gOctilleryLevelUpLearnset
.4byte gDelibirdLevelUpLearnset
.4byte gMantineLevelUpLearnset
.4byte gSkarmoryLevelUpLearnset
.4byte gHoundourLevelUpLearnset
.4byte gHoundoomLevelUpLearnset
.4byte gKingdraLevelUpLearnset
.4byte gPhanpyLevelUpLearnset
.4byte gDonphanLevelUpLearnset
.4byte gPorygon2LevelUpLearnset
.4byte gStantlerLevelUpLearnset
.4byte gSmeargleLevelUpLearnset
.4byte gTyrogueLevelUpLearnset
.4byte gHitmontopLevelUpLearnset
.4byte gSmoochumLevelUpLearnset
.4byte gElekidLevelUpLearnset
.4byte gMagbyLevelUpLearnset
.4byte gMiltankLevelUpLearnset
.4byte gBlisseyLevelUpLearnset
.4byte gRaikouLevelUpLearnset
.4byte gEnteiLevelUpLearnset
.4byte gSuicuneLevelUpLearnset
.4byte gLarvitarLevelUpLearnset
.4byte gPupitarLevelUpLearnset
.4byte gTyranitarLevelUpLearnset
.4byte gLugiaLevelUpLearnset
.4byte gHoOhLevelUpLearnset
.4byte gCelebiLevelUpLearnset
.4byte gSpecies252LevelUpLearnset
.4byte gSpecies253LevelUpLearnset
.4byte gSpecies254LevelUpLearnset
.4byte gSpecies255LevelUpLearnset
.4byte gSpecies256LevelUpLearnset
.4byte gSpecies257LevelUpLearnset
.4byte gSpecies258LevelUpLearnset
.4byte gSpecies259LevelUpLearnset
.4byte gSpecies260LevelUpLearnset
.4byte gSpecies261LevelUpLearnset
.4byte gSpecies262LevelUpLearnset
.4byte gSpecies263LevelUpLearnset
.4byte gSpecies264LevelUpLearnset
.4byte gSpecies265LevelUpLearnset
.4byte gSpecies266LevelUpLearnset
.4byte gSpecies267LevelUpLearnset
.4byte gSpecies268LevelUpLearnset
.4byte gSpecies269LevelUpLearnset
.4byte gSpecies270LevelUpLearnset
.4byte gSpecies271LevelUpLearnset
.4byte gSpecies272LevelUpLearnset
.4byte gSpecies273LevelUpLearnset
.4byte gSpecies274LevelUpLearnset
.4byte gSpecies275LevelUpLearnset
.4byte gSpecies276LevelUpLearnset
.4byte gTreeckoLevelUpLearnset
.4byte gGrovyleLevelUpLearnset
.4byte gSceptileLevelUpLearnset
.4byte gTorchicLevelUpLearnset
.4byte gCombuskenLevelUpLearnset
.4byte gBlazikenLevelUpLearnset
.4byte gMudkipLevelUpLearnset
.4byte gMarshtompLevelUpLearnset
.4byte gSwampertLevelUpLearnset
.4byte gPoochyenaLevelUpLearnset
.4byte gMightyenaLevelUpLearnset
.4byte gZigzagoonLevelUpLearnset
.4byte gLinooneLevelUpLearnset
.4byte gWurmpleLevelUpLearnset
.4byte gSilcoonLevelUpLearnset
.4byte gBeautiflyLevelUpLearnset
.4byte gCascoonLevelUpLearnset
.4byte gDustoxLevelUpLearnset
.4byte gLotadLevelUpLearnset
.4byte gLombreLevelUpLearnset
.4byte gLudicoloLevelUpLearnset
.4byte gSeedotLevelUpLearnset
.4byte gNuzleafLevelUpLearnset
.4byte gShiftryLevelUpLearnset
.4byte gNincadaLevelUpLearnset
.4byte gNinjaskLevelUpLearnset
.4byte gShedinjaLevelUpLearnset
.4byte gTaillowLevelUpLearnset
.4byte gSwellowLevelUpLearnset
.4byte gShroomishLevelUpLearnset
.4byte gBreloomLevelUpLearnset
.4byte gSpindaLevelUpLearnset
.4byte gWingullLevelUpLearnset
.4byte gPelipperLevelUpLearnset
.4byte gSurskitLevelUpLearnset
.4byte gMasquerainLevelUpLearnset
.4byte gWailmerLevelUpLearnset
.4byte gWailordLevelUpLearnset
.4byte gSkittyLevelUpLearnset
.4byte gDelcattyLevelUpLearnset
.4byte gKecleonLevelUpLearnset
.4byte gBaltoyLevelUpLearnset
.4byte gClaydolLevelUpLearnset
.4byte gNosepassLevelUpLearnset
.4byte gTorkoalLevelUpLearnset
.4byte gSableyeLevelUpLearnset
.4byte gBarboachLevelUpLearnset
.4byte gWhiscashLevelUpLearnset
.4byte gLuvdiscLevelUpLearnset
.4byte gCorphishLevelUpLearnset
.4byte gCrawdauntLevelUpLearnset
.4byte gFeebasLevelUpLearnset
.4byte gMiloticLevelUpLearnset
.4byte gCarvanhaLevelUpLearnset
.4byte gSharpedoLevelUpLearnset
.4byte gTrapinchLevelUpLearnset
.4byte gVibravaLevelUpLearnset
.4byte gFlygonLevelUpLearnset
.4byte gMakuhitaLevelUpLearnset
.4byte gHariyamaLevelUpLearnset
.4byte gElectrikeLevelUpLearnset
.4byte gManectricLevelUpLearnset
.4byte gNumelLevelUpLearnset
.4byte gCameruptLevelUpLearnset
.4byte gSphealLevelUpLearnset
.4byte gSealeoLevelUpLearnset
.4byte gWalreinLevelUpLearnset
.4byte gCacneaLevelUpLearnset
.4byte gCacturneLevelUpLearnset
.4byte gSnoruntLevelUpLearnset
.4byte gGlalieLevelUpLearnset
.4byte gLunatoneLevelUpLearnset
.4byte gSolrockLevelUpLearnset
.4byte gAzurillLevelUpLearnset
.4byte gSpoinkLevelUpLearnset
.4byte gGrumpigLevelUpLearnset
.4byte gPlusleLevelUpLearnset
.4byte gMinunLevelUpLearnset
.4byte gMawileLevelUpLearnset
.4byte gMedititeLevelUpLearnset
.4byte gMedichamLevelUpLearnset
.4byte gSwabluLevelUpLearnset
.4byte gAltariaLevelUpLearnset
.4byte gWynautLevelUpLearnset
.4byte gDuskullLevelUpLearnset
.4byte gDusclopsLevelUpLearnset
.4byte gRoseliaLevelUpLearnset
.4byte gSlakothLevelUpLearnset
.4byte gVigorothLevelUpLearnset
.4byte gSlakingLevelUpLearnset
.4byte gGulpinLevelUpLearnset
.4byte gSwalotLevelUpLearnset
.4byte gTropiusLevelUpLearnset
.4byte gWhismurLevelUpLearnset
.4byte gLoudredLevelUpLearnset
.4byte gExploudLevelUpLearnset
.4byte gClamperlLevelUpLearnset
.4byte gHuntailLevelUpLearnset
.4byte gGorebyssLevelUpLearnset
.4byte gAbsolLevelUpLearnset
.4byte gShuppetLevelUpLearnset
.4byte gBanetteLevelUpLearnset
.4byte gSeviperLevelUpLearnset
.4byte gZangooseLevelUpLearnset
.4byte gRelicanthLevelUpLearnset
.4byte gAronLevelUpLearnset
.4byte gLaironLevelUpLearnset
.4byte gAggronLevelUpLearnset
.4byte gCastformLevelUpLearnset
.4byte gVolbeatLevelUpLearnset
.4byte gIllumiseLevelUpLearnset
.4byte gLileepLevelUpLearnset
.4byte gCradilyLevelUpLearnset
.4byte gAnorithLevelUpLearnset
.4byte gArmaldoLevelUpLearnset
.4byte gRaltsLevelUpLearnset
.4byte gKirliaLevelUpLearnset
.4byte gGardevoirLevelUpLearnset
.4byte gBagonLevelUpLearnset
.4byte gShelgonLevelUpLearnset
.4byte gSalamenceLevelUpLearnset
.4byte gBeldumLevelUpLearnset
.4byte gMetangLevelUpLearnset
.4byte gMetagrossLevelUpLearnset
.4byte gRegirockLevelUpLearnset
.4byte gRegiceLevelUpLearnset
.4byte gRegisteelLevelUpLearnset
.4byte gKyogreLevelUpLearnset
.4byte gGroudonLevelUpLearnset
.4byte gRayquazaLevelUpLearnset
.4byte gLatiasLevelUpLearnset
.4byte gLatiosLevelUpLearnset
.4byte gJirachiLevelUpLearnset
.4byte gDeoxysLevelUpLearnset
.4byte gChimechoLevelUpLearnset
data/level_up_learnsets.inc
-5204
View File
File diff suppressed because it is too large Load Diff
data/nature_stat_table.inc
-27
View File
@@ -1,27 +0,0 @@
gNatureStatTable:: @ 831E818
@ Atk Def Spd Sp.Atk Sp.Def
.byte 0, 0, 0, 0, 0 @ Hardy
.byte 1, -1, 0, 0, 0 @ Lonely
.byte 1, 0, -1, 0, 0 @ Brave
.byte 1, 0, 0, -1, 0 @ Adamant
.byte 1, 0, 0, 0, -1 @ Naughty
.byte -1, 1, 0, 0, 0 @ Bold
.byte 0, 0, 0, 0, 0 @ Docile
.byte 0, 1, -1, 0, 0 @ Relaxed
.byte 0, 1, 0, -1, 0 @ Impish
.byte 0, 1, 0, 0, -1 @ Lax
.byte -1, 0, 1, 0, 0 @ Timid
.byte 0, -1, 1, 0, 0 @ Hasty
.byte 0, 0, 0, 0, 0 @ Serious
.byte 0, 0, 1, -1, 0 @ Jolly
.byte 0, 0, 1, 0, -1 @ Naive
.byte -1, 0, 0, 1, 0 @ Modest
.byte 0, -1, 0, 1, 0 @ Mild
.byte 0, 0, -1, 1, 0 @ Quiet
.byte 0, 0, 0, 0, 0 @ Bashful
.byte 0, 0, 0, 1, -1 @ Rash
.byte -1, 0, 0, 0, 1 @ Calm
.byte 0, -1, 0, 0, 1 @ Gentle
.byte 0, 0, -1, 0, 1 @ Sassy
.byte 0, 0, 0, -1, 1 @ Careful
.byte 0, 0, 0, 0, 0 @ Quirky
data/new_menu_helpers.s
-53
View File
@@ -1,53 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0860F074:: @ 860F074
.incbin "graphics/interface/860F074.gbapal"
gUnknown_0860F094:: @ 860F094
.byte 8, 4, 1, 0
gUnknown_0860F098:: @ 860F098
window_template 0, 2, 15, 27, 4, 15, 0x194
null_window_template
gUnknown_0860F0A8:: @ 860F0A8
window_template 0, 21, 9, 5, 4, 15, 0x125
@ These are not referenced in src/new_menu_helpers.c; rather, they are in src/menu.c. Regardless, they were plopped here.
gUnknown_0860F0B0:: @ 860F0B0
.incbin "graphics/interface/860F0B0.gbapal"
gUnknown_0860F0D0:: @ 860F0D0
.byte 15, 1, 2, 0
gUnknown_0860F0D4:: @ 860F0D4
.2byte 0xC0C, 0
.2byte 0xC20, 32
.2byte 0xC20, 100
.2byte 0xC20, 0x60
.2byte 0xC20, 0x80
.2byte 0xC20, 0x48
.2byte 0xC20, 0x44
.2byte 0xC20, 0x6C
.2byte 0xC20, 0x68
.2byte 0xC20, 0x88
.2byte 0xC20, 0xA4
.2byte 0xC20, 0x24
.2byte 0xC20, 0x28
.2byte 0xC20, 0x2C
.2byte 0xC20, 0x40
.2byte 0xC20, 0x84
.2byte 0xC20, 0x4C
.2byte 0xC20, 0xA0
.2byte 0xC20, 0x8C
.2byte 0xC2A, 0xA8
.2byte 0xC2A, 0xC0
.2byte 0xC2A, 0xC8
.2byte 0xC2A, 0xE0
.2byte 0xC2A, 0xE8
.2byte 0x808, 0xAE
.2byte 0x808, 0xAF
data/pokedex_order.inc
-1238
View File
File diff suppressed because it is too large Load Diff
data/reset_rtc_screen.s
-78
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
data/rom_8011DC0.s
+2 -2
View File
@@ -1705,14 +1705,14 @@ gUnknown_082F06F8:: @ 82F06F8
.4byte gText_ReturnToTitle
.align 2
gUnknown_082F0720:: @ 82F0720 struct TextColor
gUnknown_082F0720:: @ 82F0720
.byte 0x00, 0x01, 0x02
.align 2
.byte 0x00, 0x01, 0x02
.align 2
gUnknown_082F0728:: @ 82F0728 struct TextColor
gUnknown_082F0728:: @ 82F0728
.byte 0x01, 0x02, 0x03
.align 2
data/spinda_spot_graphics.inc
-81
View File
@@ -1,81 +0,0 @@
.align 2
gSpindaSpotGraphics:: @ 831E2F0
.byte 16 @ X
.byte 7 @ Y
.2byte 0b0000000001110000
.2byte 0b0000000111111100
.2byte 0b0000001111111110
.2byte 0b0000011111111110
.2byte 0b0000011111111111
.2byte 0b0000111111111111
.2byte 0b0000111111111111
.2byte 0b0000111111111111
.2byte 0b0000011111111110
.2byte 0b0000011111111110
.2byte 0b0000001111111100
.2byte 0b0000000111100000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.byte 40 @ X
.byte 8 @ Y
.2byte 0b0000000111100000
.2byte 0b0000001111111000
.2byte 0b0000011111111100
.2byte 0b0000111111111110
.2byte 0b0000111111111110
.2byte 0b0001111111111111
.2byte 0b0001111111111111
.2byte 0b0001111111111111
.2byte 0b0000111111111110
.2byte 0b0000111111111110
.2byte 0b0000011111111100
.2byte 0b0000011111111000
.2byte 0b0000000011100000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.byte 22 @ X
.byte 25 @ Y
.2byte 0b0000000000011100
.2byte 0b0000000000111110
.2byte 0b0000000001111111
.2byte 0b0000000001111111
.2byte 0b0000000001111111
.2byte 0b0000000001111111
.2byte 0b0000000001111111
.2byte 0b0000000000111110
.2byte 0b0000000000011100
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.byte 34 @ X
.byte 26 @ Y
.2byte 0b0000000000111100
.2byte 0b0000000001111110
.2byte 0b0000000011111111
.2byte 0b0000000011111111
.2byte 0b0000000011111111
.2byte 0b0000000011111111
.2byte 0b0000000011111111
.2byte 0b0000000001111110
.2byte 0b0000000000111100
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
.2byte 0b0000000000000000
data/title_screen.s
-163
View File
@@ -1,163 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.incbin "graphics/title_screen/unk_853EF78.gbapal"
.align 2
gTitleScreenRayquazaGfx:: @ 853F058
.incbin "graphics/title_screen/rayquaza.4bpp.lz"
.align 2
gTitleScreenRayquazaTilemap:: @ 853F83C
.incbin "graphics/title_screen/rayquaza.bin.lz"
.align 2
gTitleScreenLogoShineGfx:: @ 853FB3C
.incbin "graphics/title_screen/logo_shine.4bpp.lz"
.align 2
gTitleScreenCloudsGfx:: @ 853FC8C
.incbin "graphics/title_screen/clouds.4bpp.lz"
.align 2
gUnknown_0853FF70:: @ 853FF70
.2byte 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710
.2byte 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10
.2byte 0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008
.2byte 0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000
.2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000
.2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000
.2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000
.2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000
.align 2
gUnknown_0853FFF0:: @ 853FFF0
.byte 0xa0, 0x60, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0853FFF8:: @ 853FFF8
.byte 0xa0, 0x60, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08540000:: @ 8540000
.2byte 0x0000, 0x001e, 0xffff, 0x0000
.align 2
gUnknown_08540008:: @ 8540008
.2byte 0x0040, 0x001e, 0xffff, 0x0000
.align 2
gUnknown_08540010:: @ 8540010
.4byte gUnknown_08540000
.align 2
gUnknown_08540014:: @ 8540014
.4byte gUnknown_08540008
.align 2
gUnknown_08540018:: @ 8540018
spr_template 0x03e8, 0x03e8, gUnknown_0853FFF0, gUnknown_08540010, NULL, gDummySpriteAffineAnimTable, sub_80AA40C
.align 2
gUnknown_08540030:: @ 8540030
spr_template 0x03e8, 0x03e8, gUnknown_0853FFF8, gUnknown_08540014, NULL, gDummySpriteAffineAnimTable, sub_80AA474
.align 2
gUnknown_08540048:: @ 8540048
obj_tiles gTitleScreenEmeraldVersionGfx, 0x1000, 0x03e8
null_obj_tiles
.align 2
gUnknown_08540058:: @ 8540058
.byte 0xa0, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08540060:: @ 8540060
.2byte 0x0001, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08540068:: @ 8540068
.2byte 0x0005, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08540070:: @ 8540070
.2byte 0x0009, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08540078:: @ 8540078
.2byte 0x000d, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08540080:: @ 8540080
.2byte 0x0011, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08540088:: @ 8540088
.2byte 0x0015, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08540090:: @ 8540090
.2byte 0x0019, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08540098:: @ 8540098
.2byte 0x001d, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_085400A0:: @ 85400A0
.2byte 0x0021, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_085400A8:: @ 85400A8
.2byte 0x0025, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_085400B0:: @ 85400B0
.4byte gUnknown_08540060
.4byte gUnknown_08540068
.4byte gUnknown_08540070
.4byte gUnknown_08540078
.4byte gUnknown_08540080
.4byte gUnknown_08540088
.4byte gUnknown_08540090
.4byte gUnknown_08540098
.4byte gUnknown_085400A0
.4byte gUnknown_085400A8
.align 2
gUnknown_085400D8:: @ 85400D8
spr_template 0x03e9, 0x03e9, gUnknown_08540058, gUnknown_085400B0, NULL, gDummySpriteAffineAnimTable, sub_80AA4B4
.align 2
gUnknown_085400F0:: @ 85400F0
obj_tiles gTitleScreenPressStartGfx, 0x0520, 0x03e9
null_obj_tiles
.align 2
gUnknown_08540100:: @ 8540100
obj_pal gTitleScreenPressStartPal, 0x03e9
null_obj_pal
.align 2
gUnknown_08540110:: @ 8540110
.byte 0xa0, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08540118:: @ 8540118
.2byte 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08540120:: @ 8540120
.4byte gUnknown_08540118
.align 2
gUnknown_08540124:: @ 8540124
spr_template 0x03ea, 0x03e9, gUnknown_08540110, gUnknown_08540120, NULL, gDummySpriteAffineAnimTable, title_screen_logo_shine_obj_callback_type1
.align 2
gUnknown_0854013C:: @ 854013C
obj_tiles gTitleScreenLogoShineGfx, 0x0800, 0x03ea
null_obj_tiles
data/tm_hm_learnsets.inc
-414
View File
@@ -1,414 +0,0 @@
.align 2
gTMHMLearnsets:: @ 831E898
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ??????????
.8byte 0b0011100100000111100000100010000100001101010000011100100000 @ Bulbasaur
.8byte 0b0011100100000111100000100010000100001101010000011100100000 @ Ivysaur
.8byte 0b0011100100000111100000100010000110001101010100011100110000 @ Venusaur
.8byte 0b0010100110000111101010010011001100010100010000011000100011 @ Charmander
.8byte 0b0010100110000111101010010011001100010100010000011000100011 @ Charmeleon
.8byte 0b0010101110010111101010010011001110010100010100011000110011 @ Charizard
.8byte 0b1110110000000111100000000011001100010100110011001001100101 @ Squirtle
.8byte 0b1110110000000111100000000011001100010100110011001001100101 @ Wartortle
.8byte 0b1110110000000111100000000011001110010100110111001001110101 @ Blastoise
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Caterpie
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Metapod
.8byte 0b0001000000101111101000000010110100001111110100011000100000 @ Butterfree
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Weedle
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Kakuna
.8byte 0b0010000100001111101000100011000100001101010100011000100000 @ Beedrill
.8byte 0b0000001000011111101000000010000100000100110000011000100000 @ Pidgey
.8byte 0b0000001000011111101000000010000100000100110000011000100000 @ Pidgeotto
.8byte 0b0000001000011111101000000010000100000100110100011000100000 @ Pidgeot
.8byte 0b0010000100001111100000001010101101110100110011111000100000 @ Rattata
.8byte 0b0010100100001111100000001010101101110100110111111000110000 @ Raticate
.8byte 0b0000001000011111101000000010000100000100110000011000100000 @ Spearow
.8byte 0b0000001000011111101000000010000100000100110100011000100000 @ Fearow
.8byte 0b0000100001001111110000100010001110010101110000011000100000 @ Ekans
.8byte 0b0000100001001111110000100010001110010101110100011000100000 @ Arbok
.8byte 0b0011100000000111100000001011001101110100111000001000100001 @ Pikachu
.8byte 0b0011100000001111100000001011001101110100111100001000100001 @ Raichu
.8byte 0b0010100100001111101101000011001110010100010000011000100001 @ Sandshrew
.8byte 0b0010100100001111101101000011001110010100010100011000100001 @ Sandslash
.8byte 0b0010100100001111101000101010001101110100110011011000100100 @ Nidoran♀
.8byte 0b0010100100001111101000101010001101110100110011011000100100 @ Nidorina
.8byte 0b0010110100001111111111111011101111110100110111111000110101 @ Nidoqueen
.8byte 0b0010100100001111100000101010001101110100110011011000100100 @ Nidoran♂
.8byte 0b0010100100001111100000101010001101110100110011011000100100 @ Nidorino
.8byte 0b0010110100001111110111111011101111110100110111111000110101 @ Nidoking
.8byte 0b0001100001000111100010011111111101111110111011011000101101 @ Clefairy
.8byte 0b0001100001000111100010011111111101111110111111011000101101 @ Clefable
.8byte 0b0000000010000111100010010010001100010110010000011000110000 @ Vulpix
.8byte 0b0000000010000111100010010010001100010110010100011000110000 @ Ninetales
.8byte 0b0001100001000111100010011111111101101110111011011000100101 @ Jigglypuff
.8byte 0b0001100001000111100010011111111101101110111111011000100101 @ Wigglytuff
.8byte 0b0000000001011111111000100010100100000101110000111000100000 @ Zubat
.8byte 0b0000000001011111111000100010100100000101110100111000100000 @ Golbat
.8byte 0b0001000100000111100000100010000100001101010000011100100000 @ Oddish
.8byte 0b0001000100000111100000100010000100001101010000011100100000 @ Gloom
.8byte 0b0001000100000111100000100010000100001101010100011100100000 @ Vileplume
.8byte 0b0011000100001111101000100010001100001101010000011100100000 @ Paras
.8byte 0b0011000100001111101000100010001100001101010100011100100000 @ Parasect
.8byte 0b0001000000101111100000100010010100001101010000011000100000 @ Venonat
.8byte 0b0001000000101111101000100010010100001101010100011000100000 @ Venomoth
.8byte 0b0010000100001111101100100010001110000100010000011000100000 @ Diglett
.8byte 0b0010000100001111101100100010001110000100010100011000100000 @ Dugtrio
.8byte 0b0001000101001111111000001010101101110100110000111000100100 @ Meowth
.8byte 0b0001000101001111111000001010101101110100110100111000110100 @ Persian
.8byte 0b1111110000000111101000000011001100010100110011001001101101 @ Psyduck
.8byte 0b1111110000000111101000000011001100010100110111001001101101 @ Golduck
.8byte 0b0010100010001111101100000011001111110100110000111010100001 @ Mankey
.8byte 0b0010100010001111101100000011001111110100110100111010100001 @ Primeape
.8byte 0b0010100010001111101010010010001100010100010000011000110000 @ Growlithe
.8byte 0b0010100010001111101010010010001100010100010100011000110000 @ Arcanine
.8byte 0b1100010000001111100000000010011100000100110011001001100100 @ Poliwag
.8byte 0b1110110000001111100000000011011110000100110011001001100101 @ Poliwhirl
.8byte 0b1110110000001111100100000011011110000100110111001011100101 @ Poliwrath
.8byte 0b0001000001101111110000001110110100010110111000111000101001 @ Abra
.8byte 0b0001000001101111110000001110110100010110111000111000101001 @ Kadabra
.8byte 0b0001000001101111110000001110110100010110111100111000101001 @ Alakazam
.8byte 0b0010100000001111100110010011001110000100110000011010100001 @ Machop
.8byte 0b0010100000001111100110010011001110000100110000011010100001 @ Machoke
.8byte 0b0010100000001111100110010011001110000100110100011010100001 @ Machamp
.8byte 0b0001000100001111100000100010000100001101010000011100100000 @ Bellsprout
.8byte 0b0001000100001111100000100010000100001101010000011100100000 @ Weepinbell
.8byte 0b0001000100001111100000100010000100001101010100011100100000 @ Victreebel
.8byte 0b1100010100001111100000100010000100000101110011001001100100 @ Tentacool
.8byte 0b1100010100001111100000100010000100000101110111001001100100 @ Tentacruel
.8byte 0b0010100000000111100111010011001110000100010000011000100001 @ Geodude
.8byte 0b0010100000000111100111010011001110000100010000011000100001 @ Graveler
.8byte 0b0010100000000111100111010011001110000100010100011000110001 @ Golem
.8byte 0b0000100010000111100010010010000100011100010000011000100000 @ Ponyta
.8byte 0b0000100010000111100010010010000100011100010100011000100000 @ Rapidash
.8byte 0b1001110000100111100010010010111110010110110011011001101100 @ Slowpoke
.8byte 0b1011110000100111100010010011111110010110110111011001101101 @ Slowbro
.8byte 0b0001000000000011100000001110000101100100110000011000100000 @ Magnemite
.8byte 0b0001000000000011100000001110000101100100110100011000100000 @ Magneton
.8byte 0b0000001100011111101000000010000100010100010000011000100000 @ Farfetch'd
.8byte 0b0000001000011111101000000010000100000100010000011000100000 @ Doduo
.8byte 0b0000001000011111111000000010000100000100010100111000100000 @ Dodrio
.8byte 0b1100010000001111100000000010000100000110110011001001100100 @ Seel
.8byte 0b1100010000001111100000000010000100000110110111001001100100 @ Dewgong
.8byte 0b0000000000001111110110111010001101100101110000111000100000 @ Grimer
.8byte 0b0010100000001111110110111011001101100101110100111000100001 @ Muk
.8byte 0b1000010000000111100000000010000100000100110011001001100100 @ Shellder
.8byte 0b1000010000000111110000000010000100000100110111001001100100 @ Cloyster
.8byte 0b0000000001101111110000100010110100100101110000111000100000 @ Gastly
.8byte 0b0000000001101111110000100010110100100101110000111000100000 @ Haunter
.8byte 0b0010100001101111110000100011110101100101110100111000100001 @ Gengar
.8byte 0b0010100000000111110101000010001110010100010000111000110000 @ Onix
.8byte 0b0001000001101111110000000111110100000110111000111000101001 @ Drowzee
.8byte 0b0001000001101111110000000111110100000110111100111000101001 @ Hypno
.8byte 0b1010110100001111100100000010001100000100110011001001100100 @ Krabby
.8byte 0b1010110100001111100100000010001100000100110111001001100100 @ Kingler
.8byte 0b0001000000001011110000001010000101100100111000101000100000 @ Voltorb
.8byte 0b0001000000001011110000001010000101100100111100101000100000 @ Electrode
.8byte 0b0001100000101111100000100110010100001101011000011100100000 @ Exeggcute
.8byte 0b0001100000101111100000100110010100001101011100011100100000 @ Exeggutor
.8byte 0b0010100000001111101111010011001110010100010011011000100001 @ Cubone
.8byte 0b0010100000001111101111010011001110010100010111011000100001 @ Marowak
.8byte 0b0010100000001111100100000011000110000100110000011010100001 @ Hitmonlee
.8byte 0b0010100000001111100100000011000110000100110000011010100001 @ Hitmonchan
.8byte 0b0010110100001111100111011011101111111100110111011000100101 @ Lickitung
.8byte 0b0001000000001111110010111010100101100100110000111000100000 @ Koffing
.8byte 0b0001000000001111110010111010100101100100110100111000100000 @ Weezing
.8byte 0b0010100000001111100111011010001111110100110011011000110000 @ Rhyhorn
.8byte 0b0010110100001111100111011011001111110100110111011000110001 @ Rhydon
.8byte 0b0011100001100111100111011011110111111110111111011001101101 @ Chansey
.8byte 0b0011000100001111100000100010000100001101010100011100100000 @ Tangela
.8byte 0b0010110100001111101111011011101111111100110111011001110101 @ Kangaskhan
.8byte 0b1100010000000111100000000010000100000100110011001001100100 @ Horsea
.8byte 0b1100010000000111100000000010000100000100110111001001100100 @ Seadra
.8byte 0b1100010000000111100000000010000100000100110011001001100100 @ Goldeen
.8byte 0b1100010000000111100000000010000100000100110111001001100100 @ Seaking
.8byte 0b1101010000000011100000000110010101100100111011001001100100 @ Staryu
.8byte 0b1101010000100011100000000110010101100100111111001001100100 @ Starmie
.8byte 0b0001000001101111110000001111110101101110111100111000101001 @ Mr. mime
.8byte 0b0010000100011111101000000010000100000100110100011000100000 @ Scyther
.8byte 0b0001000000101111110000000111110100000100111111101001101101 @ Jynx
.8byte 0b0011100000001111100000001011010101110100111100001000100001 @ Electabuzz
.8byte 0b0010100000001111100010010011010100010100010100011000100001 @ Magmar
.8byte 0b0010100100001111100100000011001110000100110100011010100001 @ Pinsir
.8byte 0b0010110000000111100111011010000111111100110111011000100100 @ Tauros
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Magikarp
.8byte 0b1110110000000111110011010010000111100100110111101001110100 @ Gyarados
.8byte 0b1110110000000111100000001010010101110110110111001001110100 @ Lapras
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Ditto
.8byte 0b0000000000000111100000000010101100010100110000011000100000 @ Eevee
.8byte 0b1100010000000111100000000010101100010100110111011001110100 @ Vaporeon
.8byte 0b0001000000000111100000001010101101110100110100011000110000 @ Jolteon
.8byte 0b0000000010000111100010010010101100010100110100011000110000 @ Flareon
.8byte 0b0001000000001011101000001010110101111100110111011000100000 @ Porygon
.8byte 0b1110010000001111100101000010000100000100110011001001100100 @ Omanyte
.8byte 0b1110010000001111100101000010000100000100110111001001100100 @ Omastar
.8byte 0b0110010000001111101101000010001100000101110011001001100100 @ Kabuto
.8byte 0b1110010100001111101101000011001100000101110111001001100100 @ Kabutops
.8byte 0b0010101000011111111111010010000110010100110100111000110010 @ Aerodactyl
.8byte 0b0000110000000111100111011011110111101100110111011000100101 @ Snorlax
.8byte 0b0010001000010011101001000110000100000100110111011001110100 @ Articuno
.8byte 0b0011001000010011101001001010000101100100111100011000110000 @ Zapdos
.8byte 0b0010001010010011101011010010000100000110110100011000110000 @ Moltres
.8byte 0b0100010000000111100010011010000101110110110111011001100100 @ Dratini
.8byte 0b0100010000000111100010011010000101110110110111011001100100 @ Dragonair
.8byte 0b1110111100010111101111011011000111110110110111011001110111 @ Dragonite
.8byte 0b0011100001100011111111011111110111111110111111111011101101 @ Mewtwo
.8byte 0b1111111111111111111111111111111111111111111111111111111111 @ Mew
.8byte 0b0001000100000111100000000110000100011111011000011100100000 @ Chikorita
.8byte 0b0011100100000111100000000110000100011111011000011100100000 @ Bayleef
.8byte 0b0011100100000111100000000110000110011111011100011100100000 @ Meganium
.8byte 0b0000000110000111101010010010001100000100010000011000100000 @ Cyndaquil
.8byte 0b0010100110000111101010010011001100000100010000011000110001 @ Quilava
.8byte 0b0010100110000111101010010011001110000100010100011000110001 @ Typhlosion
.8byte 0b1100010100000111101000000011001100010100110011001001100101 @ Totodile
.8byte 0b1110110100000111101000000011001100010100110011001001110101 @ Croconaw
.8byte 0b1110110100000111101000000011001110010100110111001001110111 @ Feraligatr
.8byte 0b0000010100001111100000011011101100111100110001011000100101 @ Sentret
.8byte 0b0010110100001111100000011011101101111100110111011000100101 @ Furret
.8byte 0b0001001000011111101000000110110100000100110000011000100000 @ Hoothoot
.8byte 0b0001001000011111101000000110110100000100110100011000100000 @ Noctowl
.8byte 0b0001000000001111101000000111001100001111011000011000100001 @ Ledyba
.8byte 0b0001000000001111101000000111001100001111011100011000100001 @ Ledian
.8byte 0b0001000000001111100000100010011100001101010000011000100000 @ Spinarak
.8byte 0b0001000000001111100000100010011100001101010100011000100000 @ Ariados
.8byte 0b0000001001011111111000100010100100000101110100111000100000 @ Crobat
.8byte 0b1101010000000111100000001010000101100100110011001001100100 @ Chinchou
.8byte 0b1101010000000111100000001010000101100100110111001001100100 @ Lanturn
.8byte 0b0001000000000111100000001010000101110100111000001000100000 @ Pichu
.8byte 0b0001000000000111100010011110111100011110111000011000100100 @ Cleffa
.8byte 0b0001000000000111100010011110111100001110111000011000100100 @ Igglybuff
.8byte 0b0011000000000111100010011110110100001110111000011000100100 @ Togepi
.8byte 0b0011001000010111101010011111110100001110111100011000100101 @ Togetic
.8byte 0b0001000000111111101000000110110100001101111000011000101000 @ Natu
.8byte 0b0001001000111111101000000110110100001101111100011000101000 @ Xatu
.8byte 0b0001000000000111100000001010000101110100111000001000100000 @ Mareep
.8byte 0b0011100000000111100000001011000101110100111000001000100001 @ Flaaffy
.8byte 0b0011100000000111100000001011000101110100111100001000100001 @ Ampharos
.8byte 0b0001000100000111100000100010000100001111010100011100100000 @ Bellossom
.8byte 0b1110110000000111100000000011001100010100110011001001100101 @ Marill
.8byte 0b1110110000000111100000000011001100010100110111001001100101 @ Azumarill
.8byte 0b0010100000001111100101000011001110000100010000111000101001 @ Sudowoodo
.8byte 0b1110110000001111100000000011011110000100110111001001100101 @ Politoed
.8byte 0b0001000000000111101000000010000100001101010000011100100000 @ Hoppip
.8byte 0b0001000000000111101000000010000100001101010000011100100000 @ Skiploom
.8byte 0b0001000000000111101000000010000100001101010100011100100000 @ Jumpluff
.8byte 0b0010100101001111101000001011101101111100110000111000100101 @ Aipom
.8byte 0b0001000100000111100000100010000100001111011000011100100000 @ Sunkern
.8byte 0b0001000100000111100000100010000100001111011100011100100000 @ Sunflora
.8byte 0b0001000000011111101000000010110100001101010000011000100000 @ Yanma
.8byte 0b1111010000000111100001100010001110010100110011001001100100 @ Wooper
.8byte 0b1111110000000111100101100011001110010100110111001001100101 @ Quagsire
.8byte 0b0001000100100111100000000110111100010100111100011000101000 @ Espeon
.8byte 0b0001000101000111110000000010111100010100110100111000100000 @ Umbreon
.8byte 0b0000001001011111111000000010100100000100110000111000101000 @ Murkrow
.8byte 0b1011110000100111100010010011111110010110110111011001101101 @ Slowking
.8byte 0b0001000001101111111000001010110101100100110000111000101000 @ Misdreavus
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Unown
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Wobbuffet
.8byte 0b0011100000101111100000001110110111110100111000011000101000 @ Girafarig
.8byte 0b0010100000000111100001000110001110001101011000011000100000 @ Pineco
.8byte 0b0010100000000111100001000110001110001101011100011000100000 @ Forretress
.8byte 0b0010100000001111100110011010101111111100110011011000101100 @ Dunsparce
.8byte 0b0010100100011111101101100010001110010100110000011000100000 @ Gligar
.8byte 0b0010100100000111110101000010001110010100010100111000110000 @ Steelix
.8byte 0b0010100010001111110010111011101111101100110000111010110101 @ Snubbull
.8byte 0b0010100010001111110110111011101111111100110100111010110101 @ Granbull
.8byte 0b1100010000000111100000101010100100000100110011001001100100 @ Qwilfish
.8byte 0b0010100100011111101001000010000100000100110100011000100000 @ Scizor
.8byte 0b0011100000000111100101100010001110000110010000011000100000 @ Shuckle
.8byte 0b0010100100001111100100000011001110000100110100011010100001 @ Heracross
.8byte 0b0010110101001111111000000011101100010100110011111001101001 @ Sneasel
.8byte 0b0010100100001111111000000011001110000100110000111010110001 @ Teddiursa
.8byte 0b0010100100001111111100000011001110000100110100111010110001 @ Ursaring
.8byte 0b0010000010000111100010010110000100000100011000011000100000 @ Slugma
.8byte 0b0010100010000111100111010110000110000100011100011000100000 @ Magcargo
.8byte 0b0010100000000111100101000110001110000100111011001001110000 @ Swinub
.8byte 0b0010100000000111100101000110001110000100111111001001110000 @ Piloswine
.8byte 0b0010110000000111100101000110111110000110111011011001101100 @ Corsola
.8byte 0b1100010000001111100010010010010100000100110111011000100100 @ Remoraid
.8byte 0b1100010000001111100010110010010100000100110111011100100100 @ Octillery
.8byte 0b0000001000001111101000000010000100000100110011001001100101 @ Delibird
.8byte 0b1100010000000111101000000010000110000100110011001001100100 @ Mantine
.8byte 0b0010001100011111111001000010000100000100010000111000110000 @ Skarmory
.8byte 0b0010000011001111110010110010100100011100010000111000110000 @ Houndour
.8byte 0b0010100011001111110010110010100100011100010100111000110000 @ Houndoom
.8byte 0b1100010000000111100000000010000100000100110111001001100100 @ Kingdra
.8byte 0b0010100000000111100101000010000110010100010000011000110000 @ Phanpy
.8byte 0b0010100000000111100101000010000110010100010100011000110000 @ Donphan
.8byte 0b0001000000001011101000001010110101111100110111011000100000 @ Porygon2
.8byte 0b0001000000101111100000001110110111111100111000011000111000 @ Stantler
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Smeargle
.8byte 0b0010100000001111100000000011000110000100110000011010100000 @ Tyrogue
.8byte 0b0010100000001111100001000011001110000100110000011010100000 @ Hitmontop
.8byte 0b0001000000101111100000000110110100000100111011001001101100 @ Smoochum
.8byte 0b0011000000001111100000001011010101100100111000001000100001 @ Elekid
.8byte 0b0010000000001111100010010011010100010100010000011000100001 @ Magby
.8byte 0b0010110000000111100101001011100111111100110111011000100101 @ Miltank
.8byte 0b0011100001100111100111011011110111111110111111011001101101 @ Blissey
.8byte 0b0011100100000011100001001110001101110100110100011000111000 @ Raikou
.8byte 0b0011100100000011100011010110001100011100110100011000111000 @ Entei
.8byte 0b1110010100000011100001000110001100010100110111011001111100 @ Suicune
.8byte 0b0010000000000111110001000011001110000100110100111000100000 @ Larvitar
.8byte 0b0010000000000111110001000011001110000100110100111000100000 @ Pupitar
.8byte 0b0010110100000111111111011011001111110100110111111000110111 @ Tyranitar
.8byte 0b1110111000110011101001001110110111110111111111011001111100 @ Lugia
.8byte 0b0011101010010011101011011110110111101111111100011000111000 @ Ho-Oh
.8byte 0b0001000100100011101001001110110100001111111100011000101100 @ Celebi
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
.8byte 0b0011100100000111101100000011001100011111010000011100100001 @ Treecko
.8byte 0b0011100100000111101100000011001100011111010000011100100001 @ Grovyle
.8byte 0b0011100100000111101100000011001110011111010100011100110011 @ Sceptile
.8byte 0b0010100110000111101110010010001100000100010000011000100000 @ Torchic
.8byte 0b0010100110000111101110010011001100000100010000011010100001 @ Combusken
.8byte 0b0010100110000111101110010011001110000100010100011010110001 @ Blaziken
.8byte 0b1110110000000111100100000010001100010100110011001001100100 @ Mudkip
.8byte 0b1110110000000111100100000010001110010100110011001001100100 @ Marshtomp
.8byte 0b1110110000000111100100000011001110010100110111001001110101 @ Swampert
.8byte 0b0010000001001111110000000010101100010100110000111000110000 @ Poochyena
.8byte 0b0010100001001111110000000010101100010100110100111000110000 @ Mightyena
.8byte 0b0010010100001111100000001010101101110100110011011000100100 @ Zigzagoon
.8byte 0b0010110100001111100000001010101101110100110111011000110100 @ Linoone
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Wurmple
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Silcoon
.8byte 0b0001000000001111101000000010110100001111010100011000100000 @ Beautifly
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Cascoon
.8byte 0b0001000000001111101000100010110100001101011100011000100000 @ Dustox
.8byte 0b0001010000001111100000000010000100001101110011011101100100 @ Lotad
.8byte 0b1111110000001111100000000011000100001101110011011101100100 @ Lombre
.8byte 0b1111110000001111100000000011000100001101110111011101100101 @ Ludicolo
.8byte 0b0011000000000111100000000010101100001101010000011100100000 @ Seedot
.8byte 0b0011100100001111110100000011101100001101010100011100100000 @ Nuzleaf
.8byte 0b0011100100001111111100000011101100001101010100011100100000 @ Shiftry
.8byte 0b0001000100000011101001000010101100001101010000011000100000 @ Nincada
.8byte 0b0001000100001111101001000010101100001101010100011000100000 @ Ninjask
.8byte 0b0001000100001011101001000010101100001101010100011000100000 @ Shedinja
.8byte 0b0000001000011111101000000010000100000100110000011000100000 @ Taillow
.8byte 0b0000001000011111101000000010000100000100110100011000100000 @ Swellow
.8byte 0b0001000001000111100000100010000100001111010000011100100000 @ Shroomish
.8byte 0b0011100101000111100000100011000100011111010100011110100001 @ Breloom
.8byte 0b0011100001101111100100001011111100000110110000011000101101 @ Spinda
.8byte 0b0000001000011111101000001010000100000100110011001001100100 @ Wingull
.8byte 0b0000011000011111101000001010000100000100110111001001100100 @ Pelipper
.8byte 0b0001000000001111100000000010100100001101110011011000100100 @ Surskit
.8byte 0b0001000000001111101000000010100100001101110111011000100100 @ Masquerain
.8byte 0b1110110000000111100100000010000110000100110011001001110100 @ Wailmer
.8byte 0b1110110000000111100100000010000110000100110111001001110100 @ Wailord
.8byte 0b0001000000000111100000001010101101111110110011011000101100 @ Skitty
.8byte 0b0011100000000111100000001010101101111110110111011000101100 @ Delcatty
.8byte 0b0011100101101111101110011011101101111100110011011000100101 @ Kecleon
.8byte 0b0001000000100011100101000110111110001100111001011000100000 @ Baltoy
.8byte 0b0011100000100011100101000110111110001100111101011000100000 @ Claydol
.8byte 0b0010100000000111110101001010000111100100010000111000100000 @ Nosepass
.8byte 0b0010100010000111100010110010000100010100010000011000100000 @ Torkoal
.8byte 0b0011000101001111111100001011111100000100110000111000101101 @ Sableye
.8byte 0b1100010000000111100101000010000110000100110011001001100100 @ Barboach
.8byte 0b1110110000000111100101000010000110000100110111001001100100 @ Whiscash
.8byte 0b1100010000000111100000000010000100000110110011001001100100 @ Luvdisc
.8byte 0b0110110100000111101100100011001100000100110011101001100100 @ Corphish
.8byte 0b1110110100000111101100100011001100000100110111101001100100 @ Crawdaunt
.8byte 0b1100010000000111100000000010000100000100110011001001100100 @ Feebas
.8byte 0b1100010000000111100000000010000100010110110111001001100100 @ Milotic
.8byte 0b1100010000001111110000000010000100000100110011101001100100 @ Carvanha
.8byte 0b1110110000001111110100000010000110000100110111101001110100 @ Sharpedo
.8byte 0b0010100000000111100101000010001110001101010100011000100000 @ Trapinch
.8byte 0b0010101000010111100101000010001110001101010100011000100000 @ Vibrava
.8byte 0b0010101000010111100111010010001110011101010100011000100010 @ Flygon
.8byte 0b0010110000000111100100000011001110000100110000011010100001 @ Makuhita
.8byte 0b0010110000000111100100000011001110000100110100011010100001 @ Hariyama
.8byte 0b0001100000001111100000001010000101110100110000001000110000 @ Electrike
.8byte 0b0001100000001111100000001010000101110100110100001000110000 @ Manectric
.8byte 0b0010100010000111100111010010001110000100010000011000100000 @ Numel
.8byte 0b0010100010000111100111010010001110000100010100011000110000 @ Camerupt
.8byte 0b1110110000000111100100000010000110010100110011001001100100 @ Spheal
.8byte 0b1110110000000111100100000010000110010100110011001001110100 @ Sealeo
.8byte 0b1110110000000111100100000010000110010100110111001001110100 @ Walrein
.8byte 0b0001000100000111100001000010000100001101010000011100100001 @ Cacnea
.8byte 0b0001100100000111100001000010000100001101010100011100100001 @ Cacturne
.8byte 0b0001000000000111100000000010100100000110111011001001100100 @ Snorunt
.8byte 0b0001000000000111110000000010100110000110111111101001100100 @ Glalie
.8byte 0b0001000000100011100101000110110110000110111101001000101000 @ Lunatone
.8byte 0b0001000010100011100111010110110110001110011100011000101000 @ Solrock
.8byte 0b0100010000000111100000000010000100010100110011001001100100 @ Azurill
.8byte 0b0001000001101111110000001110110100010100111000111000101000 @ Spoink
.8byte 0b0001000001101111110000001110110100010100111100111000101001 @ Grumpig
.8byte 0b0001000000000111100000001010000101110100111000001000100000 @ Plusle
.8byte 0b0001000000000111100000001010000101110100111000001000100000 @ Minun
.8byte 0b0010100000000111110111110011000100001100110101111000100001 @ Mawile
.8byte 0b0011100000000111100100000111110100000100111000011010101001 @ Meditite
.8byte 0b0011100000000111100100000111110100000100111100011010101001 @ Medicham
.8byte 0b0000001000011111101000000010000100001110110001011000100000 @ Swablu
.8byte 0b0010001000011111101010010010000110011110110101011000110010 @ Altaria
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Wynaut
.8byte 0b0001000001101111110000000010110100000100110011111000101000 @ Duskull
.8byte 0b0011100001101111110100000010110110000100110111111000101001 @ Dusclops
.8byte 0b0001000100000111100000100010100100001101010000011100100000 @ Roselia
.8byte 0b0010100100000111101010011011100101101100110011011010100101 @ Slakoth
.8byte 0b0010100100000111101010011011100111101100110011111010110101 @ Vigoroth
.8byte 0b0010100100000111101010011011100111101100110111111010110101 @ Slaking
.8byte 0b0010100001000111100000101010100100001101110001011100100100 @ Gulpin
.8byte 0b0010100001000111100000101010100100001101110101011100100100 @ Swalot
.8byte 0b0011101100010111101000000010000110001111010100011100110000 @ Tropius
.8byte 0b0000000000000111100010011010100100001100110011011000110100 @ Whismur
.8byte 0b0010100010000111110010011011100110001100110011111000110100 @ Loudred
.8byte 0b0010100010000111110010011011100110001100110111111000110100 @ Exploud
.8byte 0b1100010000000111100000000010000100000100110011001001100100 @ Clamperl
.8byte 0b1100010001000111100100000010000100000100110111001001100100 @ Huntail
.8byte 0b1100010000000111100000000010110100000110110111001001100100 @ Gorebyss
.8byte 0b0011100101001111111011011010100101110100110111111001101100 @ Absol
.8byte 0b0001000001101111110000001010110101100100110000111000101000 @ Shuppet
.8byte 0b0001000001101111110000001010110101100100110100111000101000 @ Banette
.8byte 0b0010100001001111100000110010001110010101110000111000100000 @ Seviper
.8byte 0b0010100000001111101010011011101101111101110011111000110101 @ Zangoose
.8byte 0b1110010000000111100101000010000110000110110111001001101100 @ Relicanth
.8byte 0b0010100100000111101101001010001110010100110000011000110100 @ Aron
.8byte 0b0010100100000111101101001010001110010100110000011000110100 @ Lairon
.8byte 0b0010110100000111101111011011001111111100110111111000110111 @ Aggron
.8byte 0b0001000000001111100011011010100101101100110011011001100100 @ Castform
.8byte 0b0001000000001111101000001011100101101101111000011000100101 @ Volbeat
.8byte 0b0001000000001111101000001011100101101101111000011000100101 @ Illumise
.8byte 0b0000000000000111100001100010000100001101010000011100100000 @ Lileep
.8byte 0b0010100000000111100101100010000110001101010100011100100000 @ Cradily
.8byte 0b0010000100000111101101000011001100000100010000011000100100 @ Anorith
.8byte 0b0010100100000111101101000011001110010100010100011000100100 @ Armaldo
.8byte 0b0001000001101111110000001110110100100110111000111000101000 @ Ralts
.8byte 0b0001000001101111110000001110110100100110111000111000101000 @ Kirlia
.8byte 0b0001000001101111110000001110110100100110111100111000101000 @ Gardevoir
.8byte 0b0010100100000111101110010011000100000100110000011000110010 @ Bagon
.8byte 0b0010100100000111101110010011000100000100110000011000110010 @ Shelgon
.8byte 0b0010101100010111101110010011000110010100110100011000110010 @ Salamence
.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Beldum
.8byte 0b0011100100000011101101100111110110000100111100011000100000 @ Metang
.8byte 0b0011100100000011101101100111110110000100111100011000100000 @ Metagross
.8byte 0b0010100000000011100101001011001111100110010100011000100001 @ Regirock
.8byte 0b0010100000000011100000001011000111100110110111001001100001 @ Regice
.8byte 0b0010100000000011101101001011000111100110110100011000100001 @ Registeel
.8byte 0b1110110000000011100100001011000111100110110111001001111100 @ Kyogre
.8byte 0b0010100110000011101111011011001111111110010100011010110010 @ Groudon
.8byte 0b1110111010000011101011011011000111111100110111011010110110 @ Rayquaza
.8byte 0b1101011100010111101001001110110111101110111101011000111110 @ Latias
.8byte 0b1101011100010111101001001110110111101110111101011000111110 @ Latios
.8byte 0b0001000000100011101001001110110101100110111100011000101100 @ Jirachi
.8byte 0b0011100101100011111100001111110101101110111101111000101101 @ Deoxys
.8byte 0b0001000001100111110000001110110100000110111000111000101000 @ Chimecho
data/trainer_class_name_indices.inc
-83
View File
@@ -1,83 +0,0 @@
gTrainerClassToNameIndex:: @ 831F5CA
.byte TRAINER_CLASS_NAME_HIKER
.byte TRAINER_CLASS_NAME_TEAM_AQUA
.byte TRAINER_CLASS_NAME_PKMN_BREEDER
.byte TRAINER_CLASS_NAME_COOLTRAINER_1
.byte TRAINER_CLASS_NAME_BIRD_KEEPER
.byte TRAINER_CLASS_NAME_COLLECTOR
.byte TRAINER_CLASS_NAME_TEAM_AQUA
.byte TRAINER_CLASS_NAME_SWIMMER_M
.byte TRAINER_CLASS_NAME_TEAM_MAGMA
.byte TRAINER_CLASS_NAME_EXPERT
.byte TRAINER_CLASS_NAME_BLACK_BELT
.byte TRAINER_CLASS_NAME_AQUA_LEADER
.byte TRAINER_CLASS_NAME_HEX_MANIAC
.byte TRAINER_CLASS_NAME_AROMA_LADY
.byte TRAINER_CLASS_NAME_RUIN_MANIAC
.byte TRAINER_CLASS_NAME_INTERVIEWER
.byte TRAINER_CLASS_NAME_TUBER_1
.byte TRAINER_CLASS_NAME_TUBER_2
.byte TRAINER_CLASS_NAME_COOLTRAINER_1
.byte TRAINER_CLASS_NAME_LADY
.byte TRAINER_CLASS_NAME_BEAUTY
.byte TRAINER_CLASS_NAME_RICH_BOY
.byte TRAINER_CLASS_NAME_EXPERT
.byte TRAINER_CLASS_NAME_POKEMANIAC
.byte TRAINER_CLASS_NAME_TEAM_MAGMA
.byte TRAINER_CLASS_NAME_GUITARIST
.byte TRAINER_CLASS_NAME_KINDLER
.byte TRAINER_CLASS_NAME_CAMPER
.byte TRAINER_CLASS_NAME_PICNICKER
.byte TRAINER_CLASS_NAME_BUG_MANIAC
.byte TRAINER_CLASS_NAME_PSYCHIC
.byte TRAINER_CLASS_NAME_PSYCHIC
.byte TRAINER_CLASS_NAME_GENTLEMAN
.byte TRAINER_CLASS_NAME_ELITE_FOUR
.byte TRAINER_CLASS_NAME_ELITE_FOUR
.byte TRAINER_CLASS_NAME_LEADER
.byte TRAINER_CLASS_NAME_LEADER
.byte TRAINER_CLASS_NAME_LEADER
.byte TRAINER_CLASS_NAME_SCHOOL_KID
.byte TRAINER_CLASS_NAME_SCHOOL_KID
.byte TRAINER_CLASS_NAME_SR_AND_JR
.byte TRAINER_CLASS_NAME_POKEFAN
.byte TRAINER_CLASS_NAME_POKEFAN
.byte TRAINER_CLASS_NAME_YOUNGSTER
.byte TRAINER_CLASS_NAME_CHAMPION
.byte TRAINER_CLASS_NAME_FISHERMAN
.byte TRAINER_CLASS_NAME_TRIATHLETE
.byte TRAINER_CLASS_NAME_TRIATHLETE
.byte TRAINER_CLASS_NAME_TRIATHLETE
.byte TRAINER_CLASS_NAME_TRIATHLETE
.byte TRAINER_CLASS_NAME_TRIATHLETE
.byte TRAINER_CLASS_NAME_TRIATHLETE
.byte TRAINER_CLASS_NAME_DRAGON_TAMER
.byte TRAINER_CLASS_NAME_NINJA_BOY
.byte TRAINER_CLASS_NAME_BATTLE_GIRL
.byte TRAINER_CLASS_NAME_PARASOL_LADY
.byte TRAINER_CLASS_NAME_SWIMMER_F
.byte TRAINER_CLASS_NAME_TWINS
.byte TRAINER_CLASS_NAME_SAILOR
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
.byte TRAINER_CLASS_NAME_PKMN_BREEDER
.byte TRAINER_CLASS_NAME_BUG_CATCHER
.byte TRAINER_CLASS_NAME_PKMN_RANGER
.byte TRAINER_CLASS_NAME_PKMN_RANGER
.byte TRAINER_CLASS_NAME_MAGMA_LEADER
.byte TRAINER_CLASS_NAME_LASS
.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
.byte TRAINER_CLASS_NAME_OLD_COUPLE
.byte TRAINER_CLASS_NAME_SIS_AND_BRO
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
.byte TRAINER_CLASS_NAME_SALON_MAIDEN
.byte TRAINER_CLASS_NAME_DOME_ACE
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_4
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_4
data/trainer_money.inc
+55 -55
View File
@@ -1,59 +1,59 @@
@ This is a factor in how much money you get for beating a trainer.
.align 2
gTrainerMoneyTable:: @ 831AEB8
.byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0
.byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0
.byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0
.byte TRAINER_CLASS_NAME_TUBER_1, 1, 0, 0
.byte TRAINER_CLASS_NAME_TUBER_2, 1, 0, 0
.byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0
.byte TRAINER_CLASS_NAME_COOLTRAINER_1, 12, 0, 0
.byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0
.byte TRAINER_CLASS_NAME_LADY, 50, 0, 0
.byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0
.byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0
.byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0
.byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0
.byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0
.byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0
.byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0
.byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0
.byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0
.byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0
.byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0
.byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0
.byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0
.byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0
.byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0
.byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0
.byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0
.byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0
.byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0
.byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0
.byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0
.byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0
.byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0
.byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0
.byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0
.byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0
.byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0
.byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0
.byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0
.byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3, 15, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_BREEDER, 10, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_RANGER, 12, 0, 0
.byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0
.byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_NAME_LASS, 4, 0, 0
.byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0
.byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0
.byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0
.byte TRAINER_CLASS_LEADER_1, 10, 0, 0
.byte TRAINER_CLASS_TEAM_AQUA, 5, 0, 0
.byte TRAINER_CLASS_AQUA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_AQUA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_AROMA_LADY, 10, 0, 0
.byte TRAINER_CLASS_RUIN_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_INTERVIEWER, 12, 0, 0
.byte TRAINER_CLASS_TUBER_1, 1, 0, 0
.byte TRAINER_CLASS_TUBER_2, 1, 0, 0
.byte TRAINER_CLASS_SIS_AND_BRO, 3, 0, 0
.byte TRAINER_CLASS_COOLTRAINER_1, 12, 0, 0
.byte TRAINER_CLASS_HEX_MANIAC, 6, 0, 0
.byte TRAINER_CLASS_LADY, 50, 0, 0
.byte TRAINER_CLASS_BEAUTY, 20, 0, 0
.byte TRAINER_CLASS_RICH_BOY, 50, 0, 0
.byte TRAINER_CLASS_POKEMANIAC, 15, 0, 0
.byte TRAINER_CLASS_SWIMMER_M, 2, 0, 0
.byte TRAINER_CLASS_BLACK_BELT, 8, 0, 0
.byte TRAINER_CLASS_GUITARIST, 8, 0, 0
.byte TRAINER_CLASS_KINDLER, 8, 0, 0
.byte TRAINER_CLASS_CAMPER, 4, 0, 0
.byte TRAINER_CLASS_OLD_COUPLE, 10, 0, 0
.byte TRAINER_CLASS_BUG_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_PSYCHIC, 6, 0, 0
.byte TRAINER_CLASS_GENTLEMAN, 20, 0, 0
.byte TRAINER_CLASS_ELITE_FOUR, 25, 0, 0
.byte TRAINER_CLASS_LEADER, 25, 0, 0
.byte TRAINER_CLASS_SCHOOL_KID, 5, 0, 0
.byte TRAINER_CLASS_SR_AND_JR, 4, 0, 0
.byte TRAINER_CLASS_POKEFAN, 20, 0, 0
.byte TRAINER_CLASS_EXPERT, 10, 0, 0
.byte TRAINER_CLASS_YOUNGSTER, 4, 0, 0
.byte TRAINER_CLASS_CHAMPION, 50, 0, 0
.byte TRAINER_CLASS_FISHERMAN, 10, 0, 0
.byte TRAINER_CLASS_TRIATHLETE, 10, 0, 0
.byte TRAINER_CLASS_DRAGON_TAMER, 12, 0, 0
.byte TRAINER_CLASS_BIRD_KEEPER, 8, 0, 0
.byte TRAINER_CLASS_NINJA_BOY, 3, 0, 0
.byte TRAINER_CLASS_BATTLE_GIRL, 6, 0, 0
.byte TRAINER_CLASS_PARASOL_LADY, 10, 0, 0
.byte TRAINER_CLASS_SWIMMER_F, 2, 0, 0
.byte TRAINER_CLASS_PICNICKER, 4, 0, 0
.byte TRAINER_CLASS_TWINS, 3, 0, 0
.byte TRAINER_CLASS_SAILOR, 8, 0, 0
.byte TRAINER_CLASS_COLLECTOR, 15, 0, 0
.byte TRAINER_CLASS_PKMN_TRAINER_3, 15, 0, 0
.byte TRAINER_CLASS_PKMN_BREEDER, 10, 0, 0
.byte TRAINER_CLASS_PKMN_RANGER, 12, 0, 0
.byte TRAINER_CLASS_TEAM_MAGMA, 5, 0, 0
.byte TRAINER_CLASS_MAGMA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_MAGMA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_LASS, 4, 0, 0
.byte TRAINER_CLASS_BUG_CATCHER, 4, 0, 0
.byte TRAINER_CLASS_HIKER, 10, 0, 0
.byte TRAINER_CLASS_YOUNG_COUPLE, 8, 0, 0
.byte TRAINER_CLASS_WINSTRATE, 10, 0, 0
.byte -1, 5, 0, 0
data/trainer_pic_indices.inc
-84
View File
@@ -1,84 +0,0 @@
.align 2
gUnknown_0831F578:: @ 831F578
.byte TRAINER_PIC_HIKER
.byte TRAINER_PIC_AQUA_GRUNT_M
.byte TRAINER_PIC_POKEMON_BREEDER_F
.byte TRAINER_PIC_COOL_TRAINER_M
.byte TRAINER_PIC_BIRD_KEEPER
.byte TRAINER_PIC_COLLECTOR
.byte TRAINER_PIC_AQUA_GRUNT_F
.byte TRAINER_PIC_SWIMMER_M
.byte TRAINER_PIC_MAGMA_GRUNT_M
.byte TRAINER_PIC_EXPERT_M
.byte TRAINER_PIC_BLACK_BELT
.byte TRAINER_PIC_AQUA_LEADER_ARCHIE
.byte TRAINER_PIC_HEX_MANIAC
.byte TRAINER_PIC_AROMA_LADY
.byte TRAINER_PIC_RUIN_MANIAC
.byte TRAINER_PIC_INTERVIEWER
.byte TRAINER_PIC_TUBER_F
.byte TRAINER_PIC_TUBER_M
.byte TRAINER_PIC_COOL_TRAINER_F
.byte TRAINER_PIC_LADY
.byte TRAINER_PIC_BEAUTY
.byte TRAINER_PIC_RICH_BOY
.byte TRAINER_PIC_EXPERT_F
.byte TRAINER_PIC_POKEMANIAC
.byte TRAINER_PIC_MAGMA_GRUNT_F
.byte TRAINER_PIC_GUITARIST
.byte TRAINER_PIC_KINDLER
.byte TRAINER_PIC_CAMPER
.byte TRAINER_PIC_PICNICKER
.byte TRAINER_PIC_BUG_MANIAC
.byte TRAINER_PIC_PSYCHIC_M
.byte TRAINER_PIC_PSYCHIC_F
.byte TRAINER_PIC_GENTLEMAN
.byte TRAINER_PIC_ELITE_FOUR_SIDNEY
.byte TRAINER_PIC_ELITE_FOUR_PHOEBE
.byte TRAINER_PIC_LEADER_ROXANNE
.byte TRAINER_PIC_LEADER_BRAWLY
.byte TRAINER_PIC_LEADER_TATE_AND_LIZA
.byte TRAINER_PIC_SCHOOL_KID_M
.byte TRAINER_PIC_SCHOOL_KID_F
.byte TRAINER_PIC_SR_AND_JR
.byte TRAINER_PIC_WINSTRATE_M
.byte TRAINER_PIC_WINSTRATE_F
.byte TRAINER_PIC_YOUNGSTER
.byte TRAINER_PIC_CHAMPION_WALLACE
.byte TRAINER_PIC_FISHERMAN
.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
.byte TRAINER_PIC_DRAGON_TAMER
.byte TRAINER_PIC_NINJA_BOY
.byte TRAINER_PIC_BATTLE_GIRL
.byte TRAINER_PIC_PARASOL_LADY
.byte TRAINER_PIC_SWIMMER_F
.byte TRAINER_PIC_TWINS
.byte TRAINER_PIC_SAILOR
.byte TRAINER_PIC_WALLY
.byte TRAINER_PIC_BRENDAN
.byte TRAINER_PIC_BRENDAN
.byte TRAINER_PIC_BRENDAN
.byte TRAINER_PIC_MAY
.byte TRAINER_PIC_MAY
.byte TRAINER_PIC_MAY
.byte TRAINER_PIC_POKEMON_BREEDER_M
.byte TRAINER_PIC_BUG_CATCHER
.byte TRAINER_PIC_POKEMON_RANGER_M
.byte TRAINER_PIC_POKEMON_RANGER_F
.byte TRAINER_PIC_MAGMA_LEADER_MAXIE
.byte TRAINER_PIC_LASS
.byte TRAINER_PIC_YOUNG_COUPLE
.byte TRAINER_PIC_OLD_COUPLE
.byte TRAINER_PIC_SIS_AND_BRO
.byte TRAINER_PIC_STEVEN
.byte TRAINER_PIC_SALON_MAIDEN_ANABEL
.byte TRAINER_PIC_DOME_ACE_TUCKER
.byte TRAINER_PIC_RED
.byte TRAINER_PIC_LEAF
.byte TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN
.byte TRAINER_PIC_RUBY_SAPPHIRE_MAY
data/trainers.inc
+855 -855
View File
File diff suppressed because it is too large Load Diff
data/wild_encounter.s
-295
View File
@@ -1,295 +0,0 @@
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
@ 85507E4
.include "data/wild_mons.inc"
gBattlePyramidPlaceholders_1:: @ 55370C
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
gBattlePyramidPlaceholders_1Info:: @ 55373C
.4byte 4
.4byte gBattlePyramidPlaceholders_1
gBattlePyramidPlaceholders_2:: @ 553744
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMANDER, 5
gBattlePyramidPlaceholders_2Info:: @ 553774
.4byte 4
.4byte gBattlePyramidPlaceholders_2
gBattlePyramidPlaceholders_3:: @ 55377C
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
gBattlePyramidPlaceholders_3Info:: @ 5537AC
.4byte 4
.4byte gBattlePyramidPlaceholders_3
gBattlePyramidPlaceholders_4:: @ 5537B4
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_SQUIRTLE, 5
gBattlePyramidPlaceholders_4Info:: @ 5537E4
.4byte 4
.4byte gBattlePyramidPlaceholders_4
gBattlePyramidPlaceholders_5:: @ 5537EC
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_WARTORTLE, 5
gBattlePyramidPlaceholders_5Info:: @ 55381C
.4byte 4
.4byte gBattlePyramidPlaceholders_5
gBattlePyramidPlaceholders_6:: @ 553824
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
gBattlePyramidPlaceholders_6Info:: @ 553854
.4byte 4
.4byte gBattlePyramidPlaceholders_6
gBattlePyramidPlaceholders_7:: @ 55385C
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
gBattlePyramidPlaceholders_7Info:: @ 55388C
.4byte 8
.4byte gBattlePyramidPlaceholders_7
gBattlePyramidWildMonHeaders:: @ 8553894
.byte 0, 1
.2byte 0
.4byte gBattlePyramidPlaceholders_1Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 2
.2byte 0
.4byte gBattlePyramidPlaceholders_2Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 3
.2byte 0
.4byte gBattlePyramidPlaceholders_3Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 4
.2byte 0
.4byte gBattlePyramidPlaceholders_4Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 5
.2byte 0
.4byte gBattlePyramidPlaceholders_5Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 6
.2byte 0
.4byte gBattlePyramidPlaceholders_6Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 7
.2byte 0
.4byte gBattlePyramidPlaceholders_7Info
.4byte NULL
.4byte NULL
.4byte NULL
.2byte 0xFFFF
.2byte 0
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
gBattlePikeMons_1:: @ 8553934
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_1:: @ 8553964
.4byte 10
.4byte gBattlePikeMons_1
gBattlePikeMons_2:: @ 855396C
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_2:: @ 855399C
.4byte 10
.4byte gBattlePikeMons_2
gBattlePikeMons_3:: @ 85539A4
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_3:: @ 85539D4
.4byte 10
.4byte gBattlePikeMons_3
gBattlePikeMons_4:: @ 85539DC
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_4:: @ 8553A0C
.4byte 10
.4byte gBattlePikeMons_4
gBattlePikeWildMonHeaders:: @ 8553A14
.byte 0, 1
.2byte 0
.4byte gBattlePikeMonsInfo_1
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 2
.2byte 0
.4byte gBattlePikeMonsInfo_2
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 3
.2byte 0
.4byte gBattlePikeMonsInfo_3
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 4
.2byte 0
.4byte gBattlePikeMonsInfo_4
.4byte NULL
.4byte NULL
.4byte NULL
.2byte 0xFFFF
.2byte 0
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
gWildFeebasRoute119Data:: @ 8553A78
wild_mon SPECIES_FEEBAS, 20, 25
gRoute119WaterTileData:: @ 8553A7C
.2byte 0, 0x2D, 0, 0x2E, 0x5B, 0x83, 0x5C, 0x8B, 0x12A, 0
data/wild_mons.inc
-4524
View File
File diff suppressed because it is too large Load Diff
graphics/battle_anims/sprites/smokescreen_impact.pal
-19
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
graphics/battle_interface/ball_display.pal
-19
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
graphics/battle_interface/ball_status_bar.pal
-19
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

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