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

Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise

Browse Source
This commit is contained in:
Slawter666
2018-11-12 14:14:50 +00:00
parent be33878b94 65f053fd89
commit 1b895ff52c
258 changed files with 80987 additions and 87448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -32,7 +32,7 @@ To set up the repository, see [INSTALL.md](INSTALL.md).
[poketcg]: https://github.com/pret/poketcg
[pokeruby]: https://github.com/pret/pokeruby
[pokefirered]: https://github.com/pret/pokefirered
[Discord]: https://discord.gg/cJxDDVP
[Discord]: https://discord.gg/6EuWgX9
[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
[travis]: https://travis-ci.org/pret/pokeemerald
[travis-badge]: https://travis-ci.org/pret/pokeemerald.svg?branch=master
asm/battle_anim_80FE840.s
-52267
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_effects_1.s
+9550
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_effects_2.s
+7544
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_utility_funcs.s
+3059
View File
File diff suppressed because it is too large Load Diff
asm/battle_frontier_1.s
+2 -2
View File
@@ -1180,7 +1180,7 @@ sub_81965D8: @ 81965D8
negs r0, r0
ands r0, r1
strb r0, [r2]
bl GetPlayerTextSpeed
bl GetPlayerTextSpeedDelay
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2163,7 +2163,7 @@ sub_8196D74: @ 8196D74
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
adds r0, 0xA
bl ReadUnalignedWord
bl GetTrainerId
adds r6, r0, 0
ldr r0, =0x0000ffff
ands r6, r0
asm/battle_frontier_2.s
+17 -6745
View File
File diff suppressed because it is too large Load Diff
asm/battle_intro.s
+2035
View File
File diff suppressed because it is too large Load Diff
asm/battle_tower.s
-7552
View File
File diff suppressed because it is too large Load Diff
asm/bug.s
+791
View File
@@ -0,0 +1,791 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8110368
sub_8110368: @ 8110368
push {r4-r6,lr}
adds r6, r0, 0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _08110394
adds r0, r6, 0
movs r1, 0x2
bl StartSpriteAffineAnim
ldr r0, =gBattleAnimArgs
ldrh r1, [r0, 0x4]
negs r1, r1
strh r1, [r0, 0x4]
ldrh r1, [r0]
negs r1, r1
strh r1, [r0]
b _081103C4
.pool
_08110394:
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _081103C4
adds r0, r6, 0
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x2]
negs r0, r0
strh r0, [r1, 0x2]
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
ldrh r0, [r1, 0x6]
negs r0, r0
strh r0, [r1, 0x6]
ldrh r0, [r1]
negs r0, r0
strh r0, [r1]
_081103C4:
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord2
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
ldrh r1, [r4]
adds r0, r1
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord2
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
adds r0, r1
strh r0, [r6, 0x22]
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
adds r0, r1
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r6, 0x36]
ldr r0, =sub_80A6EEC
str r0, [r6, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r6, 0
bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8110368
thumb_func_start sub_8110438
sub_8110438: @ 8110438
push {r4-r6,lr}
adds r6, r0, 0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _0811045C
ldr r1, =gBattleAnimArgs
ldrh r0, [r1]
negs r0, r0
strh r0, [r1]
adds r0, r6, 0
movs r1, 0x2
bl StartSpriteAffineAnim
b _08110478
.pool
_0811045C:
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08110478
ldr r0, =gBattleAnimArgs
ldrh r1, [r0, 0x2]
negs r1, r1
strh r1, [r0, 0x2]
ldrh r1, [r0]
negs r1, r1
strh r1, [r0]
_08110478:
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord2
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
ldrh r1, [r4]
adds r0, r1
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord2
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
adds r0, r1
strh r0, [r6, 0x22]
ldrh r0, [r4, 0x4]
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x36]
ldr r0, =sub_80A6EEC
str r0, [r6, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r6, 0
bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8110438
thumb_func_start sub_81104E4
sub_81104E4: @ 81104E4
push {r4,r5,lr}
adds r5, r0, 0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _08110500
ldr r0, =gBattleAnimArgs
movs r2, 0x4
ldrsh r1, [r0, r2]
lsrs r2, r1, 31
adds r1, r2
asrs r1, 1
strh r1, [r0, 0x4]
_08110500:
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
strh r0, [r5, 0x30]
ldrh r0, [r5, 0x22]
strh r0, [r5, 0x34]
movs r2, 0x8
ldrsh r0, [r1, r2]
cmp r0, 0
bne _08110548
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
b _0811055A
.pool
_08110548:
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
adds r3, r5, 0
adds r3, 0x36
movs r1, 0x1
bl SetAverageBattlerPositions
_0811055A:
adds r0, r5, 0
bl sub_80A6FD4
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x6]
strh r0, [r5, 0x38]
ldr r0, =sub_811057C
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81104E4
thumb_func_start sub_811057C
sub_811057C: @ 811057C
push {r4,lr}
adds r4, r0, 0
bl TranslateAnimLinear
lsls r0, 24
cmp r0, 0
beq _08110592
adds r0, r4, 0
bl DestroyAnimSprite
b _081105AE
_08110592:
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x3A]
adds r0, 0xD
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x3A]
_081105AE:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_811057C
thumb_func_start sub_81105B4
sub_81105B4: @ 81105B4
push {r4,lr}
adds r4, r0, 0
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
adds r3, r4, 0
adds r3, 0x22
movs r1, 0
bl SetAverageBattlerPositions
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _081105F0
ldr r0, =gBattleAnimArgs
ldrh r1, [r4, 0x20]
ldrh r2, [r0]
subs r1, r2
strh r1, [r4, 0x20]
b _081105FC
.pool
_081105F0:
ldr r1, =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r4, 0x20]
adds r0, r2
strh r0, [r4, 0x20]
adds r0, r1, 0
_081105FC:
ldrh r0, [r0, 0x2]
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08110618
ldrh r0, [r4, 0x22]
adds r0, 0x8
strh r0, [r4, 0x22]
_08110618:
ldr r0, =sub_8110630
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81105B4
thumb_func_start sub_8110630
sub_8110630: @ 8110630
push {lr}
adds r3, r0, 0
ldrh r0, [r3, 0x2E]
adds r0, 0x1
strh r0, [r3, 0x2E]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3
bne _08110664
movs r0, 0
strh r0, [r3, 0x2E]
movs r0, 0x3E
adds r0, r3
mov r12, r0
ldrb r2, [r0]
lsls r0, r2, 29
lsrs r0, 31
movs r1, 0x1
eors r1, r0
lsls r1, 2
movs r0, 0x5
negs r0, r0
ands r0, r2
orrs r0, r1
mov r1, r12
strb r0, [r1]
_08110664:
ldrh r0, [r3, 0x30]
adds r0, 0x1
strh r0, [r3, 0x30]
lsls r0, 16
asrs r0, 16
cmp r0, 0x33
bne _08110678
adds r0, r3, 0
bl DestroyAnimSprite
_08110678:
pop {r0}
bx r0
thumb_func_end sub_8110630
thumb_func_start sub_811067C
sub_811067C: @ 811067C
push {r4,lr}
adds r4, r0, 0
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
bl SetGpuReg
movs r0, 0x10
strh r0, [r4, 0x2E]
ldr r0, =sub_81106A4
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_811067C
thumb_func_start sub_81106A4
sub_81106A4: @ 81106A4
push {r4,lr}
adds r4, r0, 0
ldrh r1, [r4, 0x32]
movs r2, 0x32
ldrsh r0, [r4, r2]
cmp r0, 0x13
bgt _081106B8
adds r0, r1, 0x1
strh r0, [r4, 0x32]
b _081106F6
_081106B8:
ldrh r1, [r4, 0x30]
adds r0, r1, 0x1
strh r0, [r4, 0x30]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _081106F6
ldrh r1, [r4, 0x2E]
subs r1, 0x1
strh r1, [r4, 0x2E]
movs r0, 0x10
subs r0, r1
lsls r0, 8
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0
bne _081106F6
adds r2, r4, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r0, =sub_8110700
str r0, [r4, 0x1C]
_081106F6:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81106A4
thumb_func_start sub_8110700
sub_8110700: @ 8110700
push {r4,lr}
adds r4, r0, 0
movs r0, 0x50
movs r1, 0
bl SetGpuReg
movs r0, 0x52
movs r1, 0
bl SetGpuReg
adds r0, r4, 0
bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8110700
thumb_func_start sub_8110720
sub_8110720: @ 8110720
push {r4-r7,lr}
sub sp, 0x4
adds r7, r0, 0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _08110740
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
b _08110762
.pool
_08110740:
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08110762
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
ldrh r0, [r1, 0x2]
negs r0, r0
strh r0, [r1, 0x2]
ldrh r0, [r1, 0x6]
negs r0, r0
strh r0, [r1, 0x6]
_08110762:
bl IsContest
lsls r0, 24
cmp r0, 0
bne _081107B2
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
adds r4, r0, 0
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _081107B2
ldrb r0, [r5]
bl GetBattlerPosition
lsls r0, 24
cmp r0, 0
beq _081107A0
ldrb r0, [r5]
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _081107B2
_081107A0:
ldr r0, =gBattleAnimArgs
movs r2, 0x4
ldrsh r1, [r0, r2]
negs r1, r1
strh r1, [r0, 0x4]
movs r2, 0
ldrsh r1, [r0, r2]
negs r1, r1
strh r1, [r0]
_081107B2:
adds r0, r7, 0
movs r1, 0x1
bl sub_80A69CC
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
ldr r6, =gBattleAnimArgs
lsrs r4, 24
ldrh r0, [r6, 0x4]
adds r4, r0
lsls r4, 16
lsrs r4, 16
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldrh r2, [r6, 0x6]
adds r1, r2
lsls r1, 16
ldrh r2, [r7, 0x20]
lsls r0, r4, 16
asrs r0, 16
subs r0, r2
lsls r0, 16
asrs r0, 16
ldrh r2, [r7, 0x22]
lsrs r5, r1, 16
asrs r1, 16
subs r1, r2
lsls r1, 16
asrs r1, 16
bl ArcTan2Neg
lsls r0, 16
movs r1, 0xC0
lsls r1, 24
adds r0, r1
lsrs r0, 16
movs r3, 0x80
lsls r3, 1
str r0, [sp]
adds r0, r7, 0
movs r1, 0
adds r2, r3, 0
bl sub_80A73E0
ldrh r0, [r6, 0x8]
strh r0, [r7, 0x2E]
strh r4, [r7, 0x32]
strh r5, [r7, 0x36]
ldr r0, =sub_80A6EEC
str r0, [r7, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r7, 0
bl StoreSpriteCallbackInData6
add sp, 0x4
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8110720
thumb_func_start sub_8110850
sub_8110850: @ 8110850
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
bl sub_80A69CC
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08110870
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
_08110870:
ldr r4, =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
adds r0, r1
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
adds r0, r1
strh r0, [r6, 0x36]
ldrh r0, [r4, 0xA]
strh r0, [r6, 0x38]
adds r0, r6, 0
bl sub_80A68D4
ldr r0, =sub_81108CC
str r0, [r6, 0x1C]
adds r2, r6, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8110850
thumb_func_start sub_81108CC
sub_81108CC: @ 81108CC
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x14
adds r4, r0, 0
adds r2, r4, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x5
negs r1, r1
ands r1, r0
strb r1, [r2]
adds r0, r4, 0
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _081108F8
adds r0, r4, 0
bl DestroyAnimSprite
b _08110988
_081108F8:
movs r0, 0x2E
adds r0, r4
mov r8, r0
ldrh r7, [r4, 0x20]
ldrh r5, [r4, 0x24]
ldrh r1, [r4, 0x22]
mov r12, r1
ldrh r6, [r4, 0x26]
mov r2, r8
add r1, sp, 0x4
movs r3, 0x7
_0811090E:
ldrh r0, [r2]
strh r0, [r1]
adds r2, 0x2
adds r1, 0x2
subs r3, 0x1
cmp r3, 0
bge _0811090E
adds r0, r7, r5
lsls r0, 16
lsrs r5, r0, 16
mov r2, r12
adds r0, r2, r6
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
bne _08110988
ldrh r0, [r4, 0x24]
ldrh r1, [r4, 0x20]
adds r0, r1
lsls r1, r5, 16
asrs r1, 16
subs r0, r1
lsls r0, 16
asrs r0, 16
ldrh r1, [r4, 0x26]
ldrh r2, [r4, 0x22]
adds r1, r2
lsls r2, r6, 16
asrs r2, 16
subs r1, r2
lsls r1, 16
asrs r1, 16
bl ArcTan2Neg
lsls r0, 16
movs r1, 0xC0
lsls r1, 24
adds r0, r1
lsrs r0, 16
movs r3, 0x80
lsls r3, 1
str r0, [sp]
adds r0, r4, 0
movs r1, 0
adds r2, r3, 0
bl sub_80A73E0
add r2, sp, 0x4
mov r1, r8
movs r3, 0x7
_0811097A:
ldrh r0, [r2]
strh r0, [r1]
adds r2, 0x2
adds r1, 0x2
subs r3, 0x1
cmp r3, 0
bge _0811097A
_08110988:
add sp, 0x14
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81108CC
thumb_func_start sub_8110994
sub_8110994: @ 8110994
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _081109B0
ldr r4, =gBattleAnimAttacker
b _081109B2
.pool
_081109B0:
ldr r4, =gBattleAnimTarget
_081109B2:
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x12
strh r0, [r5, 0x22]
ldr r1, =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A67BC
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8110994
.align 2, 0
asm/contest.s
+1 -1
View File
@@ -6485,7 +6485,7 @@ _080DEC80:
b _080DEC9C
.pool
_080DEC94:
bl GetPlayerTextSpeed
bl GetPlayerTextSpeedDelay
lsls r0, 24
lsrs r1, r0, 24
_080DEC9C:
asm/dark.s
+2199
View File
File diff suppressed because it is too large Load Diff
asm/dragon.s
+793
View File
@@ -0,0 +1,793 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8113064
sub_8113064: @ 8113064
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _081130B4
ldr r2, =gBattleAnimArgs
ldrh r0, [r5, 0x20]
ldrh r1, [r2]
subs r0, r1
strh r0, [r5, 0x20]
ldrh r0, [r2, 0x6]
negs r0, r0
strh r0, [r2, 0x6]
ldrh r0, [r2, 0x8]
negs r0, r0
strh r0, [r2, 0x8]
adds r1, r2, 0
b _081130BE
.pool
_081130B4:
ldr r1, =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r5, 0x20]
adds r0, r2
strh r0, [r5, 0x20]
_081130BE:
ldrh r0, [r1, 0x2]
ldrh r2, [r5, 0x22]
adds r0, r2
strh r0, [r5, 0x22]
ldrh r0, [r1, 0x4]
strh r0, [r5, 0x2E]
ldrh r0, [r1, 0x6]
strh r0, [r5, 0x30]
ldrh r0, [r1, 0x8]
strh r0, [r5, 0x34]
ldrh r0, [r1, 0xA]
strh r0, [r5, 0x38]
adds r2, r5, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r1, =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A66DC
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8113064
thumb_func_start sub_8113100
sub_8113100: @ 8113100
push {r4,r5,lr}
adds r5, r0, 0
bl sub_80A6838
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08113164
ldr r2, =gBattleAnimArgs
ldrh r0, [r5, 0x20]
ldrh r1, [r2, 0x2]
subs r0, r1
strh r0, [r5, 0x20]
ldrh r0, [r5, 0x22]
adds r1, r0
strh r1, [r5, 0x22]
ldrh r0, [r5, 0x32]
ldrh r1, [r2, 0x4]
subs r0, r1
strh r0, [r5, 0x32]
ldrh r0, [r2, 0x6]
ldrh r1, [r5, 0x36]
adds r0, r1
strh r0, [r5, 0x36]
b _0811318E
.pool
_08113164:
ldr r1, =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r5, 0x20]
adds r0, r2
strh r0, [r5, 0x20]
ldrh r0, [r1, 0x2]
ldrh r2, [r5, 0x22]
adds r0, r2
strh r0, [r5, 0x22]
ldrh r0, [r1, 0x4]
ldrh r2, [r5, 0x32]
adds r0, r2
strh r0, [r5, 0x32]
ldrh r0, [r1, 0x6]
ldrh r1, [r5, 0x36]
adds r0, r1
strh r0, [r5, 0x36]
adds r0, r5, 0
movs r1, 0x1
bl StartSpriteAnim
_0811318E:
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x8]
strh r0, [r5, 0x2E]
ldr r0, =sub_80A6EEC
str r0, [r5, 0x1C]
ldr r1, =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8113100
thumb_func_start sub_81131B4
sub_81131B4: @ 81131B4
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _081131D0
ldr r4, =gBattleAnimAttacker
b _081131D2
.pool
_081131D0:
ldr r4, =gBattleAnimTarget
_081131D2:
ldrb r0, [r4]
movs r1, 0
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldr r4, =gBattleAnimArgs
movs r0, 0x2
ldrsh r1, [r4, r0]
adds r0, r5, 0
bl sub_80A6864
ldrh r0, [r4, 0x4]
ldrh r1, [r5, 0x22]
adds r0, r1
strh r0, [r5, 0x22]
ldr r0, =sub_80A67D8
str r0, [r5, 0x1C]
ldr r1, =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81131B4
thumb_func_start sub_8113224
sub_8113224: @ 8113224
push {r4,lr}
adds r4, r0, 0
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0811323E
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAffineAnim
_0811323E:
adds r0, r4, 0
bl sub_8113100
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8113224
thumb_func_start sub_8113250
sub_8113250: @ 8113250
push {r4-r7,lr}
adds r6, r0, 0
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r5, 0
strh r0, [r6, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
strh r5, [r6, 0x36]
movs r0, 0x1
strh r0, [r6, 0x38]
ldr r0, =gBattleAnimArgs
ldrh r0, [r0]
strh r0, [r6, 0x3A]
ldr r4, =gBattlerAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_80A861C
lsls r7, r0, 16
lsrs r5, r7, 16
ldrb r0, [r4]
movs r1, 0x1
bl sub_80A861C
lsls r1, r0, 16
lsrs r0, r1, 16
cmp r5, r0
bls _081132B0
lsrs r0, r7, 17
b _081132B2
.pool
_081132B0:
lsrs r0, r1, 17
_081132B2:
strh r0, [r6, 0x3C]
movs r1, 0x3A
ldrsh r0, [r6, r1]
movs r2, 0x3C
ldrsh r1, [r6, r2]
bl Cos
strh r0, [r6, 0x24]
movs r1, 0x3A
ldrsh r0, [r6, r1]
movs r2, 0x3C
ldrsh r1, [r6, r2]
bl Sin
strh r0, [r6, 0x26]
ldr r0, =sub_81132E0
str r0, [r6, 0x1C]
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8113250
thumb_func_start sub_81132E0
sub_81132E0: @ 81132E0
push {r4,r5,lr}
adds r4, r0, 0
movs r0, 0x2E
ldrsh r5, [r4, r0]
cmp r5, 0
beq _081132F2
cmp r5, 0x1
beq _0811335E
b _081133E2
_081132F2:
ldrh r0, [r4, 0x3A]
ldrh r1, [r4, 0x38]
subs r0, r1
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x3A]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
adds r0, 0x1
strh r0, [r4, 0x36]
lsls r0, 16
asrs r0, 16
cmp r0, 0x5
ble _08113344
strh r5, [r4, 0x36]
ldrh r1, [r4, 0x38]
movs r2, 0x38
ldrsh r0, [r4, r2]
cmp r0, 0xF
bgt _08113344
adds r0, r1, 0x1
strh r0, [r4, 0x38]
lsls r0, 16
asrs r0, 16
cmp r0, 0xF
ble _08113344
movs r0, 0x10
strh r0, [r4, 0x38]
_08113344:
ldrh r0, [r4, 0x34]
adds r0, 0x1
strh r0, [r4, 0x34]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3C
ble _081133E2
movs r0, 0
strh r0, [r4, 0x34]
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
b _081133E2
_0811335E:
ldrh r0, [r4, 0x3A]
ldrh r1, [r4, 0x38]
subs r0, r1
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x3A]
ldrh r1, [r4, 0x3C]
movs r2, 0x3C
ldrsh r0, [r4, r2]
cmp r0, 0x95
bgt _08113386
adds r0, r1, 0
adds r0, 0x8
strh r0, [r4, 0x3C]
lsls r0, 16
asrs r0, 16
cmp r0, 0x95
ble _08113386
movs r0, 0x96
strh r0, [r4, 0x3C]
_08113386:
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
adds r0, 0x1
strh r0, [r4, 0x36]
lsls r0, 16
asrs r0, 16
cmp r0, 0x5
ble _081133CE
movs r0, 0
strh r0, [r4, 0x36]
ldrh r1, [r4, 0x38]
movs r2, 0x38
ldrsh r0, [r4, r2]
cmp r0, 0xF
bgt _081133CE
adds r0, r1, 0x1
strh r0, [r4, 0x38]
lsls r0, 16
asrs r0, 16
cmp r0, 0xF
ble _081133CE
movs r0, 0x10
strh r0, [r4, 0x38]
_081133CE:
ldrh r0, [r4, 0x34]
adds r0, 0x1
strh r0, [r4, 0x34]
lsls r0, 16
asrs r0, 16
cmp r0, 0x14
ble _081133E2
adds r0, r4, 0
bl DestroyAnimSprite
_081133E2:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_81132E0
thumb_func_start sub_81133E8
sub_81133E8: @ 81133E8
push {r4-r6,lr}
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r0, =gTasks
adds r4, r1, r0
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08113424
ldr r0, =0x04000014
str r0, [sp]
ldr r0, =gBattle_BG1_X
b _0811342A
.pool
_08113424:
ldr r0, =0x04000018
str r0, [sp]
ldr r0, =gBattle_BG2_X
_0811342A:
ldrh r0, [r0]
strh r0, [r4, 0xC]
ldr r0, =0xa2600001
str r0, [sp, 0x4]
mov r1, sp
movs r5, 0
movs r0, 0x1
strb r0, [r1, 0x8]
mov r0, sp
strb r5, [r0, 0x9]
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerYCoordWithElevation
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
subs r1, 0x20
strh r1, [r4, 0xE]
adds r0, 0x20
strh r0, [r4, 0x10]
cmp r1, 0
bge _0811345A
strh r5, [r4, 0xE]
_0811345A:
ldrh r3, [r4, 0xE]
movs r1, 0x10
ldrsh r0, [r4, r1]
cmp r3, r0
bgt _08113488
ldr r5, =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r5, r0
_0811346C:
lsls r1, r3, 1
adds r2, r1, r5
ldrh r0, [r4, 0xC]
strh r0, [r2]
adds r1, r6
ldrh r0, [r4, 0xC]
strh r0, [r1]
adds r0, r3, 0x1
lsls r0, 16
lsrs r3, r0, 16
movs r1, 0x10
ldrsh r0, [r4, r1]
cmp r3, r0
ble _0811346C
_08113488:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
bl ScanlineEffect_SetParams
ldr r0, =sub_81134B8
str r0, [r4]
add sp, 0xC
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81133E8
thumb_func_start sub_81134B8
sub_81134B8: @ 81134B8
push {lr}
lsls r0, 24
lsrs r3, r0, 24
lsls r0, r3, 2
adds r0, r3
lsls r0, 3
ldr r1, =gTasks
adds r2, r0, r1
movs r1, 0x8
ldrsh r0, [r2, r1]
cmp r0, 0x4
bhi _0811356E
lsls r0, 2
ldr r1, =_081134E4
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081134E4:
.4byte _081134F8
.4byte _0811351A
.4byte _0811352A
.4byte _08113556
.4byte _08113568
_081134F8:
ldrh r0, [r2, 0x16]
adds r0, 0x1
strh r0, [r2, 0x16]
lsls r0, 16
asrs r0, 16
cmp r0, 0x1
ble _0811354E
movs r0, 0
strh r0, [r2, 0x16]
ldrh r0, [r2, 0x14]
adds r0, 0x1
strh r0, [r2, 0x14]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3
bne _0811354E
b _08113548
_0811351A:
ldrh r0, [r2, 0xA]
adds r0, 0x1
strh r0, [r2, 0xA]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3C
ble _0811354E
b _08113548
_0811352A:
ldrh r0, [r2, 0x16]
adds r0, 0x1
strh r0, [r2, 0x16]
lsls r0, 16
asrs r0, 16
cmp r0, 0x1
ble _0811354E
movs r0, 0
strh r0, [r2, 0x16]
ldrh r0, [r2, 0x14]
subs r0, 0x1
strh r0, [r2, 0x14]
lsls r0, 16
cmp r0, 0
bne _0811354E
_08113548:
ldrh r0, [r2, 0x8]
adds r0, 0x1
strh r0, [r2, 0x8]
_0811354E:
adds r0, r2, 0
bl sub_8113574
b _0811356E
_08113556:
ldr r1, =gScanlineEffect
movs r0, 0x3
strb r0, [r1, 0x15]
ldrh r0, [r2, 0x8]
adds r0, 0x1
strh r0, [r2, 0x8]
b _0811356E
.pool
_08113568:
adds r0, r3, 0
bl DestroyAnimVisualTask
_0811356E:
pop {r0}
bx r0
thumb_func_end sub_81134B8
thumb_func_start sub_8113574
sub_8113574: @ 8113574
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r5, r0, 0
ldrh r3, [r5, 0x12]
ldrh r4, [r5, 0xE]
movs r1, 0x10
ldrsh r0, [r5, r1]
cmp r4, r0
bgt _081135CA
ldr r7, =gScanlineEffectRegBuffers
mov r12, r7
ldr r0, =gSineTable
mov r8, r0
ldr r6, =gScanlineEffect
_08113592:
lsls r2, r4, 1
ldrb r1, [r6, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
adds r2, r0
add r2, r12
lsls r0, r3, 1
add r0, r8
movs r7, 0
ldrsh r1, [r0, r7]
movs r7, 0x14
ldrsh r0, [r5, r7]
muls r0, r1
asrs r0, 7
ldrh r1, [r5, 0xC]
adds r0, r1
strh r0, [r2]
adds r3, 0x8
movs r0, 0xFF
ands r3, r0
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
movs r7, 0x10
ldrsh r0, [r5, r7]
cmp r4, r0
ble _08113592
_081135CA:
ldrh r0, [r5, 0x12]
adds r0, 0x9
movs r1, 0xFF
ands r0, r1
strh r0, [r5, 0x12]
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8113574
thumb_func_start sub_81135EC
sub_81135EC: @ 81135EC
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r4, r0, 0
ldr r5, =gBattleAnimArgs
movs r0, 0x4
ldrsh r1, [r5, r0]
lsls r0, r1, 1
adds r0, r1
movs r1, 0x5
bl __divsi3
adds r6, r0, 0
ldr r1, =gBattleAnimAttacker
mov r8, r1
ldrb r0, [r1]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
mov r2, r8
ldrb r0, [r2]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r3, [r5, 0x8]
adds r0, r3
strh r0, [r4, 0x22]
movs r1, 0x2
ldrsh r0, [r5, r1]
movs r2, 0x4
ldrsh r1, [r5, r2]
bl Cos
strh r0, [r4, 0x30]
movs r3, 0x2
ldrsh r0, [r5, r3]
lsls r6, 16
asrs r6, 16
adds r1, r6, 0
bl Sin
strh r0, [r4, 0x32]
ldrh r1, [r4, 0x30]
ldrh r2, [r5]
adds r3, r2, 0
muls r3, r1
adds r1, r3, 0
ldrh r3, [r4, 0x20]
adds r1, r3
strh r1, [r4, 0x20]
adds r1, r2, 0
muls r1, r0
adds r0, r1, 0
ldrh r2, [r4, 0x22]
adds r0, r2
strh r0, [r4, 0x22]
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x34]
ldr r0, =sub_811369C
str r0, [r4, 0x1C]
adds r4, 0x2E
ldr r2, =gUnknown_0203A100
movs r1, 0x6
_08113674:
ldrh r0, [r4]
strh r0, [r2]
adds r4, 0x2
adds r2, 0x2
subs r1, 0x1
cmp r1, 0
bge _08113674
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81135EC
thumb_func_start sub_811369C
sub_811369C: @ 811369C
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x30]
ldrh r1, [r4, 0x36]
adds r0, r1
strh r0, [r4, 0x36]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x38]
adds r0, r2
strh r0, [r4, 0x38]
movs r1, 0x36
ldrsh r0, [r4, r1]
movs r1, 0xA
bl __divsi3
strh r0, [r4, 0x24]
movs r2, 0x38
ldrsh r0, [r4, r2]
movs r1, 0xA
bl __divsi3
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
lsls r0, 16
asrs r0, 16
movs r2, 0x34
ldrsh r1, [r4, r2]
cmp r0, r1
ble _081136E0
adds r0, r4, 0
bl DestroyAnimSprite
_081136E0:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_811369C
.align 2, 0
asm/easy_chat.s
+4 -4
View File
@@ -369,7 +369,7 @@ _0811AF86:
thumb_func_start sub_811AF8C
sub_811AF8C: @ 811AF8C
push {lr}
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -418,7 +418,7 @@ _0811AFE6:
thumb_func_start sub_811AFEC
sub_811AFEC: @ 811AFEC
push {r4,lr}
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -461,7 +461,7 @@ _0811B03A:
thumb_func_start sub_811B040
sub_811B040: @ 811B040
push {lr}
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -566,7 +566,7 @@ sub_811B0E8: @ 811B0E8
thumb_func_start sub_811B0F8
sub_811B0F8: @ 811B0F8
push {r4,lr}
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
asm/electric.s
+2547
View File
File diff suppressed because it is too large Load Diff
asm/fight.s
+1649
View File
File diff suppressed because it is too large Load Diff
asm/fire.s
+2397
View File
File diff suppressed because it is too large Load Diff
asm/flying.s
+2551
View File
File diff suppressed because it is too large Load Diff
asm/ghost.s
+3251
View File
File diff suppressed because it is too large Load Diff
asm/ground.s
+1675
View File
File diff suppressed because it is too large Load Diff
asm/ice.s
+2944
View File
File diff suppressed because it is too large Load Diff
asm/normal.s
+1876
View File
File diff suppressed because it is too large Load Diff
asm/party_menu.s
+14 -14
View File
@@ -2740,7 +2740,7 @@ sub_81B1708: @ 81B1708
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -4196,7 +4196,7 @@ sub_81B227C: @ 81B227C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -6178,7 +6178,7 @@ sub_81B3300: @ 81B3300
movs r1, 0x1
orrs r0, r1
strb r0, [r2]
bl GetPlayerTextSpeed
bl GetPlayerTextSpeedDelay
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -8138,7 +8138,7 @@ sub_81B43DC: @ 81B43DC
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -8671,7 +8671,7 @@ sub_81B48DC: @ 81B48DC
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -8963,7 +8963,7 @@ sub_81B4BA0: @ 81B4BA0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -9069,7 +9069,7 @@ sub_81B4C94: @ 81B4C94
push {r7}
lsls r0, 24
lsrs r5, r0, 24
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -9877,7 +9877,7 @@ sub_81B5430: @ 81B5430
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -10171,7 +10171,7 @@ sub_81B56D8: @ 81B56D8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -12543,7 +12543,7 @@ ether_effect_related_3: @ 81B6AB4
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
bl ProcessMenuInput
bl Menu_ProcessInput
lsls r0, 24
asrs r1, r0, 24
movs r0, 0x2
@@ -13156,7 +13156,7 @@ sub_81B7028: @ 81B7028
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -13458,7 +13458,7 @@ sub_81B72C8: @ 81B72C8
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r5, r0, 24
cmp r5, 0
@@ -15240,7 +15240,7 @@ sub_81B82D4: @ 81B82D4
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -15615,7 +15615,7 @@ _081B8618:
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
ldr r3, =gUnknown_08611C9A
ldr r3, =gFrontierBannedSpecies
lsls r1, r6, 1
adds r0, r1, r3
ldrh r0, [r0]
asm/poison.s
+306
View File
@@ -0,0 +1,306 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_810DBAC
sub_810DBAC: @ 810DBAC
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =gBattleAnimArgs
movs r1, 0x6
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0810DBC2
adds r0, r5, 0
movs r1, 0x2
bl StartSpriteAnim
_0810DBC2:
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x2E]
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, =0x0000ffe2
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
ldr r0, =sub_810DC10
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_810DBAC
thumb_func_start sub_810DC10
sub_810DC10: @ 810DC10
push {r4,lr}
adds r4, r0, 0
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _0810DC24
adds r0, r4, 0
bl DestroyAnimSprite
_0810DC24:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_810DC10
thumb_func_start sub_810DC2C
sub_810DC2C: @ 810DC2C
push {r4-r6,lr}
sub sp, 0x4
adds r4, r0, 0
ldr r5, =gBattleAnimArgs
movs r1, 0x6
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0810DC44
adds r0, r4, 0
movs r1, 0x2
bl StartSpriteAnim
_0810DC44:
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
mov r6, sp
adds r6, 0x2
movs r1, 0x1
mov r2, sp
adds r3, r6, 0
bl SetAverageBattlerPositions
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DC72
ldrh r0, [r5, 0x8]
negs r0, r0
strh r0, [r5, 0x8]
_0810DC72:
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
mov r1, sp
ldrh r0, [r5, 0x8]
ldrh r1, [r1]
adds r0, r1
strh r0, [r4, 0x32]
ldrh r0, [r5, 0xA]
ldrh r6, [r6]
adds r0, r6
strh r0, [r4, 0x36]
ldr r0, =0x0000ffe2
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
ldr r0, =sub_810DCB4
str r0, [r4, 0x1C]
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_810DC2C
thumb_func_start sub_810DCB4
sub_810DCB4: @ 810DCB4
push {r4,lr}
adds r4, r0, 0
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _0810DCC8
adds r0, r4, 0
bl DestroyAnimSprite
_0810DCC8:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_810DCB4
thumb_func_start sub_810DCD0
sub_810DCD0: @ 810DCD0
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =gBattleAnimArgs
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
strh r0, [r4, 0x30]
ldrh r1, [r5]
adds r0, r1
strh r0, [r4, 0x32]
ldrh r0, [r4, 0x22]
strh r0, [r4, 0x34]
ldrh r1, [r5, 0x2]
adds r0, r1
strh r0, [r4, 0x36]
adds r0, r4, 0
bl sub_80A6E14
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r2, 0x4
ldrsh r1, [r5, r2]
bl __divsi3
strh r0, [r4, 0x38]
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r2, 0x4
ldrsh r1, [r5, r2]
bl __divsi3
strh r0, [r4, 0x3A]
ldr r0, =sub_810DD24
str r0, [r4, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_810DCD0
thumb_func_start sub_810DD24
sub_810DD24: @ 810DD24
push {r4,lr}
adds r4, r0, 0
bl sub_80A656C
ldrh r0, [r4, 0x30]
ldrh r1, [r4, 0x38]
subs r0, r1
strh r0, [r4, 0x30]
ldrh r0, [r4, 0x32]
ldrh r1, [r4, 0x3A]
subs r0, r1
strh r0, [r4, 0x32]
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0810DD4A
adds r0, r4, 0
bl DestroyAnimSprite
_0810DD4A:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_810DD24
thumb_func_start sub_810DD50
sub_810DD50: @ 810DD50
push {r4,lr}
adds r4, r0, 0
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
adds r3, r4, 0
adds r3, 0x22
movs r1, 0x1
bl SetAverageBattlerPositions
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DD7C
ldr r1, =gBattleAnimArgs
ldrh r0, [r1]
negs r0, r0
strh r0, [r1]
_0810DD7C:
ldr r0, =gBattleAnimArgs
ldrh r2, [r0]
ldrh r1, [r4, 0x20]
adds r2, r1
strh r2, [r4, 0x20]
ldrh r1, [r0, 0x2]
ldrh r3, [r4, 0x22]
adds r1, r3
strh r1, [r4, 0x22]
ldrh r3, [r0, 0x8]
strh r3, [r4, 0x2E]
ldrh r0, [r0, 0x4]
adds r2, r0
strh r2, [r4, 0x32]
adds r1, r3
strh r1, [r4, 0x36]
ldr r0, =sub_80A6EEC
str r0, [r4, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_810DD50
thumb_func_start sub_810DDC4
sub_810DDC4: @ 810DDC4
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =gBattleAnimArgs
movs r1, 0x4
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0810DDE0
adds r0, r4, 0
movs r1, 0x1
bl sub_80A6980
b _0810DE16
.pool
_0810DDE0:
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
adds r3, r4, 0
adds r3, 0x22
movs r1, 0x1
bl SetAverageBattlerPositions
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DE06
ldrh r0, [r5]
negs r0, r0
strh r0, [r5]
_0810DE06:
ldrh r0, [r5]
ldrh r1, [r4, 0x20]
adds r0, r1
strh r0, [r4, 0x20]
ldrh r0, [r5, 0x2]
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
_0810DE16:
ldr r0, =sub_810DE2C
str r0, [r4, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_810DDC4
.align 2, 0
asm/pokemon_storage_system.s
+4 -4
View File
@@ -1904,7 +1904,7 @@ _080C8F0C:
adds r0, 0x1
strb r0, [r1]
_080C8F22:
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -2628,7 +2628,7 @@ _080C9584:
b _080C9664
.pool
_080C95A4:
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -3422,7 +3422,7 @@ _080C9C78:
b _080C9CAA
.pool
_080C9C8C:
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -3553,7 +3553,7 @@ _080C9DAC:
b _080C9DE0
.pool
_080C9DC0:
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
asm/pokenav.s
+7 -7
View File
@@ -10440,7 +10440,7 @@ sub_81CC158: @ 81CC158
adds r1, 0xF
bl sub_81CAF78
adds r5, r0, 0
bl GetPlayerTextSpeed
bl GetPlayerTextSpeedDelay
lsls r0, 24
lsrs r0, 24
ldrb r2, [r4, 0x14]
@@ -22957,7 +22957,7 @@ sub_81D2BF4: @ 81D2BF4
movs r1, 0x1
orrs r0, r1
strb r0, [r2]
bl GetPlayerTextSpeed
bl GetPlayerTextSpeedDelay
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -28371,7 +28371,7 @@ _081D5764:
adds r1, 0x4
adds r0, r1
adds r0, 0x10
bl ConvertBattleFrontierTrainerSpeechToString
bl FrontierSpeechToString
b _081D580E
.pool
_081D5790:
@@ -28392,7 +28392,7 @@ _081D5790:
adds r1, 0x4
adds r0, r1
adds r0, 0x1C
bl ConvertBattleFrontierTrainerSpeechToString
bl FrontierSpeechToString
b _081D580E
.pool
_081D57BC:
@@ -28413,7 +28413,7 @@ _081D57BC:
adds r1, 0x4
adds r0, r1
adds r0, 0x28
bl ConvertBattleFrontierTrainerSpeechToString
bl FrontierSpeechToString
b _081D580E
.pool
_081D57E8:
@@ -28434,7 +28434,7 @@ _081D57E8:
adds r1, 0x4
adds r0, r1
adds r0, 0x34
bl ConvertBattleFrontierTrainerSpeechToString
bl FrontierSpeechToString
_081D580E:
bl sub_81D5710
pop {r4-r6}
@@ -29731,7 +29731,7 @@ sub_81D62CC: @ 81D62CC
lsls r0, r1, 24
lsrs r6, r0, 24
bl sub_81D56B0
bl sub_8165CB4
bl GetHighestLevelInPlayerParty
lsls r0, 24
lsrs r0, 24
mov r10, r0
asm/post_battle_event_funcs.s
-165
View File
@@ -1,165 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start GameClear
GameClear: @ 8137734
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x1C
bl HealPlayerParty
ldr r4, =0x00000864
adds r0, r4, 0
bl FlagGet
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
bne _08137760
ldr r0, =gHasHallOfFameRecords
strb r1, [r0]
b _0813776C
.pool
_08137760:
ldr r1, =gHasHallOfFameRecords
movs r0, 0
strb r0, [r1]
adds r0, r4, 0
bl FlagSet
_0813776C:
movs r0, 0x1
bl GetGameStat
cmp r0, 0
bne _0813778E
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldrh r1, [r2, 0xE]
lsls r1, 16
ldrb r0, [r2, 0x10]
lsls r0, 8
orrs r1, r0
ldrb r0, [r2, 0x11]
orrs r1, r0
movs r0, 0x1
bl SetGameStat
_0813778E:
bl sub_8076D48
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _081377AC
movs r0, 0x1
bl sub_8084F6C
b _081377B2
.pool
_081377AC:
movs r0, 0x2
bl sub_8084F6C
_081377B2:
movs r7, 0
movs r6, 0
add r0, sp, 0x18
mov r8, r0
mov r5, sp
_081377BC:
movs r0, 0x64
adds r1, r6, 0
muls r1, r0
ldr r0, =gPlayerParty
adds r4, r1, r0
movs r0, 0
strb r6, [r5]
strb r0, [r5, 0x1]
adds r0, r4, 0
movs r1, 0x5
bl GetMonData
cmp r0, 0
beq _0813780A
adds r0, r4, 0
movs r1, 0x6
bl GetMonData
cmp r0, 0
bne _0813780A
adds r0, r4, 0
movs r1, 0x43
bl GetMonData
cmp r0, 0
bne _0813780A
movs r0, 0x1
mov r1, r8
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x43
add r2, sp, 0x18
bl SetMonData
adds r0, r4, 0
bl GetRibbonCount
strb r0, [r5, 0x1]
movs r7, 0x1
_0813780A:
adds r5, 0x4
adds r6, 0x1
cmp r6, 0x5
ble _081377BC
cmp r7, 0x1
bne _0813785A
movs r0, 0x2A
bl IncrementGameStat
ldr r0, =0x0000089b
bl FlagSet
mov r3, sp
add r2, sp, 0x4
movs r6, 0x4
_08137828:
ldrb r1, [r3, 0x1]
ldrb r0, [r2, 0x1]
cmp r0, r1
bls _08137838
ldr r1, [sp]
ldr r0, [r2]
str r0, [sp]
str r1, [r2]
_08137838:
adds r2, 0x4
subs r6, 0x1
cmp r6, 0
bge _08137828
mov r0, sp
ldrb r0, [r0, 0x1]
cmp r0, 0x4
bls _0813785A
mov r0, sp
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x43
bl sub_80EE4DC
_0813785A:
ldr r0, =CB2_DoHallOfFameScreen
bl SetMainCallback2
movs r0, 0
add sp, 0x1C
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end GameClear
thumb_func_start sp0C8_whiteout_maybe
sp0C8_whiteout_maybe: @ 813787C
push {lr}
ldr r0, =CB2_WhiteOut
bl SetMainCallback2
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sp0C8_whiteout_maybe
asm/psychic.s
+2172
View File
File diff suppressed because it is too large Load Diff
asm/rock.s
+1469
View File
File diff suppressed because it is too large Load Diff
asm/rom_8011DC0.s
+10 -10
View File
@@ -2905,7 +2905,7 @@ _080170CA:
negs r0, r0
b _08017110
_080170D4:
bl sub_8197930
bl DisplayYesNoMenu
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -2920,7 +2920,7 @@ _080170E0:
negs r0, r0
b _08017110
_080170F2:
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
movs r2, 0x80
@@ -6278,7 +6278,7 @@ _08018BD6:
b _08018C3E
.pool
_08018BE4:
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r6, r0, 24
movs r1, 0x80
@@ -10934,7 +10934,7 @@ sub_801B1E8: @ 801B1E8
ldr r0, [r0]
ldr r1, =0x00000bec
adds r0, r1
bl sub_816534C
bl ClearEReaderTrainer
pop {r0}
bx r0
.pool
@@ -11490,7 +11490,7 @@ _0801B628:
ldr r1, [r0]
adds r1, 0xA
adds r0, r4, 0
bl CopyUnalignedWord
bl CopyTrainerId
mov r2, r8
ldr r1, [r2]
adds r0, r6, 0
@@ -16904,7 +16904,7 @@ _0801E16A:
b _0801E23A
.pool
_0801E17C:
bl ProcessMenuInput
bl Menu_ProcessInput
lsls r0, 24
asrs r0, 8
lsrs r6, r0, 16
@@ -20614,7 +20614,7 @@ _0801FEFE:
thumb_func_start sub_801FF08
sub_801FF08: @ 801FF08
push {lr}
bl ProcessMenuInput
bl Menu_ProcessInput
lsls r0, 24
asrs r0, 24
pop {r1}
@@ -28887,10 +28887,10 @@ _08024246:
strb r0, [r5, 0xC]
b _080242D8
_0802426A:
bl sub_8197930
bl DisplayYesNoMenu
b _080242D0
_08024270:
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
@@ -47811,7 +47811,7 @@ _0802DA84:
thumb_func_start sub_802DA8C
sub_802DA8C: @ 802DA8C
push {lr}
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r0, 24
pop {r1}
asm/roulette.s
+2 -2
View File
@@ -736,7 +736,7 @@ sub_8140914: @ 8140914
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_8197930
bl DisplayYesNoMenu
ldr r5, =gUnknown_0203AB8C
ldrb r0, [r5]
movs r1, 0
@@ -4502,7 +4502,7 @@ sub_81428C4: @ 81428C4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_8197930
bl DisplayYesNoMenu
ldr r1, =gUnknown_085B6408
adds r0, r4, 0
bl sub_8121F68
asm/script_menu.s
-1883
View File
File diff suppressed because it is too large Load Diff
asm/trade.s
+3 -3
View File
@@ -3349,7 +3349,7 @@ sub_8078EF8: @ 8078EF8
sub_8078F50: @ 8078F50
push {lr}
sub sp, 0x4
bl Menu_ProcessInputNoWrapAround
bl Menu_ProcessInputNoWrap
lsls r0, 24
asrs r0, 24
movs r1, 0x1
@@ -3695,7 +3695,7 @@ _0807920E:
thumb_func_start sub_8079218
sub_8079218: @ 8079218
push {lr}
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -3797,7 +3797,7 @@ _080792D8:
thumb_func_start sub_80792E4
sub_80792E4: @ 80792E4
push {lr}
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
asm/use_pokeblock.s
+1 -1
View File
@@ -900,7 +900,7 @@ sub_8166D44: @ 8166D44
thumb_func_start sub_8166DE4
sub_8166DE4: @ 8166DE4
push {r4,lr}
bl Menu_ProcessInputNoWrap_
bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24
lsrs r4, r0, 24
asrs r1, r0, 24
asm/water.s
+3607
View File
File diff suppressed because it is too large Load Diff
common_syms/text.txt
-4
View File
@@ -1,8 +1,4 @@
gFonts
gUnknown_03002F84
gUnknown_03002F90
gUnknown_03002FB0
gUnknown_03002FD0
gUnknown_03002FF0
gGlyphDimensions
gTextFlags
data/battle_anim_80A9C70.s
+9 -8
View File
@@ -1,3 +1,4 @@
#include "constants/battle_anim.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -13,8 +14,8 @@ gUnknown_0853EDF8:: @ 853EDF8
.align 2
gUnknown_0853EDFC:: @ 853EDFC
spr_template 0x2714, 0x2714, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
spr_template 0x2714, 0x2714, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C
spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C
.align 2
gUnknown_0853EE2C:: @ 853EE2C
@@ -26,11 +27,11 @@ gUnknown_0853EE34:: @ 853EE34
.align 2
gUnknown_0853EE38:: @ 853EE38
spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30
spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30
.align 2
gUnknown_0853EE50:: @ 853EE50
spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4
spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4
.align 2
gUnknown_0853EE68:: @ 853EE68
@@ -42,8 +43,8 @@ gUnknown_0853EE80:: @ 853EE80
.align 2
gUnknown_0853EE84:: @ 853EE84
spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64
spr_template 0x2743, 0x2743, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
spr_template ANIM_TAG_SPARKLE_4, ANIM_TAG_SPARKLE_4, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64
spr_template ANIM_TAG_UNUSED_MONSTER_FOOT, ANIM_TAG_UNUSED_MONSTER_FOOT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
.align 2
gUnknown_0853EEB4:: @ 853EEB4
@@ -65,7 +66,7 @@ gUnknown_0853EECC:: @ 853EECC
.align 2
gUnknown_0853EED8:: @ 853EED8
spr_template 0x2797, 0x2797, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
.align 2
gUnknown_0853EEF0:: @ 853EEF0
@@ -85,4 +86,4 @@ gUnknown_0853EF14:: @ 853EF14
.align 2
gUnknown_0853EF18:: @ 853EF18
spr_template 0x2714, 0x2714, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C
spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C
data/battle_anim_80FE840.s
-3883
View File
File diff suppressed because it is too large Load Diff
data/battle_anim_815A0D4.s
+46 -45
View File
@@ -1,3 +1,4 @@
#include "constants/battle_anim.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -15,15 +16,15 @@ gUnknown_085CE01C:: @ 85CE01C
.align 2
gUnknown_085CE020:: @ 85CE020
spr_template 0x2799, 0x2799, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
spr_template ANIM_TAG_SCRATCH, ANIM_TAG_SCRATCH, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
gUnknown_085CE038:: @ 85CE038
spr_template 0x2720, 0x2720, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4
spr_template ANIM_TAG_BLACK_SMOKE, ANIM_TAG_BLACK_SMOKE, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4
.align 2
gUnknown_085CE050:: @ 85CE050
spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC
spr_template ANIM_TAG_BLACK_BALL, ANIM_TAG_BLACK_BALL, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC
.align 2
gUnknown_085CE068:: @ 85CE068
@@ -36,15 +37,15 @@ gUnknown_085CE078:: @ 85CE078
.align 2
gUnknown_085CE07C:: @ 85CE07C
spr_template 0x27ce, 0x27ce, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
spr_template ANIM_TAG_OPENING_EYE, ANIM_TAG_OPENING_EYE, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
gUnknown_085CE094::
spr_template 0x27cf, 0x27cf, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0
spr_template ANIM_TAG_ROUND_WHITE_HALO, ANIM_TAG_ROUND_WHITE_HALO, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0
.align 2
gUnknown_085CE0AC::
spr_template 0x27cd, 0x27cd, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254
spr_template ANIM_TAG_TEAL_ALERT, ANIM_TAG_TEAL_ALERT, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254
.align 2
gUnknown_085CE0C4:: @ 85CE0C4
@@ -66,11 +67,11 @@ gUnknown_085CE0FC:: @ 85CE0FC
.align 2
gUnknown_085CE104:: @ 85CE104
spr_template 0x27cb, 0x27cb, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0
spr_template ANIM_TAG_EYE, ANIM_TAG_EYE, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0
.align 2
gUnknown_085CE11C:: @ 85CE11C
spr_template 0x27a8, 0x27a8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4
spr_template ANIM_TAG_SPIKES, ANIM_TAG_SPIKES, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4
.align 2
gUnknown_085CE134:: @ 85CE134
@@ -84,7 +85,7 @@ gUnknown_085CE14C:: @ 85CE14C
.align 2
gUnknown_085CE150:: @ 85CE150
spr_template 0x272b, 0x272b, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0
spr_template ANIM_TAG_LEER, ANIM_TAG_LEER, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0
.align 2
gUnknown_085CE168:: @ 85CE168
@@ -106,7 +107,7 @@ gUnknown_085CE18C:: @ 85CE18C
.align 2
gUnknown_085CE190:: @ 85CE190
spr_template 0x27f4, 0x27f4, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC
spr_template ANIM_TAG_LETTER_Z, ANIM_TAG_LETTER_Z, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC
.align 2
gUnknown_085CE1A8:: @ 85CE1A8
@@ -128,7 +129,7 @@ gUnknown_085CE1D8:: @ 85CE1D8
.align 2
gUnknown_085CE1DC:: @ 85CE1DC
spr_template 0x27d0, 0x27d0, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC
spr_template ANIM_TAG_FANG_ATTACK, ANIM_TAG_FANG_ATTACK, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC
.align 2
gUnknown_085CE1F4:: @ 85CE1F4
@@ -149,15 +150,15 @@ gUnknown_085CE224:: @ 85CE224
.align 2
gUnknown_085CE22C:: @ 85CE22C
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934
spr_template ANIM_TAG_SPOTLIGHT, ANIM_TAG_SPOTLIGHT, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934
.align 2
gUnknown_085CE244::
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4
spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4
.align 2
gUnknown_085CE25C::
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0
spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0
.align 2
gUnknown_085CE274:: @ 85CE274
@@ -170,7 +171,7 @@ gUnknown_085CE284:: @ 85CE284
.align 2
gUnknown_085CE288:: @ 85CE288
spr_template 0x27f5, 0x27f5, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0
spr_template ANIM_TAG_RAPID_SPIN, ANIM_TAG_RAPID_SPIN, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0
.align 2
gUnknown_085CE2A0:: @ 85CE2A0
@@ -195,7 +196,7 @@ gUnknown_085CE2F4:: @ 85CE2F4
.align 2
gUnknown_085CE2F8:: @ 85CE2F8
spr_template 0x27f6, 0x27f6, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C
spr_template ANIM_TAG_TRI_FORCE_TRIANGLE, ANIM_TAG_TRI_FORCE_TRIANGLE, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C
.align 2
gUnknown_085CE310:: @ 85CE310
@@ -208,7 +209,7 @@ gUnknown_085CE334:: @ 85CE334
.align 2
gUnknown_085CE338:: @ 85CE338
spr_template 0x27fa, 0x27fa, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
spr_template ANIM_TAG_ECLIPSING_ORB, ANIM_TAG_ECLIPSING_ORB, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
gUnknown_085CE350:: @ 85CE350
@@ -216,15 +217,15 @@ gUnknown_085CE350:: @ 85CE350
.align 2
gUnknown_085CE370:: @ 85CE370
spr_template 0x27f2, 0x27f2, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394
spr_template ANIM_TAG_POKEBALL, ANIM_TAG_POKEBALL, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394
.align 2
gUnknown_085CE388:: @ 85CE388
spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C
spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C
.align 2
gUnknown_085CE3A0:: @ 85CE3A0
spr_template 0x27f9, 0x27f9, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570
spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570
.align 2
gUnknown_085CE3B8:: @ 85CE3B8
@@ -238,7 +239,7 @@ gUnknown_085CE3E0:: @ 85CE3E0
.align 2
gUnknown_085CE418:: @ 85CE418
spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C
spr_template ANIM_TAG_BLUE_ORB, ANIM_TAG_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C
.align 2
gUnknown_085CE430:: @ 85CE430
@@ -269,7 +270,7 @@ gUnknown_085CE480:: @ 85CE480
.align 2
gUnknown_085CE48C:: @ 85CE48C
spr_template 0x2801, 0x2801, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04
spr_template ANIM_TAG_GREEN_STAR, ANIM_TAG_GREEN_STAR, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04
.align 2
gUnknown_085CE4A4:: @ 85CE4A4
@@ -285,7 +286,7 @@ gUnknown_085CE4B0:: @ 85CE4B0
.align 2
gUnknown_085CE4D0:: @ 85CE4D0
spr_template 0x2767, 0x2767, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815C400
spr_template ANIM_TAG_ANGER, ANIM_TAG_ANGER, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815C400
.align 2
gUnknown_085CE4E8:: @ 85CE4E8
@@ -309,7 +310,7 @@ gUnknown_085CE538:: @ 85CE538
.align 2
gUnknown_085CE544:: @ 85CE544
spr_template 0x27fe, 0x27fe, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0
spr_template ANIM_TAG_PINK_PETAL, ANIM_TAG_PINK_PETAL, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0
.align 2
gUnknown_085CE55C:: @ 85CE55C
@@ -325,13 +326,13 @@ gUnknown_085CE58C:: @ 85CE58C
.align 2
gUnknown_085CE590:: @ 85CE590
spr_template 0x27ff, 0x27ff, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C
spr_template ANIM_TAG_PAIN_SPLIT, ANIM_TAG_PAIN_SPLIT, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C
gUnknown_085CE5A8::
spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88
spr_template ANIM_TAG_CONFETTI, ANIM_TAG_CONFETTI, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88
gUnknown_085CE5C0::
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94
spr_template ANIM_TAG_SPOTLIGHT, ANIM_TAG_SPOTLIGHT, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94
gBattleAnimSpriteTemplate_85CE5D8::
spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4
spr_template ANIM_TAG_BLUE_ORB, ANIM_TAG_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4
.align 2
gUnknown_085CE5F0:: @ 85CE5F0
@@ -358,7 +359,7 @@ gUnknown_085CE680:: @ 85CE680
.align 2
gUnknown_085CE68C:: @ 85CE68C
spr_template 0x2802, 0x2802, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4
spr_template ANIM_TAG_PINK_CLOUD, ANIM_TAG_PINK_CLOUD, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4
.align 2
gUnknown_085CE6A4:: @ 85CE6A4
@@ -385,7 +386,7 @@ gUnknown_085CE724:: @ 85CE724
.align 2
gUnknown_085CE734:: @ 85CE734
spr_template 0x2802, 0x2802, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870
spr_template ANIM_TAG_PINK_CLOUD, ANIM_TAG_PINK_CLOUD, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870
.align 2
gUnknown_085CE74C:: @ 85CE74C
@@ -393,7 +394,7 @@ gUnknown_085CE74C:: @ 85CE74C
.align 2
gUnknown_085CE76C:: @ 85CE76C
spr_template 0x2803, 0x2803, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC
spr_template ANIM_TAG_SWEAT_DROP, ANIM_TAG_SWEAT_DROP, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC
.align 2
gUnknown_085CE784:: @ 85CE784
@@ -415,13 +416,13 @@ gUnknown_085CE7CC:: @ 85CE7CC
.align 2
gUnknown_085CE7D4:: @ 85CE7D4
spr_template 0x2745, 0x2745, gUnknown_08524914, gUnknown_085CE7CC, NULL, gDummySpriteAffineAnimTable, sub_815E01C
spr_template ANIM_TAG_NOISE_LINE, ANIM_TAG_NOISE_LINE, gUnknown_08524914, gUnknown_085CE7CC, NULL, gDummySpriteAffineAnimTable, sub_815E01C
.align 2
gUnknown_085CE7EC:: @ 85CE7EC
spr_template 0x2808, 0x2808, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404
spr_template ANIM_TAG_SMALL_RED_EYE, ANIM_TAG_SMALL_RED_EYE, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404
gUnknown_085CE804::
spr_template 0x280c, 0x280c, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444
spr_template ANIM_TAG_PAW_PRINT, ANIM_TAG_PAW_PRINT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444
.align 2
gUnknown_085CE81C:: @ 85CE81C
@@ -439,11 +440,11 @@ gUnknown_085CE844:: @ 85CE844
.align 2
gUnknown_085CE84C:: @ 85CE84C
spr_template 0x280e, 0x280e, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy
spr_template ANIM_TAG_RED_BALL, ANIM_TAG_RED_BALL, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy
.align 2
gUnknown_085CE864::
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8
spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8
.align 2
gUnknown_085CE87C:: @ 85CE87C
@@ -451,19 +452,19 @@ gUnknown_085CE87C:: @ 85CE87C
.align 2
gUnknown_085CE894:: @ 85CE894
spr_template 0x280f, 0x280f, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954
spr_template ANIM_TAG_SMELLINGSALT_EFFECT, ANIM_TAG_SMELLINGSALT_EFFECT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954
gUnknown_085CE8AC::
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14
spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14
gUnknown_085CE8C4::
spr_template 0x2812, 0x2812, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84
spr_template ANIM_TAG_MAGNIFYING_GLASS, ANIM_TAG_MAGNIFYING_GLASS, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84
gUnknown_085CE8DC::
spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C
spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C
gUnknown_085CE8F4::
spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4
spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4
gUnknown_085CE90C::
spr_template 0x280a, 0x280a, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C
spr_template ANIM_TAG_X_SIGN, ANIM_TAG_X_SIGN, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C
gUnknown_085CE924::
spr_template 0x27f0, 0x27f0, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80
spr_template ANIM_TAG_ITEM_BAG, ANIM_TAG_ITEM_BAG, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80
.align 2
gUnknown_085CE93C:: @ 85CE93C
@@ -488,7 +489,7 @@ gUnknown_085CE97C:: @ 85CE97C
.align 2
gUnknown_085CE984:: @ 85CE984
spr_template 0x2825, 0x2825, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338
spr_template ANIM_TAG_SLAM_HIT_2, ANIM_TAG_SLAM_HIT_2, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338
.align 2
gUnknown_085CE99C:: @ 85CE99C
@@ -500,7 +501,7 @@ gUnknown_085CE9AC:: @ 85CE9AC
.align 2
gUnknown_085CE9B0:: @ 85CE9B0
spr_template 0x2826, 0x2826, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8
spr_template ANIM_TAG_RECYCLE, ANIM_TAG_RECYCLE, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8
.align 2
gUnknown_085CE9C8:: @ 85CE9C8
data/battle_anim_8170478.s
+3 -2
View File
@@ -1,3 +1,4 @@
#include "constants/battle_anim.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -141,7 +142,7 @@ gUnknown_085E5310:: @ 85E5310
.align 2
gBattleAnimSpriteTemplate_85E5338:: @ 85E5338
spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
spr_template ANIM_TAG_UNUSED_RED_BRICK, ANIM_TAG_UNUSED_RED_BRICK, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
.align 2
gUnknown_085E5350:: @ 8535350
@@ -152,5 +153,5 @@ gUnknown_085E5358:: @ 8535358
.4byte gUnknown_085E5350
.align 2
spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_085E5358, NULL, gDummySpriteAffineAnimTable, sub_817330C
spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524914, gUnknown_085E5358, NULL, gDummySpriteAffineAnimTable, sub_817330C
data/battle_anim_scripts.s
+451 -451
View File
File diff suppressed because it is too large Load Diff
data/battle_anims.s
-907
View File
@@ -1,907 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_08524904:: @ 8524904
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852490C:: @ 852490C
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524914:: @ 8524914
.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852491C:: @ 852491C
.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524924:: @ 8524924
.byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852492C:: @ 852492C
.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524934:: @ 8524934
.byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852493C:: @ 852493C
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524944:: @ 8524944
.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852494C:: @ 852494C
.byte 0x00, 0x80, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524954:: @ 8524954
.byte 0x00, 0x80, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852495C:: @ 852495C
.byte 0x00, 0x80, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524964:: @ 8524964
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852496C:: @ 852496C
.byte 0x00, 0x01, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524974:: @ 8524974
.byte 0x00, 0x01, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852497C:: @ 852497C
.byte 0x00, 0x01, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524984:: @ 8524984
.byte 0x00, 0x41, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852498C:: @ 852498C
.byte 0x00, 0x41, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524994:: @ 8524994
.byte 0x00, 0x41, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852499C:: @ 852499C
.byte 0x00, 0x41, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249A4:: @ 85249A4
.byte 0x00, 0x81, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249AC:: @ 85249AC
.byte 0x00, 0x81, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249B4:: @ 85249B4
.byte 0x00, 0x81, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249BC:: @ 85249BC
.byte 0x00, 0x81, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249C4:: @ 85249C4
.byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249CC:: @ 85249CC
.byte 0x00, 0x03, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249D4:: @ 85249D4
.byte 0x00, 0x03, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249DC:: @ 85249DC
.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249E4:: @ 85249E4
.byte 0x00, 0x43, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249EC:: @ 85249EC
.byte 0x00, 0x43, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249F4:: @ 85249F4
.byte 0x00, 0x43, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249FC:: @ 85249FC
.byte 0x00, 0x43, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A04:: @ 8524A04
.byte 0x00, 0x83, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A0C:: @ 8524A0C
.byte 0x00, 0x83, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A14:: @ 8524A14
.byte 0x00, 0x83, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A1C:: @ 8524A1C
.byte 0x00, 0x83, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A24:: @ 8524A24
.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A2C:: @ 8524A2C
.byte 0x00, 0x04, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A34:: @ 8524A34
.byte 0x00, 0x04, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A3C:: @ 8524A3C
.byte 0x00, 0x04, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A44:: @ 8524A44
.byte 0x00, 0x44, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A4C:: @ 8524A4C
.byte 0x00, 0x44, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A54:: @ 8524A54
.byte 0x00, 0x44, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A5C:: @ 8524A5C
.byte 0x00, 0x44, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A64:: @ 8524A64
.byte 0x00, 0x84, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A6C:: @ 8524A6C
.byte 0x00, 0x84, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A74:: @ 8524A74
.byte 0x00, 0x84, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A7C:: @ 8524A7C
.byte 0x00, 0x84, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A84:: @ 8524A84
.byte 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A8C:: @ 8524A8C
.byte 0x00, 0x05, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A94:: @ 8524A94
.byte 0x00, 0x05, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A9C:: @ 8524A9C
.byte 0x00, 0x05, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AA4:: @ 8524AA4
.byte 0x00, 0x45, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AAC:: @ 8524AAC
.byte 0x00, 0x45, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AB4:: @ 8524AB4
.byte 0x00, 0x45, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524ABC:: @ 8524ABC
.byte 0x00, 0x45, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AC4:: @ 8524AC4
.byte 0x00, 0x85, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524ACC:: @ 8524ACC
.byte 0x00, 0x85, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AD4:: @ 8524AD4
.byte 0x00, 0x85, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524ADC:: @ 8524ADC
.byte 0x00, 0x85, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AE4:: @ 8524AE4
.byte 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AEC:: @ 8524AEC
.byte 0x00, 0x07, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AF4:: @ 8524AF4
.byte 0x00, 0x07, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AFC:: @ 8524AFC
.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B04:: @ 8524B04
.byte 0x00, 0x47, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B0C:: @ 8524B0C
.byte 0x00, 0x47, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B14:: @ 8524B14
.byte 0x00, 0x47, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B1C:: @ 8524B1C
.byte 0x00, 0x47, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B24:: @ 8524B24
.byte 0x00, 0x87, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B2C:: @ 8524B2C
.byte 0x00, 0x87, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B34:: @ 8524B34
.byte 0x00, 0x87, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B3C:: @ 8524B3C
.byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gBattleAnimPicTable:: @ 8524B44
obj_tiles gBattleAnimSpriteSheet_000, 0x0200, 0x2710
obj_tiles gBattleAnimSpriteSheet_001, 0x0300, 0x2711
obj_tiles gBattleAnimSpriteSheet_002, 0x0200, 0x2712
obj_tiles gBattleAnimSpriteSheet_003, 0x0100, 0x2713
obj_tiles gBattleAnimSpriteSheet_004, 0x0200, 0x2714
obj_tiles gBattleAnimSpriteSheet_005, 0x0400, 0x2715
obj_tiles gBattleAnimSpriteSheet_006, 0x0180, 0x2716
obj_tiles gBattleAnimSpriteSheet_007, 0x0800, 0x2717
obj_tiles gBattleAnimSpriteSheet_008, 0x0020, 0x2718
obj_tiles gBattleAnimSpriteSheet_009, 0x0400, 0x2719
obj_tiles gBattleAnimSpriteSheet_010, 0x1200, 0x271a
obj_tiles gBattleAnimSpriteSheet_011, 0x0180, 0x271b
obj_tiles gBattleAnimSpriteSheet_012, 0x0080, 0x271c
obj_tiles gBattleAnimSpriteSheet_013, 0x0080, 0x271d
obj_tiles gBattleAnimSpriteSheet_014, 0x0280, 0x271e
obj_tiles gBattleAnimSpriteSheet_015, 0x0080, 0x271f
obj_tiles gBattleAnimSpriteSheet_016, 0x0100, 0x2720
obj_tiles gBattleAnimSpriteSheet_017, 0x0020, 0x2721
obj_tiles gBattleAnimSpriteSheet_018, 0x0080, 0x2722
obj_tiles gBattleAnimSpriteSheet_019, 0x0400, 0x2723
obj_tiles gBattleAnimSpriteSheet_020, 0x0200, 0x2724
obj_tiles gBattleAnimSpriteSheet_021, 0x0a00, 0x2725
obj_tiles gBattleAnimSpriteSheet_021, 0x0a00, 0x2726
obj_tiles gBattleAnimSpriteSheet_023, 0x0380, 0x2727
obj_tiles gBattleAnimSpriteSheet_024, 0x0300, 0x2728
obj_tiles gBattleAnimSpriteSheet_025, 0x0a00, 0x2729
obj_tiles gBattleAnimSpriteSheet_026, 0x0a00, 0x272a
obj_tiles gBattleAnimSpriteSheet_027, 0x0a00, 0x272b
obj_tiles gBattleAnimSpriteSheet_028, 0x0a00, 0x272c
obj_tiles gBattleAnimSpriteSheet_029, 0x0a00, 0x272d
obj_tiles gBattleAnimSpriteSheet_030, 0x0a00, 0x272e
obj_tiles gBattleAnimSpriteSheet_031, 0x0e00, 0x272f
obj_tiles gBattleAnimSpriteSheet_032, 0x0380, 0x2730
obj_tiles gBattleAnimSpriteSheet_033, 0x1000, 0x2731
obj_tiles gBattleAnimSpriteSheet_034, 0x0800, 0x2732
obj_tiles gBattleAnimSpriteSheet_035, 0x0a00, 0x2733
obj_tiles gBattleAnimSpriteSheet_036, 0x0800, 0x2734
obj_tiles gBattleAnimSpriteSheet_037, 0x0a00, 0x2735
obj_tiles gBattleAnimSpriteSheet_038, 0x0a00, 0x2736
obj_tiles gBattleAnimSpriteSheet_039, 0x0a00, 0x2737
obj_tiles gBattleAnimSpriteSheet_040, 0x0a00, 0x2738
obj_tiles gBattleAnimSpriteSheet_041, 0x0a00, 0x2739
obj_tiles gBattleAnimSpriteSheet_042, 0x0a00, 0x273a
obj_tiles gBattleAnimSpriteSheet_043, 0x0a00, 0x273b
obj_tiles gBattleAnimSpriteSheet_044, 0x0a00, 0x273c
obj_tiles gBattleAnimSpriteSheet_045, 0x0a00, 0x273d
obj_tiles gBattleAnimSpriteSheet_046, 0x1000, 0x273e
obj_tiles gBattleAnimSpriteSheet_046, 0x1000, 0x273f
obj_tiles gBattleAnimSpriteSheet_048, 0x1000, 0x2740
obj_tiles gBattleAnimSpriteSheet_048, 0x1000, 0x2741
obj_tiles gBattleAnimSpriteSheet_050, 0x0200, 0x2742
obj_tiles gBattleAnimSpriteSheet_051, 0x0200, 0x2743
obj_tiles gBattleAnimSpriteSheet_052, 0x0200, 0x2744
obj_tiles gBattleAnimSpriteSheet_053, 0x0800, 0x2745
obj_tiles gBattleAnimSpriteSheet_054, 0x0080, 0x2746
obj_tiles gBattleAnimSpriteSheet_055, 0x0200, 0x2747
obj_tiles gBattleAnimSpriteSheet_056, 0x1000, 0x2748
obj_tiles gBattleAnimSpriteSheet_057, 0x0180, 0x2749
obj_tiles gBattleAnimSpriteSheet_058, 0x0c00, 0x274a
obj_tiles gBattleAnimSpriteSheet_059, 0x0100, 0x274b
obj_tiles gBattleAnimSpriteSheet_060, 0x0040, 0x274c
obj_tiles gBattleAnimSpriteSheet_061, 0x0180, 0x274d
obj_tiles gBattleAnimSpriteSheet_062, 0x0800, 0x274e
obj_tiles gBattleAnimSpriteSheet_063, 0x0480, 0x274f
obj_tiles gBattleAnimSpriteSheet_064, 0x0200, 0x2750
obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2751
obj_tiles gBattleAnimSpriteSheet_066, 0x0100, 0x2752
obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2753
obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2754
obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2755
obj_tiles gBattleAnimSpriteSheet_070, 0x0200, 0x2756
obj_tiles gBattleAnimSpriteSheet_071, 0x0a00, 0x2757
obj_tiles gBattleAnimSpriteSheet_072, 0x0300, 0x2758
obj_tiles gBattleAnimSpriteSheet_073, 0x0180, 0x2759
obj_tiles gBattleAnimSpriteSheet_074, 0x00a0, 0x275a
obj_tiles gBattleAnimSpriteSheet_075, 0x0700, 0x275b
obj_tiles gBattleAnimSpriteSheet_076, 0x0400, 0x275c
obj_tiles gBattleAnimSpriteSheet_077, 0x0200, 0x275d
obj_tiles gBattleAnimSpriteSheet_078, 0x0300, 0x275e
obj_tiles gBattleAnimSpriteSheet_079, 0x0c00, 0x275f
obj_tiles gBattleAnimSpriteSheet_080, 0x0a00, 0x2760
obj_tiles gBattleAnimSpriteSheet_081, 0x0080, 0x2761
obj_tiles gBattleAnimSpriteSheet_082, 0x0040, 0x2762
obj_tiles gBattleAnimSpriteSheet_083, 0x0e00, 0x2763
obj_tiles gBattleAnimSpriteSheet_084, 0x0e00, 0x2764
obj_tiles gBattleAnimSpriteSheet_085, 0x0280, 0x2765
obj_tiles gBattleAnimSpriteSheet_086, 0x0200, 0x2766
obj_tiles gBattleAnimSpriteSheet_087, 0x0080, 0x2767
obj_tiles gBattleAnimSpriteSheet_088, 0x00c0, 0x2768
obj_tiles gBattleAnimSpriteSheet_089, 0x0a00, 0x2769
obj_tiles gBattleAnimSpriteSheet_090, 0x0200, 0x276a
obj_tiles gBattleAnimSpriteSheet_091, 0x0180, 0x276b
obj_tiles gBattleAnimSpriteSheet_092, 0x0080, 0x276c
obj_tiles gBattleAnimSpriteSheet_093, 0x1000, 0x276d
obj_tiles gBattleAnimSpriteSheet_094, 0x0a00, 0x276e
obj_tiles gBattleAnimSpriteSheet_095, 0x0180, 0x276f
obj_tiles gBattleAnimSpriteSheet_096, 0x0380, 0x2770
obj_tiles gBattleAnimSpriteSheet_097, 0x0c00, 0x2771
obj_tiles gBattleAnimSpriteSheet_098, 0x0200, 0x2772
obj_tiles gBattleAnimSpriteSheet_099, 0x0200, 0x2773
obj_tiles gBattleAnimSpriteSheet_100, 0x0200, 0x2774
obj_tiles gBattleAnimSpriteSheet_101, 0x0200, 0x2775
obj_tiles gBattleAnimSpriteSheet_102, 0x0400, 0x2776
obj_tiles gBattleAnimSpriteSheet_103, 0x0080, 0x2777
obj_tiles gBattleAnimSpriteSheet_104, 0x0400, 0x2778
obj_tiles gBattleAnimSpriteSheet_105, 0x0c00, 0x2779
obj_tiles gBattleAnimSpriteSheet_106, 0x0200, 0x277a
obj_tiles gBattleAnimSpriteSheet_107, 0x1000, 0x277b
obj_tiles gBattleAnimSpriteSheet_108, 0x0a00, 0x277c
obj_tiles gBattleAnimSpriteSheet_109, 0x0020, 0x277d
obj_tiles gBattleAnimSpriteSheet_110, 0x0e00, 0x277e
obj_tiles gBattleAnimSpriteSheet_111, 0x0080, 0x277f
obj_tiles gBattleAnimSpriteSheet_112, 0x0a00, 0x2780
obj_tiles gBattleAnimSpriteSheet_113, 0x0400, 0x2781
obj_tiles gBattleAnimSpriteSheet_114, 0x0200, 0x2782
obj_tiles gBattleAnimSpriteSheet_115, 0x0700, 0x2783
obj_tiles gBattleAnimSpriteSheet_116, 0x0800, 0x2784
obj_tiles gBattleAnimSpriteSheet_117, 0x0a00, 0x2785
obj_tiles gBattleAnimSpriteSheet_118, 0x0600, 0x2786
obj_tiles gBattleAnimSpriteSheet_119, 0x0800, 0x2787
obj_tiles gBattleAnimSpriteSheet_120, 0x0200, 0x2788
obj_tiles gBattleAnimSpriteSheet_121, 0x0040, 0x2789
obj_tiles gBattleAnimSpriteSheet_122, 0x0180, 0x278a
obj_tiles gBattleAnimSpriteSheet_123, 0x0600, 0x278b
obj_tiles gBattleAnimSpriteSheet_124, 0x0600, 0x278c
obj_tiles gBattleAnimSpriteSheet_125, 0x0200, 0x278d
obj_tiles gBattleAnimSpriteSheet_126, 0x0080, 0x278e
obj_tiles gBattleAnimSpriteSheet_127, 0x0200, 0x278f
obj_tiles gBattleAnimSpriteSheet_128, 0x0800, 0x2790
obj_tiles gBattleAnimSpriteSheet_129, 0x0080, 0x2791
obj_tiles gBattleAnimSpriteSheet_130, 0x0a00, 0x2792
obj_tiles gBattleAnimSpriteSheet_131, 0x0280, 0x2793
obj_tiles gBattleAnimSpriteSheet_132, 0x0280, 0x2794
obj_tiles gBattleAnimSpriteSheet_133, 0x0100, 0x2795
obj_tiles gBattleAnimSpriteSheet_134, 0x0200, 0x2796
obj_tiles gBattleAnimSpriteSheet_135, 0x0200, 0x2797
obj_tiles gBattleAnimSpriteSheet_136, 0x0020, 0x2798
obj_tiles gBattleAnimSpriteSheet_137, 0x0a00, 0x2799
obj_tiles gBattleAnimSpriteSheet_138, 0x0800, 0x279a
obj_tiles gBattleAnimSpriteSheet_139, 0x0800, 0x279b
obj_tiles gBattleAnimSpriteSheet_140, 0x00c0, 0x279c
obj_tiles gBattleAnimSpriteSheet_141, 0x01c0, 0x279d
obj_tiles gBattleAnimSpriteSheet_142, 0x0100, 0x279e
obj_tiles gBattleAnimSpriteSheet_143, 0x0800, 0x279f
obj_tiles gBattleAnimSpriteSheet_144, 0x0200, 0x27a0
obj_tiles gBattleAnimSpriteSheet_145, 0x0800, 0x27a1
obj_tiles gBattleAnimSpriteSheet_146, 0x0180, 0x27a2
obj_tiles gBattleAnimSpriteSheet_147, 0x0180, 0x27a3
obj_tiles gBattleAnimSpriteSheet_148, 0x0200, 0x27a4
obj_tiles gBattleAnimSpriteSheet_149, 0x0200, 0x27a5
obj_tiles gBattleAnimSpriteSheet_150, 0x0180, 0x27a6
obj_tiles gBattleAnimSpriteSheet_151, 0x0400, 0x27a7
obj_tiles gBattleAnimSpriteSheet_152, 0x0080, 0x27a8
obj_tiles gBattleAnimSpriteSheet_153, 0x0100, 0x27a9
obj_tiles gBattleAnimSpriteSheet_154, 0x0100, 0x27aa
obj_tiles gBattleAnimSpriteSheet_155, 0x0140, 0x27ab
obj_tiles gBattleAnimSpriteSheet_156, 0x0800, 0x27ac
obj_tiles gBattleAnimSpriteSheet_157, 0x0200, 0x27ad
obj_tiles gBattleAnimSpriteSheet_158, 0x0100, 0x27ae
obj_tiles gBattleAnimSpriteSheet_159, 0x00a0, 0x27af
obj_tiles gBattleAnimSpriteSheet_160, 0x0100, 0x27b0
obj_tiles gBattleAnimSpriteSheet_161, 0x0080, 0x27b1
obj_tiles gBattleAnimSpriteSheet_162, 0x0300, 0x27b2
obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x27b3
obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x27b4
obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x27b5
obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b6
obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b7
obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b8
obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b9
obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27ba
obj_tiles gBattleAnimSpriteSheet_171, 0x0080, 0x27bb
obj_tiles gBattleAnimSpriteSheet_144, 0x0200, 0x27bc
obj_tiles gBattleAnimSpriteSheet_173, 0x0200, 0x27bd
obj_tiles gBattleAnimSpriteSheet_174, 0x0200, 0x27be
obj_tiles gBattleAnimSpriteSheet_175, 0x0080, 0x27bf
obj_tiles gBattleAnimSpriteSheet_176, 0x0200, 0x27c0
obj_tiles gBattleAnimSpriteSheet_177, 0x0500, 0x27c1
obj_tiles gBattleAnimSpriteSheet_178, 0x0800, 0x27c2
obj_tiles gBattleAnimSpriteSheet_179, 0x0400, 0x27c3
obj_tiles gBattleAnimSpriteSheet_180, 0x0020, 0x27c4
obj_tiles gBattleAnimSpriteSheet_181, 0x0800, 0x27c5
obj_tiles gBattleAnimSpriteSheet_182, 0x0100, 0x27c6
obj_tiles gBattleAnimSpriteSheet_183, 0x0800, 0x27c7
obj_tiles gBattleAnimSpriteSheet_184, 0x0400, 0x27c8
obj_tiles gBattleAnimSpriteSheet_185, 0x0a00, 0x27c9
obj_tiles gBattleAnimSpriteSheet_186, 0x1000, 0x27ca
obj_tiles gBattleAnimSpriteSheet_187, 0x0800, 0x27cb
obj_tiles gBattleAnimSpriteSheet_188, 0x0400, 0x27cc
obj_tiles gBattleAnimSpriteSheet_189, 0x0200, 0x27cd
obj_tiles gBattleAnimSpriteSheet_190, 0x0800, 0x27ce
obj_tiles gBattleAnimSpriteSheet_191, 0x0800, 0x27cf
obj_tiles gBattleAnimSpriteSheet_192, 0x0800, 0x27d0
obj_tiles gBattleAnimSpriteSheet_193, 0x0200, 0x27d1
obj_tiles gBattleAnimSpriteSheet_194, 0x0800, 0x27d2
obj_tiles gBattleAnimSpriteSheet_195, 0x0200, 0x27d3
obj_tiles gBattleAnimSpriteSheet_196, 0x0800, 0x27d4
obj_tiles gBattleAnimSpriteSheet_197, 0x0200, 0x27d5
obj_tiles gBattleAnimSpriteSheet_198, 0x0800, 0x27d6
obj_tiles gBattleAnimSpriteSheet_199, 0x0400, 0x27d7
obj_tiles gBattleAnimSpriteSheet_200, 0x0200, 0x27d8
obj_tiles gBattleAnimSpriteSheet_201, 0x0a80, 0x27d9
obj_tiles gBattleAnimSpriteSheet_202, 0x0600, 0x27da
obj_tiles gBattleAnimSpriteSheet_203, 0x0800, 0x27db
obj_tiles gBattleAnimSpriteSheet_204, 0x0200, 0x27dc
obj_tiles gBattleAnimSpriteSheet_205, 0x0600, 0x27dd
obj_tiles gBattleAnimSpriteSheet_206, 0x0800, 0x27de
obj_tiles gBattleAnimSpriteSheet_207, 0x0180, 0x27df
obj_tiles gBattleAnimSpriteSheet_208, 0x0800, 0x27e0
obj_tiles gBattleAnimSpriteSheet_209, 0x0800, 0x27e1
obj_tiles gBattleAnimSpriteSheet_210, 0x0080, 0x27e2
obj_tiles gBattleAnimSpriteSheet_211, 0x0080, 0x27e3
obj_tiles gBattleAnimSpriteSheet_212, 0x0800, 0x27e4
obj_tiles gBattleAnimSpriteSheet_213, 0x0800, 0x27e5
obj_tiles gBattleAnimSpriteSheet_214, 0x0600, 0x27e6
obj_tiles gBattleAnimSpriteSheet_215, 0x0600, 0x27e7
obj_tiles gBattleAnimSpriteSheet_210, 0x0080, 0x27e8
obj_tiles gBattleAnimSpriteSheet_217, 0x0080, 0x27e9
obj_tiles gBattleAnimSpriteSheet_218, 0x0180, 0x27ea
obj_tiles gBattleAnimSpriteSheet_210, 0x0080, 0x27eb
obj_tiles gBattleAnimSpriteSheet_220, 0x0200, 0x27ec
obj_tiles gBattleAnimSpriteSheet_221, 0x0400, 0x27ed
obj_tiles gBattleAnimSpriteSheet_222, 0x0a00, 0x27ee
obj_tiles gBattleAnimSpriteSheet_223, 0x0800, 0x27ef
obj_tiles gBattleAnimSpriteSheet_224, 0x0200, 0x27f0
obj_tiles gBattleAnimSpriteSheet_225, 0x0400, 0x27f1
obj_tiles gBattleAnimSpriteSheet_226, 0x0080, 0x27f2
obj_tiles gBattleAnimSpriteSheet_227, 0x0800, 0x27f3
obj_tiles gBattleAnimSpriteSheet_228, 0x0200, 0x27f4
obj_tiles gBattleAnimSpriteSheet_229, 0x0300, 0x27f5
obj_tiles gBattleAnimSpriteSheet_230, 0x0800, 0x27f6
obj_tiles gBattleAnimSpriteSheet_231, 0x0380, 0x27f7
obj_tiles gBattleAnimSpriteSheet_232, 0x0800, 0x27f8
obj_tiles gBattleAnimSpriteSheet_233, 0x00c0, 0x27f9
obj_tiles gBattleAnimSpriteSheet_234, 0x0800, 0x27fa
obj_tiles gBattleAnimSpriteSheet_235, 0x0060, 0x27fb
obj_tiles gBattleAnimSpriteSheet_235, 0x0060, 0x27fc
obj_tiles gBattleAnimSpriteSheet_235, 0x0060, 0x27fd
obj_tiles gBattleAnimSpriteSheet_238, 0x0080, 0x27fe
obj_tiles gBattleAnimSpriteSheet_239, 0x0180, 0x27ff
obj_tiles gBattleAnimSpriteSheet_240, 0x0180, 0x2800
obj_tiles gBattleAnimSpriteSheet_241, 0x0200, 0x2801
obj_tiles gBattleAnimSpriteSheet_242, 0x0200, 0x2802
obj_tiles gBattleAnimSpriteSheet_243, 0x0020, 0x2803
obj_tiles gBattleAnimSpriteSheet_244, 0x0400, 0x2804
obj_tiles gBattleAnimSpriteSheet_245, 0x0600, 0x2805
obj_tiles gBattleAnimSpriteSheet_246, 0x1000, 0x2806
obj_tiles gBattleAnimSpriteSheet_247, 0x0400, 0x2807
obj_tiles gBattleAnimSpriteSheet_248, 0x0020, 0x2808
obj_tiles gBattleAnimSpriteSheet_249, 0x0080, 0x2809
obj_tiles gBattleAnimSpriteSheet_250, 0x0800, 0x280a
obj_tiles gBattleAnimSpriteSheet_251, 0x0080, 0x280b
obj_tiles gBattleAnimSpriteSheet_252, 0x0200, 0x280c
obj_tiles gBattleAnimSpriteSheet_253, 0x0400, 0x280d
obj_tiles gBattleAnimSpriteSheet_254, 0x0200, 0x280e
obj_tiles gBattleAnimSpriteSheet_255, 0x0200, 0x280f
obj_tiles gBattleAnimSpriteSheet_256, 0x0800, 0x2810
obj_tiles gBattleAnimSpriteSheet_257, 0x0280, 0x2811
obj_tiles gBattleAnimSpriteSheet_258, 0x0200, 0x2812
obj_tiles gBattleAnimSpriteSheet_149, 0x0200, 0x2813
obj_tiles gBattleAnimSpriteSheet_260, 0x0400, 0x2814
obj_tiles gBattleAnimSpriteSheet_261, 0x0200, 0x2815
obj_tiles gBattleAnimSpriteSheet_262, 0x0200, 0x2816
obj_tiles gBattleAnimSpriteSheet_263, 0x0080, 0x2817
obj_tiles gBattleAnimSpriteSheet_264, 0x0020, 0x2818
obj_tiles gBattleAnimSpriteSheet_264, 0x0020, 0x2819
obj_tiles gBattleAnimSpriteSheet_266, 0x0080, 0x281a
obj_tiles gBattleAnimSpriteSheet_212, 0x0800, 0x281b
obj_tiles gBattleAnimSpriteSheet_264, 0x0020, 0x281c
obj_tiles gBattleAnimSpriteSheet_269, 0x0080, 0x281d
obj_tiles gBattleAnimSpriteSheet_270, 0x0400, 0x281e
obj_tiles gBattleAnimSpriteSheet_271, 0x0080, 0x281f
obj_tiles gBattleAnimSpriteSheet_272, 0x0800, 0x2820
obj_tiles gBattleAnimSpriteSheet_273, 0x0020, 0x2821
obj_tiles gBattleAnimSpriteSheet_274, 0x0800, 0x2822
obj_tiles gBattleAnimSpriteSheet_275, 0x0800, 0x2823
obj_tiles gBattleAnimSpriteSheet_276, 0x0800, 0x2824
obj_tiles gBattleAnimSpriteSheet_277, 0x1000, 0x2825
obj_tiles gBattleAnimSpriteSheet_278, 0x0800, 0x2826
obj_tiles gBattleAnimSpriteSheet_279, 0x00a0, 0x2827
obj_tiles gBattleAnimSpriteSheet_280, 0x0800, 0x2828
obj_tiles gBattleAnimSpriteSheet_281, 0x0200, 0x2829
obj_tiles gBattleAnimSpriteSheet_282, 0x0600, 0x282a
obj_tiles gBattleAnimSpriteSheet_283, 0x0200, 0x282b
obj_tiles gBattleAnimSpriteSheet_284, 0x0800, 0x282c
obj_tiles gBattleAnimSpriteSheet_285, 0x0200, 0x282d
obj_tiles gBattleAnimSpriteSheet_183, 0x0800, 0x282e
obj_tiles gBattleAnimSpriteSheet_056, 0x1000, 0x282f
obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x2830
.align 2
gBattleAnimPaletteTable:: @ 852544C
obj_pal gBattleAnimSpritePalette_000, 0x2710
obj_pal gBattleAnimSpritePalette_001, 0x2711
obj_pal gBattleAnimSpritePalette_002, 0x2712
obj_pal gBattleAnimSpritePalette_003, 0x2713
obj_pal gBattleAnimSpritePalette_004, 0x2714
obj_pal gBattleAnimSpritePalette_005, 0x2715
obj_pal gBattleAnimSpritePalette_006, 0x2716
obj_pal gBattleAnimSpritePalette_007, 0x2717
obj_pal gBattleAnimSpritePalette_008, 0x2718
obj_pal gBattleAnimSpritePalette_009, 0x2719
obj_pal gBattleAnimSpritePalette_010, 0x271a
obj_pal gBattleAnimSpritePalette_011, 0x271b
obj_pal gBattleAnimSpritePalette_012, 0x271c
obj_pal gBattleAnimSpritePalette_013, 0x271d
obj_pal gBattleAnimSpritePalette_014, 0x271e
obj_pal gBattleAnimSpritePalette_015, 0x271f
obj_pal gBattleAnimSpritePalette_016, 0x2720
obj_pal gBattleAnimSpritePalette_016, 0x2721
obj_pal gBattleAnimSpritePalette_018, 0x2722
obj_pal gBattleAnimSpritePalette_019, 0x2723
obj_pal gBattleAnimSpritePalette_020, 0x2724
obj_pal gBattleAnimSpritePalette_021, 0x2725
obj_pal gBattleAnimSpritePalette_022, 0x2726
obj_pal gBattleAnimSpritePalette_023, 0x2727
obj_pal gBattleAnimSpritePalette_024, 0x2728
obj_pal gBattleAnimSpritePalette_025, 0x2729
obj_pal gBattleAnimSpritePalette_026, 0x272a
obj_pal gBattleAnimSpritePalette_027, 0x272b
obj_pal gBattleAnimSpritePalette_028, 0x272c
obj_pal gBattleAnimSpritePalette_029, 0x272d
obj_pal gBattleAnimSpritePalette_030, 0x272e
obj_pal gBattleAnimSpritePalette_031, 0x272f
obj_pal gBattleAnimSpritePalette_032, 0x2730
obj_pal gBattleAnimSpritePalette_033, 0x2731
obj_pal gBattleAnimSpritePalette_033, 0x2732
obj_pal gBattleAnimSpritePalette_033, 0x2733
obj_pal gBattleAnimSpritePalette_036, 0x2734
obj_pal gBattleAnimSpritePalette_036, 0x2735
obj_pal gBattleAnimSpritePalette_038, 0x2736
obj_pal gBattleAnimSpritePalette_039, 0x2737
obj_pal gBattleAnimSpritePalette_038, 0x2738
obj_pal gBattleAnimSpritePalette_038, 0x2739
obj_pal gBattleAnimSpritePalette_042, 0x273a
obj_pal gBattleAnimSpritePalette_043, 0x273b
obj_pal gBattleAnimSpritePalette_044, 0x273c
obj_pal gBattleAnimSpritePalette_045, 0x273d
obj_pal gBattleAnimSpritePalette_046, 0x273e
obj_pal gBattleAnimSpritePalette_047, 0x273e
obj_pal gBattleAnimSpritePalette_048, 0x2740
obj_pal gBattleAnimSpritePalette_049, 0x2741
obj_pal gBattleAnimSpritePalette_050, 0x2742
obj_pal gBattleAnimSpritePalette_050, 0x2743
obj_pal gBattleAnimSpritePalette_050, 0x2744
obj_pal gBattleAnimSpritePalette_026, 0x2745
obj_pal gBattleAnimSpritePalette_054, 0x2746
obj_pal gBattleAnimSpritePalette_050, 0x2747
obj_pal gBattleAnimSpritePalette_056, 0x2748
obj_pal gBattleAnimSpritePalette_057, 0x2749
obj_pal gBattleAnimSpritePalette_058, 0x274a
obj_pal gBattleAnimSpritePalette_059, 0x274b
obj_pal gBattleAnimSpritePalette_060, 0x274c
obj_pal gBattleAnimSpritePalette_061, 0x274d
obj_pal gBattleAnimSpritePalette_062, 0x274e
obj_pal gBattleAnimSpritePalette_063, 0x274f
obj_pal gBattleAnimSpritePalette_064, 0x2750
obj_pal gBattleAnimSpritePalette_065, 0x2751
obj_pal gBattleAnimSpritePalette_066, 0x2752
obj_pal gBattleAnimSpritePalette_067, 0x2753
obj_pal gBattleAnimSpritePalette_068, 0x2754
obj_pal gBattleAnimSpritePalette_065, 0x2755
obj_pal gBattleAnimSpritePalette_070, 0x2756
obj_pal gBattleAnimSpritePalette_070, 0x2757
obj_pal gBattleAnimSpritePalette_072, 0x2758
obj_pal gBattleAnimSpritePalette_073, 0x2759
obj_pal gBattleAnimSpritePalette_074, 0x275a
obj_pal gBattleAnimSpritePalette_075, 0x275b
obj_pal gBattleAnimSpritePalette_076, 0x275c
obj_pal gBattleAnimSpritePalette_076, 0x275d
obj_pal gBattleAnimSpritePalette_078, 0x275e
obj_pal gBattleAnimSpritePalette_078, 0x275f
obj_pal gBattleAnimSpritePalette_080, 0x2760
obj_pal gBattleAnimSpritePalette_081, 0x2761
obj_pal gBattleAnimSpritePalette_082, 0x2762
obj_pal gBattleAnimSpritePalette_083, 0x2763
obj_pal gBattleAnimSpritePalette_084, 0x2764
obj_pal gBattleAnimSpritePalette_085, 0x2765
obj_pal gBattleAnimSpritePalette_086, 0x2766
obj_pal gBattleAnimSpritePalette_087, 0x2767
obj_pal gBattleAnimSpritePalette_088, 0x2768
obj_pal gBattleAnimSpritePalette_089, 0x2769
obj_pal gBattleAnimSpritePalette_090, 0x276a
obj_pal gBattleAnimSpritePalette_091, 0x276b
obj_pal gBattleAnimSpritePalette_092, 0x276c
obj_pal gBattleAnimSpritePalette_093, 0x276d
obj_pal gBattleAnimSpritePalette_094, 0x276e
obj_pal gBattleAnimSpritePalette_095, 0x276f
obj_pal gBattleAnimSpritePalette_096, 0x2770
obj_pal gBattleAnimSpritePalette_097, 0x2771
obj_pal gBattleAnimSpritePalette_094, 0x2772
obj_pal gBattleAnimSpritePalette_099, 0x2773
obj_pal gBattleAnimSpritePalette_100, 0x2774
obj_pal gBattleAnimSpritePalette_101, 0x2775
obj_pal gBattleAnimSpritePalette_101, 0x2776
obj_pal gBattleAnimSpritePalette_103, 0x2777
obj_pal gBattleAnimSpritePalette_104, 0x2778
obj_pal gBattleAnimSpritePalette_105, 0x2779
obj_pal gBattleAnimSpritePalette_105, 0x277a
obj_pal gBattleAnimSpritePalette_107, 0x277b
obj_pal gBattleAnimSpritePalette_107, 0x277c
obj_pal gBattleAnimSpritePalette_109, 0x277d
obj_pal gBattleAnimSpritePalette_109, 0x277e
obj_pal gBattleAnimSpritePalette_111, 0x277f
obj_pal gBattleAnimSpritePalette_112, 0x2780
obj_pal gBattleAnimSpritePalette_113, 0x2781
obj_pal gBattleAnimSpritePalette_114, 0x2782
obj_pal gBattleAnimSpritePalette_115, 0x2783
obj_pal gBattleAnimSpritePalette_116, 0x2784
obj_pal gBattleAnimSpritePalette_117, 0x2785
obj_pal gBattleAnimSpritePalette_118, 0x2786
obj_pal gBattleAnimSpritePalette_119, 0x2787
obj_pal gBattleAnimSpritePalette_120, 0x2788
obj_pal gBattleAnimSpritePalette_121, 0x2789
obj_pal gBattleAnimSpritePalette_122, 0x278a
obj_pal gBattleAnimSpritePalette_122, 0x278b
obj_pal gBattleAnimSpritePalette_124, 0x278c
obj_pal gBattleAnimSpritePalette_125, 0x278d
obj_pal gBattleAnimSpritePalette_126, 0x278e
obj_pal gBattleAnimSpritePalette_127, 0x278f
obj_pal gBattleAnimSpritePalette_128, 0x2790
obj_pal gBattleAnimSpritePalette_128, 0x2791
obj_pal gBattleAnimSpritePalette_130, 0x2792
obj_pal gBattleAnimSpritePalette_130, 0x2793
obj_pal gBattleAnimSpritePalette_132, 0x2794
obj_pal gBattleAnimSpritePalette_133, 0x2795
obj_pal gBattleAnimSpritePalette_133, 0x2796
obj_pal gBattleAnimSpritePalette_135, 0x2797
obj_pal gBattleAnimSpritePalette_136, 0x2798
obj_pal gBattleAnimSpritePalette_135, 0x2799
obj_pal gBattleAnimSpritePalette_135, 0x279a
obj_pal gBattleAnimSpritePalette_139, 0x279b
obj_pal gBattleAnimSpritePalette_140, 0x279c
obj_pal gBattleAnimSpritePalette_141, 0x279d
obj_pal gBattleAnimSpritePalette_141, 0x279e
obj_pal gBattleAnimSpritePalette_143, 0x279f
obj_pal gBattleAnimSpritePalette_144, 0x27a0
obj_pal gBattleAnimSpritePalette_139, 0x27a1
obj_pal gBattleAnimSpritePalette_115, 0x27a2
obj_pal gBattleAnimSpritePalette_147, 0x27a3
obj_pal gBattleAnimSpritePalette_148, 0x27a4
obj_pal gBattleAnimSpritePalette_148, 0x27a5
obj_pal gBattleAnimSpritePalette_150, 0x27a6
obj_pal gBattleAnimSpritePalette_150, 0x27a7
obj_pal gBattleAnimSpritePalette_152, 0x27a8
obj_pal gBattleAnimSpritePalette_153, 0x27a9
obj_pal gBattleAnimSpritePalette_154, 0x27aa
obj_pal gBattleAnimSpritePalette_155, 0x27ab
obj_pal gBattleAnimSpritePalette_156, 0x27ac
obj_pal gBattleAnimSpritePalette_157, 0x27ad
obj_pal gBattleAnimSpritePalette_158, 0x27ae
obj_pal gBattleAnimSpritePalette_159, 0x27af
obj_pal gBattleAnimSpritePalette_160, 0x27b0
obj_pal gBattleAnimSpritePalette_161, 0x27b1
obj_pal gBattleAnimSpritePalette_162, 0x27b2
obj_pal gBattleAnimSpritePalette_163, 0x27b3
obj_pal gBattleAnimSpritePalette_164, 0x27b4
obj_pal gBattleAnimSpritePalette_165, 0x27b5
obj_pal gBattleAnimSpritePalette_166, 0x27b6
obj_pal gBattleAnimSpritePalette_167, 0x27b7
obj_pal gBattleAnimSpritePalette_168, 0x27b8
obj_pal gBattleAnimSpritePalette_169, 0x27b9
obj_pal gBattleAnimSpritePalette_170, 0x27ba
obj_pal gBattleAnimSpritePalette_171, 0x27bb
obj_pal gBattleAnimSpritePalette_172, 0x27bc
obj_pal gBattleAnimSpritePalette_001, 0x27bd
obj_pal gBattleAnimSpritePalette_174, 0x27be
obj_pal gBattleAnimSpritePalette_175, 0x27bf
obj_pal gBattleAnimSpritePalette_176, 0x27c0
obj_pal gBattleAnimSpritePalette_177, 0x27c1
obj_pal gBattleAnimSpritePalette_178, 0x27c2
obj_pal gBattleAnimSpritePalette_179, 0x27c3
obj_pal gBattleAnimSpritePalette_179, 0x27c4
obj_pal gBattleAnimSpritePalette_179, 0x27c5
obj_pal gBattleAnimSpritePalette_182, 0x27c6
obj_pal gBattleAnimSpritePalette_183, 0x27c7
obj_pal gBattleAnimSpritePalette_184, 0x27c8
obj_pal gBattleAnimSpritePalette_185, 0x27c9
obj_pal gBattleAnimSpritePalette_186, 0x27ca
obj_pal gBattleAnimSpritePalette_187, 0x27cb
obj_pal gBattleAnimSpritePalette_188, 0x27cc
obj_pal gBattleAnimSpritePalette_189, 0x27cd
obj_pal gBattleAnimSpritePalette_190, 0x27ce
obj_pal gBattleAnimSpritePalette_191, 0x27cf
obj_pal gBattleAnimSpritePalette_192, 0x27d0
obj_pal gBattleAnimSpritePalette_193, 0x27d1
obj_pal gBattleAnimSpritePalette_194, 0x27d2
obj_pal gBattleAnimSpritePalette_195, 0x27d3
obj_pal gBattleAnimSpritePalette_196, 0x27d4
obj_pal gBattleAnimSpritePalette_197, 0x27d5
obj_pal gBattleAnimSpritePalette_198, 0x27d6
obj_pal gBattleAnimSpritePalette_199, 0x27d7
obj_pal gBattleAnimSpritePalette_200, 0x27d8
obj_pal gBattleAnimSpritePalette_201, 0x27d9
obj_pal gBattleAnimSpritePalette_202, 0x27da
obj_pal gBattleAnimSpritePalette_203, 0x27db
obj_pal gBattleAnimSpritePalette_204, 0x27dc
obj_pal gBattleAnimSpritePalette_205, 0x27dd
obj_pal gBattleAnimSpritePalette_206, 0x27de
obj_pal gBattleAnimSpritePalette_207, 0x27df
obj_pal gBattleAnimSpritePalette_167, 0x27e0
obj_pal gBattleAnimSpritePalette_209, 0x27e1
obj_pal gBattleAnimSpritePalette_210, 0x27e2
obj_pal gBattleAnimSpritePalette_211, 0x27e3
obj_pal gBattleAnimSpritePalette_211, 0x27e4
obj_pal gBattleAnimSpritePalette_211, 0x27e5
obj_pal gBattleAnimSpritePalette_064, 0x27e6
obj_pal gBattleAnimSpritePalette_215, 0x27e7
obj_pal gBattleAnimSpritePalette_216, 0x27e8
obj_pal gBattleAnimSpritePalette_217, 0x27e9
obj_pal gBattleAnimSpritePalette_218, 0x27ea
obj_pal gBattleAnimSpritePalette_219, 0x27eb
obj_pal gBattleAnimSpritePalette_220, 0x27ec
obj_pal gBattleAnimSpritePalette_221, 0x27ed
obj_pal gBattleAnimSpritePalette_222, 0x27ee
obj_pal gBattleAnimSpritePalette_223, 0x27ef
obj_pal gBattleAnimSpritePalette_224, 0x27f0
obj_pal gBattleAnimSpritePalette_225, 0x27f1
obj_pal gBattleAnimSpritePalette_226, 0x27f2
obj_pal gBattleAnimSpritePalette_226, 0x27f3
obj_pal gBattleAnimSpritePalette_228, 0x27f4
obj_pal gBattleAnimSpritePalette_229, 0x27f5
obj_pal gBattleAnimSpritePalette_230, 0x27f6
obj_pal gBattleAnimSpritePalette_231, 0x27f7
obj_pal gBattleAnimSpritePalette_231, 0x27f8
obj_pal gBattleAnimSpritePalette_233, 0x27f9
obj_pal gBattleAnimSpritePalette_234, 0x27fa
obj_pal gBattleAnimSpritePalette_235, 0x27fb
obj_pal gBattleAnimSpritePalette_236, 0x27fc
obj_pal gBattleAnimSpritePalette_237, 0x27fd
obj_pal gBattleAnimSpritePalette_238, 0x27fe
obj_pal gBattleAnimSpritePalette_239, 0x27ff
obj_pal gBattleAnimSpritePalette_240, 0x2800
obj_pal gBattleAnimSpritePalette_241, 0x2801
obj_pal gBattleAnimSpritePalette_242, 0x2802
obj_pal gBattleAnimSpritePalette_243, 0x2803
obj_pal gBattleAnimSpritePalette_244, 0x2804
obj_pal gBattleAnimSpritePalette_245, 0x2805
obj_pal gBattleAnimSpritePalette_245, 0x2806
obj_pal gBattleAnimSpritePalette_064, 0x2807
obj_pal gBattleAnimSpritePalette_248, 0x2808
obj_pal gBattleAnimSpritePalette_249, 0x2809
obj_pal gBattleAnimSpritePalette_249, 0x280a
obj_pal gBattleAnimSpritePalette_251, 0x280b
obj_pal gBattleAnimSpritePalette_252, 0x280c
obj_pal gBattleAnimSpritePalette_253, 0x280d
obj_pal gBattleAnimSpritePalette_254, 0x280e
obj_pal gBattleAnimSpritePalette_255, 0x280f
obj_pal gBattleAnimSpritePalette_256, 0x2810
obj_pal gBattleAnimSpritePalette_257, 0x2811
obj_pal gBattleAnimSpritePalette_258, 0x2812
obj_pal gBattleAnimSpritePalette_259, 0x2813
obj_pal gBattleAnimSpritePalette_260, 0x2814
obj_pal gBattleAnimSpritePalette_261, 0x2815
obj_pal gBattleAnimSpritePalette_262, 0x2816
obj_pal gBattleAnimSpritePalette_263, 0x2817
obj_pal gBattleAnimSpritePalette_264, 0x2818
obj_pal gBattleAnimSpritePalette_265, 0x2819
obj_pal gBattleAnimSpritePalette_266, 0x281a
obj_pal gBattleAnimSpritePalette_267, 0x281b
obj_pal gBattleAnimSpritePalette_268, 0x281c
obj_pal gBattleAnimSpritePalette_269, 0x281d
obj_pal gBattleAnimSpritePalette_270, 0x281e
obj_pal gBattleAnimSpritePalette_271, 0x281f
obj_pal gBattleAnimSpritePalette_272, 0x2820
obj_pal gBattleAnimSpritePalette_272, 0x2821
obj_pal gBattleAnimSpritePalette_274, 0x2822
obj_pal gBattleAnimSpritePalette_274, 0x2823
obj_pal gBattleAnimSpritePalette_274, 0x2824
obj_pal gBattleAnimSpritePalette_277, 0x2825
obj_pal gBattleAnimSpritePalette_278, 0x2826
obj_pal gBattleAnimSpritePalette_279, 0x2827
obj_pal gBattleAnimSpritePalette_280, 0x2828
obj_pal gBattleAnimSpritePalette_281, 0x2829
obj_pal gBattleAnimSpritePalette_282, 0x282a
obj_pal gBattleAnimSpritePalette_283, 0x282b
obj_pal gBattleAnimSpritePalette_284, 0x282c
obj_pal gBattleAnimSpritePalette_285, 0x282d
obj_pal gBattleAnimSpritePalette_286, 0x282e
obj_pal gBattleAnimSpritePalette_287, 0x282f
obj_pal gBattleAnimSpritePalette_288, 0x2830
.align 2
gBattleAnimBackgroundTable:: @ 8525D54
.4byte gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00
.4byte gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00
.4byte gBattleAnimBackgroundImage_02, gBattleAnimBackgroundPalette_02, gBattleAnimBackgroundTilemap_02
.4byte gBattleAnimBackgroundImage_03, gBattleAnimBackgroundPalette_03, gBattleAnimBackgroundTilemap_03
.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_04
.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_05
.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_06
.4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_07
.4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_08
.4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_09
.4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_10
.4byte gBattleAnimBackgroundImage_11, gBattleAnimBackgroundPalette_11, gBattleAnimBackgroundTilemap_11
.4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_12
.4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_13
.4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_14
.4byte gBattleAnimBackgroundImage_15, gBattleAnimBackgroundPalette_15, gBattleAnimBackgroundTilemap_15
.4byte gBattleAnimBackgroundImage_16, gBattleAnimBackgroundPalette_16, gBattleAnimBackgroundTilemap_16
.4byte gBattleAnimBackgroundImage_17, gBattleAnimBackgroundPalette_17, gBattleAnimBackgroundTilemap_17
.4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_07
.4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_08
.4byte gBattleAnimBackgroundImage_20, gBattleAnimBackgroundPalette_20, gBattleAnimBackgroundTilemap_20
.4byte gBattleAnimBackgroundImage_21, gBattleAnimBackgroundPalette_21, gBattleAnimBackgroundTilemap_21
.4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_09
.4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_10
.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_04
.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_05
.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_06
data/battle_frontier_2.s
-114
View File
@@ -6,120 +6,6 @@
.section .rodata
.align 2
gUnknown_08611550:: @ 8611550
.byte 0x23, 0x46, 0x23, 0x01, 0x04, 0x09, 0x05, 0x00, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x38, 0x1c, 0x01, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x8c, 0x38, 0x01, 0x15, 0x46, 0x23, 0x00
.align 2
gUnknown_0861156C:: @ 861156C
.byte 0x41, 0x00, 0xb3, 0x00, 0x18, 0x0f, 0x6a, 0x00, 0x98, 0x98, 0x64, 0x00
.align 2
gUnknown_08611578:: @ 8611578
.2byte 0x0009, 0x0007, 0x0008, 0x0032, 0x00f4, 0x008d, 0x0118, 0x9864, 0x0098, 0x0664, 0x007e, 0x015b, 0x00d8, 0x002e, 0x008f, 0x00b7
.2byte 0x0318, 0x9898, 0x0000, 0x646a, 0x0022, 0x00bb, 0x0119, 0x00f7, 0x00f3, 0x008d, 0x0f1f, 0x009e, 0x64fc, 0x0000, 0x0055, 0x015b
.2byte 0x0073, 0x009c, 0x0198, 0x00b3, 0x0f1f, 0x00fc, 0x06fc, 0x0000, 0x005e, 0x015b, 0x0069, 0x0151, 0x008f, 0x0086, 0x031f, 0xfcfc
.2byte 0x0000, 0x0006, 0x00ae, 0x00d8, 0x009c, 0x00f7, 0x011d, 0x00c4, 0x0214, 0x9898, 0x006a, 0x0064, 0x0039, 0x0059, 0x003a, 0x0044
.2byte 0x018d, 0x008d, 0x0314, 0x9898, 0x646a, 0x0000, 0x0059, 0x0118, 0x0151, 0x014c, 0x0006, 0x00b4, 0x1114, 0x9864, 0x986a, 0x0000
.2byte 0x013b, 0x009d, 0x014c, 0x0059, 0x011d, 0x00c8, 0x021f, 0xfcfc, 0x0006, 0x0000, 0x0039, 0x0059, 0x003a, 0x00f3, 0x0190, 0x00b7
.2byte 0x021f, 0xfcfc, 0x0006, 0x0000, 0x005e, 0x0135, 0x0059, 0x00b6, 0x0197, 0x0086, 0x0f1f, 0x00fc, 0x06fc, 0x0000, 0x0055, 0x005e
.2byte 0x015b, 0x009c, 0x00a9, 0x00b3, 0x0310, 0x0098, 0x9800, 0x6a64, 0x006d, 0x0068, 0x005c, 0x0013, 0x016e, 0x00c6, 0x0010, 0x9898
.2byte 0x6a00, 0x0064, 0x0059, 0x00cf, 0x00f7, 0x0118, 0x0083, 0x00b7, 0x1110, 0x0000, 0x00fc, 0x986a, 0x003a, 0x0020, 0x006d, 0x00b6
.2byte 0x003b, 0x00b4, 0x0b1f, 0xfc06, 0x00fc, 0x0000, 0x013b, 0x00f5, 0x002e, 0x00b6, 0x016e, 0x00c6, 0x001f, 0xfc06, 0xfc00, 0x0000
.2byte 0x003f, 0x0059, 0x00f7, 0x0119, 0x00f5, 0x00bb, 0x0b1f, 0x00fc, 0x06fc, 0x0000, 0x003b, 0x0039, 0x002c, 0x015b, 0x00d6, 0x00aa
.2byte 0x0d14, 0x986a, 0x9800, 0x6400, 0x00e0, 0x013d, 0x00cb, 0x00b3, 0x00c5, 0x00c8, 0x1414, 0x0098, 0x0064, 0x6a98, 0x0022, 0x006d
.2byte 0x005e, 0x00b9, 0x012f, 0x00b3, 0x0314, 0xfc00, 0xfc06, 0x0000, 0x00f7, 0x00d8, 0x006d, 0x014c, 0x00c5, 0x0086, 0x141f, 0x00fc
.2byte 0x0000, 0x06fc, 0x0026, 0x006d, 0x009c, 0x005e, 0x005e, 0x00c8, 0x0f1f, 0x00fc, 0x00fc, 0x0006, 0x005e, 0x005f, 0x008a, 0x00c2
.2byte 0x0133, 0x008d, 0x0d1f, 0xfc06, 0xfc00, 0x0000, 0x0093, 0x0108, 0x00ca, 0x001d, 0x018f, 0x008e, 0x021f, 0xfc00, 0x00fc, 0x0006
.2byte 0x0071, 0x005e, 0x0073, 0x00e8, 0x00e3, 0x008e, 0x081f, 0x00fc, 0x0000, 0xfc06, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x008e
.2byte 0x031f, 0xfc00, 0x0000, 0x06fc, 0x0055, 0x00b6, 0x004c, 0x0151, 0x018f, 0x008e, 0x021f, 0xfc00, 0x00fc, 0x0006, 0x0071, 0x005e
.2byte 0x0073, 0x00e8, 0x00e3, 0x008e, 0x081f, 0x00fc, 0x0000, 0xfc06, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x008e, 0x031f, 0xfc00
.2byte 0x0000, 0x06fc, 0x0055, 0x00b6, 0x004c, 0x0151, 0x017b, 0x00b7, 0x0210, 0x00fc, 0x00fc, 0x0006, 0x00cf, 0x00f2, 0x0131, 0x00ca
.2byte 0x00d5, 0x0086, 0x0510, 0x00fc, 0x0000, 0xfc6a, 0x005c, 0x00c9, 0x00b6, 0x009c, 0x0149, 0x00c8, 0x0f10, 0x0098, 0x0064, 0x6a98
.2byte 0x003a, 0x00f3, 0x0039, 0x0069, 0x017b, 0x00c4, 0x051f, 0x00fc, 0x0000, 0x06fc, 0x00cf, 0x00f2, 0x00bc, 0x00ca, 0x00d0, 0x00b3
.2byte 0x021f, 0x00fc, 0x0000, 0xfc06, 0x0059, 0x009d, 0x0099, 0x0067, 0x0082, 0x0086, 0x031f, 0x06fc, 0x0000, 0xfc00, 0x015d, 0x00d8
.2byte 0x002e, 0x009c, 0x0191, 0x00b7, 0x0310, 0x9898, 0x0000, 0x646a, 0x0099, 0x0114, 0x0059, 0x00f6, 0x0193, 0x00c8, 0x0310, 0x9898
.2byte 0x0000, 0xc806, 0x0059, 0x00e8, 0x005c, 0x014e, 0x0192, 0x0086, 0x0f10, 0x006a, 0x0098, 0x9864, 0x003a, 0x0085, 0x0057, 0x009c
.2byte 0x0090, 0x00c6, 0x101f, 0x0006, 0xfcfc, 0x0000, 0x003b, 0x0160, 0x014c, 0x0073, 0x0091, 0x008d, 0x101f, 0x0006, 0xfcfc, 0x0000
.2byte 0x0057, 0x00c5, 0x0041, 0x0071, 0x0092, 0x00b3, 0x101f, 0x0006, 0xfcfc, 0x0000, 0x007e, 0x003f, 0x014c, 0x00db
gUnknown_086118B4:: @ 86118B4
.byte 0x01, 0x02, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x03, 0x04, 0x04
.byte 0x01, 0x01, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x02, 0x02, 0x00, 0x00
.byte 0x05, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x05, 0x06, 0x06, 0x02, 0x02, 0x00, 0x00, 0x05, 0x06, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x05, 0x06, 0x07, 0x07, 0x03, 0x03, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x05, 0x06, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x07, 0x08, 0x08, 0x03, 0x03, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x06, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x08, 0x09, 0x09, 0x04, 0x04, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0x08, 0x00, 0x00, 0x00, 0x08, 0x09, 0x0a, 0x0a, 0x04, 0x04, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0x09, 0x0a, 0x0b, 0x0b, 0x05, 0x05, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0c
.byte 0x05, 0x05, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x0d, 0x0d, 0x06, 0x06, 0x00, 0x00
.byte 0x09, 0x0a, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x0e, 0x0e, 0x06, 0x06, 0x00, 0x00, 0x09, 0x0a, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
.byte 0x09, 0x0a, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x0a, 0x00, 0x00
.byte 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00
.byte 0x0c, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00
.byte 0x0f, 0x0f, 0x0f, 0x0f, 0x09, 0x09, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f
.byte 0x09, 0x09, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0a, 0x00, 0x00
.byte 0x0d, 0x0e, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0a, 0x00, 0x00, 0x0d, 0x0e, 0x00, 0x00
.byte 0x0e, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0b, 0x0b, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00
.byte 0x0d, 0x0e, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0b, 0x0b, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x00, 0x00
.byte 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00
.byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00
.byte 0x0f, 0x0f, 0x0f, 0x0f, 0x0d, 0x0d, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f
.byte 0x0d, 0x0d, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x00, 0x00
.byte 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00
.byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00
.byte 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00
.byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00
.align 2
gUnknown_08611BFC:: @ 8611BFC
.2byte 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080, 0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000
.align 2
gUnknown_08611C18:: @ 8611C18
.4byte sub_81A17A0
.4byte sub_81A1830
.4byte sub_81A1968
.4byte sub_81A1AD4
.4byte sub_81A1B1C
.4byte sub_81A1B28
.4byte sub_81A1B38
.4byte sub_81A1B98
.4byte sub_81A31FC
.4byte sub_81A35EC
.4byte sub_81A3B00
.4byte sub_81A3B64
.4byte sub_81A3D30
.4byte sub_81A3D58
.4byte sub_81A3DA0
.4byte sub_81A3FD4
.4byte sub_81A4224
.4byte sub_81A4230
.4byte sub_81A43A8
.4byte sub_81A4410
.4byte sub_81A443C
.4byte sub_81A447C
.4byte sub_81A457C
.align 2
gUnknown_08611C74:: @ 8611C74
window_template 0x00, 0x01, 0x01, 0x1c, 0x12, 0x0f, 0x0001
.align 2
gUnknown_08611C7C:: @ 8611C7C
window_template 0x00, 0x02, 0x02, 0x1a, 0x0f, 0x0f, 0x0001
.align 2
gUnknown_08611C84:: @ 8611C84
window_template 0x00, 0x02, 0x01, 0x1a, 0x11, 0x0f, 0x0001
gUnknown_08611C8C:: @ 8611C8C
.byte 0x46, 0x01, 0x47, 0x00, 0x49, 0x00, 0x48, 0x01, 0x4a, 0x00, 0x4b, 0x01, 0xea, 0x00
gUnknown_08611C9A:: @ 8611C9A
.2byte 0x0097, 0x0096, 0x00fa, 0x00f9, 0x00fb, 0x0194, 0x0195, 0x0196, 0x0199, 0x019a, 0xffff
.align 2
gUnknown_08611CB0:: @ 8611CB0
.4byte gText_BattleTower2
data/battle_scripts_1.s
+8 -8
View File
@@ -1601,12 +1601,12 @@ BattleScript_EffectPerishSong::
waitanimation
printstring STRINGID_FAINTINTHREE
waitmessage 0x40
setbyte sBANK, 0x0
setbyte sBATTLER, 0x0
BattleScript_PerishSongLoop::
jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
BattleScript_PerishSongLoopIncrement::
addbyte sBANK, 0x1
jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop
addbyte sBATTLER, 0x1
jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_PerishSongLoop
goto BattleScript_MoveEnd
BattleScript_PerishSongNotAffected::
@@ -2493,7 +2493,7 @@ BattleScript_EffectYawn::
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_PrintBankAbilityMadeIneffective::
copybyte sBANK, sBANK_WITH_ABILITY
copybyte sBATTLER, sBATTLER_WITH_ABILITY
BattleScript_PrintAbilityMadeIneffective::
pause 0x20
printstring STRINGID_PKMNSXMADEITINEFFECTIVE
@@ -3523,7 +3523,7 @@ BattleScript_RapidSpinAway::
BattleScript_WrapFree::
printstring STRINGID_PKMNGOTFREE
waitmessage 0x40
copybyte gBattlerTarget, sBANK
copybyte gBattlerTarget, sBATTLER
return
BattleScript_LeechSeedFree::
@@ -4030,11 +4030,11 @@ BattleScript_ShedSkinActivates::
end3
BattleScript_WeatherFormChanges::
setbyte sBANK, 0x0
setbyte sBATTLER, 0x0
BattleScript_WeatherFormChangesLoop::
trycastformdatachange
addbyte sBANK, 0x1
jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop
addbyte sBATTLER, 0x1
jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop
return
BattleScript_CastformChange::
data/battle_tower.s
+6 -60
View File
@@ -21,19 +21,19 @@
@ 85D97BC
.include "data/battle_frontier/battle_frontier_mons.inc"
gUnknown_085DCEDC:: @ 85DCEDC
gTowerMaleFacilityClasses:: @ 85DCEDC
.byte 0x0e, 0x11, 0x03, 0x15, 0x17, 0x07, 0x0a, 0x19, 0x1a, 0x1b, 0x1d, 0x1e, 0x20, 0x26, 0x29, 0x09, 0x2b, 0x2d, 0x2e, 0x30, 0x32, 0x34, 0x04, 0x35, 0x3a, 0x05, 0x42, 0x44, 0x43, 0x00
gUnknown_085DCEFA:: @ 85DCEFA
gTowerFemaleFacilityClasses:: @ 85DCEFA
.byte 0x0d, 0x10, 0x12, 0x0c, 0x13, 0x14, 0x1f, 0x27, 0x2a, 0x16, 0x2f, 0x31, 0x33, 0x36, 0x37, 0x38, 0x1c, 0x02, 0x45, 0x47
gUnknown_085DCF0E:: @ 85DCF0E
gTowerMaleTrainerGfxIds:: @ 85DCF0E
.byte 0x37, 0x36, 0x21, 0x0f, 0x27, 0x33, 0x2c, 0x42, 0x42, 0x1f, 0x27, 0x25, 0x30, 0x26, 0x19, 0x15, 0x23, 0x32, 0x38, 0x33, 0x33, 0x21, 0x42, 0x05, 0x31, 0x27, 0x41, 0x1f, 0x24, 0x37
gUnknown_085DCF2C:: @ 85DCF2C
gTowerFemaleTrainerGfxIds:: @ 85DCF2C
.byte 0x14, 0x35, 0x22, 0x28, 0x14, 0x2d, 0x2f, 0x0e, 0x12, 0x16, 0x39, 0x34, 0x34, 0x0e, 0x22, 0x34, 0x20, 0x14, 0x20, 0x2f
gUnknown_085DCF40:: @ 85DCF40
sRubyFacilityClassToEmerald:: @ 85DCF40
.byte 0x00, 0x0b, 0x01, 0x01, 0x02, 0x06, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x06, 0x10, 0x07, 0x11, 0x08, 0x03, 0x09, 0x12, 0x0a, 0x0c, 0x0b, 0x13, 0x0c, 0x14, 0x0d, 0x15, 0x0e, 0x17, 0x0f, 0x07
.byte 0x10, 0x0a, 0x11, 0x19, 0x12, 0x1a, 0x13, 0x1b, 0x14, 0x1d, 0x15, 0x1e, 0x16, 0x1f, 0x17, 0x20, 0x18, 0x21, 0x19, 0x22, 0x1a, 0x23, 0x1b, 0x24, 0x1c, 0x25, 0x1d, 0x26, 0x1e, 0x27, 0x1f, 0x28
.byte 0x20, 0x29, 0x21, 0x2a, 0x22, 0x09, 0x23, 0x16, 0x24, 0x2b, 0x25, 0x2c, 0x26, 0x2d, 0x27, 0x2e, 0x28, 0x2f, 0x29, 0x30, 0x2a, 0x31, 0x2b, 0x32, 0x2c, 0x33, 0x2d, 0x34, 0x2e, 0x04, 0x2f, 0x35
@@ -640,7 +640,7 @@ gUnknown_085DD690:: @ 85DD690
.4byte gUnknown_085DD0F0
.4byte gUnknown_085DD104
gUnknown_085DD6D0:: @ 85DD6D0
sStevenMons:: @ 85DD6D0
.byte 0x8f, 0x01, 0x1f, 0x2a, 0x02
gUnknown_085DD6D5:: @ 85DD6D5
@@ -677,57 +677,3 @@ gUnknown_085DD6DC:: @ 85DD6DC
@ 85DF69C
.include "data/battle_frontier/fallarbor_battle_tent_mons.inc"
.align 2
gUnknown_085DF96C:: @ 85DF96C
.4byte sub_8161F94
.4byte sub_8162054
.4byte sub_81620F4
.4byte sub_81623F0
.4byte sub_81621C0
.4byte sub_816502C
.4byte sub_8164040
.4byte sub_8163914
.4byte nullsub_61
.4byte nullsub_116
.4byte sub_81642A0
.4byte sub_8164828
.4byte sub_8164B74
.4byte sub_8164DCC
.4byte sub_8164DE4
.4byte sub_8164E04
.align 2
gUnknown_085DF9AC:: @ 85DF9AC
.4byte 0x00000001, 0x00000002, 0x00004000, 0x00008000, 0x00010000, 0x00020000, 0x00040000, 0x00080000
.align 2
gUnknown_085DF9CC:: @ 85DF9CC
.4byte 0xfffffffe, 0xfffffffd, 0xffffbfff, 0xffff7fff, 0xfffeffff, 0xfffdffff, 0xfffbffff, 0xfff7ffff
gUnknown_085DF9EC:: @ 85DF9EC
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c
gUnknown_085DF9F6:: @ 85DF9F6
.byte 0x03, 0x04, 0x02, 0x02
.align 1
gUnknown_085DF9FA:: @ 85DF9FA
.2byte 0x0000, 0x0063, 0x0050, 0x0077, 0x0064, 0x008b, 0x0078, 0x009f, 0x008c, 0x00b3, 0x00a0, 0x00c7, 0x00b4, 0x00db, 0x00c8, 0x012b
.align 1
gUnknown_085DFA1A:: @ 85DFA1A
.2byte 0x0064, 0x0077, 0x0078, 0x008b, 0x008c, 0x009f, 0x00a0, 0x00b3, 0x00b4, 0x00c7, 0x00c8, 0x00db, 0x00dc, 0x00ef, 0x00c8, 0x012b
.2byte 0x00b3, 0x008d, 0x00c8, 0x00b7
gUnknown_085DFA42:: @ 85DFA42
.byte 0x03, 0x04, 0x02, 0x02
.align 1
gUnknown_085DFA46:: @ 85DFA46
.2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01
.align 1
gUnknown_085DFA52:: @ 85DFA52
.2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04, 0x0000
data/event_scripts.s
+15 -14
View File
@@ -7,6 +7,7 @@
#include "constants/vars.h"
#include "constants/heal_locations.h"
#include "constants/trainers.h"
#include "constants/battle_frontier.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
@@ -1771,7 +1772,7 @@ EventScript_PC:: @ 8271D92
end
EventScript_271DAC:: @ 8271DAC
message gUnknown_0827266F
message gText_WhichPCShouldBeAccessed
waitmessage
special ScrSpecial_CreatePCMenu
waitstate
@@ -3112,7 +3113,7 @@ Text_272640: @ 8272640
Text_27265A: @ 827265A
.string "{PLAYER} booted up the PC.$"
gUnknown_0827266F:: @ 827266F
gText_WhichPCShouldBeAccessed:: @ 827266F
.string "Which PC should be accessed?$"
gUnknown_0827268C:: @ 827268C
@@ -5126,9 +5127,9 @@ SecretBase_RedCave1_EventScript_27627C:: @ 827627C
SecretBase_RedCave1_EventScript_276286:: @ 8276286
special sub_80EA2E4
setvar VAR_0x8004, 1
setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
compare VAR_RESULT, 3
call_if 1, SecretBase_RedCave1_EventScript_2762BD
@@ -10301,12 +10302,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
special sub_81A703C
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 0
special sub_81A703C
setvar VAR_0x8004, 5
@@ -10382,12 +10383,12 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
special sub_81A703C
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 3
special sub_81A703C
compare VAR_RESULT, 1
@@ -10446,12 +10447,12 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
special sub_81A703C
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 3
special sub_81A703C
compare VAR_RESULT, 1
@@ -10478,7 +10479,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
waitstate
end
@@ -10488,7 +10489,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E
setorcopyvar VAR_0x8006, VAR_RESULT
setvar VAR_0x8004, 1
setvar VAR_0x8005, 0
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B
compare VAR_RESULT, 1
@@ -10502,7 +10503,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271
BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271
setvar VAR_0x8004, 21
special sub_81A1780
special CallFrontierUtilFunc
return
BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A
@@ -11664,7 +11665,7 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
special sp194_trainer_tower
setvar VAR_0x8004, 1
setvar VAR_0x8005, 5
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq TrainerHill_1F_EventScript_2C83C9
compare VAR_RESULT, 3
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+25 -25
View File
@@ -11,7 +11,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C
BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
setvar VAR_0x8004, 5
special sub_81A1780
special CallFrontierUtilFunc
call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE
end
@@ -42,7 +42,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
@@ -51,7 +51,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0
BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
@@ -89,7 +89,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E
waitmovement 0
setvar VAR_0x8004, 5
special sub_8195960
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C
switch VAR_RESULT
@@ -112,7 +112,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
waitstate
@@ -120,12 +120,12 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7
@@ -140,20 +140,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
setvar VAR_0x8004, 9
special sub_81A1780
special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870
compare VAR_RESULT, 2
@@ -227,7 +227,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
waitstate
@@ -271,7 +271,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A
waitse
fadescreen 1
setvar VAR_0x8004, 4
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC
@@ -332,14 +332,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, 4
@@ -358,7 +358,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F
BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
@@ -369,21 +369,21 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4
goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, 4
@@ -402,7 +402,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8
BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
@@ -413,7 +413,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4
goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852
@@ -429,17 +429,17 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special HealPlayerParty
setvar VAR_0x8004, 5
setvar VAR_0x8004, SPECIAL_BATTLE_ARENA
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
setvar VAR_0x8004, 18
special sub_81A1780
special CallFrontierUtilFunc
special HealPlayerParty
setvar VAR_0x8004, 21
special sub_81A1780
special CallFrontierUtilFunc
return
BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+15 -15
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55
BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
@@ -40,7 +40,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
releaseall
end
@@ -48,7 +48,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88
BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF
lockall
setvar VAR_0x8004, 10
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0
msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4
@@ -60,7 +60,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0
BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8
msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4
setvar VAR_0x8004, 11
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9
message BattleFrontier_BattleArenaLobby_Text_256931
waitmessage
@@ -88,7 +88,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B
BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
special HealPlayerParty
setvar VAR_0x8004, 3
@@ -125,7 +125,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
goto BattleFrontier_BattleArenaLobby_EventScript_255F54
@@ -155,13 +155,13 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB
case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4
fadescreen 1
call BattleFrontier_BattleArenaLobby_EventScript_23F2B7
@@ -181,7 +181,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 0
special sub_81A5238
setvar VAR_0x8004, 2
@@ -191,11 +191,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
closemessage
delay 2
@@ -208,12 +208,12 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4
closemessage
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005
compare VAR_RESULT, 1
@@ -244,7 +244,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleArenaLobby_EventScript_255FFB
BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8
@@ -346,7 +346,7 @@ BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092
lockall
setvar VAR_0x8004, 7
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+23 -23
View File
@@ -10,7 +10,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
special CallBattleDomeFunction
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919
@@ -81,7 +81,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
special sub_8161F74
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
closemessage
setvar VAR_0x8004, 5
special CallBattleDomeFunction
@@ -137,14 +137,14 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
@ goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5
BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1
setvar VAR_0x8004, 20
setvar VAR_0x8005, 1
special sub_81A1780
special CallFrontierUtilFunc
message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1
waitmessage
return
@@ -152,7 +152,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1
BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5
setvar VAR_0x8004, 20
setvar VAR_0x8005, 0
special sub_81A1780
special CallFrontierUtilFunc
message BattleFrontier_BattleDomeBattleRoom_Text_24CB34
waitmessage
return
@@ -179,12 +179,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
special CallBattleDomeFunction
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
setvar VAR_0x8006, 1
@@ -196,7 +196,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, 4
@@ -213,7 +213,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3
@@ -379,7 +379,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6
BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB
@@ -428,13 +428,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211
case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4
@@ -448,7 +448,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
setvar VAR_0x8005, 1
special CallBattleDomeFunction
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
closemessage
@@ -460,20 +460,20 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4
@@ -487,7 +487,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
setvar VAR_0x8005, 1
special CallBattleDomeFunction
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
closemessage
@@ -499,7 +499,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
@@ -527,12 +527,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special HealPlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8004, SPECIAL_BATTLE_DOME
setvar VAR_0x8005, 0
setvar VAR_TEMP_9, 1
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
setvar VAR_TEMP_9, 0
setvar VAR_0x8004, 17
@@ -554,11 +554,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B
applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 3
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
setvar VAR_0x8004, 9
special sub_81A1780
special CallFrontierUtilFunc
copyvar VAR_TEMP_E, VAR_RESULT
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
setvar VAR_TEMP_0, 1
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+18 -18
View File
@@ -29,7 +29,7 @@ BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F
BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
@@ -51,7 +51,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
releaseall
end
@@ -60,7 +60,7 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B
call BattleFrontier_BattleDomeLobby_EventScript_241EBA
lockall
setvar VAR_0x8004, 10
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1
msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4
@@ -72,16 +72,16 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1
BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4
setvar VAR_0x8004, 11
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9
message BattleFrontier_BattleDomeLobby_Text_24A5D6
waitmessage
special LoadPlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
@@ -106,9 +106,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
special LoadPlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
@@ -160,7 +160,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
goto BattleFrontier_BattleDomeLobby_EventScript_249BC2
@@ -208,13 +208,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64
case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4
fadescreen 1
call BattleFrontier_BattleDomeLobby_EventScript_23F2B7
@@ -234,17 +234,17 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 0
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
closemessage
delay 2
@@ -259,7 +259,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 15
special CallBattleDomeFunction
msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4
@@ -295,7 +295,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleDomeLobby_EventScript_249C64
BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61
@@ -413,7 +413,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
setvar VAR_0x8004, 7
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
@@ -424,7 +424,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
setvar VAR_0x8004, 7
setvar VAR_0x8005, 1
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+8 -8
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 1
applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652
waitmovement 0
@@ -100,7 +100,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
waitse
fadescreen 1
setvar VAR_0x8004, 4
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
@@ -122,7 +122,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452
@@ -157,7 +157,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
special sub_80F9490
waitstate
setvar VAR_0x8004, 21
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
setvar VAR_0x8004, 2
@@ -187,7 +187,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540
@@ -209,7 +209,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C
setvar VAR_0x8004, 9
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B
case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0
@@ -246,7 +246,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
special LoadPlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
@@ -260,7 +260,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634
case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+22 -22
View File
@@ -6,14 +6,14 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
setvar VAR_0x8004, 5
special sub_81A1780
special CallFrontierUtilFunc
checkplayergender
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
setvar VAR_0x8004, 9
special sub_81A1780
special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3
@@ -82,17 +82,17 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
setvar VAR_0x8004, 5
special sub_8195960
lockall
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special HealPlayerParty
setvar VAR_0x8004, 6
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
switch VAR_RESULT
case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F
@@ -102,7 +102,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
@ goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190
@@ -124,12 +124,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
setvar VAR_0x8006, 1
@@ -140,7 +140,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
@@ -150,13 +150,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4
@@ -167,7 +167,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4
@@ -179,20 +179,20 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4
@@ -203,7 +203,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4
@@ -215,7 +215,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
@@ -224,11 +224,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special HealPlayerParty
setvar VAR_0x8004, 6
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
return
@@ -255,7 +255,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
special sub_81A5E74
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
end
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+13 -13
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407
BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
@@ -46,7 +46,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
releaseall
end
@@ -54,7 +54,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B
lockall
setvar VAR_0x8004, 10
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD
msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4
@@ -68,12 +68,12 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD
BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4
setvar VAR_0x8004, 11
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9
message BattleFrontier_BattleFactoryLobby_Text_259323
waitmessage
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
@@ -88,7 +88,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
message BattleFrontier_BattleFactoryLobby_Text_258CC7
waitmessage
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
@@ -134,7 +134,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
setvar VAR_0x8006, 2
goto BattleFrontier_BattleFactoryLobby_EventScript_25871A
@@ -183,7 +183,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A
@@ -197,7 +197,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
@@ -205,7 +205,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
closemessage
delay 2
call BattleFrontier_BattleFactoryLobby_EventScript_27134F
@@ -249,7 +249,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleFactoryLobby_EventScript_25879D
BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A
@@ -303,7 +303,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
setvar VAR_0x8004, 7
setvar VAR_0x8005, 4
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
@@ -314,7 +314,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA
setvar VAR_0x8004, 7
setvar VAR_0x8005, 4
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+5 -5
View File
@@ -74,7 +74,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
waitfanfare
special HealPlayerParty
setvar VAR_0x8004, 9
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26
playse 263
@@ -95,14 +95,14 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13
setvar VAR_0x8004, 9
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D
compare VAR_RESULT, 2
@@ -232,7 +232,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
waitse
fadescreen 1
setvar VAR_0x8004, 4
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
@@ -243,7 +243,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
special CalculatePlayerPartyCount
goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+25 -25
View File
@@ -6,7 +6,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
setvar VAR_0x8004, 5
special sub_81A1780
special CallFrontierUtilFunc
call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
end
@@ -36,7 +36,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B
@@ -46,7 +46,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
@@ -61,7 +61,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
waitmovement 0
setvar VAR_0x8004, 5
special sub_8195960
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
switch VAR_RESULT
@@ -71,19 +71,19 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7
@@ -97,20 +97,20 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
setvar VAR_0x8004, 9
special sub_81A1780
special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66
compare VAR_RESULT, 2
@@ -181,7 +181,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
@@ -194,7 +194,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
waitse
fadescreen 1
setvar VAR_0x8004, 4
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61
@@ -246,13 +246,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06
case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4
@@ -265,7 +265,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
setvar VAR_0x8004, 6
special sub_8195960
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4
@@ -277,7 +277,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
waitmovement 0
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
@@ -289,13 +289,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4
@@ -308,7 +308,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
setvar VAR_0x8004, 6
special sub_8195960
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4
@@ -320,7 +320,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
waitmovement 0
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
@@ -336,17 +336,17 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special HealPlayerParty
setvar VAR_0x8004, 4
setvar VAR_0x8004, SPECIAL_BATTLE_PALACE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
setvar VAR_0x8004, 18
special sub_81A1780
special CallFrontierUtilFunc
special HealPlayerParty
setvar VAR_0x8004, 21
special sub_81A1780
special CallFrontierUtilFunc
return
BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34
data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+1 -1
View File
@@ -27,7 +27,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
closemessage
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+15 -15
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D
BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
@@ -40,7 +40,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
releaseall
end
@@ -48,7 +48,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
lockall
setvar VAR_0x8004, 10
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4
@@ -60,7 +60,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838
BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4
setvar VAR_0x8004, 11
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9
message BattleFrontier_BattlePalaceLobby_Text_24E4F7
waitmessage
@@ -88,7 +88,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
special HealPlayerParty
setvar VAR_0x8004, 7
@@ -126,7 +126,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3
@@ -179,13 +179,13 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4
fadescreen 1
call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7
@@ -205,7 +205,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 0
special sub_8195960
setvar VAR_0x8004, 2
@@ -215,11 +215,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
closemessage
delay 2
@@ -232,7 +232,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4
closemessage
call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC
@@ -268,7 +268,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94
BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91
@@ -364,7 +364,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
setvar VAR_0x8004, 7
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
@@ -375,7 +375,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69
setvar VAR_0x8004, 7
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+2 -2
View File
@@ -12,7 +12,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 20
special sub_81A703C
setvar VAR_0x8004, 24
@@ -30,7 +30,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 99
special sub_81A1780
special CallFrontierUtilFunc
call BattleFrontier_BattlePikeCorridor_EventScript_25BB49
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
waitstate
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+16 -16
View File
@@ -21,7 +21,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
@@ -42,7 +42,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
releaseall
end
@@ -50,7 +50,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762
lockall
setvar VAR_0x8004, 10
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784
msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4
@@ -64,10 +64,10 @@ BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784
BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4
setvar VAR_0x8004, 11
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 1
setvar VAR_0x8005, 3
special sub_81A703C
@@ -98,11 +98,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
message BattleFrontier_BattlePikeLobby_Text_25C146
waitmessage
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
setvar VAR_0x8006, 0
@@ -148,13 +148,13 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76
case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4
fadescreen 1
call BattleFrontier_BattlePikeLobby_EventScript_23F2B7
@@ -175,13 +175,13 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
setvar VAR_TEMP_1, 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 28
special sub_81A703C
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
setvar VAR_0x8006, 1
@@ -191,7 +191,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
closemessage
delay 2
@@ -204,11 +204,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4
closemessage
setvar VAR_0x8004, 5
special sub_81A1780
special CallFrontierUtilFunc
call BattleFrontier_BattlePikeLobby_EventScript_25BA94
special HealPlayerParty
call BattleFrontier_BattlePikeLobby_EventScript_25BB49
@@ -238,7 +238,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattlePikeLobby_EventScript_25BA76
BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73
@@ -255,7 +255,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
lockall
setvar VAR_0x8004, 7
setvar VAR_0x8005, 5
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
+22 -22
View File
@@ -30,13 +30,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6
setvar VAR_0x8004, 21
setvar VAR_0x8005, 0
special sub_81A703C
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
closemessage
releaseall
setvar VAR_0x8004, 7
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
switch VAR_RESULT
case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226
@@ -45,7 +45,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
waitstate
end
@@ -66,13 +66,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231
setvar VAR_0x8004, 21
setvar VAR_0x8005, 0
special sub_81A703C
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
closemessage
releaseall
setvar VAR_0x8004, 7
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
switch VAR_RESULT
case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285
@@ -144,13 +144,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4
@@ -161,7 +161,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4
@@ -171,7 +171,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4
closemessage
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
@@ -179,13 +179,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4
@@ -196,7 +196,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4
@@ -206,7 +206,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4
closemessage
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
@@ -282,7 +282,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
setvar VAR_0x8004, 21
setvar VAR_0x8005, 0
special sub_81A703C
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
closemessage
delay 16
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
@@ -290,11 +290,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
setvar VAR_0x8004, 21
setvar VAR_0x8005, 1
special sub_81A703C
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
closemessage
setvar VAR_0x8004, 9
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
switch VAR_RESULT
case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC
@@ -433,9 +433,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B
closemessage
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
waitmovement 0
setvar VAR_0x8004, 7
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
return
@@ -590,7 +590,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B
faceplayer
setvar VAR_0x8004, 14
special sub_81A703C
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
closemessage
release
data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
+1 -1
View File
@@ -14,7 +14,7 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
lockall
msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4
closemessage
data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
+2 -2
View File
@@ -19,7 +19,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
waitstate
end
@@ -37,7 +37,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A
call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271
setvar VAR_0x8004, 1
setvar VAR_0x8005, 5
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
compare VAR_RESULT, 3
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+8 -8
View File
@@ -23,7 +23,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A
@@ -43,27 +43,27 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4
closemessage
releaseall
setvar VAR_0x8004, 5
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 99
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968
case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978
@@ -133,7 +133,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
setvar VAR_0x8004, 6
special sub_81A1780
special CallFrontierUtilFunc
message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08
waitmessage
special LoadPlayerParty
@@ -144,7 +144,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
waitse
fadescreen 1
setvar VAR_0x8004, 4
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A
data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+9 -9
View File
@@ -41,14 +41,14 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
setvar VAR_0x8004, 15
special sub_81A8E7C
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_TEMP_0
case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66
case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
setvar VAR_0x8004, 1
setvar VAR_0x8005, 5
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 4
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
compare VAR_RESULT, 5
@@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
setvar VAR_0x8004, 14
setvar VAR_0x8005, 8
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_D, 1
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
@@ -76,7 +76,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
setvar VAR_0x8006, 255
@@ -103,12 +103,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 9
special sub_81A8E7C
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_F, 1
end
@@ -128,12 +128,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 7
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
setvar VAR_0x8004, 6
@@ -141,7 +141,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_RESULT, 0
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
waitstate
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+15 -15
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
@@ -43,7 +43,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
releaseall
end
@@ -51,7 +51,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1
lockall
setvar VAR_0x8004, 10
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2
msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4
@@ -66,7 +66,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB
clearflag FLAG_SPECIAL_FLAG_0x4004
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
setvar VAR_0x8004, 14
special sub_81A8E7C
@@ -77,7 +77,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
waitse
msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4
setvar VAR_0x8004, 11
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9
message BattleFrontier_BattlePyramidLobby_Text_251A77
waitmessage
@@ -96,7 +96,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
setvar VAR_0x8004, 14
special sub_81A8E7C
@@ -152,13 +152,13 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4
fadescreen 1
call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7
@@ -178,7 +178,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 0
special sub_81A8E7C
setvar VAR_0x8004, 2
@@ -188,11 +188,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 6
special sub_81A8E7C
setvar VAR_0x8004, 9
@@ -209,14 +209,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4
closemessage
call BattleFrontier_BattlePyramidLobby_EventScript_250D56
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_RESULT, 0
special HealPlayerParty
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
@@ -245,7 +245,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4
BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1
@@ -426,7 +426,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
lockall
setvar VAR_0x8004, 7
setvar VAR_0x8005, 6
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+16 -16
View File
@@ -29,7 +29,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3
BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
setvar VAR_0x8004, 9
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C
call BattleFrontier_BattlePyramidTop_EventScript_242170
@@ -37,14 +37,14 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C
copyvar VAR_TEMP_C, VAR_RESULT
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_TEMP_0
case 0, BattleFrontier_BattlePyramidTop_EventScript_255193
case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66
case 2, BattleFrontier_BattlePyramidTop_EventScript_255193
setvar VAR_0x8004, 1
setvar VAR_0x8005, 5
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 3
@@ -76,12 +76,12 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 9
special sub_81A8E7C
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_F, 1
end
@@ -110,7 +110,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
waitstate
end
@@ -135,7 +135,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
case 4, BattleFrontier_BattlePyramidTop_EventScript_255388
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0
special SpawnScriptEventObject
@@ -145,7 +145,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_25573E, 4
@@ -166,7 +166,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA
BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A
msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4
@@ -175,14 +175,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4
goto BattleFrontier_BattlePyramidTop_EventScript_25521A
BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388
special SpawnScriptEventObject
@@ -192,7 +192,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, 4
@@ -213,7 +213,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392
BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A
msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4
@@ -222,15 +222,15 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4
goto BattleFrontier_BattlePyramidTop_EventScript_25521A
BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED
closemessage
setvar VAR_0x8004, 10
setvar VAR_0x8004, SPECIAL_BATTLE_PYRAMID
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
return
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+25 -25
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
@@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
@@ -45,7 +45,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
special sub_8161F74
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
switch VAR_RESULT
@@ -56,7 +56,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
special sub_8161F74
@@ -74,7 +74,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
waitmovement 0
removeobject 1
setvar VAR_0x8004, 9
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
@@ -88,13 +88,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
setvar VAR_0x8004, 9
special sub_81A1780
special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44
call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1
@@ -156,7 +156,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
special sub_8161F74
@@ -174,7 +174,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
waitse
fadescreen 1
setvar VAR_0x8004, 4
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44
@@ -224,7 +224,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA:: @ 8241EBA
BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA
BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA
setvar VAR_0x8004, 17
special sub_81A1780
special CallFrontierUtilFunc
return
BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
@@ -288,13 +288,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4
@@ -306,7 +306,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4
@@ -315,20 +315,20 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4
@@ -340,7 +340,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA
setvar VAR_0x8004, 12
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4
@@ -349,7 +349,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
waitmessage
waitfanfare
setvar VAR_0x8004, 13
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
@@ -360,27 +360,27 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special HealPlayerParty
setvar VAR_0x8004, 0
setvar VAR_0x8004, SPECIAL_BATTLE_TOWER
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE
compare VAR_0x8004, 3
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
setvar VAR_0x8004, 18
special sub_81A1780
special CallFrontierUtilFunc
special HealPlayerParty
setvar VAR_0x8004, 21
special sub_81A1780
special CallFrontierUtilFunc
BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A
setvar VAR_0x8004, 15
special sub_8161F74
setvar VAR_0x8004, 1
setvar VAR_0x8005, 5
special sub_81A1780
special CallFrontierUtilFunc
return
BattleFrontier_BattleArenaBattleRoom_EventScript_242170:: @ 8242170
@@ -390,7 +390,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_242170:: @ 8242170
BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170
BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170
setvar VAR_0x8004, 22
special sub_81A1780
special CallFrontierUtilFunc
return
BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+9 -9
View File
@@ -47,7 +47,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
@@ -59,7 +59,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
@@ -78,14 +78,14 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
delay 15
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
setvar VAR_0x8004, 7
setvar VAR_0x8005, 1
special sub_8161F74
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
@@ -117,7 +117,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
special sub_8161F74
@@ -156,7 +156,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
special LoadPlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
playfanfare MUS_ME_ASA
@@ -166,7 +166,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
@@ -234,7 +234,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
special sub_8161F74
@@ -252,7 +252,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
waitse
fadescreen 1
setvar VAR_0x8004, 4
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+31 -31
View File
@@ -49,7 +49,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD
BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
@@ -68,7 +68,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
release
end
@@ -77,7 +77,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758
lock
faceplayer
setvar VAR_0x8004, 10
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778
message BattleFrontier_BattleTowerLobby_Text_23F60D
@@ -101,7 +101,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4
setvar VAR_0x8004, 11
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9
call BattleFrontier_BattleTowerLobby_EventScript_23E84D
setvar VAR_0x8004, 1
@@ -151,7 +151,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
message BattleFrontier_BattleTowerLobby_Text_23F70F
waitmessage
setvar VAR_0x8004, 8
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
special HealPlayerParty
setvar VAR_0x8004, 6
@@ -182,7 +182,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4:: @ 823E8B4
BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4
BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4
setvar VAR_0x8004, 19
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7
playse SE_SAVE
@@ -208,7 +208,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0
BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0
setvar VAR_0x8004, 1
setvar VAR_0x8005, 6
special sub_81A1780
special CallFrontierUtilFunc
return
BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
@@ -228,7 +228,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end
@@ -262,13 +262,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4
fadescreen 1
call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
@@ -287,7 +287,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 0
special sub_8161F74
@@ -298,7 +298,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
closemessage
delay 2
@@ -342,13 +342,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4
fadescreen 1
call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
@@ -367,7 +367,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 0
special sub_8161F74
@@ -378,7 +378,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
closemessage
delay 2
@@ -423,13 +423,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4
fadescreen 1
call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
@@ -448,7 +448,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 0
special sub_8161F74
@@ -459,7 +459,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
closemessage
delay 2
@@ -503,13 +503,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4
fadescreen 1
call BattleFrontier_BattleTowerLobby_EventScript_23F2B7
@@ -528,7 +528,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 0
special sub_8161F74
@@ -539,7 +539,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
closemessage
delay 2
@@ -634,7 +634,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
@@ -645,7 +645,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
@@ -656,7 +656,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
setvar VAR_0x8006, 2
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
@@ -667,7 +667,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
@@ -717,7 +717,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2
BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6
end
@@ -736,7 +736,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3
special SavePlayerParty
setvar VAR_0x8004, 3
call BattleFrontier_BattleTowerLobby_EventScript_23F272
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_RESULT, 0
BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
@@ -924,7 +924,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7
BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_81A1780
special CallFrontierUtilFunc
return
BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+1 -1
View File
@@ -98,7 +98,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03
end
data/maps/BattleFrontier_RankingHall/scripts.inc
+2 -2
View File
@@ -62,9 +62,9 @@ BattleFrontier_RankingHall_EventScript_25E516:: @ 825E516
end
BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522
special sub_81A4AA0
special ShowRankingHallRecordsWindow
waitbuttonpress
special sub_81A4AE8
special ScrollRankingHallRecordsWindow
waitbuttonpress
special RemoveRecordsWindow
releaseall
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+4 -4
View File
@@ -114,7 +114,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_8161F74
@@ -123,7 +123,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_8161F74
@@ -157,7 +157,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_8161F74
@@ -166,7 +166,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_8161F74
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+9 -9
View File
@@ -37,7 +37,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73
@@ -54,7 +54,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4
setvar VAR_0x8004, 4
special sub_81B99B4
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
call FallarborTown_BattleTentBattleRoom_EventScript_257B6C
switch VAR_RESULT
@@ -71,7 +71,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate
@@ -87,12 +87,12 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C
FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3
applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E
@@ -107,7 +107,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
@@ -115,7 +115,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43
compare VAR_RESULT, 2
@@ -156,7 +156,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate
@@ -191,7 +191,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51
waitse
fadescreen 1
setvar VAR_0x8004, 4
special sub_81A1780
special CallFrontierUtilFunc
end
FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73
data/maps/FallarborTown_BattleTentLobby/scripts.inc
+14 -14
View File
@@ -22,7 +22,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85
FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
@@ -32,12 +32,12 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
releaseall
end
@@ -51,7 +51,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special sub_81B9B80
@@ -67,7 +67,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
message FallarborTown_BattleTentLobby_Text_2C4F69
waitmessage
playfanfare MUS_FANFA4
@@ -99,7 +99,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special sub_81B9B80
@@ -123,7 +123,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
goto FallarborTown_BattleTentLobby_EventScript_20013C
@@ -152,13 +152,13 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
setvar VAR_FRONTIER_BATTLE_MODE, 0
setvar VAR_RESULT, 2
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq FallarborTown_BattleTentLobby_EventScript_200176
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 2
special sub_81A1780
special CallFrontierUtilFunc
msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4
fadescreen 1
setvar VAR_0x8004, 2
@@ -177,17 +177,17 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 0
special sub_81B9B80
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
closemessage
delay 2
@@ -200,7 +200,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4
closemessage
call FallarborTown_BattleTentLobby_EventScript_2001CF
@@ -230,7 +230,7 @@ FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
goto FallarborTown_BattleTentLobby_EventScript_2001C5
FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2
data/maps/LilycoveCity_ContestLobby/scripts.inc
+1 -1
View File
@@ -562,7 +562,7 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
lockall
setvar VAR_0x8004, 7
setvar VAR_0x8005, 7
special sub_81A1780
special CallFrontierUtilFunc
waitbuttonpress
special RemoveRecordsWindow
releaseall
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+4 -4
View File
@@ -263,13 +263,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
special ReducePlayerPartyToThree
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
setvar VAR_0x8004, 8
special CallFrontierUtilFunc
setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
setvar VAR_0x8004, 6
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
switch VAR_RESULT
case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+7 -7
View File
@@ -51,13 +51,13 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
setvar VAR_0x8004, 4
special sub_81B99B4
lockall
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
closemessage
special HealPlayerParty
setvar VAR_0x8004, 6
setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
switch VAR_RESULT
case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39
@@ -66,7 +66,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate
@@ -74,12 +74,12 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B
@ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B
@@ -92,7 +92,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate
data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+2 -2
View File
@@ -70,7 +70,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014
compare VAR_RESULT, 2
@@ -136,7 +136,7 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
waitse
fadescreen 1
setvar VAR_0x8004, 4
special sub_81A1780
special CallFrontierUtilFunc
end
SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044
data/maps/SlateportCity_BattleTentLobby/scripts.inc
+12 -12
View File
@@ -22,7 +22,7 @@ SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F
SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
@@ -32,12 +32,12 @@ SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
releaseall
end
@@ -50,7 +50,7 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special sub_81B9D08
@@ -66,7 +66,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
message SlateportCity_BattleTentLobby_Text_23F68C
waitmessage
playfanfare MUS_FANFA4
@@ -84,7 +84,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special sub_81B9D08
@@ -110,7 +110,7 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
setvar VAR_0x8006, 2
goto SlateportCity_BattleTentLobby_EventScript_2089AC
@@ -141,7 +141,7 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 2
special sub_81A1780
special CallFrontierUtilFunc
msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5
switch VAR_RESULT
case 0, SlateportCity_BattleTentLobby_EventScript_208A2B
@@ -152,17 +152,17 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 0
special sub_81B9D08
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
closemessage
delay 2
call SlateportCity_BattleTentLobby_EventScript_27134F
@@ -224,7 +224,7 @@ SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
goto SlateportCity_BattleTentLobby_EventScript_208A2E
SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+2 -2
View File
@@ -5,7 +5,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953
SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
setvar VAR_0x8004, 16
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
compare VAR_0x40C0, 0
@@ -75,7 +75,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24
lock
faceplayer
setvar VAR_0x8004, 16
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E
compare VAR_TEMP_1, 1
data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
+5 -5
View File
@@ -4,7 +4,7 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F
.byte 0
SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A
special sub_8162794
special SetEReaderTrainerGfxId
end
SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E
@@ -15,12 +15,12 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
lockall
applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3
waitmovement 0
special sub_8165360
msgbox 0x2021fc4, 4
special CopyEReaderTrainerGreeting
msgbox gStringVar4, 4
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8004, SPECIAL_BATTLE_EREADER
setvar VAR_0x8005, 0
special sub_8163AC4
special DoSpecialTrainerBattle
waitstate
compare VAR_RESULT, 3
call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF
data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+9 -9
View File
@@ -36,7 +36,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
@@ -48,7 +48,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
waitmovement 0
setvar VAR_0x8004, 4
special sub_81B99B4
msgbox 0x2021fc4, 4
msgbox gStringVar4, 4
waitmessage
call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7
switch VAR_RESULT
@@ -58,7 +58,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate
@@ -66,12 +66,12 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special sub_81A1780
special CallFrontierUtilFunc
switch VAR_RESULT
case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501
applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581
@@ -85,7 +85,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
@@ -93,7 +93,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_RESULT, 1
call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565
compare VAR_RESULT, 2
@@ -131,7 +131,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 3
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate
@@ -146,7 +146,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F
waitse
fadescreen 1
setvar VAR_0x8004, 4
special sub_81A1780
special CallFrontierUtilFunc
end
VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541
data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+14 -14
View File
@@ -22,7 +22,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF
VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719
setvar VAR_0x8004, 0
special sub_81A1780
special CallFrontierUtilFunc
end
VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
@@ -32,12 +32,12 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
releaseall
end
@@ -51,7 +51,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 5
setvar VAR_0x8005, 0
special sub_81B99B4
@@ -67,7 +67,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
message VerdanturfTown_BattleTentLobby_Text_24A554
waitmessage
playfanfare MUS_FANFA4
@@ -99,7 +99,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 5
setvar VAR_0x8005, 0
special sub_81B99B4
@@ -124,7 +124,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 255
goto VerdanturfTown_BattleTentLobby_EventScript_2019AE
@@ -153,13 +153,13 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
setvar VAR_FRONTIER_BATTLE_MODE, 0
setvar VAR_RESULT, 2
setvar VAR_0x8004, 15
special sub_81A1780
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 2
special sub_81A1780
special CallFrontierUtilFunc
msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4
fadescreen 1
setvar VAR_0x8004, 1
@@ -178,17 +178,17 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 0
special sub_81B99B4
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 1
special sub_81A1780
special CallFrontierUtilFunc
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
special LoadPlayerParty
closemessage
delay 2
@@ -201,7 +201,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special sub_81A1780
special CallFrontierUtilFunc
msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4
closemessage
call VerdanturfTown_BattleTentLobby_EventScript_201A41
@@ -231,7 +231,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special sub_81A1780
special CallFrontierUtilFunc
goto VerdanturfTown_BattleTentLobby_EventScript_201A37
VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34
data/script_menu.s
-780
View File
@@ -1,780 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0858ABD8:: @ 858ABD8
.4byte gUnknown_085EAD37, 0
.4byte gUnknown_085EAD41, 0
.4byte gText_Exit, 0
gUnknown_0858ABF0:: @ 58ABF0
.4byte gUnknown_085EAD67, 0
.4byte gUnknown_085EAD6D, 0
.4byte gText_Exit, 0
gUnknown_0858AC08:: @ 58AC08
.4byte gUnknown_085EAD72, 0
.4byte gUnknown_085EAD84, 0
.4byte gUnknown_085EAD96, 0
.4byte gText_Cancel2, 0
gUnknown_0858AC28:: @ 58AC28
.4byte gUnknown_085EADA4, 0
.4byte gUnknown_085EADB5, 0
.4byte gUnknown_085EADC4, 0
.4byte gUnknown_085EADD5, 0
.4byte gUnknown_085EADE7, 0
.4byte gText_Exit, 0
gUnknown_0858AC58:: @ 58AC58
.4byte gUnknown_085EADF9, 0
.4byte gUnknown_085EAE04, 0
.4byte gUnknown_085EAE12, 0
.4byte gText_Exit, 0
gUnknown_0858AC78:: @ 58AC78
.4byte gUnknown_085EADF9, 0
.4byte gUnknown_085EAE04, 0
.4byte gText_Exit, 0
gUnknown_0858AC90:: @ 58AC90
.4byte gMenuText_Register, 0
.4byte gUnknown_085EAE12, 0
.4byte gUnknown_085EAE1B, 0
.4byte gText_Cancel2, 0
gUnknown_0858ACB0:: @ 58ACB0
.4byte gUnknown_085EAE27, 0
.4byte gUnknown_085EAE2C, 0
gUnknown_0858ACC0:: @ 58ACC0
.4byte gUnknown_085EAE31, 0
.4byte gUnknown_085EAE35, 0
.4byte gUnknown_085EAE39, 0
.4byte gUnknown_085EAE3D, 0
.4byte gUnknown_085EAE41, 0
.4byte gText_Exit, 0
gUnknown_0858ACF0:: @ 58ACF0
.4byte gUnknown_085EAD5F, 0
.4byte gText_Exit, 0
gUnknown_0858AD00:: @ 58AD00
.4byte gUnknown_085EAE53, 0
.4byte gUnknown_085EAE5A, 0
gUnknown_0858AD10:: @ 58AD10
.4byte gText_Yes, 0
.4byte gText_No, 0
.4byte gUnknown_085EAD6D, 0
gUnknown_0858AD28:: @ 58AD28
.4byte gUnknown_085EAEA2, 0
.4byte gUnknown_085EAEAC, 0
.4byte gText_Exit, 0
gUnknown_0858AD40:: @ 58AD40
.4byte gText_Lv50, 0
.4byte gText_OpenLevel, 0
.4byte gText_Exit, 0
gUnknown_0858AD58:: @ 58AD58
.4byte gUnknown_0827ECBC, 0
.4byte gUnknown_0827ECC3, 0
.4byte gUnknown_0827ECCD, 0
gUnknown_0858AD70:: @ 58AD70
.4byte gUnknown_0827ECD5, 0
.4byte gUnknown_0827ECDD, 0
.4byte gUnknown_0827ECE3, 0
gUnknown_0858AD88:: @ 58AD88
.4byte gUnknown_0827ECEB, 0
.4byte gUnknown_0827ECF2, 0
.4byte gUnknown_0827ECF8, 0
gUnknown_0858ADA0:: @ 58ADA0
.4byte gUnknown_0827ED00, 0
.4byte gUnknown_0827ED06, 0
.4byte gUnknown_0827ED10, 0
gUnknown_0858ADB8:: @ 58ADB8
.4byte gUnknown_0827ED18, 0
.4byte gUnknown_0827ED22, 0
.4byte gUnknown_0827ED2C, 0
gUnknown_0858ADD0:: @ 58ADD0
.4byte gUnknown_0827ED36, 0
.4byte gUnknown_0827ED40, 0
.4byte gUnknown_0827ED46, 0
gUnknown_0858ADE8:: @ 58ADE8
.4byte gUnknown_0827ED4F, 0
.4byte gUnknown_0827ED59, 0
.4byte gUnknown_0827ED65, 0
gUnknown_0858AE00:: @ 58AE00
.4byte gUnknown_0827ED70, 0
.4byte gUnknown_0827ED74, 0
.4byte gUnknown_0827ED78, 0
gUnknown_0858AE18:: @ 58AE18
.4byte gUnknown_0827ED80, 0
.4byte gUnknown_0827ED95, 0
.4byte gUnknown_0827EDAA, 0
gUnknown_0858AE30:: @ 58AE30
.4byte gUnknown_0827EDB5, 0
.4byte gUnknown_0827EDBA, 0
.4byte gUnknown_0827EDC1, 0
gUnknown_0858AE48:: @ 58AE48
.4byte gUnknown_0827EDC9, 0
.4byte gUnknown_0827EDD5, 0
.4byte gUnknown_0827EDE4, 0
gUnknown_0858AE60:: @ 58AE60
.4byte gUnknown_0827EDF0, 0
.4byte gUnknown_0827EDF5, 0
.4byte gUnknown_0827EDF7, 0
gUnknown_0858AE78:: @ 58AE78
.4byte gUnknown_0827EDF9, 0
.4byte gUnknown_0827EDFB, 0
.4byte gUnknown_0827EDFD, 0
gUnknown_0858AE90:: @ 58AE90
.4byte gUnknown_0827EDFF, 0
.4byte gUnknown_0827EE01, 0
.4byte gUnknown_0827EE03, 0
gUnknown_0858AEA8:: @ 58AEA8
.4byte gUnknown_0827EE05, 0
.4byte gUnknown_0827EE07, 0
.4byte gUnknown_0827EE09, 0
gUnknown_0858AEC0:: @ 58AEC0
.4byte gUnknown_085EAEC3, 0
.4byte gUnknown_085EAED6, 0
.4byte gUnknown_085EAEE6, 0
.4byte gText_Exit, 0
gUnknown_0858AEE0:: @ 58AEE0
.4byte gUnknown_085EAEF6, 0
.4byte gUnknown_085EAF02, 0
.4byte gUnknown_085EAF0E, 0
.4byte gText_Exit, 0
gUnknown_0858AF00:: @ 58AF00
.4byte gUnknown_085EAF1B, 0
.4byte gUnknown_085EAF24, 0
.4byte gUnknown_085EAF2F, 0
.4byte gText_Exit, 0
gUnknown_0858AF20:: @ 58AF20
.4byte gUnknown_085EAF34, 0
.4byte gUnknown_085EAF3E, 0
gUnknown_0858AF30:: @ 58AF30
.4byte gUnknown_085EAF4B, 0
.4byte gUnknown_085EAF58, 0
.4byte gText_Exit, 0
gUnknown_0858AF48:: @ 58AF48
.4byte gUnknown_085EAF65, 0
.4byte gUnknown_085EAF70, 0
.4byte gUnknown_085EAF7D, 0
.4byte gUnknown_085EAF87, 0
.4byte gUnknown_085EAF93, 0
.4byte gUnknown_085EAF9F, 0
.4byte gUnknown_085EAFAB, 0
.4byte gText_Cancel2, 0
gUnknown_0858AF88:: @ 58AF88
.4byte gUnknown_085EAFB6, 0
.4byte gUnknown_085EAFCF, 0
.4byte gUnknown_085EAFE8, 0
.4byte gText_Exit, 0
gUnknown_0858AFA8:: @ 58AFA8
.4byte gUnknown_085EB089, 0
.4byte gUnknown_085EB09C, 0
.4byte gUnknown_085EB0AF, 0
.4byte gUnknown_085EB0C2, 0
.4byte gUnknown_085EB0D5, 0
.4byte gText_Exit, 0
gUnknown_0858AFD8:: @ 58AFD8
.4byte gUnknown_085EB002, 0
.4byte gUnknown_085EB017, 0
.4byte gText_Exit, 0
gUnknown_0858AFF0:: @ 58AFF0
.4byte gUnknown_085EB02A, 0
.4byte gUnknown_085EB034, 0
gUnknown_0858B000:: @ 58B000
.4byte gText_LilycoveCity, 0
.4byte gText_BattleFrontier, 0
.4byte gText_Exit, 0
gUnknown_0858B018:: @ 58B018
.4byte gText_SlateportCity, 0
.4byte gText_LilycoveCity, 0
.4byte gText_Exit, 0
gUnknown_0858B030:: @ 58B030
.4byte gUnknown_085EB07E, 0
.4byte gUnknown_085EB084, 0
gUnknown_0858B040:: @ 58B040
.4byte gText_LilycoveCity, 0
.4byte gText_Exit, 0
gUnknown_0858B050:: @ 58B050
.4byte gText_5F, 0
.4byte gText_4F, 0
.4byte gText_3F, 0
.4byte gText_2F, 0
.4byte gText_1F, 0
.4byte gText_Exit, 0
gUnknown_0858B080:: @ 58B080
.4byte gUnknown_085EB040, 0
.4byte gText_Exit, 0
gUnknown_0858B090:: @ 58B090
.4byte gUnknown_085EB04A, 0
.4byte gText_Exit, 0
gUnknown_0858B0A0:: @ 58B0A0
.4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0
.4byte gText_Exit, 0
gUnknown_0858B0B8:: @ 58B0B8
.4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0
gUnknown_0858B0C8:: @ 58B0C8
.4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0
gUnknown_0858B0E0:: @ 58B0E0
.4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0
gUnknown_0858B0F8:: @ 58B0F8
.4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0
gUnknown_0858B118:: @ 58B118
.4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0
gUnknown_0858B128:: @ 58B128
.4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0
gUnknown_0858B140:: @ 58B140
.4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0
gUnknown_0858B158:: @ 58B158
.4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0
gUnknown_0858B178:: @ 58B178
.4byte gUnknown_085EB057, 0
.4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0
gUnknown_0858B190:: @ 58B190
.4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB057, 0
.4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0
gUnknown_0858B1B0:: @ 58B1B0
.4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0
.4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0
gUnknown_0858B1D0:: @ 58B1D0
.4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0
.4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0
gUnknown_0858B1F8:: @ 58B1F8
.4byte gText_Opponent, 0
.4byte gText_Tourney_Tree, 0
.4byte gText_ReadyToStart, 0
.4byte gUnknown_085EB5BC, 0
.4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0
gUnknown_0858B228:: @ 58B228
.4byte gText_Opponent, 0
.4byte gText_Tourney_Tree, 0
.4byte gText_ReadyToStart, 0
.4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0
gUnknown_0858B250:: @ 58B250
.4byte gUnknown_085EB29A, 0
.4byte gUnknown_085EB2A3, 0
gUnknown_0858B260:: @ 58B260
.4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0
.4byte gUnknown_085EB389, 0
.4byte gText_Exit, 0
gUnknown_0858B280:: @ 58B280
.4byte gText_Yes, 0
.4byte gText_No, 0
.4byte gUnknown_085EAD6D, 0
gUnknown_0858B298:: @ 58B298
.4byte gUnknown_085EAE6E, 0
.4byte gUnknown_085EAE7C, 0
.4byte gUnknown_085EAE8A, 0
.4byte gUnknown_085EAD6D, 0
.4byte gText_Exit, 0
gUnknown_0858B2C0:: @ 58B2C0
.4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0
.4byte gUnknown_085EB397, 0
.4byte gText_Exit, 0
gUnknown_0858B2E0:: @ 58B2E0
.4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0
.4byte gUnknown_085EB389, 0
.4byte gUnknown_085EB397, 0
.4byte gText_Exit, 0
gUnknown_0858B308:: @ 58B308
.4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0
.4byte gText_Exit, 0
gUnknown_0858B320:: @ 58B320
.4byte gUnknown_085EB3A4, 0
.4byte gUnknown_085EB3B1, 0
.4byte gText_Exit, 0
gUnknown_0858B338:: @ 58B338
.4byte gUnknown_085EB3D4, 0
.4byte gUnknown_085EB3C6, 0
.4byte gText_Exit, 0
gUnknown_0858B350:: @ 58B350
.4byte gText_NormalRank, 0
.4byte gText_SuperRank, 0
.4byte gText_HyperRank, 0
.4byte gText_MasterRank, 0
.4byte gText_Exit, 0
gUnknown_0858B378:: @ 58B378
.4byte gText_BattleBag, 0
.4byte gText_HeldItem, 0
.4byte gText_Exit, 0
gUnknown_0858B390:: @ 58B390
.4byte gText_LinkContest, 0
.4byte gText_AboutE_Mode, 0
.4byte gText_AboutG_Mode, 0
.4byte gText_Cancel2, 0
gUnknown_0858B3B0:: @ 58B3B0
.4byte gText_E_Mode, 0
.4byte gText_G_Mode, 0
.4byte gText_Exit, 0
gUnknown_0858B3C8:: @ 58B3C8
.4byte gText_MenuOptionPokedex, 0
.4byte gText_MenuOptionPokemon, 0
.4byte gText_MenuOptionBag, 0
.4byte gText_MenuOptionPokenav, 0
.4byte gUnknown_085EB278, 0
.4byte gText_MenuOptionSave, 0
.4byte gText_MenuOptionOption, 0
.4byte gText_MenuOptionExit, 0
gUnknown_0858B408:: @ 58B408
.4byte gUnknown_085EB28A, 0
.4byte gUnknown_085EB290, 0
.4byte gUnknown_085EB295, 0
.4byte gText_Exit, 0
gUnknown_0858B428:: @ 58B428
.4byte gText_SouthernIsland, 0
.4byte gText_BirthIsland, 0
.4byte gText_Exit, 0
gUnknown_0858B440:: @ 58B440
.4byte gText_SouthernIsland, 0
.4byte gText_FarawayIsland, 0
.4byte gText_Exit, 0
gUnknown_0858B458:: @ 58B458
.4byte gText_BirthIsland, 0
.4byte gText_FarawayIsland, 0
.4byte gText_Exit, 0
gUnknown_0858B470:: @ 58B470
.4byte gText_SouthernIsland, 0
.4byte gText_BirthIsland, 0
.4byte gText_FarawayIsland, 0
.4byte gText_Exit, 0
gUnknown_0858B490:: @ 58B490
.4byte gUnknown_085EB2E4, 0
.4byte gUnknown_085EB2F0, 0
.4byte gText_Exit, 0
gUnknown_0858B4A8:: @ 58B4A8
.4byte gText_Yes, 0
.4byte gUnknown_085EB2FC, 0
gUnknown_0858B4B8:: @ 58B4B8
.4byte gUnknown_085EB3DF, 0
.4byte gUnknown_085EB3EA, 0
.4byte gUnknown_085EB3F1, 0
.4byte gUnknown_085EB3FC, 0
.4byte gUnknown_085EB40A, 0
.4byte gText_Exit, 0
gUnknown_0858B4E8:: @ 58B4E8
.4byte gUnknown_085EB415, 0
.4byte gUnknown_085EB41D, 0
.4byte gUnknown_085EB424, 0
.4byte gText_Exit, 0
gUnknown_0858B508:: @ 58B508
.4byte gUnknown_085EB45C, 0
.4byte gUnknown_085EB469, 0
.4byte gUnknown_085EB475, 0
.4byte gUnknown_085EB482, 0
.4byte gText_Exit, 0
gUnknown_0858B530:: @ 58B530
.4byte gUnknown_085EB42F, 0
.4byte gUnknown_085EB43A, 0
.4byte gUnknown_085EB444, 0
.4byte gUnknown_085EB451, 0
.4byte gText_Exit, 0
gUnknown_0858B558:: @ 58B558
.4byte gUnknown_085EB48E, 0
.4byte gUnknown_085EB496, 0
.4byte gUnknown_085EB4A3, 0
.4byte gText_Exit, 0
gUnknown_0858B578:: @ 58B578
.4byte gUnknown_085EB4AD, 0
.4byte gUnknown_085EB4B9, 0
.4byte gUnknown_085EB4C7, 0
.4byte gUnknown_085EB4D4, 0
.4byte gUnknown_085EB4E0, 0
.4byte gText_Exit, 0
gUnknown_0858B5A8:: @ 58B5A8
.4byte gText_BattleBasics, 0
.4byte gText_PokemonNature, 0
.4byte gText_PokemonMoves, 0
.4byte gText_Underpowered, 0
.4byte gText_WhenInDanger, 0
.4byte gText_Exit, 0
gUnknown_0858B5D8:: @ 58B5D8
.4byte gUnknown_085EB532, 0
.4byte gUnknown_085EB543, 0
.4byte gUnknown_085EB555, 0
.4byte gUnknown_085EB563, 0
.4byte gText_Exit, 0
gUnknown_0858B600:: @ 58B600
.4byte gUnknown_085EB56E, 0
.4byte gUnknown_085EB57E, 0
.4byte gUnknown_085EB589, 0
.4byte gText_Exit, 0
gUnknown_0858B620:: @ 58B620
.4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5BC, 0
.4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0
gUnknown_0858B640:: @ 58B640
.4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0
gUnknown_0858B658:: @ 58B658
.4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5BC, 0
.4byte gUnknown_085EB5C8, 0
gUnknown_0858B670:: @ 58B670
.4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5C8, 0
gUnknown_0858B680:: @ 58B680
.4byte gUnknown_085EE14B, 0
.4byte gUnknown_085EE14F, 0
gUnknown_0858B690:: @ 58B690
.4byte gUnknown_085EB2FF, 0
.4byte gUnknown_085EB310, 0
.4byte gUnknown_085EB317, 0
.4byte gUnknown_085EB31F, 0
gUnknown_0858B6B0:: @ 58B6B0
.4byte gText_CaveOfOrigin, 0
.4byte gText_MtPyre, 0
.4byte gText_SkyPillar, 0
.4byte gText_DontRemember, 0
gUnknown_0858B6D0:: @ 58B6D0
.4byte gUnknown_085EB4AD, 0
.4byte gUnknown_085EB4B9, 0
.4byte gUnknown_085EB4C7, 0
.4byte gUnknown_085EB4D4, 0
.4byte gUnknown_085EB597, 0
.4byte gText_Exit, 0
gUnknown_0858B700:: @ 58B700
.4byte gText_BattleTrainers, 0
.4byte gUnknown_085EB45C, 0
.4byte gUnknown_085EB469, 0
.4byte gUnknown_085EB475, 0
.4byte gUnknown_085EB482, 0
.4byte gText_Exit, 0
gUnknown_0858B730:: @ 58B730
.4byte gUnknown_085EB32D, 0
.4byte gUnknown_085EB33E, 0
.4byte gUnknown_085EB350, 0
.4byte gUnknown_085EB361, 0
.4byte gText_Exit, 0
gUnknown_0858B758:: @ 58B758
.4byte gText_Exit, 0
gUnknown_0858B760:: @ 858B760
.4byte gUnknown_0858ABD8, 3
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858ABF0, 3
.4byte gUnknown_0858AC08, 4
.4byte gUnknown_0858AC28, 6
.4byte gUnknown_0858AC78, 3
.4byte gUnknown_0858AC58, 4
.4byte gUnknown_0858AC90, 4
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858B4E8, 4
.4byte gUnknown_0858ACB0, 2
.4byte gUnknown_0858ACC0, 6
.4byte gUnknown_0858ACF0, 2
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858AD00, 2
.4byte gUnknown_0858B280, 3
.4byte gUnknown_0858B298, 5
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858AD10, 3
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858AD28, 3
.4byte gUnknown_0858AD40, 3
.4byte gUnknown_0858AD58, 3
.4byte gUnknown_0858AD70, 3
.4byte gUnknown_0858AD88, 3
.4byte gUnknown_0858ADA0, 3
.4byte gUnknown_0858ADB8, 3
.4byte gUnknown_0858ADD0, 3
.4byte gUnknown_0858ADE8, 3
.4byte gUnknown_0858AE00, 3
.4byte gUnknown_0858AE18, 3
.4byte gUnknown_0858AE30, 3
.4byte gUnknown_0858AE48, 3
.4byte gUnknown_0858AE60, 3
.4byte gUnknown_0858AE78, 3
.4byte gUnknown_0858AE90, 3
.4byte gUnknown_0858AEA8, 3
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858AEC0, 4
.4byte gUnknown_0858AEE0, 4
.4byte gUnknown_0858AF00, 4
.4byte gUnknown_0858AF20, 2
.4byte gUnknown_0858AF30, 3
.4byte gUnknown_0858AF48, 8
.4byte gUnknown_0858AF88, 4
.4byte gUnknown_0858AFD8, 3
.4byte gUnknown_0858AFF0, 2
.4byte gUnknown_0858B758, 1
.4byte gUnknown_0858B000, 3
.4byte gUnknown_0858B018, 3
.4byte gUnknown_0858B030, 2
.4byte gUnknown_0858AFA8, 6
.4byte gUnknown_0858B040, 2
.4byte gUnknown_0858B050, 6
.4byte gUnknown_0858B080, 2
.4byte gUnknown_0858B090, 2
.4byte gUnknown_0858B0A0, 3
.4byte gUnknown_0858B0B8, 2
.4byte gUnknown_0858B0C8, 3
.4byte gUnknown_0858B0E0, 3
.4byte gUnknown_0858B0F8, 4
.4byte gUnknown_0858B118, 2
.4byte gUnknown_0858B128, 3
.4byte gUnknown_0858B140, 3
.4byte gUnknown_0858B158, 4
.4byte gUnknown_0858B178, 3
.4byte gUnknown_0858B190, 4
.4byte gUnknown_0858B1B0, 4
.4byte gUnknown_0858B1D0, 5
.4byte gUnknown_0858B1F8, 6
.4byte gUnknown_0858B308, 3
.4byte gUnknown_0858B308, 3
.4byte gUnknown_0858B260, 4
.4byte gUnknown_0858B260, 4
.4byte gUnknown_0858B2C0, 4
.4byte gUnknown_0858B2E0, 5
.4byte gUnknown_0858B320, 3
.4byte gUnknown_0858B338, 3
.4byte gUnknown_0858B350, 5
.4byte gUnknown_0858B378, 3
.4byte gUnknown_0858B390, 4
.4byte gUnknown_0858B3B0, 3
.4byte gUnknown_0858B3C8, 8
.4byte gUnknown_0858B408, 4
.4byte gUnknown_0858B250, 2
.4byte gUnknown_0858B428, 3
.4byte gUnknown_0858B440, 3
.4byte gUnknown_0858B458, 3
.4byte gUnknown_0858B470, 4
.4byte gUnknown_0858B490, 3
.4byte gUnknown_0858B4A8, 2
.4byte gUnknown_0858B4B8, 6
.4byte gUnknown_0858B508, 5
.4byte gUnknown_0858B530, 5
.4byte gUnknown_0858B558, 4
.4byte gUnknown_0858B578, 6
.4byte gUnknown_0858B5A8, 6
.4byte gUnknown_0858B5D8, 5
.4byte gUnknown_0858B600, 4
.4byte gUnknown_0858B620, 4
.4byte gUnknown_0858B640, 3
.4byte gUnknown_0858B658, 3
.4byte gUnknown_0858B670, 2
.4byte gUnknown_0858B228, 5
.4byte gUnknown_0858B680, 2
.4byte gUnknown_0858B690, 4
.4byte gUnknown_0858B6B0, 4
.4byte gUnknown_0858B6D0, 6
.4byte gUnknown_0858B700, 6
.4byte gUnknown_0858B730, 5
gUnknown_0858BAF0:: @ 858BAF0
.4byte gText_Cool
.4byte gText_Beauty
.4byte gText_Cute
.4byte gText_Smart
.4byte gText_Tough
.4byte gText_Normal
.4byte gText_Super
.4byte gText_Hyper
.4byte gText_Master
.4byte gText_Cool2
.4byte gText_Beauty2
.4byte gText_Cute2
.4byte gText_Smart2
.4byte gText_Tough2
.4byte gText_Items
.4byte gText_Key_Items
.4byte gText_Poke_Balls
.4byte gText_TMs_Hms
.4byte gText_Berries2
.4byte gText_Single2
.4byte gText_Double2
.4byte gText_Multi
.4byte gText_MultiLink
.4byte gText_BattleTower2
.4byte gText_BattleDome
.4byte gText_BattleFactory
.4byte gText_BattlePalace
.4byte gText_BattleArena
.4byte gText_BattlePike
.4byte gText_BattlePyramid
gUnknown_0858BB68:: @ 858BB68
.byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F
.align 2
gUnknown_0858BB70:: @ 858BB70
.4byte gText_SomeonesPC
.4byte gText_LanettesPC
.4byte gText_PlayersPC
.4byte gText_LogOff
gUnknown_0858BB80:: @ 858BB80
.4byte gText_SlateportCity
.4byte gText_BattleFrontier
.4byte gText_SouthernIsland
.4byte gText_NavelRock
.4byte gText_BirthIsland
.4byte gText_FarawayIsland
.4byte gText_Exit
gUnknown_0858BB9C:: @ 858BB9C
.4byte OldaleTown_PokemonCenter_2F_Text_277F1B
.4byte OldaleTown_PokemonCenter_2F_Text_277F5A
.4byte OldaleTown_PokemonCenter_2F_Text_277F96
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
gUnknown_0858BBAC:: @ 858BBAC
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
.4byte OldaleTown_PokemonCenter_2F_Text_278831
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
gUnknown_0858BBBC:: @ 858BBBC
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
.4byte OldaleTown_PokemonCenter_2F_Text_2787FC
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
gUnknown_0858BBCC:: @ 858BBCC
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
.4byte OldaleTown_PokemonCenter_2F_Text_278831
.4byte OldaleTown_PokemonCenter_2F_Text_2787FC
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
gUnknown_0858BBE0:: @ 858BBE0
.4byte OldaleTown_PokemonCenter_2F_Text_277F1B
.4byte OldaleTown_PokemonCenter_2F_Text_277F5A
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
gUnknown_0858BBEC:: @ 858BBEC
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
data/specials.inc
+6 -6
View File
@@ -242,12 +242,12 @@ gSpecials:: @ 81DBA64
def_special FinishCyclingRoadChallenge
def_special UpdateCyclingRoadState
def_special GetLeadMonFriendshipScore
def_special sub_81A1780
def_special CallFrontierUtilFunc
def_special sub_8161F74
def_special CallBattleDomeFunction
def_special sub_8195960
def_special sub_8165360
def_special sub_8163AC4
def_special CopyEReaderTrainerGreeting
def_special DoSpecialTrainerBattle
def_special sub_81A5238
def_special sub_81A5E74
def_special sub_81A703C
@@ -332,7 +332,7 @@ gSpecials:: @ 81DBA64
def_special sp13F_fall_to_last_warp
def_special sub_80F8D28
def_special sub_80F8EB8
def_special sub_8162794
def_special SetEReaderTrainerGfxId
def_special BattleSetup_StartLatiBattle
def_special SetRoute119Weather
def_special SetRoute123Weather
@@ -448,8 +448,8 @@ gSpecials:: @ 81DBA64
def_special sub_80F90DC
def_special sub_80F910C
def_special sub_80F9160
def_special sub_81A4AA0
def_special sub_81A4AE8
def_special ShowRankingHallRecordsWindow
def_special ScrollRankingHallRecordsWindow
def_special sub_8139F20
def_special sub_80F9134
def_special sub_80F9154
data/use_pokeblock.s
+2
View File
@@ -2,6 +2,8 @@
.include "constants/constants.inc"
.section .rodata
.align 4
gUnknown_085DFA60:: @ 85DFA60
.incbin "graphics/interface/85DFA60.bin"
include/apprentice.h
+2 -1
View File
@@ -9,7 +9,8 @@ struct ApprenticeTrainer
u16 otId;
u8 facilityClass;
u16 species[APPRENTICE_SPECIES_COUNT];
u8 rest[14];
u8 id;
u16 easyChatWords[6];
};
extern const struct ApprenticeTrainer gApprentices[];
include/battle.h
+1
View File
@@ -561,6 +561,7 @@ struct BattleScripting
u8 field_23;
u8 windowsType; // 0 - normal, 1 - battle arena
u8 multiplayerId;
u8 specialTrainerBattleType;
};
// rom_80A5C6C
include/battle_anim.h
+51 -3
View File
@@ -1,6 +1,9 @@
#ifndef GUARD_BATTLE_ANIM_H
#define GUARD_BATTLE_ANIM_H
#include "battle.h"
#include "constants/battle_anim.h"
enum
{
BG_ANIM_SCREEN_SIZE,
@@ -24,9 +27,9 @@ struct UnknownAnimStruct2
struct BattleAnimBackground
{
void *image;
void *palette;
void *tilemap;
const u32 *image;
const u32 *palette;
const u32 *tilemap;
};
#define ANIM_ARGS_COUNT 8
@@ -126,4 +129,49 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId);
u8 GetBattlerSpriteFinal_Y(u8, u16, u8);
extern const struct OamData gUnknown_08524944;
extern const struct OamData gUnknown_08524A8C;
extern const struct OamData gUnknown_08524904;
extern const struct OamData gUnknown_085249C4;
extern const struct OamData gUnknown_0852490C;
extern const struct OamData gUnknown_08524934;
extern const struct OamData gUnknown_08524974;
extern const struct OamData gUnknown_0852499C;
extern const struct OamData gUnknown_085249CC;
extern const struct OamData gUnknown_08524914;
extern const struct OamData gUnknown_0852496C;
extern const struct OamData gUnknown_08524A34;
extern const struct OamData gUnknown_08524A3C;
extern const struct OamData gUnknown_08524A94;
extern const struct OamData gUnknown_08524954;
extern const struct OamData gUnknown_08524AE4;
extern const struct OamData gUnknown_085249D4;
extern const struct OamData gUnknown_08524A9C;
extern const struct OamData gUnknown_08524ADC;
extern const struct OamData gUnknown_08524B14;
extern const struct OamData gUnknown_08524A54;
extern const struct OamData gUnknown_08524A14;
extern const struct OamData gUnknown_08524A1C;
extern const struct OamData gUnknown_085249BC;
extern const struct OamData gUnknown_08524AF4;
extern const struct OamData gUnknown_085249DC;
extern const struct OamData gUnknown_08524AFC;
extern const struct OamData gUnknown_08524B1C;
extern const struct OamData gUnknown_08524A04;
extern const struct OamData gUnknown_08524A2C;
extern const struct OamData gUnknown_08524AEC;
extern const struct OamData gUnknown_08524964;
extern const struct OamData gUnknown_08524B24;
extern const struct OamData gUnknown_08524A24;
extern const struct OamData gUnknown_08524AC4;
extern const struct OamData gUnknown_08524A84;
extern const struct OamData gUnknown_08524A64;
extern const struct OamData gUnknown_0852491C;
extern const struct OamData gUnknown_0852495C;
extern const struct OamData gUnknown_0852497C;
extern const struct OamData gUnknown_085249F4;
extern const struct OamData gUnknown_0852493C;
extern const struct OamData gUnknown_08524A5C;
extern const struct OamData gUnknown_08524A74;
#endif // GUARD_BATTLE_ANIM_H
include/battle_dome.h
+1 -1
View File
@@ -3,7 +3,7 @@
extern u32 gUnknown_0203CD70;
s32 GetTrainerMonCountInBits(u16 tournamentTrainerId);
s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId);
s32 TrainerIdToDomeTournamentId(u16 trainerId);
#endif // GUARD_BATTLE_DOME_H
include/battle_frontier_1.h
-6
View File
@@ -1,6 +0,0 @@
#ifndef GUARD_BATTLE_FRONTIER_1_H
#define GUARD_BATTLE_FRONTIER_1_H
bool32 sub_8196034(void);
#endif // GUARD_BATTLE_FRONTIER_1_H
include/battle_frontier_2.h
-18
View File
@@ -1,18 +0,0 @@
#ifndef GUARD_BATTLE_FRONTIER_2_H
#define GUARD_BATTLE_FRONTIER_2_H
#define FRONTIER_BEFORE_TEXT 0
#define FRONTIER_WIN_TEXT 1
#define FRONTIER_LOSE_TEXT 2
void CopyFrontierTrainerText(u8 whichText, u16 trainerId);
void sub_81A8934(u8);
void sub_81A895C(void);
u16 sub_81A89A0(u8);
void sub_81A8AF8(void);
bool8 InBattlePike(void);
void sub_81AA078(u16*, u8);
void sub_81A4C30(void);
bool8 sub_81A6BF4(void);
#endif // GUARD_BATTLE_FRONTIER_2_H
include/battle_tower.h
+46 -26
View File
@@ -3,35 +3,25 @@
struct RSBattleTowerRecord
{
/*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100
/*0x01*/ u8 trainerClass;
/*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100
/*0x01*/ u8 facilityClass;
/*0x02*/ u16 winStreak;
/*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
/*0x0C*/ u8 trainerId[4];
/*0x10*/ struct {
u16 easyChat[6];
} greeting;
/*0x10*/ u16 greeting[6];
/*0x1C*/ struct UnknownPokemonStruct party[3];
/*0xA0*/ u32 checksum;
/*0xA4*/ u16 unk_11c8;
};
union BattleTowerRecord
{
struct RSBattleTowerRecord ruby_sapphire;
struct EmeraldBattleTowerRecord emerald;
};
#define FRONTIER_TRAINER_NAME_LENGTH 7
struct BattleFrontierTrainer
{
u32 facilityClass;
u8 trainerName[FRONTIER_TRAINER_NAME_LENGTH + 1];
u8 facilityClass;
u8 filler1[3];
u8 trainerName[PLAYER_NAME_LENGTH + 1];
u16 speechBefore[6];
u16 speechWin[6];
u16 speechLose[6];
const u16 *btMonPool;
const u16 *bfMonPool;
};
struct FacilityMon
@@ -43,17 +33,47 @@ struct FacilityMon
u8 nature;
};
extern const u8 gTowerMaleFacilityClasses[30];
extern const u8 gTowerMaleTrainerGfxIds[30];
extern const u8 gTowerFemaleFacilityClasses[20];
extern const u8 gTowerFemaleTrainerGfxIds[20];
extern const struct BattleFrontierTrainer *gFacilityTrainers;
extern const struct FacilityMon *gFacilityTrainerMons;
u16 sub_8164FCC(u8, u8);
void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1);
bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *);
void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *);
void sub_81628A0(union BattleTowerRecord *);
void sub_8162614(u16 trainerId, u8);
void ConvertBattleFrontierTrainerSpeechToString(const u16 *words);
void GetFrontierTrainerName(u8 *dest, u16 trainerIdx);
void GetEreaderTrainerName(u8 *dest);
void sub_8161F74(void);
u16 sub_8162548(u8 challengeNum, u8 battleNum);
void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId);
void SetEReaderTrainerGfxId(void);
u8 GetBattleFacilityTrainerGfxId(u16 trainerId);
void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm);
u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
u8 GetFrontierOpponentClass(u16 trainerId);
void GetFrontierTrainerName(u8 *dst, u16 trainerId);
void FillFrontierTrainerParty(u8 monsCount);
void FillFrontierTrainersParties(u8 monsCount);
u16 RandomizeFacilityTrainerMonId(u16 trainerId);
void FrontierSpeechToString(const u16 *words);
void DoSpecialTrainerBattle(void);
void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *record);
void CalcRubyBattleTowerChecksum(struct RSBattleTowerRecord *record);
u16 GetCurrentBattleTowerWinStreak(u8 lvlMode, u8 battleMode);
u8 GetEreaderTrainerFrontSpriteId(void);
u8 GetEreaderTrainerClassId(void);
void GetEreaderTrainerName(u8 *dst);
void ValidateEReaderTrainer(void);
void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer);
void CopyEReaderTrainerGreeting(void);
void sub_81653CC(void);
bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst);
bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, struct RSBattleTowerRecord *dst);
void CalcApprenticeChecksum(struct Apprentice *apprentice);
void GetBattleTowerTrainerLanguage(u8 *dst, u16 trainerId);
u8 SetFacilityPtrsGetLevel(void);
u8 GetFrontierEnemyMonLevel(u8 lvlMode);
s32 GetHighestLevelInPlayerParty(void);
u8 sub_81660B8(u8 facilityClass);
bool32 ValidateBattleTowerRecord(u8 recordId); // unused
void sub_8166188(void);
#endif //GUARD_BATTLE_TOWER_H
include/constants/battle_anim.h
+318 -299
View File
@@ -7,305 +7,295 @@
// Particle ids.
#define ANIM_SPRITES_START 10000
#define ANIM_TAG_BONE (ANIM_SPRITES_START + 0)
#define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1)
#define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2)
#define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3)
#define ANIM_TAG_004 (ANIM_SPRITES_START + 4) // ?
#define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5)
#define ANIM_TAG_SEED (ANIM_SPRITES_START + 6)
#define ANIM_TAG_007 (ANIM_SPRITES_START + 7) // ?
#define ANIM_TAG_008 (ANIM_SPRITES_START + 8) // ?
#define ANIM_TAG_GUST (ANIM_SPRITES_START + 9)
#define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10)
#define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11)
#define ANIM_TAG_012 (ANIM_SPRITES_START + 12) // ?
#define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13)
#define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14)
#define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15)
#define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16)
#define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17)
#define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18)
#define ANIM_TAG_019 (ANIM_SPRITES_START + 19) // ?
#define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20)
#define ANIM_TAG_021 (ANIM_SPRITES_START + 21) // ?
#define ANIM_TAG_022 (ANIM_SPRITES_START + 22) // ?
#define ANIM_TAG_023 (ANIM_SPRITES_START + 23) // ?
#define ANIM_TAG_024 (ANIM_SPRITES_START + 24) // ?
#define ANIM_TAG_025 (ANIM_SPRITES_START + 25) // ?
#define ANIM_TAG_026 (ANIM_SPRITES_START + 26) // ?
#define ANIM_TAG_GLARE (ANIM_SPRITES_START + 27)
#define ANIM_TAG_028 (ANIM_SPRITES_START + 28) // ?
#define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29)
#define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30)
#define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31)
#define ANIM_TAG_032 (ANIM_SPRITES_START + 32) // ?
#define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33)
#define ANIM_TAG_034 (ANIM_SPRITES_START + 34) // ?
#define ANIM_TAG_035 (ANIM_SPRITES_START + 35) // ?
#define ANIM_TAG_036 (ANIM_SPRITES_START + 36) // ?
#define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37)
#define ANIM_TAG_038 (ANIM_SPRITES_START + 38) // ?
#define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39)
#define ANIM_TAG_040 (ANIM_SPRITES_START + 40) // ?
#define ANIM_TAG_041 (ANIM_SPRITES_START + 41) // ?
#define ANIM_TAG_042 (ANIM_SPRITES_START + 42) // ?
#define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43)
#define ANIM_TAG_044 (ANIM_SPRITES_START + 44) // ?
#define ANIM_TAG_PINK_HEART (ANIM_SPRITES_START + 45) // ?
#define ANIM_TAG_046 (ANIM_SPRITES_START + 46) // ?
#define ANIM_TAG_047 (ANIM_SPRITES_START + 47) // ?
#define ANIM_TAG_048 (ANIM_SPRITES_START + 48) // ?
#define ANIM_TAG_SPARKLE (ANIM_SPRITES_START + 49)
#define ANIM_TAG_050 (ANIM_SPRITES_START + 50) // ?
#define ANIM_TAG_051 (ANIM_SPRITES_START + 51)
#define ANIM_TAG_052 (ANIM_SPRITES_START + 52)
#define ANIM_TAG_053 (ANIM_SPRITES_START + 53)
#define ANIM_TAG_054 (ANIM_SPRITES_START + 54)
#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55)
#define ANIM_TAG_056 (ANIM_SPRITES_START + 56)
#define ANIM_TAG_057 (ANIM_SPRITES_START + 57)
#define ANIM_TAG_058 (ANIM_SPRITES_START + 58)
#define ANIM_TAG_059 (ANIM_SPRITES_START + 59)
#define ANIM_TAG_060 (ANIM_SPRITES_START + 60)
#define ANIM_TAG_061 (ANIM_SPRITES_START + 61)
#define ANIM_TAG_062 (ANIM_SPRITES_START + 62)
#define ANIM_TAG_063 (ANIM_SPRITES_START + 63)
#define ANIM_TAG_064 (ANIM_SPRITES_START + 64)
#define ANIM_TAG_065 (ANIM_SPRITES_START + 65)
#define ANIM_TAG_066 (ANIM_SPRITES_START + 66)
#define ANIM_TAG_067 (ANIM_SPRITES_START + 67)
#define ANIM_TAG_068 (ANIM_SPRITES_START + 68)
#define ANIM_TAG_069 (ANIM_SPRITES_START + 69)
#define ANIM_TAG_070 (ANIM_SPRITES_START + 70)
#define ANIM_TAG_071 (ANIM_SPRITES_START + 71)
#define ANIM_TAG_MUSIC_NOTES2 (ANIM_SPRITES_START + 72)
#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73)
#define ANIM_TAG_074 (ANIM_SPRITES_START + 74)
#define ANIM_TAG_075 (ANIM_SPRITES_START + 75)
#define ANIM_TAG_076 (ANIM_SPRITES_START + 76)
#define ANIM_TAG_077 (ANIM_SPRITES_START + 77)
#define ANIM_TAG_078 (ANIM_SPRITES_START + 78)
#define ANIM_TAG_079 (ANIM_SPRITES_START + 79)
#define ANIM_TAG_080 (ANIM_SPRITES_START + 80)
#define ANIM_TAG_081 (ANIM_SPRITES_START + 81)
#define ANIM_TAG_082 (ANIM_SPRITES_START + 82)
#define ANIM_TAG_083 (ANIM_SPRITES_START + 83)
#define ANIM_TAG_084 (ANIM_SPRITES_START + 84)
#define ANIM_TAG_085 (ANIM_SPRITES_START + 85)
#define ANIM_TAG_086 (ANIM_SPRITES_START + 86)
#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87)
#define ANIM_TAG_088 (ANIM_SPRITES_START + 88)
#define ANIM_TAG_089 (ANIM_SPRITES_START + 89)
#define ANIM_TAG_090 (ANIM_SPRITES_START + 90)
#define ANIM_TAG_091 (ANIM_SPRITES_START + 91)
#define ANIM_TAG_092 (ANIM_SPRITES_START + 92)
#define ANIM_TAG_093 (ANIM_SPRITES_START + 93)
#define ANIM_TAG_094 (ANIM_SPRITES_START + 94)
#define ANIM_TAG_095 (ANIM_SPRITES_START + 95)
#define ANIM_TAG_096 (ANIM_SPRITES_START + 96)
#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97)
#define ANIM_TAG_098 (ANIM_SPRITES_START + 98)
#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99)
#define ANIM_TAG_100 (ANIM_SPRITES_START + 100)
#define ANIM_TAG_101 (ANIM_SPRITES_START + 101)
#define ANIM_TAG_102 (ANIM_SPRITES_START + 102)
#define ANIM_TAG_103 (ANIM_SPRITES_START + 103)
#define ANIM_TAG_104 (ANIM_SPRITES_START + 104)
#define ANIM_TAG_105 (ANIM_SPRITES_START + 105)
#define ANIM_TAG_106 (ANIM_SPRITES_START + 106)
#define ANIM_TAG_107 (ANIM_SPRITES_START + 107)
#define ANIM_TAG_108 (ANIM_SPRITES_START + 108)
#define ANIM_TAG_109 (ANIM_SPRITES_START + 109)
#define ANIM_TAG_110 (ANIM_SPRITES_START + 110)
#define ANIM_TAG_111 (ANIM_SPRITES_START + 111)
#define ANIM_TAG_112 (ANIM_SPRITES_START + 112)
#define ANIM_TAG_113 (ANIM_SPRITES_START + 113)
#define ANIM_TAG_114 (ANIM_SPRITES_START + 114)
#define ANIM_TAG_115 (ANIM_SPRITES_START + 115)
#define ANIM_TAG_116 (ANIM_SPRITES_START + 116)
#define ANIM_TAG_117 (ANIM_SPRITES_START + 117)
#define ANIM_TAG_118 (ANIM_SPRITES_START + 118)
#define ANIM_TAG_119 (ANIM_SPRITES_START + 119)
#define ANIM_TAG_ITEM_BAG2 (ANIM_SPRITES_START + 120)
#define ANIM_TAG_121 (ANIM_SPRITES_START + 121)
#define ANIM_TAG_122 (ANIM_SPRITES_START + 122)
#define ANIM_TAG_123 (ANIM_SPRITES_START + 123)
#define ANIM_TAG_124 (ANIM_SPRITES_START + 124)
#define ANIM_TAG_125 (ANIM_SPRITES_START + 125)
#define ANIM_TAG_126 (ANIM_SPRITES_START + 126)
#define ANIM_TAG_127 (ANIM_SPRITES_START + 127)
#define ANIM_TAG_128 (ANIM_SPRITES_START + 128)
#define ANIM_TAG_129 (ANIM_SPRITES_START + 129)
#define ANIM_TAG_130 (ANIM_SPRITES_START + 130)
#define ANIM_TAG_131 (ANIM_SPRITES_START + 131)
#define ANIM_TAG_132 (ANIM_SPRITES_START + 132)
#define ANIM_TAG_133 (ANIM_SPRITES_START + 133)
#define ANIM_TAG_134 (ANIM_SPRITES_START + 134)
#define ANIM_TAG_135 (ANIM_SPRITES_START + 135)
#define ANIM_TAG_136 (ANIM_SPRITES_START + 136)
#define ANIM_TAG_137 (ANIM_SPRITES_START + 137)
#define ANIM_TAG_138 (ANIM_SPRITES_START + 138)
#define ANIM_TAG_139 (ANIM_SPRITES_START + 139)
#define ANIM_TAG_140 (ANIM_SPRITES_START + 140)
#define ANIM_TAG_141 (ANIM_SPRITES_START + 141)
#define ANIM_TAG_142 (ANIM_SPRITES_START + 142)
#define ANIM_TAG_143 (ANIM_SPRITES_START + 143)
#define ANIM_TAG_144 (ANIM_SPRITES_START + 144)
#define ANIM_TAG_145 (ANIM_SPRITES_START + 145)
#define ANIM_TAG_146 (ANIM_SPRITES_START + 146)
#define ANIM_TAG_147 (ANIM_SPRITES_START + 147)
#define ANIM_TAG_148 (ANIM_SPRITES_START + 148)
#define ANIM_TAG_149 (ANIM_SPRITES_START + 149)
#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150)
#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151)
#define ANIM_TAG_152 (ANIM_SPRITES_START + 152)
#define ANIM_TAG_153 (ANIM_SPRITES_START + 153)
#define ANIM_TAG_154 (ANIM_SPRITES_START + 154)
#define ANIM_TAG_155 (ANIM_SPRITES_START + 155)
#define ANIM_TAG_156 (ANIM_SPRITES_START + 156)
#define ANIM_TAG_157 (ANIM_SPRITES_START + 157)
#define ANIM_TAG_158 (ANIM_SPRITES_START + 158)
#define ANIM_TAG_159 (ANIM_SPRITES_START + 159)
#define ANIM_TAG_160 (ANIM_SPRITES_START + 160)
#define ANIM_TAG_161 (ANIM_SPRITES_START + 161)
#define ANIM_TAG_162 (ANIM_SPRITES_START + 162)
#define ANIM_TAG_163 (ANIM_SPRITES_START + 163)
#define ANIM_TAG_164 (ANIM_SPRITES_START + 164)
#define ANIM_TAG_165 (ANIM_SPRITES_START + 165)
#define ANIM_TAG_166 (ANIM_SPRITES_START + 166)
#define ANIM_TAG_167 (ANIM_SPRITES_START + 167)
#define ANIM_TAG_168 (ANIM_SPRITES_START + 168)
#define ANIM_TAG_169 (ANIM_SPRITES_START + 169)
#define ANIM_TAG_170 (ANIM_SPRITES_START + 170)
#define ANIM_TAG_171 (ANIM_SPRITES_START + 171)
#define ANIM_TAG_172 (ANIM_SPRITES_START + 172)
#define ANIM_TAG_173 (ANIM_SPRITES_START + 173)
#define ANIM_TAG_174 (ANIM_SPRITES_START + 174)
#define ANIM_TAG_175 (ANIM_SPRITES_START + 175)
#define ANIM_TAG_176 (ANIM_SPRITES_START + 176)
#define ANIM_TAG_177 (ANIM_SPRITES_START + 177)
#define ANIM_TAG_178 (ANIM_SPRITES_START + 178)
#define ANIM_TAG_179 (ANIM_SPRITES_START + 179)
#define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180)
#define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181)
#define ANIM_TAG_182 (ANIM_SPRITES_START + 182)
#define ANIM_TAG_183 (ANIM_SPRITES_START + 183)
#define ANIM_TAG_184 (ANIM_SPRITES_START + 184)
#define ANIM_TAG_185 (ANIM_SPRITES_START + 185)
#define ANIM_TAG_186 (ANIM_SPRITES_START + 186)
#define ANIM_TAG_EYE (ANIM_SPRITES_START + 187)
#define ANIM_TAG_188 (ANIM_SPRITES_START + 188)
#define ANIM_TAG_189 (ANIM_SPRITES_START + 189)
#define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190)
#define ANIM_TAG_191 (ANIM_SPRITES_START + 191)
#define ANIM_TAG_192 (ANIM_SPRITES_START + 192)
#define ANIM_TAG_193 (ANIM_SPRITES_START + 193)
#define ANIM_TAG_MOON (ANIM_SPRITES_START + 194)
#define ANIM_TAG_GREEN_SPARKLE (ANIM_SPRITES_START + 195)
#define ANIM_TAG_196 (ANIM_SPRITES_START + 196)
#define ANIM_TAG_197 (ANIM_SPRITES_START + 197)
#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198)
#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199)
#define ANIM_TAG_200 (ANIM_SPRITES_START + 200)
#define ANIM_TAG_201 (ANIM_SPRITES_START + 201)
#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202)
#define ANIM_TAG_203 (ANIM_SPRITES_START + 203)
#define ANIM_TAG_204 (ANIM_SPRITES_START + 204)
#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205)
#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 206)
#define ANIM_TAG_207 (ANIM_SPRITES_START + 207)
#define ANIM_TAG_208 (ANIM_SPRITES_START + 208)
#define ANIM_TAG_209 (ANIM_SPRITES_START + 209)
#define ANIM_TAG_PURPLE_HEART (ANIM_SPRITES_START + 210)
#define ANIM_TAG_211 (ANIM_SPRITES_START + 211)
#define ANIM_TAG_212 (ANIM_SPRITES_START + 212)
#define ANIM_TAG_213 (ANIM_SPRITES_START + 213)
#define ANIM_TAG_214 (ANIM_SPRITES_START + 214)
#define ANIM_TAG_215 (ANIM_SPRITES_START + 215)
#define ANIM_TAG_216 (ANIM_SPRITES_START + 216)
#define ANIM_TAG_217 (ANIM_SPRITES_START + 217)
#define ANIM_TAG_218 (ANIM_SPRITES_START + 218)
#define ANIM_TAG_219 (ANIM_SPRITES_START + 219)
#define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220)
#define ANIM_TAG_EVIL_ANGEL (ANIM_SPRITES_START + 221)
#define ANIM_TAG_222 (ANIM_SPRITES_START + 222)
#define ANIM_TAG_223 (ANIM_SPRITES_START + 223)
#define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224)
#define ANIM_TAG_225 (ANIM_SPRITES_START + 225)
#define ANIM_TAG_226 (ANIM_SPRITES_START + 226)
#define ANIM_TAG_227 (ANIM_SPRITES_START + 227)
#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228)
#define ANIM_TAG_229 (ANIM_SPRITES_START + 229)
#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230)
#define ANIM_TAG_231 (ANIM_SPRITES_START + 231)
#define ANIM_TAG_232 (ANIM_SPRITES_START + 232)
#define ANIM_TAG_233 (ANIM_SPRITES_START + 233)
#define ANIM_TAG_234 (ANIM_SPRITES_START + 234)
#define ANIM_TAG_235 (ANIM_SPRITES_START + 235)
#define ANIM_TAG_236 (ANIM_SPRITES_START + 236)
#define ANIM_TAG_237 (ANIM_SPRITES_START + 237)
#define ANIM_TAG_238 (ANIM_SPRITES_START + 238)
#define ANIM_TAG_239 (ANIM_SPRITES_START + 239)
#define ANIM_TAG_240 (ANIM_SPRITES_START + 240)
#define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241)
#define ANIM_TAG_242 (ANIM_SPRITES_START + 242)
#define ANIM_TAG_243 (ANIM_SPRITES_START + 243)
#define ANIM_TAG_244 (ANIM_SPRITES_START + 244)
#define ANIM_TAG_245 (ANIM_SPRITES_START + 245)
#define ANIM_TAG_246 (ANIM_SPRITES_START + 246)
#define ANIM_TAG_HAND (ANIM_SPRITES_START + 247)
#define ANIM_TAG_248 (ANIM_SPRITES_START + 248)
#define ANIM_TAG_249 (ANIM_SPRITES_START + 249)
#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250)
#define ANIM_TAG_251 (ANIM_SPRITES_START + 251)
#define ANIM_TAG_252 (ANIM_SPRITES_START + 252)
#define ANIM_TAG_253 (ANIM_SPRITES_START + 253)
#define ANIM_TAG_254 (ANIM_SPRITES_START + 254)
#define ANIM_TAG_255 (ANIM_SPRITES_START + 255)
#define ANIM_TAG_256 (ANIM_SPRITES_START + 256)
#define ANIM_TAG_257 (ANIM_SPRITES_START + 257)
#define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258)
#define ANIM_TAG_259 (ANIM_SPRITES_START + 259)
#define ANIM_TAG_260 (ANIM_SPRITES_START + 260)
#define ANIM_TAG_261 (ANIM_SPRITES_START + 261)
#define ANIM_TAG_262 (ANIM_SPRITES_START + 262)
#define ANIM_TAG_263 (ANIM_SPRITES_START + 263)
#define ANIM_TAG_264 (ANIM_SPRITES_START + 264)
#define ANIM_TAG_265 (ANIM_SPRITES_START + 265)
#define ANIM_TAG_266 (ANIM_SPRITES_START + 266)
#define ANIM_TAG_267 (ANIM_SPRITES_START + 267)
#define ANIM_TAG_268 (ANIM_SPRITES_START + 268)
#define ANIM_TAG_269 (ANIM_SPRITES_START + 269)
#define ANIM_TAG_270 (ANIM_SPRITES_START + 270)
#define ANIM_TAG_271 (ANIM_SPRITES_START + 271)
#define ANIM_TAG_272 (ANIM_SPRITES_START + 272)
#define ANIM_TAG_273 (ANIM_SPRITES_START + 273)
#define ANIM_TAG_274 (ANIM_SPRITES_START + 274)
#define ANIM_TAG_275 (ANIM_SPRITES_START + 275)
#define ANIM_TAG_276 (ANIM_SPRITES_START + 276)
#define ANIM_TAG_277 (ANIM_SPRITES_START + 277)
#define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278)
#define ANIM_TAG_279 (ANIM_SPRITES_START + 279)
#define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280)
#define ANIM_TAG_281 (ANIM_SPRITES_START + 281)
#define ANIM_TAG_282 (ANIM_SPRITES_START + 282)
#define ANIM_TAG_283 (ANIM_SPRITES_START + 283)
#define ANIM_TAG_284 (ANIM_SPRITES_START + 284)
#define ANIM_TAG_285 (ANIM_SPRITES_START + 285)
#define ANIM_TAG_286 (ANIM_SPRITES_START + 286)
#define ANIM_TAG_287 (ANIM_SPRITES_START + 287)
#define ANIM_TAG_288 (ANIM_SPRITES_START + 288)
#define ANIM_TAG_289 (ANIM_SPRITES_START + 289)
#define ANIM_TAG_290 (ANIM_SPRITES_START + 290)
#define ANIM_TAG_291 (ANIM_SPRITES_START + 291)
#define ANIM_TAG_292 (ANIM_SPRITES_START + 292)
#define ANIM_TAG_293 (ANIM_SPRITES_START + 293)
#define ANIM_TAG_294 (ANIM_SPRITES_START + 294)
#define ANIM_TAG_295 (ANIM_SPRITES_START + 295)
#define ANIM_TAG_296 (ANIM_SPRITES_START + 296)
#define ANIM_TAG_297 (ANIM_SPRITES_START + 297)
#define ANIM_TAG_298 (ANIM_SPRITES_START + 298)
#define ANIM_TAG_BONE (ANIM_SPRITES_START + 0)
#define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1)
#define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2)
#define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3)
#define ANIM_TAG_UNUSED_ORB (ANIM_SPRITES_START + 4)
#define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5)
#define ANIM_TAG_SEED (ANIM_SPRITES_START + 6)
#define ANIM_TAG_UNUSED_EXPLOSION (ANIM_SPRITES_START + 7)
#define ANIM_TAG_UNUSED_PINK_ORB (ANIM_SPRITES_START + 8)
#define ANIM_TAG_GUST (ANIM_SPRITES_START + 9)
#define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10)
#define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11)
#define ANIM_TAG_UNUSED_ORANGE (ANIM_SPRITES_START + 12)
#define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13)
#define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14)
#define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15)
#define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16)
#define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17)
#define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18)
#define ANIM_TAG_UNUSED_GLASS (ANIM_SPRITES_START + 19)
#define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20)
#define ANIM_TAG_UNUSED_HIT (ANIM_SPRITES_START + 21)
#define ANIM_TAG_UNUSED_HIT_2 (ANIM_SPRITES_START + 22)
#define ANIM_TAG_UNUSED_BLUE_SHARDS (ANIM_SPRITES_START + 23)
#define ANIM_TAG_UNUSED_CLOSING_EYE (ANIM_SPRITES_START + 24)
#define ANIM_TAG_UNUSED_WAVING_HAND (ANIM_SPRITES_START + 25)
#define ANIM_TAG_UNUSED_HIT_DUPLICATE (ANIM_SPRITES_START + 26)
#define ANIM_TAG_LEER (ANIM_SPRITES_START + 27)
#define ANIM_TAG_UNUSED_BLUE_BURST (ANIM_SPRITES_START + 28)
#define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29)
#define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30)
#define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31)
#define ANIM_TAG_UNUSED_BUBBLE_BURST (ANIM_SPRITES_START + 32)
#define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33)
#define ANIM_TAG_UNUSED_SPINNING_FIRE (ANIM_SPRITES_START + 34)
#define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35)
#define ANIM_TAG_UNUSED_LIGHTNING (ANIM_SPRITES_START + 36)
#define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37)
#define ANIM_TAG_UNUSED_CLAW_SLASH (ANIM_SPRITES_START + 38)
#define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39)
#define ANIM_TAG_UNUSED_SCRATCH (ANIM_SPRITES_START + 40)
#define ANIM_TAG_UNUSED_SCRATCH_2 (ANIM_SPRITES_START + 41)
#define ANIM_TAG_UNUSED_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42)
#define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43)
#define ANIM_TAG_UNUSED_GLASS_2 (ANIM_SPRITES_START + 44)
#define ANIM_TAG_UNUSED_PINK_HEART (ANIM_SPRITES_START + 45)
#define ANIM_TAG_UNUSED_SAP_DRIP (ANIM_SPRITES_START + 46)
#define ANIM_TAG_UNUSED_SAP_DRIP_2 (ANIM_SPRITES_START + 47)
#define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48)
#define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49)
#define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50)
#define ANIM_TAG_UNUSED_MONSTER_FOOT (ANIM_SPRITES_START + 51)
#define ANIM_TAG_UNUSED_HUMANOID_HAND (ANIM_SPRITES_START + 52)
#define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53)
#define ANIM_TAG_UNUSED_YELLOW_UNK (ANIM_SPRITES_START + 54)
#define ANIM_TAG_UNUSED_RED_FIST (ANIM_SPRITES_START + 55)
#define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56)
#define ANIM_TAG_UNUSED_RING (ANIM_SPRITES_START + 57)
#define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58)
#define ANIM_TAG_UNUSED_Z (ANIM_SPRITES_START + 59)
#define ANIM_TAG_UNUSED_YELLOW_UNK_2 (ANIM_SPRITES_START + 60)
#define ANIM_TAG_UNUSED_AIR_SLASH (ANIM_SPRITES_START + 61)
#define ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62)
#define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63)
#define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64)
#define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65)
#define ANIM_TAG_UNUSED_BROWN_TRIANGLE (ANIM_SPRITES_START + 66)
#define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67)
#define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68)
#define ANIM_TAG_UNUSED_POWDER (ANIM_SPRITES_START + 69)
#define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70)
#define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71)
#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72)
#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73)
#define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74)
#define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75)
#define ANIM_TAG_UNUSED_BLUE_FLAMES (ANIM_SPRITES_START + 76)
#define ANIM_TAG_UNUSED_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77)
#define ANIM_TAG_UNUSED_SHOCK (ANIM_SPRITES_START + 78)
#define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79)
#define ANIM_TAG_UNUSED_BELL (ANIM_SPRITES_START + 80)
#define ANIM_TAG_UNUSED_PINK_GLOVE (ANIM_SPRITES_START + 81)
#define ANIM_TAG_UNUSED_BLUE_LINES (ANIM_SPRITES_START + 82)
#define ANIM_TAG_UNUSED_IMPACT (ANIM_SPRITES_START + 83)
#define ANIM_TAG_UNUSED_IMPACT_2 (ANIM_SPRITES_START + 84)
#define ANIM_TAG_UNUSED_RETICLE (ANIM_SPRITES_START + 85)
#define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86)
#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87)
#define ANIM_TAG_UNUSED_SNOWBALL (ANIM_SPRITES_START + 88)
#define ANIM_TAG_UNUSED_VINE (ANIM_SPRITES_START + 89)
#define ANIM_TAG_UNUSED_SWORD (ANIM_SPRITES_START + 90)
#define ANIM_TAG_UNUSED_CLAPPING (ANIM_SPRITES_START + 91)
#define ANIM_TAG_UNUSED_RED_TUBE (ANIM_SPRITES_START + 92)
#define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93)
#define ANIM_TAG_UNUSED_STRING (ANIM_SPRITES_START + 94)
#define ANIM_TAG_UNUSED_PENCIL (ANIM_SPRITES_START + 95)
#define ANIM_TAG_UNUSED_PETAL (ANIM_SPRITES_START + 96)
#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97)
#define ANIM_TAG_UNUSED_WEB (ANIM_SPRITES_START + 98)
#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99)
#define ANIM_TAG_COIN (ANIM_SPRITES_START + 100)
#define ANIM_TAG_UNUSED_CRACKED_EGG (ANIM_SPRITES_START + 101)
#define ANIM_TAG_UNUSED_HATCHED_EGG (ANIM_SPRITES_START + 102)
#define ANIM_TAG_UNUSED_FRESH_EGG (ANIM_SPRITES_START + 103)
#define ANIM_TAG_UNUSED_FANGS (ANIM_SPRITES_START + 104)
#define ANIM_TAG_UNUSED_EXPLOSION_2 (ANIM_SPRITES_START + 105)
#define ANIM_TAG_UNUSED_EXPLOSION_3 (ANIM_SPRITES_START + 106)
#define ANIM_TAG_UNUSED_WATER_DROPLET (ANIM_SPRITES_START + 107)
#define ANIM_TAG_UNUSED_WATER_DROPLET_2 (ANIM_SPRITES_START + 108)
#define ANIM_TAG_UNUSED_SEED (ANIM_SPRITES_START + 109)
#define ANIM_TAG_UNUSED_SPROUT (ANIM_SPRITES_START + 110)
#define ANIM_TAG_UNUSED_RED_WAND (ANIM_SPRITES_START + 111)
#define ANIM_TAG_UNUSED_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112)
#define ANIM_TAG_UNUSED_WATER_COLUMN (ANIM_SPRITES_START + 113)
#define ANIM_TAG_UNUSED_MUD_UNK (ANIM_SPRITES_START + 114)
#define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115)
#define ANIM_TAG_UNUSED_FURY_SWIPES (ANIM_SPRITES_START + 116)
#define ANIM_TAG_UNUSED_VINE_2 (ANIM_SPRITES_START + 117)
#define ANIM_TAG_UNUSED_TEETH (ANIM_SPRITES_START + 118)
#define ANIM_TAG_UNUSED_BONE (ANIM_SPRITES_START + 119)
#define ANIM_TAG_UNUSED_WHITE_BAG (ANIM_SPRITES_START + 120)
#define ANIM_TAG_UNUSED_UNKNOWN (ANIM_SPRITES_START + 121)
#define ANIM_TAG_UNUSED_PURPLE_CORAL (ANIM_SPRITES_START + 122)
#define ANIM_TAG_UNUSED_PURPLE_DROPLET (ANIM_SPRITES_START + 123)
#define ANIM_TAG_UNUSED_SHOCK_2 (ANIM_SPRITES_START + 124)
#define ANIM_TAG_UNUSED_CLOSING_EYE_2 (ANIM_SPRITES_START + 125)
#define ANIM_TAG_UNUSED_METAL_BALL (ANIM_SPRITES_START + 126)
#define ANIM_TAG_UNUSED_MONSTER_DOLL (ANIM_SPRITES_START + 127)
#define ANIM_TAG_UNUSED_WHIRLWIND (ANIM_SPRITES_START + 128)
#define ANIM_TAG_UNUSED_WHIRLWIND_2 (ANIM_SPRITES_START + 129)
#define ANIM_TAG_UNUSED_EXPLOSION_4 (ANIM_SPRITES_START + 130)
#define ANIM_TAG_UNUSED_EXPLOSION_5 (ANIM_SPRITES_START + 131)
#define ANIM_TAG_UNUSED_TONGUE (ANIM_SPRITES_START + 132)
#define ANIM_TAG_UNUSED_SMOKE (ANIM_SPRITES_START + 133)
#define ANIM_TAG_UNUSED_SMOKE_2 (ANIM_SPRITES_START + 134)
#define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135)
#define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136)
#define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137)
#define ANIM_TAG_CUT (ANIM_SPRITES_START + 138)
#define ANIM_TAG_SHARP_TEETH (ANIM_SPRITES_START + 139)
#define ANIM_TAG_RAINBOW_RINGS (ANIM_SPRITES_START + 140)
#define ANIM_TAG_ICE_CRYSTALS (ANIM_SPRITES_START + 141)
#define ANIM_TAG_ICE_SPIKES (ANIM_SPRITES_START + 142)
#define ANIM_TAG_HANDS_AND_FEET (ANIM_SPRITES_START + 143)
#define ANIM_TAG_MIST_CLOUD (ANIM_SPRITES_START + 144)
#define ANIM_TAG_CLAMP (ANIM_SPRITES_START + 145)
#define ANIM_TAG_BUBBLE (ANIM_SPRITES_START + 146)
#define ANIM_TAG_ORBS (ANIM_SPRITES_START + 147)
#define ANIM_TAG_WATER_IMPACT (ANIM_SPRITES_START + 148)
#define ANIM_TAG_WATER_ORB (ANIM_SPRITES_START + 149)
#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150)
#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151)
#define ANIM_TAG_SPIKES (ANIM_SPRITES_START + 152)
#define ANIM_TAG_HORN_HIT_2 (ANIM_SPRITES_START + 153)
#define ANIM_TAG_AIR_WAVE_2 (ANIM_SPRITES_START + 154)
#define ANIM_TAG_SMALL_BUBBLES (ANIM_SPRITES_START + 155)
#define ANIM_TAG_ROUND_SHADOW (ANIM_SPRITES_START + 156)
#define ANIM_TAG_SUNLIGHT (ANIM_SPRITES_START + 157)
#define ANIM_TAG_SPORE (ANIM_SPRITES_START + 158)
#define ANIM_TAG_FLOWER (ANIM_SPRITES_START + 159)
#define ANIM_TAG_RAZOR_LEAF (ANIM_SPRITES_START + 160)
#define ANIM_TAG_NEEDLE (ANIM_SPRITES_START + 161)
#define ANIM_TAG_WHIRLWIND_LINES (ANIM_SPRITES_START + 162)
#define ANIM_TAG_GOLD_RING (ANIM_SPRITES_START + 163)
#define ANIM_TAG_PURPLE_RING (ANIM_SPRITES_START + 164)
#define ANIM_TAG_BLUE_RING (ANIM_SPRITES_START + 165)
#define ANIM_TAG_GREEN_LIGHT_WALL (ANIM_SPRITES_START + 166)
#define ANIM_TAG_BLUE_LIGHT_WALL (ANIM_SPRITES_START + 167)
#define ANIM_TAG_RED_LIGHT_WALL (ANIM_SPRITES_START + 168)
#define ANIM_TAG_GRAY_LIGHT_WALL (ANIM_SPRITES_START + 169)
#define ANIM_TAG_ORANGE_LIGHT_WALL (ANIM_SPRITES_START + 170)
#define ANIM_TAG_BLACK_BALL_2 (ANIM_SPRITES_START + 171)
#define ANIM_TAG_PURPLE_GAS_CLOUD (ANIM_SPRITES_START + 172)
#define ANIM_TAG_SPARK_H (ANIM_SPRITES_START + 173)
#define ANIM_TAG_YELLOW_STAR (ANIM_SPRITES_START + 174)
#define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175)
#define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176)
#define ANIM_TAG_LICK (ANIM_SPRITES_START + 177)
#define ANIM_TAG_UNUSED_VOID_LINES (ANIM_SPRITES_START + 178)
#define ANIM_TAG_STRING (ANIM_SPRITES_START + 179)
#define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180)
#define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181)
#define ANIM_TAG_UNUSED_LIGHTBULB (ANIM_SPRITES_START + 182)
#define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183)
#define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184)
#define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185)
#define ANIM_TAG_TENDRILS (ANIM_SPRITES_START + 186)
#define ANIM_TAG_EYE (ANIM_SPRITES_START + 187)
#define ANIM_TAG_WHITE_SHADOW (ANIM_SPRITES_START + 188)
#define ANIM_TAG_TEAL_ALERT (ANIM_SPRITES_START + 189)
#define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190)
#define ANIM_TAG_ROUND_WHITE_HALO (ANIM_SPRITES_START + 191)
#define ANIM_TAG_FANG_ATTACK (ANIM_SPRITES_START + 192)
#define ANIM_TAG_PURPLE_HAND_OUTLINE (ANIM_SPRITES_START + 193)
#define ANIM_TAG_MOON (ANIM_SPRITES_START + 194)
#define ANIM_TAG_GREEN_SPARKLE (ANIM_SPRITES_START + 195)
#define ANIM_TAG_SPIRAL (ANIM_SPRITES_START + 196)
#define ANIM_TAG_SNORE_Z (ANIM_SPRITES_START + 197)
#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198)
#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199)
#define ANIM_TAG_GHOSTLY_SPIRIT (ANIM_SPRITES_START + 200)
#define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201)
#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202)
#define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203)
#define ANIM_TAG_UNUSED_PUNCH_IMPACT (ANIM_SPRITES_START + 204)
#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205)
#define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206)
#define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207)
#define ANIM_TAG_TORN_METAL (ANIM_SPRITES_START + 208)
#define ANIM_TAG_THOUGHT_BUBBLE (ANIM_SPRITES_START + 209)
#define ANIM_TAG_MAGENTA_HEART (ANIM_SPRITES_START + 210)
#define ANIM_TAG_ELECTRIC_ORBS (ANIM_SPRITES_START + 211)
#define ANIM_TAG_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 212)
#define ANIM_TAG_ELECTRICITY (ANIM_SPRITES_START + 213)
#define ANIM_TAG_FINGER_2 (ANIM_SPRITES_START + 214)
#define ANIM_TAG_MOVEMENT_WAVES (ANIM_SPRITES_START + 215)
#define ANIM_TAG_RED_HEART (ANIM_SPRITES_START + 216)
#define ANIM_TAG_RED_ORB (ANIM_SPRITES_START + 217)
#define ANIM_TAG_EYE_SPARKLE (ANIM_SPRITES_START + 218)
#define ANIM_TAG_PINK_HEART (ANIM_SPRITES_START + 219)
#define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220)
#define ANIM_TAG_DEVIL (ANIM_SPRITES_START + 221)
#define ANIM_TAG_SWIPE (ANIM_SPRITES_START + 222)
#define ANIM_TAG_ROOTS (ANIM_SPRITES_START + 223)
#define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224)
#define ANIM_TAG_JAGGED_MUSIC_NOTE (ANIM_SPRITES_START + 225)
#define ANIM_TAG_POKEBALL (ANIM_SPRITES_START + 226)
#define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227)
#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228)
#define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229)
#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230)
#define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231)
#define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232)
#define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233)
#define ANIM_TAG_ECLIPSING_ORB (ANIM_SPRITES_START + 234)
#define ANIM_TAG_GRAY_ORB (ANIM_SPRITES_START + 235)
#define ANIM_TAG_BLUE_ORB (ANIM_SPRITES_START + 236)
#define ANIM_TAG_RED_ORB_2 (ANIM_SPRITES_START + 237)
#define ANIM_TAG_PINK_PETAL (ANIM_SPRITES_START + 238)
#define ANIM_TAG_PAIN_SPLIT (ANIM_SPRITES_START + 239)
#define ANIM_TAG_CONFETTI (ANIM_SPRITES_START + 240)
#define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241)
#define ANIM_TAG_PINK_CLOUD (ANIM_SPRITES_START + 242)
#define ANIM_TAG_SWEAT_DROP (ANIM_SPRITES_START + 243)
#define ANIM_TAG_GUARD_RING (ANIM_SPRITES_START + 244)
#define ANIM_TAG_PURPLE_SCRATCH (ANIM_SPRITES_START + 245)
#define ANIM_TAG_PURPLE_SWIPE (ANIM_SPRITES_START + 246)
#define ANIM_TAG_TAG_HAND (ANIM_SPRITES_START + 247)
#define ANIM_TAG_SMALL_RED_EYE (ANIM_SPRITES_START + 248)
#define ANIM_TAG_HOLLOW_ORB (ANIM_SPRITES_START + 249)
#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250)
#define ANIM_TAG_BLUEGREEN_ORB (ANIM_SPRITES_START + 251)
#define ANIM_TAG_PAW_PRINT (ANIM_SPRITES_START + 252)
#define ANIM_TAG_PURPLE_FLAME (ANIM_SPRITES_START + 253)
#define ANIM_TAG_RED_BALL (ANIM_SPRITES_START + 254)
#define ANIM_TAG_SMELLINGSALT_EFFECT (ANIM_SPRITES_START + 255)
#define ANIM_TAG_METEOR (ANIM_SPRITES_START + 256)
#define ANIM_TAG_FLAT_ROCK (ANIM_SPRITES_START + 257)
#define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258)
#define ANIM_TAG_BROWN_ORB (ANIM_SPRITES_START + 259)
#define ANIM_TAG_METAL_SOUND_WAVES (ANIM_SPRITES_START + 260)
#define ANIM_TAG_FLYING_DIRT (ANIM_SPRITES_START + 261)
#define ANIM_TAG_ICICLE_SPEAR (ANIM_SPRITES_START + 262)
#define ANIM_TAG_HAIL (ANIM_SPRITES_START + 263)
#define ANIM_TAG_GLOWY_RED_ORB (ANIM_SPRITES_START + 264)
#define ANIM_TAG_GLOWY_GREEN_ORB (ANIM_SPRITES_START + 265)
#define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266)
#define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267)
#define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268)
#define ANIM_TAG_UNUSED_RED_BRICK (ANIM_SPRITES_START + 269)
#define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270)
#define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271)
#define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272)
#define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273)
#define ANIM_TAG_UNUSED_GEM_1 (ANIM_SPRITES_START + 274)
#define ANIM_TAG_UNUSED_GEM_2 (ANIM_SPRITES_START + 275)
#define ANIM_TAG_UNUSED_GEM_3 (ANIM_SPRITES_START + 276)
#define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277)
#define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278)
#define ANIM_TAG_UNUSED_RED_PARTICLES (ANIM_SPRITES_START + 279)
#define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280)
#define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281)
#define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282)
#define ANIM_TAG_WEATHER_BALL (ANIM_SPRITES_START + 283)
#define ANIM_TAG_BIRD (ANIM_SPRITES_START + 284)
#define ANIM_TAG_CROSS_IMPACT (ANIM_SPRITES_START + 285)
#define ANIM_TAG_SLASH_2 (ANIM_SPRITES_START + 286)
#define ANIM_TAG_WHIP_HIT (ANIM_SPRITES_START + 287)
#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288)
// battlers
#define ANIM_ATTACKER 0
@@ -420,4 +410,33 @@
#define ANIM_WEATHER_SANDSTORM 3
#define ANIM_WEATHER_HAIL 4
// Battle mon back animations.
#define BACK_ANIM_NONE 0x00
#define BACK_ANIM_H_SLIDE_QUICK 0x01
#define BACK_ANIM_H_SLIDE 0x02
#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_1 0x03
#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_2 0x04
#define BACK_ANIM_SHRINK_GROW_1 0x05
#define BACK_ANIM_GROW_1 0x06
#define BACK_ANIM_CIRCLE_MOVE_COUNTERCLOCKWISE 0x07
#define BACK_ANIM_HORIZONTAL_SHAKE 0x08
#define BACK_ANIM_VERTICAL_SHAKE 0x09
#define BACK_ANIM_V_SHAKE_WITH_H_SLIDE 0x0a
#define BACK_ANIM_VERTICAL_STRETCH 0x0b
#define BACK_ANIM_HORIZONTAL_STRETCH 0x0c
#define BACK_ANIM_GROW_2 0x0d
#define BACK_ANIM_V_SHAKE_WITH_PAUSE 0x0e
#define BACK_ANIM_CIRCLE_MOVE_CLOCKWISE 0x0f
#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_SMALL 0x10
#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_LARGE 0x11
#define BACK_ANIM_CONCAVE_UP_ARC_SWAY_LARGE 0x12
#define BACK_ANIM_DIP_RIGHT_SIDE 0x13
#define BACK_ANIM_SHRINK_GROW_2 0x14
#define BACK_ANIM_JOLT_RIGHT 0x15
#define BACK_ANIM_FLASH_YELLOW_WITH_SHAKE 0x16
#define BACK_ANIM_FADE_RED_WITH_SHAKE 0x17
#define BACK_ANIM_FADE_GREEN_WITH_SHAKE 0x18
#define BACK_ANIM_FADE_BLUE_WITH_SHAKE 0x19
#endif // GUARD_CONSTANTS_BATTLE_ANIM_H
include/constants/battle_frontier.h
+20
View File
@@ -10,6 +10,10 @@
#define FRONTIER_FACILITY_PIKE 5
#define FRONTIER_FACILITY_PYRAMID 6
#define TENT_VERDANTURF 2
#define TENT_FALLARBOR 3
#define TENT_SLATEPORT 4
// Battle Frontier lvl modes.
#define FRONTIER_LVL_50 0
#define FRONTIER_LVL_OPEN 1
@@ -21,4 +25,20 @@
#define FRONTIER_MODE_MULTIS 2
#define FRONTIER_MODE_LINK_MULTIS 3
// Special trainer battles.
#define SPECIAL_BATTLE_TOWER 0
#define SPECIAL_BATTLE_SECRET_BASE 1
#define SPECIAL_BATTLE_EREADER 2
#define SPECIAL_BATTLE_DOME 3
#define SPECIAL_BATTLE_PALACE 4
#define SPECIAL_BATTLE_ARENA 5
#define SPECIAL_BATTLE_FACTORY 6
#define SPECIAL_BATTLE_PIKE_SINGLE 7
#define SPECIAL_BATTLE_STEVEN 8
#define SPECIAL_BATTLE_PIKE_DOUBLE 9
#define SPECIAL_BATTLE_PYRAMID 10
// For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special.
#define RESULTS_LINK_CONTEST 7
#endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H
include/constants/battle_script_commands.h
+4 -3
View File
@@ -11,9 +11,9 @@
#define sB_ANIM_ARG2 gBattleScripting + 0x11
#define sTRIPLE_KICK_POWER gBattleScripting + 0x12
#define sMOVEEND_STATE gBattleScripting + 0x14
#define sBANK_WITH_ABILITY gBattleScripting + 0x15
#define sBATTLER_WITH_ABILITY gBattleScripting + 0x15
#define sMULTIHIT_EFFECT gBattleScripting + 0x16
#define sBANK gBattleScripting + 0x17
#define sBATTLER gBattleScripting + 0x17
#define sB_ANIM_TURN gBattleScripting + 0x18
#define sB_ANIM_TARGETS_HIT gBattleScripting + 0x19
#define sSTATCHANGER gBattleScripting + 0x1A
@@ -26,8 +26,9 @@
#define sRESHOW_MAIN_STATE gBattleScripting + 0x21
#define sRESHOW_HELPER_STATE gBattleScripting + 0x22
#define sFIELD_23 gBattleScripting + 0x23
#define sFIELD_24 gBattleScripting + 0x24
#define sWINDOWS_TYPE gBattleScripting + 0x24
#define sMULTIPLAYER_ID gBattleScripting + 0x25
#define sSPECIAL_TRAINER_BATTLE_TYPE gBattleScripting + 0x26
#define cEFFECT_CHOOSER gBattleCommunication + 3
#define cMULTISTRING_CHOOSER gBattleCommunication + 5
include/constants/trainers.h
+9 -6
View File
@@ -4,12 +4,15 @@
#include "constants/opponents.h"
// Special Trainer Ids.
#define TRAINER_FRONTIER_BRAIN 1022
#define TRAINER_PLAYER 1023
#define TRAINER_SECRET_BASE 1024
#define TRAINER_LINK_OPPONENT 2048
#define TRAINER_OPPONENT_C00 3072
#define TRAINER_STEVEN_PARTNER 3075
#define TRAINER_RECORD_MIXING_FRIEND 300
#define TRAINER_RECORD_MIXING_APPRENTICE 400
#define TRAINER_EREADER 500
#define TRAINER_FRONTIER_BRAIN 1022
#define TRAINER_PLAYER 1023
#define TRAINER_SECRET_BASE 1024
#define TRAINER_LINK_OPPONENT 2048
#define TRAINER_OPPONENT_C00 3072
#define TRAINER_STEVEN_PARTNER 3075
#define TRAINER_PIC_HIKER 0
#define TRAINER_PIC_AQUA_GRUNT_M 1
include/decompress.h
+3 -3
View File
@@ -5,8 +5,8 @@
extern u8 gDecompressionBuffer[0x4000];
void LZDecompressWram(const void *src, void *dest);
void LZDecompressVram(const void *src, void *dest);
void LZDecompressWram(const u32 *src, void *dest);
void LZDecompressVram(const u32 *src, void *dest);
u16 LoadCompressedObjectPic(const struct CompressedSpriteSheet *src);
void LoadCompressedObjectPicOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer);
@@ -28,6 +28,6 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32
void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);
void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);
u32 GetDecompressedDataSize(const u8 *ptr);
u32 GetDecompressedDataSize(const u32 *ptr);
#endif // GUARD_DECOMPRESS_H
include/field_effect.h
+2
View File
@@ -237,5 +237,7 @@ void sub_80B7CAC(struct Sprite*);
void sub_80B7A58(struct Sprite*);
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority);
#endif //GUARD_FIELD_EFFECTS_H

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