summaryrefslogtreecommitdiff
path: root/battle
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-04-10 14:42:14 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-04-10 14:42:14 -0400
commitbf73772a560ddfdf0b404ba3f85eb26542031b7b (patch)
treeee3cbc2fb2be1b2353ebd4c9887de2d69a91d2f2 /battle
parent46ead9b8498fe7191735bd99f667dd1f9147f969 (diff)
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
Diffstat (limited to 'battle')
-rw-r--r--battle/ai/items.asm8
-rwxr-xr-xbattle/ai/move.asm26
-rw-r--r--battle/ai/scoring.asm90
-rwxr-xr-xbattle/ai/switch.asm2
-rw-r--r--battle/anims.asm22
-rw-r--r--battle/bg_effects.asm86
-rw-r--r--battle/core.asm190
-rw-r--r--battle/effect_commands.asm186
-rw-r--r--battle/effects/metronome.asm2
-rwxr-xr-xbattle/effects/present.asm2
-rw-r--r--battle/misc.asm26
-rwxr-xr-xbattle/objects/framesets.asm1482
-rwxr-xr-xbattle/objects/functions.asm8
-rwxr-xr-xbattle/objects/oam.asm2172
-rwxr-xr-xbattle/used_move_text.asm4
15 files changed, 2153 insertions, 2153 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm
index c7c8f8201..90bfb840d 100644
--- a/battle/ai/items.asm
+++ b/battle/ai/items.asm
@@ -318,7 +318,7 @@ AI_Items: ; 39196
jp c, .Use
jp .DontUse
-.StatusCheckContext
+.StatusCheckContext:
ld a, [EnemySubStatus5]
bit SUBSTATUS_TOXIC, a
jr z, .FailToxicCheck
@@ -328,7 +328,7 @@ AI_Items: ; 39196
call Random
cp 1 + 50 percent
jp c, .Use
-.FailToxicCheck
+.FailToxicCheck:
ld a, [EnemyMonStatus]
and 1 << FRZ | SLP
jp z, .DontUse
@@ -344,7 +344,7 @@ AI_Items: ; 39196
call .Status
jp c, .DontUse
-.UseFullRestore
+.UseFullRestore:
call EnemyUsedFullRestore
jp .Use
; 38220
@@ -676,7 +676,7 @@ AI_TrySwitch: ; 3844b
ld c, a
ld hl, OTPartyMon1HP
ld d, 0
-.SwitchLoop
+.SwitchLoop:
ld a, [hli]
ld b, a
ld a, [hld]
diff --git a/battle/ai/move.asm b/battle/ai/move.asm
index eb6a0536d..0d1c6c968 100755
--- a/battle/ai/move.asm
+++ b/battle/ai/move.asm
@@ -31,24 +31,24 @@ endr
ld hl, EnemyMonMoves
ld c, 0
-.CheckDisabledMove
+.CheckDisabledMove:
cp [hl]
jr z, .ScoreDisabledMove
inc c
inc hl
jr .CheckDisabledMove
-.ScoreDisabledMove
+.ScoreDisabledMove:
ld hl, Buffer1
ld b, 0
add hl, bc
ld [hl], 80
; Don't pick moves with 0 PP.
-.CheckPP
+.CheckPP:
ld hl, Buffer1 - 1
ld de, EnemyMonPP
ld b, 0
-.CheckMovePP
+.CheckMovePP:
inc b
ld a, b
cp EnemyMonMovesEnd - EnemyMonMoves + 1
@@ -63,7 +63,7 @@ endr
; Apply AI scoring layers depending on the trainer class.
-.ApplyLayers
+.ApplyLayers:
ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS
; If we have a battle in BattleTower just load the Attributes of the first TrainerClass (Falkner)
@@ -82,7 +82,7 @@ endr
push bc
push hl
-.CheckLayer
+.CheckLayer:
pop hl
pop bc
@@ -119,12 +119,12 @@ endr
jr .CheckLayer
; Decrement the scores of all moves one by one until one reaches 0.
-.DecrementScores
+.DecrementScores:
ld hl, Buffer1
ld de, EnemyMonMoves
ld c, EnemyMonMovesEnd - EnemyMonMoves
-.DecrementNextScore
+.DecrementNextScore:
; If the enemy has no moves, this will infinite.
ld a, [de]
inc de
@@ -145,7 +145,7 @@ endr
; In order to avoid bias towards the moves located first in memory, increment the scores
; that were decremented one more time than the rest (in case there was a tie).
; This means that the minimum score will be 1.
-.PickLowestScoreMoves
+.PickLowestScoreMoves:
ld a, c
.move_loop
@@ -159,14 +159,14 @@ endr
ld de, EnemyMonMoves
ld c, NUM_MOVES
-; Give a score of 0 to a blank move
+; Give a score of 0 to a blank move
.loop2
ld a, [de]
and a
jr nz, .skip_load
ld [hl], a
-; Disregard the move if its score is not 1
+; Disregard the move if its score is not 1
.skip_load
ld a, [hl]
dec a
@@ -183,8 +183,8 @@ endr
dec c
jr nz, .loop2
-; Randomly choose one of the moves with a score of 1
-.ChooseMove
+; Randomly choose one of the moves with a score of 1
+.ChooseMove:
ld hl, Buffer1
call Random
and 3
diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm
index e9df9c62a..9b8dd6e42 100644
--- a/battle/ai/scoring.asm
+++ b/battle/ai/scoring.asm
@@ -23,7 +23,7 @@ AI_Basic: ; 38591
; Dismiss moves with special effects if they are
; useless or not a good choice right now.
-; For example, healing moves, weather moves, Dream Eater...
+; For example, healing moves, weather moves, Dream Eater...
push hl
push de
push bc
@@ -33,7 +33,7 @@ AI_Basic: ; 38591
pop hl
jr nz, .discourage
-; Dismiss status-only moves if the player can't be statused.
+; Dismiss status-only moves if the player can't be statused.
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
push hl
push de
@@ -680,7 +680,7 @@ rept 2
inc [hl]
endr
-; 30% chance to end up here if enemy's HP is full and player is not badly poisoned.
+; 30% chance to end up here if enemy's HP is full and player is not badly poisoned.
; 77% chance to end up here if enemy's HP is above 50% but not full.
; 96% chance to end up here if enemy's HP is between 25% and 50%.
; 100% chance to end up here if enemy's HP is below 25%.
@@ -771,7 +771,7 @@ AI_Smart_MirrorMove: ; 3895b
jr nz, .asm_38968
; ...do nothing if enemy is slower than player
- call AICompareSpeed
+ call AICompareSpeed
ret nc
; ...or dismiss this move if enemy is faster than player.
@@ -784,7 +784,7 @@ AI_Smart_MirrorMove: ; 3895b
ld de, 1
call IsInArray
pop hl
-
+
; ...do nothing if he didn't use a useful move.
ret nc
@@ -813,11 +813,11 @@ AI_Smart_AccuracyDown: ; 38985
call AICheckPlayerMaxHP
jr nc, .asm_389a0
-; ...and enemy's HP is above 50%...
+; ...and enemy's HP is above 50%...
call AICheckEnemyHalfHP
jr nc, .asm_389a0
-; ...greatly encourage this move if player is badly poisoned.
+; ...greatly encourage this move if player is badly poisoned.
ld a, [PlayerSubStatus5]
bit SUBSTATUS_TOXIC, a
jr nz, .asm_3899d
@@ -839,21 +839,21 @@ endr
call AICheckPlayerQuarterHP
jr nc, .asm_389bd
-; If player's HP is above 25% but not full, 4% chance to greatly encourage this move.
+; If player's HP is above 25% but not full, 4% chance to greatly encourage this move.
call Random
cp $a
jr c, .asm_3899d
-; If player's HP is between 25% and 50%,...
+; If player's HP is between 25% and 50%,...
call AICheckPlayerHalfHP
jr nc, .asm_389b8
-; If player's HP is above 50% but not full, 20% chance to greatly encourage this move.
+; If player's HP is above 50% but not full, 20% chance to greatly encourage this move.
call AI_80_20
jr c, .asm_3899d
jr .asm_389bf
-; ...50% chance to greatly discourage this move.
+; ...50% chance to greatly discourage this move.
.asm_389b8
call AI_50_50
jr c, .asm_389bf
@@ -863,7 +863,7 @@ rept 2
inc [hl]
endr
-; We only end up here if the move has not been already encouraged.
+; We only end up here if the move has not been already encouraged.
.asm_389bf
ld a, [PlayerSubStatus5]
bit SUBSTATUS_TOXIC, a
@@ -873,14 +873,14 @@ endr
bit SUBSTATUS_LEECH_SEED, a
jr nz, .asm_389ef
-; Discourage this move if enemy's evasion level is higher than player's accuracy level.
+; Discourage this move if enemy's evasion level is higher than player's accuracy level.
ld a, [EnemyEvaLevel]
ld b, a
ld a, [PlayerAccLevel]
cp b
jr c, .asm_389e4
-; Greatly encourage this move if the player is in the middle of Fury Cutter or Rollout.
+; Greatly encourage this move if the player is in the middle of Fury Cutter or Rollout.
ld a, [PlayerFuryCutterCount]
and a
jr nz, .asm_3899d
@@ -895,7 +895,7 @@ endr
; Player is badly poisoned.
; 80% chance to greatly encourage this move.
-; This would counter any previous discouragement.
+; This would counter any previous discouragement.
.asm_389e6
call Random
cp $50
@@ -907,7 +907,7 @@ endr
; Player is seeded.
; 50% chance to encourage this move.
-; This would partly counter any previous discouragement.
+; This would partly counter any previous discouragement.
.asm_389ef
call AI_50_50
ret c
@@ -931,7 +931,7 @@ AI_Smart_Haze: ; 389f5
jr c, .asm_38a12
jr .asm_389fb
-; 85% chance to encourage this move if any of player's stat levels is higher than +2.
+; 85% chance to encourage this move if any of player's stat levels is higher than +2.
.asm_38a05
ld hl, PlayerAtkLevel
ld c, $8
@@ -1164,7 +1164,7 @@ AI_Smart_Confuse: ; 38adb
cp $19
jr c, .asm_38ae7
inc [hl]
-
+
.asm_38ae7
; Discourage again if player's HP is below 25%.
call AICheckPlayerQuarterHP
@@ -1220,10 +1220,10 @@ AI_Smart_Fly: ; 38b12
ld a, [PlayerSubStatus3]
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
ret z
-
+
call AICompareSpeed
ret nc
-
+
rept 3
dec [hl]
endr
@@ -1246,9 +1246,9 @@ AI_Smart_Paralyze: ; 38b26
; 50% chance to discourage this move if player's HP is below 25%.
call AICheckPlayerQuarterHP
jr nc, .asm_38b3a
-
+
; 80% chance to greatly encourage this move
-; if enemy is slower than player and its HP is above 25%.
+; if enemy is slower than player and its HP is above 25%.
call AICompareSpeed
ret c
call AICheckEnemyQuarterHP
@@ -1308,8 +1308,8 @@ AI_Smart_Substitute: ; 38b5c
AI_Smart_HyperBeam: ; 38b63
call AICheckEnemyHalfHP
jr c, .asm_38b72
-
-; 50% chance to encourage this move if enemy's HP is below 25%.
+
+; 50% chance to encourage this move if enemy's HP is below 25%.
call AICheckEnemyQuarterHP
ret c
call AI_50_50
@@ -1335,13 +1335,13 @@ AI_Smart_Rage: ; 38b7f
bit SUBSTATUS_RAGE, a
jr z, .asm_38b9b
-; If enemy's Rage is building, 50% chance to encourage this move.
+; If enemy's Rage is building, 50% chance to encourage this move.
call AI_50_50
jr c, .asm_38b8c
dec [hl]
-; Encourage this move based on Rage's counter.
+; Encourage this move based on Rage's counter.
.asm_38b8c
ld a, [wEnemyRageCounter]
cp $2
@@ -1773,12 +1773,12 @@ AI_Smart_PriorityHit: ; 38d5a
call AICompareSpeed
ret c
-; Dismiss this move if the player is flying or underground.
+; Dismiss this move if the player is flying or underground.
ld a, [PlayerSubStatus3]
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
jp nz, AIDiscourageMove
-; Greatly encourage this move if it will KO the player.
+; Greatly encourage this move if it will KO the player.
ld a, $1
ld [hBattleTurn], a
push hl
@@ -1895,18 +1895,18 @@ AI_Smart_MeanLook: ; 38dfb
pop hl
jp z, AIDiscourageMove
-; 80% chance to greatly encourage this move if the enemy is badly poisoned (weird).
+; 80% chance to greatly encourage this move if the enemy is badly poisoned (weird).
ld a, [EnemySubStatus5]
bit SUBSTATUS_TOXIC, a
jr nz, .asm_38e26
; 80% chance to greatly encourage this move if the player is either
-; in love, identified, stuck in Rollout, or has a Nightmare.
+; in love, identified, stuck in Rollout, or has a Nightmare.
ld a, [PlayerSubStatus1]
and 1<<SUBSTATUS_IN_LOVE | 1<<SUBSTATUS_ROLLOUT | 1<<SUBSTATUS_IDENTIFIED | 1<<SUBSTATUS_NIGHTMARE
jr nz, .asm_38e26
-; Otherwise, discourage this move unless the player only has not very effective moves against the enemy.
+; Otherwise, discourage this move unless the player only has not very effective moves against the enemy.
push hl
callab CheckPlayerMoveTypeMatchups
ld a, [wEnemyAISwitchScore]
@@ -2233,7 +2233,7 @@ AI_Smart_Sandstorm: ; 38f7a
inc [hl]
ret
-.SandstormImmuneTypes
+.SandstormImmuneTypes:
db ROCK
db GROUND
db STEEL
@@ -2493,7 +2493,7 @@ AI_Smart_HiddenPower: ; 3909e
push hl
ld a, 1
ld [hBattleTurn], a
-
+
; Calculate Hidden Power's type and base power based on enemy's DVs.
callab HiddenPowerDamage
callab BattleCheckTypeMatchup
@@ -2697,7 +2697,7 @@ AI_Smart_PsychUp: ; 39152
jr nz, .asm_3915a
; Calculate the sum of all player's stat level modifiers. Add 100 first to prevent underflow.
-; Put the result in d. d will range between 58 and 142.
+; Put the result in d. d will range between 58 and 142.
ld hl, PlayerAtkLevel
ld b, $8
ld d, 100
@@ -2716,12 +2716,12 @@ AI_Smart_PsychUp: ; 39152
pop hl
jr nc, .asm_39188
-; Else, 80% chance to encourage this move unless player's accuracy level is lower than -1...
+; Else, 80% chance to encourage this move unless player's accuracy level is lower than -1...
ld a, [PlayerAccLevel]
cp $6
ret c
-
-; ...or enemy's evasion level is higher than +0.
+
+; ...or enemy's evasion level is higher than +0.
ld a, [EnemyEvaLevel]
cp $8
ret nc
@@ -2825,7 +2825,7 @@ rept 2
endr
ret
-; Try to predict if the player will use Fly this turn.
+; Try to predict if the player will use Fly this turn.
.couldFly
; 50% chance to encourage this move if the enemy is slower than the player.
@@ -3175,10 +3175,10 @@ AI_Opportunist: ; 39315
call AICheckEnemyHalfHP
ret c
-; Discourage stall moves if enemy's HP is below 25%.
+; Discourage stall moves if enemy's HP is below 25%.
call AICheckEnemyQuarterHP
jr nc, .asm_39322
-
+
; 50% chance to discourage stall moves if enemy's HP is between 25% and 50%.
call AI_50_50
ret c
@@ -3333,12 +3333,12 @@ AI_Aggressive: ; 39369
; Ignore this move if its power is 0 or 1.
; Moves such as Seismic Toss, Hidden Power,
-; Counter and Fissure have a base power of 1.
+; Counter and Fissure have a base power of 1.
ld a, [wEnemyMoveStruct + MOVE_POWER]
cp 2
jr c, .checkmove2
-; Ignore this move if it is reckless.
+; Ignore this move if it is reckless.
push hl
push de
push bc
@@ -3351,7 +3351,7 @@ AI_Aggressive: ; 39369
pop hl
jr c, .checkmove2
-; If we made it this far, discourage this move.
+; If we made it this far, discourage this move.
inc [hl]
jr .checkmove2
@@ -3384,7 +3384,7 @@ AIDamageCalc: ; 393e7
callab BattleCommand_Stab
ret
-.ConstantDamageEffects
+.ConstantDamageEffects:
db EFFECT_SUPER_FANG
db EFFECT_STATIC_DAMAGE
db EFFECT_LEVEL_DAMAGE
@@ -3550,7 +3550,7 @@ AI_Risky: ; 394a9
call AICheckEnemyMaxHP
jr c, .nextmove
-; Else, 80% chance to exclude them.
+; Else, 80% chance to exclude them.
call Random
cp 200 ; 1/5
jr c, .nextmove
diff --git a/battle/ai/switch.asm b/battle/ai/switch.asm
index 8209d8f2a..8f5db7a54 100755
--- a/battle/ai/switch.asm
+++ b/battle/ai/switch.asm
@@ -161,7 +161,7 @@ endr
.doubledown
call .DecreaseScore
-
+
; fallthrough
; 34931
diff --git a/battle/anims.asm b/battle/anims.asm
index 66ae9ff1b..3d7525ec5 100644
--- a/battle/anims.asm
+++ b/battle/anims.asm
@@ -321,7 +321,7 @@ BattleAnim_ThrowPokeBall
anim_jump .Shake
; c92f2
-.TheTrainerBlockedTheBall
+.TheTrainerBlockedTheBall:
anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_HIT
anim_sound 6, 2, SFX_THROW_BALL
anim_obj ANIM_OBJ_16, 8, 0, 11, 4, $20
@@ -331,7 +331,7 @@ BattleAnim_ThrowPokeBall
anim_ret
; c9305
-.UltraBall
+.UltraBall:
anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
anim_sound 6, 2, SFX_THROW_BALL
anim_obj ANIM_OBJ_POKE_BALL, 8, 4, 11, 4, $40
@@ -345,7 +345,7 @@ BattleAnim_ThrowPokeBall
anim_jump .Shake
; c9326
-.GreatBall
+.GreatBall:
anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
anim_sound 6, 2, SFX_THROW_BALL
anim_obj ANIM_OBJ_POKE_BALL, 8, 4, 11, 4, $40
@@ -359,7 +359,7 @@ BattleAnim_ThrowPokeBall
anim_jump .Shake
; c9347
-.MasterBall
+.MasterBall:
anim_3gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE, ANIM_GFX_SPEED
anim_sound 6, 2, SFX_THROW_BALL
anim_obj ANIM_OBJ_POKE_BALL, 8, 0, 11, 4, $20
@@ -380,7 +380,7 @@ BattleAnim_ThrowPokeBall
anim_obj ANIM_OBJ_2B, -15, 0, 7, 0, $36
anim_obj ANIM_OBJ_2B, -15, 0, 7, 0, $37
anim_wait 64
-.Shake
+.Shake:
anim_bgeffect ANIM_BG_RETURN_MON, $0, $0, $0
anim_wait 8
anim_incobj 2
@@ -394,7 +394,7 @@ BattleAnim_ThrowPokeBall
anim_wait 32
anim_wait 8
anim_setvar $0
-.Loop
+.Loop:
anim_wait 48
anim_checkpokeball
anim_jumpvar $1, .Click
@@ -404,12 +404,12 @@ BattleAnim_ThrowPokeBall
anim_jump .Loop
; c93bc
-.Click
+.Click:
anim_clearsprites
anim_ret
; c93be
-.BreakFree
+.BreakFree:
anim_setobj $1, $b
anim_sound 0, 1, SFX_BALL_POOF
anim_obj ANIM_OBJ_1C, -15, 0, 8, 0, $10
@@ -434,7 +434,7 @@ BattleAnim_SendOutMon: ; c93d1
anim_call BattleAnim_ShowMon_0
anim_ret
-.Unknown
+.Unknown:
anim_1gfx ANIM_GFX_SMOKE
anim_call BattleAnim_FollowEnemyFeet_0
anim_bgeffect ANIM_BG_2A, $0, $1, $0
@@ -449,7 +449,7 @@ BattleAnim_SendOutMon: ; c93d1
anim_call BattleAnim_ShowMon_0
anim_ret
-.Shiny
+.Shiny:
anim_1gfx ANIM_GFX_SPEED
anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $3
anim_bgeffect ANIM_BG_06, $0, $2, $0
@@ -479,7 +479,7 @@ BattleAnim_SendOutMon: ; c93d1
anim_wait 32
anim_ret
-.Normal
+.Normal:
anim_1gfx ANIM_GFX_SMOKE
anim_sound 0, 0, SFX_BALL_POOF
anim_obj ANIM_OBJ_1C, 5, 4, 12, 0, $0
diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm
index b03e3aea5..f2ddde3e0 100644
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -236,7 +236,7 @@ BattleBGEffect_WhiteHues: ; c812d (32:412d)
call EndBattleBGEffect
ret
-.Pals
+.Pals:
db %11100100
db %11100000
db %11010000
@@ -254,7 +254,7 @@ BattleBGEffect_BlackHues: ; c8141 (32:4141)
call EndBattleBGEffect
ret
-.Pals
+.Pals:
db %11100100
db %11110100
db %11111000
@@ -273,7 +273,7 @@ BattleBGEffect_AlternateHues: ; c8155 (32:4155)
call EndBattleBGEffect
ret
-.Pals
+.Pals:
db %11100100
db %11111000
db %11111100
@@ -298,12 +298,12 @@ BattleBGEffect_06: ; c8171 (32:4171)
ld [wOBP0], a
ret
-.PalsCGB
+.PalsCGB:
db %11100100
db %10010000
db -2
-.PalsSGB
+.PalsSGB:
db %11110000
db %11000000
db -2
@@ -322,12 +322,12 @@ BattleBGEffect_07: ; c818b (32:418b)
ld [wOBP0], a
ret
-.PalsCGB
+.PalsCGB:
db %11100100
db %11011000
db -2
-.PalsSGB
+.PalsSGB:
db %11110000
db %11001100
db -2
@@ -339,7 +339,7 @@ BattleBGEffect_08: ; c81a5 (32:41a5)
ld [wBGP], a
ret
-.Pals
+.Pals:
db %00011011
db %01100011
db %10000111
@@ -405,10 +405,10 @@ BattleBGEffect_ShowMon: ; c81ea (32:41ea)
call BattleBGEffect_RunPicResizeScript
ret
-.PlayerData
+.PlayerData:
db 0, $31, 0
db -1
-.EnemyData
+.EnemyData:
db 3, $00, 3
db -1
; c8214
@@ -670,12 +670,12 @@ BattleBGEffect_EnterMon: ; c837b (32:437b)
call BattleBGEffect_RunPicResizeScript
ret
-.PlayerData
+.PlayerData:
db 2, $31, 2
db 1, $31, 1
db 0, $31, 0
db -1
-.EnemyData
+.EnemyData:
db 5, $00, 5
db 4, $00, 4
db 3, $00, 3
@@ -698,7 +698,7 @@ BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
call BattleBGEffect_RunPicResizeScript
ret
-.PlayerData
+.PlayerData:
db 0, $31, 0
db -2, $66, 0
db 1, $31, 1
@@ -707,7 +707,7 @@ BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
db -2, $22, 2
db -3, $00, 0
db -1
-.EnemyData
+.EnemyData:
db 3, $00, 3
db -2, $77, 3
db 4, $00, 4
@@ -773,7 +773,7 @@ endr
call EndBattleBGEffect
ret
-.ClearBox
+.ClearBox:
; get dims
push bc
inc hl
@@ -798,7 +798,7 @@ endr
pop bc
ret
-.PlaceGraphic
+.PlaceGraphic:
; get dims
push bc
push hl
@@ -858,7 +858,7 @@ endr
pop bc
ret
-.Coords
+.Coords:
dwcoord 2, 6
dwcoord 3, 8
dwcoord 4, 10
@@ -866,7 +866,7 @@ endr
dwcoord 13, 2
dwcoord 14, 4
-.BGSquares
+.BGSquares:
bgsquare: MACRO
dn \1,\2
dw \3
@@ -879,7 +879,7 @@ endm
bgsquare 5, 5, .FiveByFive
bgsquare 3, 3, .ThreeByThree
-.SixBySix
+.SixBySix:
db $00, $06, $0c, $12, $18, $1e
db $01, $07, $0d, $13, $19, $1f
db $02, $08, $0e, $14, $1a, $20
@@ -887,17 +887,17 @@ endm
db $04, $0a, $10, $16, $1c, $22
db $05, $0b, $11, $17, $1d, $23
-.FourByFour
+.FourByFour:
db $00, $0c, $12, $1e
db $02, $0e, $14, $20
db $03, $0f, $15, $21
db $05, $11, $17, $23
-.TwoByTwo
+.TwoByTwo:
db $00, $1e
db $05, $23
-.SevenBySeven
+.SevenBySeven:
db $00, $07, $0e, $15, $1c, $23, $2a
db $01, $08, $0f, $16, $1d, $24, $2b
db $02, $09, $10, $17, $1e, $25, $2c
@@ -906,14 +906,14 @@ endm
db $05, $0c, $13, $1a, $21, $28, $2f
db $06, $0d, $14, $1b, $22, $29, $30
-.FiveByFive
+.FiveByFive:
db $00, $07, $15, $23, $2a
db $01, $08, $16, $24, $2b
db $03, $0a, $18, $26, $2d
db $05, $0c, $1a, $28, $2f
db $06, $0d, $1b, $29, $30
-.ThreeByThree
+.ThreeByThree:
db $00, $15, $2a
db $03, $18, $2d
db $06, $1b, $30
@@ -945,7 +945,7 @@ BattleBGEffect_Surf: ; c8545 (32:4545)
call BattleAnim_ResetLCDStatCustom
ret
-.RotatewSurfWaveBGEffect
+.RotatewSurfWaveBGEffect:
ld hl, wSurfWaveBGEffect
ld de, wSurfWaveBGEffect + 1
ld c, wSurfWaveBGEffectEnd - wSurfWaveBGEffect - 1
@@ -1218,7 +1218,7 @@ BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
.four
ret
-.UpdateLYOverrides
+.UpdateLYOverrides:
ld e, a
xor $ff
inc a
@@ -1893,7 +1893,7 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
call BattleBGEffects_IncrementJumptable
ret
-.SetLYOverridesBackup
+.SetLYOverridesBackup:
ld e, a
ld a, [hFFC7]
ld l, a
@@ -1913,7 +1913,7 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
call BattleBGEffects_ResetVideoHRAM
ret
-.GetLYOverride
+.GetLYOverride:
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
@@ -2042,7 +2042,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
ld [wOBP1], a
ret
-.DMG_LYOverrideLoads
+.DMG_LYOverrideLoads:
ld hl, LYOverridesBackup
.loop1
ld [hl], d
@@ -2061,7 +2061,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
call BatttleBGEffects_GetNamedJumptablePointer
jp [hl]
-.Jumptable
+.Jumptable:
dw .cgb_zero
dw .cgb_one
dw .cgb_two
@@ -2118,12 +2118,12 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
call EndBattleBGEffect
ret
-.CGB_DMGEnemyData
+.CGB_DMGEnemyData:
db $e4, $e4
db $f8, $90
db $fc, $40
db $f8, $90
-.DMG_PlayerData
+.DMG_PlayerData:
db $e4, $e4
db $90, $f8
db $40, $fc
@@ -2135,7 +2135,7 @@ BattleBGEffect_RapidFlash: ; c8be8 (32:4be8)
call BGEffect_RapidCyclePals
ret
-.FlashPals
+.FlashPals:
db $e4, $6c, $fe
; c8bf2
@@ -2144,7 +2144,7 @@ BattleBGEffect_16: ; c8bf2 (32:4bf2)
call BGEffect_RapidCyclePals
ret
-.Pals
+.Pals:
db $e4, $90, $40, $ff
; c8bfd
@@ -2153,7 +2153,7 @@ BattleBGEffect_17: ; c8bfd (32:4bfd)
call BGEffect_RapidCyclePals
ret
-.Pals
+.Pals:
db $e4, $f8, $fc, $ff
; c8c08
@@ -2162,7 +2162,7 @@ BattleBGEffect_18: ; c8c08 (32:4c08)
call BGEffect_RapidCyclePals
ret
-.Pals
+.Pals:
db $e4, $90, $40, $90, $fe
; c8c14
@@ -2171,7 +2171,7 @@ BattleBGEffect_19: ; c8c14 (32:4c14)
call BGEffect_RapidCyclePals
ret
-.Pals
+.Pals:
db $e4, $f8, $fc, $f8, $fe
; c8c20
@@ -2180,7 +2180,7 @@ BattleBGEffect_1a: ; c8c20 (32:4c20)
call BGEffect_RapidCyclePals
ret
-.Pals
+.Pals:
db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe
; c8c30
@@ -2189,7 +2189,7 @@ BattleBGEffect_1b: ; c8c30 (32:4c30)
call BGEffect_RapidCyclePals
ret
-.Pals
+.Pals:
db $e4, $fc, $e4, $00, $fe
; c8c3c
@@ -2198,7 +2198,7 @@ BattleBGEffect_1d: ; c8c3c (32:4c3c)
call BGEffect_RapidCyclePals
ret
-.Pals
+.Pals:
db $e4, $90, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $90, $e4, $ff
; c8c55
@@ -2207,7 +2207,7 @@ BattleBGEffect_1e: ; c8c55 (32:4c55)
call BGEffect_RapidCyclePals
ret
-.Pals
+.Pals:
db $00, $40, $90, $e4, $ff
; c8c61
@@ -2423,7 +2423,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
pop de
jp [hl]
-.Jumptable_DMG
+.Jumptable_DMG:
dw .zero_dmg
dw .one_dmg
dw .two_dmg
@@ -2836,7 +2836,7 @@ Functionc8f9a: ; c8f9a (32:4f9a)
and a
ret
-.GetLYOverrideBackupAddrOffset
+.GetLYOverrideBackupAddrOffset:
ld a, [hFFC7]
ld e, a
ld a, [wBattleAnimTemp0]
diff --git a/battle/core.asm b/battle/core.asm
index 34e43a9ab..4a8d37997 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -273,7 +273,7 @@ HandleBetweenTurnEffects: ; 3c1d6
ret c
jr .NoMoreFaintingConditions
-.CheckEnemyFirst
+.CheckEnemyFirst:
call CheckFaint_EnemyThenPlayer
ret c
call HandleFutureSight
@@ -289,7 +289,7 @@ HandleBetweenTurnEffects: ; 3c1d6
call CheckFaint_EnemyThenPlayer
ret c
-.NoMoreFaintingConditions
+.NoMoreFaintingConditions:
call HandleLeftovers
call HandleMysteryberry
call HanleDefrost
@@ -310,7 +310,7 @@ CheckFaint_PlayerThenEnemy: ; 3c23c
and a
jr nz, .BattleIsOver
-.PlayerNotFainted
+.PlayerNotFainted:
call HasEnemyFainted
jr nz, .BattleContinues
call HandleEnemyMonFaint
@@ -318,11 +318,11 @@ CheckFaint_PlayerThenEnemy: ; 3c23c
and a
jr nz, .BattleIsOver
-.BattleContinues
+.BattleContinues:
and a
ret
-.BattleIsOver
+.BattleIsOver:
scf
ret
; 3c25c
@@ -335,7 +335,7 @@ CheckFaint_EnemyThenPlayer: ; 3c25c
and a
jr nz, .BattleIsOver
-.EnemyNotFainted
+.EnemyNotFainted:
call HasPlayerFainted
jr nz, .BattleContinues
call HandlePlayerMonFaint
@@ -343,11 +343,11 @@ CheckFaint_EnemyThenPlayer: ; 3c25c
and a
jr nz, .BattleIsOver
-.BattleContinues
+.BattleContinues:
and a
ret
-.BattleIsOver
+.BattleIsOver:
scf
ret
; 3c27c
@@ -816,11 +816,11 @@ TryEnemyFlee: ; 3c543
call IsInArray
jr c, .Flee
-.Stay
+.Stay:
and a
ret
-.Flee
+.Flee:
scf
ret
; 3c59a
@@ -1218,7 +1218,7 @@ HandlePerishSong: ; 3c801
call SetEnemyTurn
jp .do_it
-.EnemyFirst
+.EnemyFirst:
call SetEnemyTurn
call .do_it
call SetPlayerTurn
@@ -1287,7 +1287,7 @@ HandleWrap: ; 3c874
call SetEnemyTurn
jp .do_it
-.EnemyFirst
+.EnemyFirst:
call SetEnemyTurn
call .do_it
call SetPlayerTurn
@@ -1359,7 +1359,7 @@ HandleLeftovers: ; 3c8eb
call SetEnemyTurn
jp .do_it
-.DoEnemyFirst
+.DoEnemyFirst:
call SetEnemyTurn
call .do_it
call SetPlayerTurn
@@ -1409,7 +1409,7 @@ HandleMysteryberry: ; 3c93c
call SetEnemyTurn
jp .do_it
-.DoEnemyFirst
+.DoEnemyFirst:
call SetEnemyTurn
call .do_it
call SetPlayerTurn
@@ -1667,7 +1667,7 @@ HandleSafeguard: ; 3cafb
.player1
call .CheckEnemy
-.CheckPlayer
+.CheckPlayer:
ld a, [PlayerScreens]
bit SCREENS_SAFEGUARD, a
ret z
@@ -1679,7 +1679,7 @@ HandleSafeguard: ; 3cafb
xor a
jr .print
-.CheckEnemy
+.CheckEnemy:
ld a, [EnemyScreens]
bit SCREENS_SAFEGUARD, a
ret z
@@ -1703,10 +1703,10 @@ HandleScreens: ; 3cb36
call .CheckPlayer
jr .CheckEnemy
-.Both
+.Both:
call .CheckEnemy
-.CheckPlayer
+.CheckPlayer:
call SetPlayerTurn
ld de, .Your
call .Copy
@@ -1714,28 +1714,28 @@ HandleScreens: ; 3cb36
ld de, PlayerLightScreenCount
jr .TickScreens
-.CheckEnemy
+.CheckEnemy:
call SetEnemyTurn
ld de, .Enemy
call .Copy
ld hl, EnemyScreens
ld de, EnemyLightScreenCount
-.TickScreens
+.TickScreens:
bit SCREENS_LIGHT_SCREEN, [hl]
call nz, .LightScreenTick
bit SCREENS_REFLECT, [hl]
call nz, .ReflectTick
ret
-.Copy
+.Copy:
ld hl, StringBuffer1
jp CopyName2
; 3cb75
-.Your
+.Your:
db "Your@"
-.Enemy
+.Enemy:
db "Enemy@"
; 3cb80
@@ -1797,7 +1797,7 @@ HandleWeather: ; 3cb9e
call .SandstormDamage
call SetPlayerTurn
-.SandstormDamage
+.SandstormDamage:
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar
bit SUBSTATUS_UNDERGROUND, a
@@ -1844,7 +1844,7 @@ HandleWeather: ; 3cb9e
ld [Weather], a
ret
-.PrintWeatherMessage
+.PrintWeatherMessage:
ld a, [Weather]
dec a
ld c, a
@@ -1857,11 +1857,11 @@ HandleWeather: ; 3cb9e
jp StdBattleTextBox
; 3cc2d
-.WeatherMessages
+.WeatherMessages:
dw BattleText_RainContinuesToFall
dw BattleText_TheSunlightIsStrong
dw BattleText_TheSandstormRages
-.WeatherEndedMessages
+.WeatherEndedMessages:
dw BattleText_TheRainStopped
dw BattleText_TheSunlightFaded
dw BattleText_TheSandstormSubsided
@@ -2525,7 +2525,7 @@ WinTrainerBattle: ; 3cfa4
call ClearBGPalettes
ret
-.GiveMoney
+.GiveMoney:
ld a, [wAmuletCoin]
and a
call nz, .DoubleReward
@@ -2578,7 +2578,7 @@ WinTrainerBattle: ; 3cfa4
ld l, a
jp StdBattleTextBox
-.KeepItAll
+.KeepItAll:
ld hl, GotMoneyForWinningText
jp StdBattleTextBox
; 3d081
@@ -3143,7 +3143,7 @@ LostBattle: ; 3d38e
call SetPalettes
jr .end
-.LostLinkBattle
+.LostLinkBattle:
call UpdateEnemyMonInParty
call CheckEnemyTrainerDefeated
jr nz, .not_tied
@@ -3202,13 +3202,13 @@ MonFaintedAnimation: ; 3d444
ld [wcfbe], a
ld b, 7
-.OuterLoop
+.OuterLoop:
push bc
push de
push hl
ld b, 6
-.InnerLoop
+.InnerLoop:
push bc
push hl
push de
@@ -3246,7 +3246,7 @@ MonFaintedAnimation: ; 3d444
ret
; 3d488
-.Spaces
+.Spaces:
db " @"
; 3d490
@@ -4655,7 +4655,7 @@ UseHeldStatusHealingItem: ; 3dde9
ret
; 3de44
-.Statuses ; 3de44
+.Statuses: ; 3de44
db HELD_HEAL_POISON, 1 << PSN
db HELD_HEAL_FREEZE, 1 << FRZ
db HELD_HEAL_BURN, 1 << BRN
@@ -4779,7 +4779,7 @@ HandleStatBoostingHeldItems: ; 3de97
ret
; 3defc
-.StatUpItems
+.StatUpItems:
dbw HELD_ATTACK_UP, BattleCommand_AttackUp
dbw HELD_DEFENSE_UP, BattleCommand_DefenseUp
dbw HELD_SPEED_UP, BattleCommand_SpeedUp
@@ -5347,18 +5347,18 @@ BattleMenuPKMN_Loop:
jr z, .Cancel
jr .loop
-.PressedB
+.PressedB:
call CheckMobileBattleError
jr c, .Cancel
jr BattleMenuPKMN_Loop
-.Stats
+.Stats:
call Battle_StatsScreen
call CheckMobileBattleError
jr c, .Cancel
jp BattleMenuPKMN_ReturnFromStats
-.Cancel
+.Cancel:
call ClearSprites
call ClearPalettes
call DelayFrame
@@ -5984,9 +5984,9 @@ MoveInfoBox: ; 3e6c8
ret
; 3e74f
-.Disabled
+.Disabled:
db "Disabled!@"
-.Type
+.Type:
db "TYPE/@"
; 3e75f
@@ -6291,7 +6291,7 @@ LoadEnemyMon: ; 3e8eb
jr .UpdateItem
-.WildItem
+.WildItem:
; In a wild battle, we pull from the item slots in BaseData
; Force Item1
@@ -6321,7 +6321,7 @@ LoadEnemyMon: ; 3e8eb
ld a, [BaseItems+1]
-.UpdateItem
+.UpdateItem:
ld [EnemyMonItem], a
@@ -6347,7 +6347,7 @@ LoadEnemyMon: ; 3e8eb
jp .Happiness
-.InitDVs
+.InitDVs:
; Trainer DVs
@@ -6403,7 +6403,7 @@ LoadEnemyMon: ; 3e8eb
jr .UpdateDVs
-.NotRoaming
+.NotRoaming:
; Register a contains BattleType
; Forced shiny battle type
@@ -6415,14 +6415,14 @@ LoadEnemyMon: ; 3e8eb
ld c, SPDSPCDV_SHINY ; $aa
jr .UpdateDVs
-.GenerateDVs
+.GenerateDVs:
; Generate new random DVs
call BattleRandom
ld b, a
call BattleRandom
ld c, a
-.UpdateDVs
+.UpdateDVs:
; Input DVs in register bc
ld hl, EnemyMonDVs
ld a, b
@@ -6453,7 +6453,7 @@ LoadEnemyMon: ; 3e8eb
jr c, .GenerateDVs ; try again
-.Magikarp
+.Magikarp:
; Skimming this part recommended
ld a, [TempEnemyMonSpecies]
@@ -6488,7 +6488,7 @@ LoadEnemyMon: ; 3e8eb
cp a, $40
jr nc, .GenerateDVs
-.CheckMagikarpArea
+.CheckMagikarpArea:
; The z checks are supposed to be nz
; Instead, all maps in GROUP_LAKE_OF_RAGE (mahogany area)
; and routes 20 and 44 are treated as Lake of Rage
@@ -6516,7 +6516,7 @@ LoadEnemyMon: ; 3e8eb
; Finally done with DVs
-.Happiness
+.Happiness:
; Set happiness
ld a, BASE_HAPPINESS
ld [EnemyMonHappiness], a
@@ -6543,7 +6543,7 @@ LoadEnemyMon: ; 3e8eb
bit SUBSTATUS_TRANSFORMED, a
jp nz, .Moves
-.TreeMon
+.TreeMon:
; If we're headbutting trees, some monsters enter battle asleep
call CheckSleepingTreeMon
ld a, SLP ; Asleep for 7 turns
@@ -6551,7 +6551,7 @@ LoadEnemyMon: ; 3e8eb
; Otherwise, no status
xor a
-.UpdateStatus
+.UpdateStatus:
ld hl, EnemyMonStatus
ld [hli], a
@@ -6581,7 +6581,7 @@ LoadEnemyMon: ; 3e8eb
ld [EnemyMonHP + 1], a
jr .Moves
-.InitRoamHP
+.InitRoamHP:
; HP only uses the lo byte in the RoamMon struct since
; Raikou/Entei/Suicune will have < 256 hp at level 40
ld a, [EnemyMonHP + 1]
@@ -6589,7 +6589,7 @@ LoadEnemyMon: ; 3e8eb
jr .Moves
-.OpponentParty
+.OpponentParty:
; Get HP from the party struct
ld hl, (OTPartyMon1HP + 1)
ld a, [CurPartyMon]
@@ -6609,7 +6609,7 @@ LoadEnemyMon: ; 3e8eb
ld [EnemyMonStatus], a
-.Moves
+.Moves:
ld hl, BaseType1
ld de, EnemyMonType1
ld a, [hli]
@@ -6632,7 +6632,7 @@ LoadEnemyMon: ; 3e8eb
call CopyBytes
jr .PP
-.WildMoves
+.WildMoves:
; Clear EnemyMonMoves
xor a
ld h, d
@@ -6646,7 +6646,7 @@ endr
; Fill moves based on level
predef FillMoves
-.PP
+.PP:
; Trainer battle?
ld a, [wBattleMode]
cp a, TRAINER_BATTLE
@@ -6658,7 +6658,7 @@ endr
predef FillPP
jr .Finish
-.TrainerPP
+.TrainerPP:
; Copy PP from the party struct
ld hl, OTPartyMon1PP
ld a, [CurPartyMon]
@@ -6667,7 +6667,7 @@ endr
ld bc, NUM_MOVES
call CopyBytes
-.Finish
+.Finish:
; Only the first five base stats are copied..
ld hl, BaseStats
ld de, EnemyMonBaseStats
@@ -6737,18 +6737,18 @@ CheckSleepingTreeMon: ; 3eb38
jr z, .Check
ld hl, .Nite
-.Check
+.Check:
ld a, [TempEnemyMonSpecies]
ld de, 1 ; length of species id
call IsInArray
; If it's a match, the opponent is asleep
ret c
-.NotSleeping
+.NotSleeping:
and a
ret
-.Nite
+.Nite:
db CATERPIE
db METAPOD
db BUTTERFREE
@@ -6762,7 +6762,7 @@ CheckSleepingTreeMon: ; 3eb38
db AIPOM
db -1 ; end
-.Day
+.Day:
db VENONAT
db HOOTHOOT
db NOCTOWL
@@ -6770,7 +6770,7 @@ CheckSleepingTreeMon: ; 3eb38
db HERACROSS
db -1 ; end
-.Morn
+.Morn:
db VENONAT
db HOOTHOOT
db NOCTOWL
@@ -6827,22 +6827,22 @@ CheckUnownLetter: ; 3eb75
and a
ret
-.LetterSets
+.LetterSets:
dw .Set1
dw .Set2
dw .Set3
dw .Set4
-.Set1
+.Set1:
; A B C D E F G H I J K
db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, $ff
-.Set2
+.Set2:
; L M N O P Q R
db 12, 13, 14, 15, 16, 17, 18, $ff
-.Set3
+.Set3:
; S T U V W
db 19, 20, 21, 22, 23, $ff
-.Set4
+.Set4:
; X Y Z
db 24, 25, 26, $ff
@@ -7124,7 +7124,7 @@ ApplyStatLevelMultiplier: ; 3ecb7
ret
; 3ed2b
-.StatLevelMultipliers
+.StatLevelMultipliers:
; /
db 25, 100 ; 25%
db 28, 100 ; 28%
@@ -7186,7 +7186,7 @@ BadgeStatBoosts: ; 3ed45
ld hl, BattleMonAttack
ld c, 4
-.CheckBadge
+.CheckBadge:
ld a, b
srl b
call c, BoostStat
@@ -7754,7 +7754,7 @@ GiveExperiencePoints: ; 3ee3b
jp ResetBattleParticipants
; 3f0d4
-.EvenlyDivideExpAmongParticipants
+.EvenlyDivideExpAmongParticipants:
; count number of battle participants
ld a, [wBattleParticipantsNotFainted]
ld b, a
@@ -7878,7 +7878,7 @@ AnimateExpBar: ; 3f136
ld [hli], a
ld [hl], a
-.NoOverflow
+.NoOverflow:
ld d, MAX_LEVEL
callab CalcExpAtLevel
ld a, [hProduct + 1]
@@ -7902,7 +7902,7 @@ AnimateExpBar: ; 3f136
ld a, d
ld [hld], a
-.AlreadyAtMaxExp
+.AlreadyAtMaxExp:
callab CalcLevel
ld a, d
pop bc
@@ -7913,7 +7913,7 @@ AnimateExpBar: ; 3f136
ld a, e
ld d, a
-.LoopLevels
+.LoopLevels:
ld a, e
cp MAX_LEVEL
jr nc, .FinishExpBar
@@ -7944,7 +7944,7 @@ AnimateExpBar: ; 3f136
ld b, $0
jr .LoopLevels
-.FinishExpBar
+.FinishExpBar:
push bc
ld b, d
ld de, TempMonExp + 2
@@ -7964,7 +7964,7 @@ AnimateExpBar: ; 3f136
pop bc
ret
-.PlayExpBarSound
+.PlayExpBarSound:
push bc
call WaitSFX
ld de, SFX_EXP_BAR
@@ -7974,7 +7974,7 @@ AnimateExpBar: ; 3f136
pop bc
ret
-.LoopBarAnimation
+.LoopBarAnimation:
ld d, 3
dec b
.anim_loop
@@ -8119,7 +8119,7 @@ WithdrawPkmnText: ; 3f2f4
ld hl, .WithdrawPkmnText
jp BattleTextBox
-.WithdrawPkmnText
+.WithdrawPkmnText:
text_jump Text_BattleMonNickComma
start_asm
; Print text to withdraw Pkmn
@@ -8523,7 +8523,7 @@ LoadTrainerOrWildMonPic: ; 3f54e
ld a, [TempWildMonSpecies]
ld [CurPartySpecies], a
-.Trainer
+.Trainer:
ld [TempEnemyMonSpecies], a
ret
; 3f55e
@@ -8873,11 +8873,11 @@ DetermineMobileBattleResult: ; 3f77c
ret
; 3f7f7
-.Win
+.Win:
db "YOU WIN@"
-.Lose
+.Lose:
db "YOU LOSE@"
-.Draw
+.Draw:
db " DRAW@"
; 3f80f
@@ -8892,7 +8892,7 @@ DetermineMobileBattleResult: ; 3f77c
ret
; 3f821
-.Invalid
+.Invalid:
db "INVALID BATTLE@"
; 3f830
@@ -8980,7 +8980,7 @@ ReadAndPrintLinkBattleRecord: ; 3f85f
call PrintNum
jr .next
-.PrintFormatString
+.PrintFormatString:
ld de, .Format
call PlaceString
.next
@@ -8997,7 +8997,7 @@ ReadAndPrintLinkBattleRecord: ; 3f85f
jr nz, .loop
ret
-.PrintBattleRecord
+.PrintBattleRecord:
hlcoord 1, 0
ld de, .Record
call PlaceString
@@ -9035,7 +9035,7 @@ ReadAndPrintLinkBattleRecord: ; 3f85f
.quit
ret
-.PrintZerosIfNoSaveFileExists
+.PrintZerosIfNoSaveFileExists:
ld a, [wSavedAtLeastOnce]
and a
ret nz
@@ -9045,18 +9045,18 @@ ReadAndPrintLinkBattleRecord: ; 3f85f
ret
; 3f938
-.Scores
+.Scores:
db " 0 0 0@"
; 3f947
-.Format ; 3f947
+.Format: ; 3f947
db " --- <LNBRK>"
db " - - -@"
-.Record ; 3f964
+.Record: ; 3f964
db "<PLAYER>'s RECORD@"
-.Result ; 3f96e
+.Result: ; 3f96e
db "RESULT WIN LOSE DRAW@"
-.Total ; 3f983
+.Total: ; 3f983
db "TOTAL WIN LOSE DRAW@"
; 3f998
@@ -9472,12 +9472,12 @@ GetTrainerBackpic: ; 3fbff
callba GetKrisBackpic
ret
-.Chris
+.Chris:
; It's a boy.
ld b, BANK(ChrisBackpic)
ld hl, ChrisBackpic
-.Decompress
+.Decompress:
ld de, VTiles2 tile $31
ld c, $31
predef DecompressPredef
@@ -9603,7 +9603,7 @@ BattleStartMessage: ; 3fc8b
ld hl, HookedPokemonAttackedText
jr .PlaceBattleStartText
-.NotFishing
+.NotFishing:
ld hl, PokemonFellFromTreeText
cp BATTLETYPE_TREE
jr z, .PlaceBattleStartText
@@ -9612,7 +9612,7 @@ BattleStartMessage: ; 3fc8b
jr z, .PlaceBattleStartText
ld hl, WildPokemonAppearedText
-.PlaceBattleStartText
+.PlaceBattleStartText:
push hl
callba BattleStart_TrainerHuds
pop hl
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index e83cf2f2e..c791e9947 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -58,7 +58,7 @@ DoMove: ; 3402c
ld de, BattleScriptBuffer
-.GetMoveEffect
+.GetMoveEffect:
ld a, BANK(MoveEffects)
call GetFarByte
inc hl
@@ -74,7 +74,7 @@ DoMove: ; 3402c
ld a, h
ld [BattleScriptBufferLoc + 1], a
-.ReadMoveEffectCommand
+.ReadMoveEffectCommand:
; ld a, [BattleScriptBufferLoc++]
ld a, [BattleScriptBufferLoc]
@@ -112,7 +112,7 @@ DoMove: ; 3402c
jr .ReadMoveEffectCommand
-.DoMoveEffectCommand
+.DoMoveEffectCommand:
jp [hl]
; 34084
@@ -830,7 +830,7 @@ BattleCommand_CheckObedience: ; 343db
jp .EndDisobedience
-.Nap
+.Nap:
call BattleRandom
add a
swap a
@@ -843,7 +843,7 @@ BattleCommand_CheckObedience: ; 343db
jr .Print
-.DoNothing
+.DoNothing:
call BattleRandom
and 3
@@ -861,12 +861,12 @@ BattleCommand_CheckObedience: ; 343db
ld hl, IgnoredOrdersText
-.Print
+.Print:
call StdBattleTextBox
jp .EndDisobedience
-.UseInstead
+.UseInstead:
; Can't use another move if the monster only has one!
ld a, [BattleMonMoves + 1]
@@ -884,7 +884,7 @@ BattleCommand_CheckObedience: ; 343db
ld b, 0
ld c, NUM_MOVES
-.GetTotalPP
+.GetTotalPP:
ld a, [hli]
and $3f ; exclude pp up
add b
@@ -900,7 +900,7 @@ BattleCommand_CheckObedience: ; 343db
jr nz, .GetTotalPP
-.CheckMovePP
+.CheckMovePP:
ld hl, BattleMonPP
ld a, [CurMoveNum]
ld e, a
@@ -927,7 +927,7 @@ BattleCommand_CheckObedience: ; 343db
push af
-.RandomMove
+.RandomMove:
call BattleRandom
and 3 ; TODO NUM_MOVES
@@ -968,7 +968,7 @@ BattleCommand_CheckObedience: ; 343db
ld [CurMoveNum], a
-.EndDisobedience
+.EndDisobedience:
xor a
ld [LastPlayerMove], a
ld [LastEnemyCounterMove], a
@@ -996,7 +996,7 @@ IgnoreSleepOnly: ; 3451f
and a
ret
-.CheckSleep
+.CheckSleep:
ld a, BATTLE_VARS_STATUS
call GetBattleVar
and SLP
@@ -1191,7 +1191,7 @@ CheckMimicUsed: ; 3460b
call GetBattleVar
cp MIMIC
jr z, .mimic
-;
+;
ld b, 0
add hl, bc
ld a, [hl]
@@ -1229,7 +1229,7 @@ BattleCommand_Critical: ; 34631
ld hl, BattleMonItem
ld a, [BattleMonSpecies]
-.Item
+.Item:
ld c, 0
cp CHANSEY
@@ -1242,7 +1242,7 @@ BattleCommand_Critical: ; 34631
ld c, 2
jr .Tally
-.Farfetchd
+.Farfetchd:
cp FARFETCH_D
jr nz, .FocusEnergy
ld a, [hl]
@@ -1253,7 +1253,7 @@ BattleCommand_Critical: ; 34631
ld c, 2
jr .Tally
-.FocusEnergy
+.FocusEnergy:
ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVar
bit SUBSTATUS_FOCUS_ENERGY, a
@@ -1262,7 +1262,7 @@ BattleCommand_Critical: ; 34631
; +1 critical level
inc c
-.CheckCritical
+.CheckCritical:
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
ld de, 1
@@ -1276,7 +1276,7 @@ BattleCommand_Critical: ; 34631
inc c
inc c
-.ScopeLens
+.ScopeLens:
push bc
call GetUserItem
ld a, b
@@ -1287,7 +1287,7 @@ BattleCommand_Critical: ; 34631
; +1 critical level
inc c
-.Tally
+.Tally:
ld hl, .Chances
ld b, 0
add hl, bc
@@ -1298,9 +1298,9 @@ BattleCommand_Critical: ; 34631
ld [CriticalHit], a
ret
-.Criticals
+.Criticals:
db KARATE_CHOP, RAZOR_WIND, RAZOR_LEAF, CRABHAMMER, SLASH, AEROBLAST, CROSS_CHOP, $ff
-.Chances
+.Chances:
; 6.25% 12.1% 24.6% 33.2% 49.6% 49.6% 49.6%
db $11, $20, $40, $55, $80, $80, $80
; 0 1 2 3 4 5 6
@@ -1424,13 +1424,13 @@ BattleCommand_Stab: ; 346d2
ld hl, TypeModifier
set 7, [hl]
-.SkipStab
+.SkipStab:
ld a, BATTLE_VARS_MOVE_TYPE
call GetBattleVar
ld b, a
ld hl, TypeMatchup
-.TypesLoop
+.TypesLoop:
ld a, [hli]
cp $ff
@@ -1446,7 +1446,7 @@ BattleCommand_Stab: ; 346d2
jr .TypesLoop
-.SkipForesightCheck
+.SkipForesightCheck:
cp b
jr nz, .SkipType
ld a, [hl]
@@ -1456,7 +1456,7 @@ BattleCommand_Stab: ; 346d2
jr z, .GotMatchup
jr .SkipType
-.GotMatchup
+.GotMatchup:
push hl
push bc
inc hl
@@ -1470,7 +1470,7 @@ BattleCommand_Stab: ; 346d2
inc a
ld [AttackMissed], a
xor a
-.NotImmune
+.NotImmune:
ld [hMultiplier], a
add b
ld [TypeModifier], a
@@ -1517,7 +1517,7 @@ BattleCommand_Stab: ; 346d2
pop bc
pop hl
-.SkipType
+.SkipType:
inc hl
inc hl
jr .TypesLoop
@@ -1559,7 +1559,7 @@ CheckTypeMatchup: ; 347d3
ld a, 10 ; 1.0
ld [wTypeMatchup], a
ld hl, TypeMatchup
-.TypesLoop
+.TypesLoop:
ld a, [hli]
cp $ff
jr z, .End
@@ -1571,7 +1571,7 @@ CheckTypeMatchup: ; 347d3
jr nz, .End
jr .TypesLoop
-.Next
+.Next:
cp d
jr nz, .Nope
ld a, [hli]
@@ -1581,13 +1581,13 @@ CheckTypeMatchup: ; 347d3
jr z, .Yup
jr .Nope2
-.Nope
+.Nope:
inc hl
-.Nope2
+.Nope2:
inc hl
jr .TypesLoop
-.Yup
+.Yup:
xor a
ld [hDividend + 0], a
ld [hMultiplicand + 0], a
@@ -1607,7 +1607,7 @@ CheckTypeMatchup: ; 347d3
ld [wTypeMatchup], a
jr .TypesLoop
-.End
+.End:
pop bc
pop de
pop hl
@@ -1740,7 +1740,7 @@ BattleCommand_CheckHit: ; 34d32
ld a, [wEnemyMoveStruct + MOVE_ACC]
ld b, a
-.BrightPowder
+.BrightPowder:
push bc
call GetOpponentItem
ld a, b
@@ -1765,11 +1765,11 @@ BattleCommand_CheckHit: ; 34d32
cp b
jr nc, .Miss
-.Hit
+.Hit:
ret
-.Miss
+.Miss:
; Keep the damage value intact if we're using (Hi) Jump Kick.
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
@@ -1777,13 +1777,13 @@ BattleCommand_CheckHit: ; 34d32
jr z, .Missed
call ResetDamage
-.Missed
+.Missed:
ld a, 1
ld [AttackMissed], a
ret
-.DreamEater
+.DreamEater:
; Return z if we're trying to eat the dream of
; a monster that isn't sleeping.
ld a, BATTLE_VARS_MOVE_EFFECT
@@ -1797,7 +1797,7 @@ BattleCommand_CheckHit: ; 34d32
ret
-.Protect
+.Protect:
; Return nz if the opponent is protected.
ld a, BATTLE_VARS_SUBSTATUS1_OPP
call GetBattleVar
@@ -1819,7 +1819,7 @@ BattleCommand_CheckHit: ; 34d32
ret
-.LockOn
+.LockOn:
; Return nz if we are locked-on and aren't trying to use Earthquake,
; Fissure or Magnitude on a monster that is flying.
ld a, BATTLE_VARS_SUBSTATUS5_OPP
@@ -1843,13 +1843,13 @@ BattleCommand_CheckHit: ; 34d32
cp MAGNITUDE
ret z
-.LockedOn
+.LockedOn:
ld a, 1
and a
ret
-.DrainSub
+.DrainSub:
; Return z if using an HP drain move on a substitute.
call CheckSubstituteOpp
jr z, .not_draining_sub
@@ -1868,7 +1868,7 @@ BattleCommand_CheckHit: ; 34d32
ret
-.FlyDigMoves
+.FlyDigMoves:
; Check for moves that can hit underground/flying opponents.
; Return z if the current move can hit the opponent.
@@ -1892,7 +1892,7 @@ BattleCommand_CheckHit: ; 34d32
cp TWISTER
ret
-.DigMoves
+.DigMoves:
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
@@ -1904,7 +1904,7 @@ BattleCommand_CheckHit: ; 34d32
ret
-.ThunderRain
+.ThunderRain:
; Return z if the current move always hits in rain, and it is raining.
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
@@ -1916,14 +1916,14 @@ BattleCommand_CheckHit: ; 34d32
ret
-.XAccuracy
+.XAccuracy:
ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVar
bit SUBSTATUS_X_ACCURACY, a
ret
-.StatModifiers
+.StatModifiers:
ld a, [hBattleTurn]
and a
@@ -2015,7 +2015,7 @@ BattleCommand_CheckHit: ; 34d32
ld [hl], a
ret
-.AccProb
+.AccProb:
db 33, 100 ; 33% -6
db 36, 100 ; 36% -5
db 43, 100 ; 43% -4
@@ -2112,7 +2112,7 @@ BattleCommand_LowerSub: ; 34eee
call BattleCommand_LowerSubNoAnim
jp BattleCommand_MoveDelay
-.Rampage
+.Rampage:
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_ROLLOUT
@@ -2764,7 +2764,7 @@ DittoMetalPowder: ; 352b1
jr nz, .Ditto
ld a, [TempEnemyMonSpecies]
-.Ditto
+.Ditto:
cp DITTO
ret nz
@@ -3048,7 +3048,7 @@ SpeciesItemBoost: ; 353d1
ld a, [hl]
jr z, .CompareSpecies
ld a, [TempEnemyMonSpecies]
-.CompareSpecies
+.CompareSpecies:
pop hl
cp b
@@ -3056,7 +3056,7 @@ SpeciesItemBoost: ; 353d1
cp c
ret nz
-.GetItemHeldEffect
+.GetItemHeldEffect:
push hl
call GetUserItem
ld a, [hl]
@@ -3110,7 +3110,7 @@ EnemyAttackDamage: ; 353f6
ld hl, EnemyStats
jr .thickclub
-.Special
+.Special:
ld hl, BattleMonSpclDef
ld a, [hli]
ld b, a
@@ -3517,7 +3517,7 @@ BattleCommand_DamageCalc: ; 35612
ld hl, TypeBoostItems
-.NextItem
+.NextItem:
ld a, [hli]
cp $ff
jr z, .DoneItem
@@ -3545,7 +3545,7 @@ BattleCommand_DamageCalc: ; 35612
ld [hDivisor], a
ld b, 4
call Divide
-.DoneItem
+.DoneItem:
; Critical hits
call .CriticalMultiplier
@@ -3609,7 +3609,7 @@ BattleCommand_DamageCalc: ; 35612
cp 998 % $100
jr c, .dont_cap_3
-.Cap
+.Cap:
ld a, 997 / $100
ld [hli], a
ld a, 997 % $100
@@ -3631,7 +3631,7 @@ BattleCommand_DamageCalc: ; 35612
ret
-.CriticalMultiplier
+.CriticalMultiplier:
ld a, [CriticalHit]
and a
ret z
@@ -3837,7 +3837,7 @@ BattleCommand_ConstantDamage: ; 35726
ld [hl], 1
ret
-.FlailPower
+.FlailPower:
; px, bp
db 1, 200
db 4, 150
@@ -4070,7 +4070,7 @@ BattleCommand_PainSplit: ; 35926
ld hl, SharedPainText
jp StdBattleTextBox
-.PlayerShareHP
+.PlayerShareHP:
ld a, [hld]
ld [Buffer1], a
ld a, [hld]
@@ -4127,7 +4127,7 @@ endr
; 359cd
-.ButItFailed
+.ButItFailed:
jp PrintDidntAffect2
; 359d0
@@ -5807,7 +5807,7 @@ BattleCommand_StatDown: ; 362e3
jr z, .GetStatLevel
ld hl, PlayerStatLevels
-.GetStatLevel
+.GetStatLevel:
; Attempt to lower the stat.
ld a, [LoweredStat]
and $f
@@ -5826,7 +5826,7 @@ BattleCommand_StatDown: ; 362e3
jr nz, .ComputerMiss
inc b
-.ComputerMiss
+.ComputerMiss:
; Computer opponents have a 1/4 chance of failing.
ld a, [hBattleTurn]
and a
@@ -5855,7 +5855,7 @@ BattleCommand_StatDown: ; 362e3
cp $40
jr c, .Failed
-.DidntMiss
+.DidntMiss:
call CheckSubstituteOpp
jr nz, .Failed
@@ -5889,27 +5889,27 @@ BattleCommand_StatDown: ; 362e3
pop hl
jr z, .CouldntLower
-.Hit
+.Hit:
xor a
ld [FailedMessage], a
ret
-.CouldntLower
+.CouldntLower:
inc [hl]
-.CantLower
+.CantLower:
ld a, 3
ld [FailedMessage], a
ld a, 1
ld [AttackMissed], a
ret
-.Failed
+.Failed:
ld a, 1
ld [FailedMessage], a
ld [AttackMissed], a
ret
-.Mist
+.Mist:
ld a, 2
ld [FailedMessage], a
ld a, 1
@@ -6046,7 +6046,7 @@ TryLowerStat: ; 3641a
call BattleCommand_SwitchTurn
jr .end
-.Player
+.Player:
call BattleCommand_SwitchTurn
call CalcEnemyStats
call BattleCommand_SwitchTurn
@@ -6106,16 +6106,16 @@ BattleCommand_StatDownFailText: ; 3646a
GetStatName: ; 3648f
ld hl, .names
ld c, "@"
-.CheckName
+.CheckName:
dec b
jr z, .Copy
-.GetName
+.GetName:
ld a, [hli]
cp c
jr z, .CheckName
jr .GetName
-.Copy
+.Copy:
ld de, StringBuffer2
ld bc, StringBuffer3 - StringBuffer2
jp CopyBytes
@@ -6301,7 +6301,7 @@ BattleCommand_RaiseSubNoAnim: ; 365af
and a
jr z, .PlayerTurn
ld hl, GetMonFrontpic
-.PlayerTurn
+.PlayerTurn:
xor a
ld [hBGMapMode], a
call CallBattleCore
@@ -6316,7 +6316,7 @@ BattleCommand_LowerSubNoAnim: ; 365c3
and a
jr z, .PlayerTurn
ld hl, DropEnemySub
-.PlayerTurn
+.PlayerTurn:
xor a
ld [hBGMapMode], a
call CallBattleCore
@@ -7353,7 +7353,7 @@ BattleCommand_Charge: ; 36b4d
jp z, SkipToBattleCommand
jp EndMoveEffect
-.UsedText
+.UsedText:
text_jump UnknownText_0x1c0d0e ; "[USER]"
start_asm
ld a, BATTLE_VARS_MOVE_ANIM
@@ -7384,32 +7384,32 @@ BattleCommand_Charge: ; 36b4d
.done
ret
-.RazorWind
+.RazorWind:
; 'made a whirlwind!'
text_jump UnknownText_0x1c0d12
db "@"
-.Solarbeam
+.Solarbeam:
; 'took in sunlight!'
text_jump UnknownText_0x1c0d26
db "@"
-.SkullBash
+.SkullBash:
; 'lowered its head!'
text_jump UnknownText_0x1c0d3a
db "@"
-.SkyAttack
+.SkyAttack:
; 'is glowing!'
text_jump UnknownText_0x1c0d4e
db "@"
-.Fly
+.Fly:
; 'flew up high!'
text_jump UnknownText_0x1c0d5c
db "@"
-.Dig
+.Dig:
; 'dug a hole!'
text_jump UnknownText_0x1c0d6c
db "@"
@@ -7471,7 +7471,7 @@ endr
ld l, a
jp StdBattleTextBox
-.Traps
+.Traps:
dbw BIND, UsedBindText ; 'used BIND on'
dbw WRAP, WrappedByText ; 'was WRAPPED by'
dbw FIRE_SPIN, FireSpinTrapText ; 'was trapped!'
@@ -8311,7 +8311,7 @@ BattleCommand_ResetStats: ; 3710e
ld hl, EliminatedStatsText
jp StdBattleTextBox
-.Fill
+.Fill:
ld b, PlayerStatLevelsEnd - PlayerStatLevels
.next
ld [hli], a
@@ -8492,7 +8492,7 @@ BattleCommand_Screen: ; 372fc
ld hl, LightScreenEffectText
jr .good
-.Reflect
+.Reflect:
bit SCREENS_REFLECT, [hl]
jr nz, .failed
set SCREENS_REFLECT, [hl]
@@ -8993,7 +8993,7 @@ BattleCommand_GetMagnitude: ; 37991
pop bc
ret
-.Magnitudes
+.Magnitudes:
; /255, BP, magnitude
db 13, 10, 4
db 38, 30, 5
@@ -9053,7 +9053,7 @@ BattleCommand_BatonPass: ; 379c9
ret
-.Enemy
+.Enemy:
; Wildmons don't have anything to switch to
ld a, [wBattleMode]
@@ -9368,7 +9368,7 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
jr z, .Weather
dec c ; double
-.Weather
+.Weather:
ld a, [Weather]
and a
jr z, .Heal
@@ -9381,7 +9381,7 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
dec c
dec c
-.Heal
+.Heal:
ld b, 0
ld hl, .Multipliers
add hl, bc
@@ -9405,14 +9405,14 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
ld hl, RegainedHealthText
jp StdBattleTextBox
-.Full
+.Full:
call AnimateFailedMove
; 'hp is full!'
ld hl, HPIsFullText
jp StdBattleTextBox
-.Multipliers
+.Multipliers:
dw GetEighthMaxHP
dw GetQuarterMaxHP
dw GetHalfMaxHP
@@ -9691,13 +9691,13 @@ BattleCommand_FutureSight: ; 37d34
ld a, BATTLE_VARS_LAST_MOVE
call GetBattleVarAddr
ld [hl], b
-.AlreadyChargingFutureSight
+.AlreadyChargingFutureSight:
ld hl, wPlayerFutureSightCount
ld a, [hBattleTurn]
and a
jr z, .GotFutureSightCount
ld hl, wEnemyFutureSightCount
-.GotFutureSightCount
+.GotFutureSightCount:
ld a, [hl]
and a
jr nz, .failed
@@ -9713,7 +9713,7 @@ BattleCommand_FutureSight: ; 37d34
and a
jr z, .StoreDamage
ld de, wEnemyFutureSightDamage
-.StoreDamage
+.StoreDamage:
ld hl, CurDamage
ld a, [hl]
ld [de], a
diff --git a/battle/effects/metronome.asm b/battle/effects/metronome.asm
index ddc1bf62e..1908df84d 100644
--- a/battle/effects/metronome.asm
+++ b/battle/effects/metronome.asm
@@ -14,7 +14,7 @@ BattleCommand_Metronome: ; 37418
.asm_3742b
call LoadMoveAnim
-.GetMove
+.GetMove:
call BattleRandom
; No invalid moves.
diff --git a/battle/effects/present.asm b/battle/effects/present.asm
index a1594e379..819294f8c 100755
--- a/battle/effects/present.asm
+++ b/battle/effects/present.asm
@@ -85,7 +85,7 @@ BattleCommand_Present: ; 37874
.do_animation
jp EndMoveEffect
-.PresentPower
+.PresentPower:
db 40 percent, 40
db 70 percent + 1, 80
db 80 percent, 120
diff --git a/battle/misc.asm b/battle/misc.asm
index beb9ce333..97a11898e 100644
--- a/battle/misc.asm
+++ b/battle/misc.asm
@@ -58,7 +58,7 @@ DoWeatherModifiers: ; fbda4
ld a, [wd265] ; move type
ld c, a
-.CheckWeatherType
+.CheckWeatherType:
ld a, [de]
inc de
cp $ff
@@ -71,7 +71,7 @@ DoWeatherModifiers: ; fbda4
cp c
jr z, .ApplyModifier
-.NextWeatherType
+.NextWeatherType:
rept 2
inc de
endr
@@ -85,7 +85,7 @@ endr
call GetBattleVar
ld c, a
-.CheckWeatherMove
+.CheckWeatherMove:
ld a, [de]
inc de
cp $ff
@@ -98,13 +98,13 @@ endr
cp c
jr z, .ApplyModifier
-.NextWeatherMove
+.NextWeatherMove:
rept 2
inc de
endr
jr .CheckWeatherMove
-.ApplyModifier
+.ApplyModifier:
xor a
ld [hMultiplicand + 0], a
ld hl, CurDamage
@@ -138,7 +138,7 @@ endr
ld bc, 1
-.Update
+.Update:
ld a, b
ld [CurDamage], a
ld a, c
@@ -147,14 +147,14 @@ endr
.done
ret
-.WeatherTypeModifiers
+.WeatherTypeModifiers:
db WEATHER_RAIN, WATER, 15
db WEATHER_RAIN, FIRE, 05
db WEATHER_SUN, FIRE, 15
db WEATHER_SUN, WATER, 05
db $ff
-.WeatherMoveModifiers
+.WeatherMoveModifiers:
db WEATHER_RAIN, EFFECT_SOLARBEAM, 05
db $ff
; fbe24
@@ -183,7 +183,7 @@ DoBadgeTypeBoosts: ; fbe24
ld a, [JohtoBadges]
ld c, a
-.CheckBadge
+.CheckBadge:
ld a, [hl]
cp $ff
jr z, .done
@@ -196,11 +196,11 @@ DoBadgeTypeBoosts: ; fbe24
cp [hl]
jr z, .ApplyBoost
-.NextBadge
+.NextBadge:
inc hl
jr .CheckBadge
-.ApplyBoost
+.ApplyBoost:
ld a, [CurDamage]
ld h, a
ld d, a
@@ -226,7 +226,7 @@ DoBadgeTypeBoosts: ; fbe24
ld hl, $ffff
-.Update
+.Update:
ld a, h
ld [CurDamage], a
ld a, l
@@ -237,7 +237,7 @@ DoBadgeTypeBoosts: ; fbe24
pop de
ret
-.BadgeTypes
+.BadgeTypes:
db FLYING ; zephyrbadge
db BUG ; hivebadge
db NORMAL ; plainbadge
diff --git a/battle/objects/framesets.asm b/battle/objects/framesets.asm
index 587bb01da..3e4186aed 100755
--- a/battle/objects/framesets.asm
+++ b/battle/objects/framesets.asm
@@ -1,220 +1,220 @@
-BattleAnimFrameData: ; ce85e
- dw .Frameset_00 ; 00
- dw .Frameset_01 ; 01
- dw .Frameset_02 ; 02
- dw .Frameset_03 ; 03
- dw .Frameset_04 ; 04
- dw .Frameset_05 ; 05
- dw .Frameset_06 ; 06
- dw .Frameset_07 ; 07
- dw .Frameset_08 ; 08
- dw .Frameset_09 ; 09
- dw .Frameset_0a ; 0a
- dw .Frameset_0b ; 0b
- dw .Frameset_0c ; 0c
- dw .Frameset_0d ; 0d
- dw .Frameset_0e ; 0e
- dw .Frameset_0f ; 0f
- dw .Frameset_10 ; 10
- dw .Frameset_11 ; 11
- dw .Frameset_12 ; 12
- dw .Frameset_13 ; 13
- dw .Frameset_14 ; 14
- dw .Frameset_15 ; 15
- dw .Frameset_16 ; 16
- dw .Frameset_17 ; 17
- dw .Frameset_18 ; 18
- dw .Frameset_19 ; 19
- dw .Frameset_1a ; 1a
- dw .Frameset_1b ; 1b
- dw .Frameset_1c ; 1c
- dw .Frameset_1d ; 1d
- dw .Frameset_1e ; 1e
- dw .Frameset_1f ; 1f
- dw .Frameset_20 ; 20
- dw .Frameset_21 ; 21
- dw .Frameset_22 ; 22
- dw .Frameset_23 ; 23
- dw .Frameset_24 ; 24
- dw .Frameset_25 ; 25
- dw .Frameset_26 ; 26
- dw .Frameset_27 ; 27
- dw .Frameset_28 ; 28
- dw .Frameset_29 ; 29
- dw .Frameset_2a ; 2a
- dw .Frameset_2b ; 2b
- dw .Frameset_2c ; 2c
- dw .Frameset_2d ; 2d
- dw .Frameset_2e ; 2e
- dw .Frameset_2f ; 2f
- dw .Frameset_30 ; 30
- dw .Frameset_31 ; 31
- dw .Frameset_32 ; 32
- dw .Frameset_33 ; 33
- dw .Frameset_34 ; 34
- dw .Frameset_35 ; 35
- dw .Frameset_36 ; 36
- dw .Frameset_37 ; 37
- dw .Frameset_38 ; 38
- dw .Frameset_39 ; 39
- dw .Frameset_3a ; 3a
- dw .Frameset_3b ; 3b
- dw .Frameset_3c ; 3c
- dw .Frameset_3d ; 3d
- dw .Frameset_3e ; 3e
- dw .Frameset_3f ; 3f
- dw .Frameset_40 ; 40
- dw .Frameset_41 ; 41
- dw .Frameset_42 ; 42
- dw .Frameset_43 ; 43
- dw .Frameset_44 ; 44
- dw .Frameset_45 ; 45
- dw .Frameset_46 ; 46
- dw .Frameset_47 ; 47
- dw .Frameset_48 ; 48
- dw .Frameset_49 ; 49
- dw .Frameset_4a ; 4a
- dw .Frameset_4b ; 4b
- dw .Frameset_4c ; 4c
- dw .Frameset_4d ; 4d
- dw .Frameset_4e ; 4e
- dw .Frameset_4f ; 4f
- dw .Frameset_50 ; 50
- dw .Frameset_51 ; 51
- dw .Frameset_52 ; 52
- dw .Frameset_53 ; 53
- dw .Frameset_54 ; 54
- dw .Frameset_55 ; 55
- dw .Frameset_56 ; 56
- dw .Frameset_57 ; 57
- dw .Frameset_58 ; 58
- dw .Frameset_59 ; 59
- dw .Frameset_5a ; 5a
- dw .Frameset_5b ; 5b
- dw .Frameset_5c ; 5c
- dw .Frameset_5d ; 5d
- dw .Frameset_5e ; 5e
- dw .Frameset_5f ; 5f
- dw .Frameset_60 ; 60
- dw .Frameset_61 ; 61
- dw .Frameset_62 ; 62
- dw .Frameset_63 ; 63
- dw .Frameset_64 ; 64
- dw .Frameset_65 ; 65
- dw .Frameset_66 ; 66
- dw .Frameset_67 ; 67
- dw .Frameset_68 ; 68
- dw .Frameset_69 ; 69
- dw .Frameset_6a ; 6a
- dw .Frameset_6b ; 6b
- dw .Frameset_6c ; 6c
- dw .Frameset_6d ; 6d
- dw .Frameset_6e ; 6e
- dw .Frameset_6f ; 6f
- dw .Frameset_70 ; 70
- dw .Frameset_71 ; 71
- dw .Frameset_72 ; 72
- dw .Frameset_73 ; 73
- dw .Frameset_74 ; 74
- dw .Frameset_75 ; 75
- dw .Frameset_76 ; 76
- dw .Frameset_77 ; 77
- dw .Frameset_78 ; 78
- dw .Frameset_79 ; 79
- dw .Frameset_7a ; 7a
- dw .Frameset_7b ; 7b
- dw .Frameset_7c ; 7c
- dw .Frameset_7d ; 7d
- dw .Frameset_7e ; 7e
- dw .Frameset_7f ; 7f
- dw .Frameset_80 ; 80
- dw .Frameset_81 ; 81
- dw .Frameset_82 ; 82
- dw .Frameset_83 ; 83
- dw .Frameset_84 ; 84
- dw .Frameset_85 ; 85
- dw .Frameset_86 ; 86
- dw .Frameset_87 ; 87
- dw .Frameset_88 ; 88
- dw .Frameset_89 ; 89
- dw .Frameset_8a ; 8a
- dw .Frameset_8b ; 8b
- dw .Frameset_8c ; 8c
- dw .Frameset_8d ; 8d
- dw .Frameset_8e ; 8e
- dw .Frameset_8f ; 8f
- dw .Frameset_90 ; 90
- dw .Frameset_91 ; 91
- dw .Frameset_92 ; 92
- dw .Frameset_93 ; 93
- dw .Frameset_94 ; 94
- dw .Frameset_95 ; 95
- dw .Frameset_96 ; 96
- dw .Frameset_97 ; 97
- dw .Frameset_98 ; 98
- dw .Frameset_99 ; 99
- dw .Frameset_9a ; 9a
- dw .Frameset_9b ; 9b
- dw .Frameset_9c ; 9c
- dw .Frameset_9d ; 9d
- dw .Frameset_9e ; 9e
- dw .Frameset_9f ; 9f
- dw .Frameset_a0 ; a0
- dw .Frameset_a1 ; a1
- dw .Frameset_a2 ; a2
- dw .Frameset_a3 ; a3
- dw .Frameset_a4 ; a4
- dw .Frameset_a5 ; a5
- dw .Frameset_a6 ; a6
- dw .Frameset_a7 ; a7
- dw .Frameset_a8 ; a8
- dw .Frameset_a9 ; a9
- dw .Frameset_aa ; aa
- dw .Frameset_ab ; ab
- dw .Frameset_ac ; ac
- dw .Frameset_ad ; ad
- dw .Frameset_ae ; ae
- dw .Frameset_af ; af
- dw .Frameset_b0 ; b0
- dw .Frameset_b1 ; b1
- dw .Frameset_b2 ; b2
- dw .Frameset_b3 ; b3
- dw .Frameset_b4 ; b4
- dw .Frameset_b5 ; b5
- dw .Frameset_b6 ; b6
- dw .Frameset_b7 ; b7
- dw .Frameset_b8 ; b8
-
- ; OAM index (see battle/objects/oam.asm), flip flags / duration
-.Frameset_00
- db BATTLEANIMOAMSET_00, $06
+BattleAnimFrameData: ; ce85e
+ dw .Frameset_00 ; 00
+ dw .Frameset_01 ; 01
+ dw .Frameset_02 ; 02
+ dw .Frameset_03 ; 03
+ dw .Frameset_04 ; 04
+ dw .Frameset_05 ; 05
+ dw .Frameset_06 ; 06
+ dw .Frameset_07 ; 07
+ dw .Frameset_08 ; 08
+ dw .Frameset_09 ; 09
+ dw .Frameset_0a ; 0a
+ dw .Frameset_0b ; 0b
+ dw .Frameset_0c ; 0c
+ dw .Frameset_0d ; 0d
+ dw .Frameset_0e ; 0e
+ dw .Frameset_0f ; 0f
+ dw .Frameset_10 ; 10
+ dw .Frameset_11 ; 11
+ dw .Frameset_12 ; 12
+ dw .Frameset_13 ; 13
+ dw .Frameset_14 ; 14
+ dw .Frameset_15 ; 15
+ dw .Frameset_16 ; 16
+ dw .Frameset_17 ; 17
+ dw .Frameset_18 ; 18
+ dw .Frameset_19 ; 19
+ dw .Frameset_1a ; 1a
+ dw .Frameset_1b ; 1b
+ dw .Frameset_1c ; 1c
+ dw .Frameset_1d ; 1d
+ dw .Frameset_1e ; 1e
+ dw .Frameset_1f ; 1f
+ dw .Frameset_20 ; 20
+ dw .Frameset_21 ; 21
+ dw .Frameset_22 ; 22
+ dw .Frameset_23 ; 23
+ dw .Frameset_24 ; 24
+ dw .Frameset_25 ; 25
+ dw .Frameset_26 ; 26
+ dw .Frameset_27 ; 27
+ dw .Frameset_28 ; 28
+ dw .Frameset_29 ; 29
+ dw .Frameset_2a ; 2a
+ dw .Frameset_2b ; 2b
+ dw .Frameset_2c ; 2c
+ dw .Frameset_2d ; 2d
+ dw .Frameset_2e ; 2e
+ dw .Frameset_2f ; 2f
+ dw .Frameset_30 ; 30
+ dw .Frameset_31 ; 31
+ dw .Frameset_32 ; 32
+ dw .Frameset_33 ; 33
+ dw .Frameset_34 ; 34
+ dw .Frameset_35 ; 35
+ dw .Frameset_36 ; 36
+ dw .Frameset_37 ; 37
+ dw .Frameset_38 ; 38
+ dw .Frameset_39 ; 39
+ dw .Frameset_3a ; 3a
+ dw .Frameset_3b ; 3b
+ dw .Frameset_3c ; 3c
+ dw .Frameset_3d ; 3d
+ dw .Frameset_3e ; 3e
+ dw .Frameset_3f ; 3f
+ dw .Frameset_40 ; 40
+ dw .Frameset_41 ; 41
+ dw .Frameset_42 ; 42
+ dw .Frameset_43 ; 43
+ dw .Frameset_44 ; 44
+ dw .Frameset_45 ; 45
+ dw .Frameset_46 ; 46
+ dw .Frameset_47 ; 47
+ dw .Frameset_48 ; 48
+ dw .Frameset_49 ; 49
+ dw .Frameset_4a ; 4a
+ dw .Frameset_4b ; 4b
+ dw .Frameset_4c ; 4c
+ dw .Frameset_4d ; 4d
+ dw .Frameset_4e ; 4e
+ dw .Frameset_4f ; 4f
+ dw .Frameset_50 ; 50
+ dw .Frameset_51 ; 51
+ dw .Frameset_52 ; 52
+ dw .Frameset_53 ; 53
+ dw .Frameset_54 ; 54
+ dw .Frameset_55 ; 55
+ dw .Frameset_56 ; 56
+ dw .Frameset_57 ; 57
+ dw .Frameset_58 ; 58
+ dw .Frameset_59 ; 59
+ dw .Frameset_5a ; 5a
+ dw .Frameset_5b ; 5b
+ dw .Frameset_5c ; 5c
+ dw .Frameset_5d ; 5d
+ dw .Frameset_5e ; 5e
+ dw .Frameset_5f ; 5f
+ dw .Frameset_60 ; 60
+ dw .Frameset_61 ; 61
+ dw .Frameset_62 ; 62
+ dw .Frameset_63 ; 63
+ dw .Frameset_64 ; 64
+ dw .Frameset_65 ; 65
+ dw .Frameset_66 ; 66
+ dw .Frameset_67 ; 67
+ dw .Frameset_68 ; 68
+ dw .Frameset_69 ; 69
+ dw .Frameset_6a ; 6a
+ dw .Frameset_6b ; 6b
+ dw .Frameset_6c ; 6c
+ dw .Frameset_6d ; 6d
+ dw .Frameset_6e ; 6e
+ dw .Frameset_6f ; 6f
+ dw .Frameset_70 ; 70
+ dw .Frameset_71 ; 71
+ dw .Frameset_72 ; 72
+ dw .Frameset_73 ; 73
+ dw .Frameset_74 ; 74
+ dw .Frameset_75 ; 75
+ dw .Frameset_76 ; 76
+ dw .Frameset_77 ; 77
+ dw .Frameset_78 ; 78
+ dw .Frameset_79 ; 79
+ dw .Frameset_7a ; 7a
+ dw .Frameset_7b ; 7b
+ dw .Frameset_7c ; 7c
+ dw .Frameset_7d ; 7d
+ dw .Frameset_7e ; 7e
+ dw .Frameset_7f ; 7f
+ dw .Frameset_80 ; 80
+ dw .Frameset_81 ; 81
+ dw .Frameset_82 ; 82
+ dw .Frameset_83 ; 83
+ dw .Frameset_84 ; 84
+ dw .Frameset_85 ; 85
+ dw .Frameset_86 ; 86
+ dw .Frameset_87 ; 87
+ dw .Frameset_88 ; 88
+ dw .Frameset_89 ; 89
+ dw .Frameset_8a ; 8a
+ dw .Frameset_8b ; 8b
+ dw .Frameset_8c ; 8c
+ dw .Frameset_8d ; 8d
+ dw .Frameset_8e ; 8e
+ dw .Frameset_8f ; 8f
+ dw .Frameset_90 ; 90
+ dw .Frameset_91 ; 91
+ dw .Frameset_92 ; 92
+ dw .Frameset_93 ; 93
+ dw .Frameset_94 ; 94
+ dw .Frameset_95 ; 95
+ dw .Frameset_96 ; 96
+ dw .Frameset_97 ; 97
+ dw .Frameset_98 ; 98
+ dw .Frameset_99 ; 99
+ dw .Frameset_9a ; 9a
+ dw .Frameset_9b ; 9b
+ dw .Frameset_9c ; 9c
+ dw .Frameset_9d ; 9d
+ dw .Frameset_9e ; 9e
+ dw .Frameset_9f ; 9f
+ dw .Frameset_a0 ; a0
+ dw .Frameset_a1 ; a1
+ dw .Frameset_a2 ; a2
+ dw .Frameset_a3 ; a3
+ dw .Frameset_a4 ; a4
+ dw .Frameset_a5 ; a5
+ dw .Frameset_a6 ; a6
+ dw .Frameset_a7 ; a7
+ dw .Frameset_a8 ; a8
+ dw .Frameset_a9 ; a9
+ dw .Frameset_aa ; aa
+ dw .Frameset_ab ; ab
+ dw .Frameset_ac ; ac
+ dw .Frameset_ad ; ad
+ dw .Frameset_ae ; ae
+ dw .Frameset_af ; af
+ dw .Frameset_b0 ; b0
+ dw .Frameset_b1 ; b1
+ dw .Frameset_b2 ; b2
+ dw .Frameset_b3 ; b3
+ dw .Frameset_b4 ; b4
+ dw .Frameset_b5 ; b5
+ dw .Frameset_b6 ; b6
+ dw .Frameset_b7 ; b7
+ dw .Frameset_b8 ; b8
+
+ ; OAM index (see battle/objects/oam.asm), flip flags / duration
+.Frameset_00:
+ db BATTLEANIMOAMSET_00, $06
db -4
-
-.Frameset_01
- db BATTLEANIMOAMSET_01, $06
+
+.Frameset_01:
+ db BATTLEANIMOAMSET_01, $06
db -4
-
-.Frameset_02
- db BATTLEANIMOAMSET_02, $06
+
+.Frameset_02:
+ db BATTLEANIMOAMSET_02, $06
db -4
-
-.Frameset_03
- db BATTLEANIMOAMSET_03, $06
+
+.Frameset_03:
+ db BATTLEANIMOAMSET_03, $06
db -4
-
-.Frameset_04
- db BATTLEANIMOAMSET_04, $06
+
+.Frameset_04:
+ db BATTLEANIMOAMSET_04, $06
db -4
-
-.Frameset_05
- db BATTLEANIMOAMSET_05, $06
+
+.Frameset_05:
+ db BATTLEANIMOAMSET_05, $06
db -4
-
-.Frameset_06
- db BATTLEANIMOAMSET_06, $06
+
+.Frameset_06:
+ db BATTLEANIMOAMSET_06, $06
db -4
-
-.Frameset_07
+
+.Frameset_07:
db BATTLEANIMOAMSET_03, $04
db BATTLEANIMOAMSET_01, $01
db BATTLEANIMOAMSET_03, $04
@@ -222,10 +222,10 @@ BattleAnimFrameData: ; ce85e
db BATTLEANIMOAMSET_03, $04
db BATTLEANIMOAMSET_01, $01
db BATTLEANIMOAMSET_03, $04
- db BATTLEANIMOAMSET_01, $01
+ db BATTLEANIMOAMSET_01, $01
db -4
-
-.Frameset_3e
+
+.Frameset_3e:
db BATTLEANIMOAMSET_4B, $02
db BATTLEANIMOAMSET_4C, $02
db BATTLEANIMOAMSET_4D, $04
@@ -235,10 +235,10 @@ BattleAnimFrameData: ; ce85e
db -3, $02
db BATTLEANIMOAMSET_4E, $02
db -3, $02
- db BATTLEANIMOAMSET_4E, $02
+ db BATTLEANIMOAMSET_4E, $02
db -4
-
-.Frameset_3f
+
+.Frameset_3f:
db BATTLEANIMOAMSET_4B, $42
db BATTLEANIMOAMSET_4C, $42
db BATTLEANIMOAMSET_4D, $44
@@ -248,10 +248,10 @@ BattleAnimFrameData: ; ce85e
db -3, $02
db BATTLEANIMOAMSET_4E, $42
db -3, $02
- db BATTLEANIMOAMSET_4E, $42
+ db BATTLEANIMOAMSET_4E, $42
db -4
-
-.Frameset_40
+
+.Frameset_40:
db BATTLEANIMOAMSET_4B, $c2
db BATTLEANIMOAMSET_4C, $c2
db BATTLEANIMOAMSET_4D, $c4
@@ -261,10 +261,10 @@ BattleAnimFrameData: ; ce85e
db -3, $02
db BATTLEANIMOAMSET_4E, $c2
db -3, $02
- db BATTLEANIMOAMSET_4E, $c2
+ db BATTLEANIMOAMSET_4E, $c2
db -4
-
-.Frameset_41
+
+.Frameset_41:
db BATTLEANIMOAMSET_4B, $01
db BATTLEANIMOAMSET_4C, $01
db BATTLEANIMOAMSET_4D, $01
@@ -277,10 +277,10 @@ BattleAnimFrameData: ; ce85e
db -3, $02
db BATTLEANIMOAMSET_52, $02
db -3, $02
- db BATTLEANIMOAMSET_52, $02
+ db BATTLEANIMOAMSET_52, $02
db -4
-
-.Frameset_42
+
+.Frameset_42:
db BATTLEANIMOAMSET_4B, $41
db BATTLEANIMOAMSET_4C, $41
db BATTLEANIMOAMSET_4D, $41
@@ -293,58 +293,58 @@ BattleAnimFrameData: ; ce85e
db -3, $02
db BATTLEANIMOAMSET_52, $42
db -3, $02
- db BATTLEANIMOAMSET_52, $42
+ db BATTLEANIMOAMSET_52, $42
db -4
-
-.Frameset_08
+
+.Frameset_08:
db BATTLEANIMOAMSET_00, $03
db BATTLEANIMOAMSET_07, $03
db BATTLEANIMOAMSET_08, $03
- db BATTLEANIMOAMSET_09, $03
+ db BATTLEANIMOAMSET_09, $03
db -4
-
-.Frameset_09
+
+.Frameset_09:
db BATTLEANIMOAMSET_0A, $07
db BATTLEANIMOAMSET_0B, $07
db BATTLEANIMOAMSET_0A, $07
- db BATTLEANIMOAMSET_0B, $47
+ db BATTLEANIMOAMSET_0B, $47
db -2
-
-.Frameset_0a
- db BATTLEANIMOAMSET_0C, $08
+
+.Frameset_0a:
+ db BATTLEANIMOAMSET_0C, $08
db -1
-
-.Frameset_0b
- db BATTLEANIMOAMSET_0D, $08
+
+.Frameset_0b:
+ db BATTLEANIMOAMSET_0D, $08
db -1
-
-.Frameset_0c
- db BATTLEANIMOAMSET_0A, $08
+
+.Frameset_0c:
+ db BATTLEANIMOAMSET_0A, $08
db -1
-
-.Frameset_0d
+
+.Frameset_0d:
db BATTLEANIMOAMSET_0A, $07
db BATTLEANIMOAMSET_0B, $07
db BATTLEANIMOAMSET_0A, $07
db BATTLEANIMOAMSET_0B, $47
- db BATTLEANIMOAMSET_0A, $07
+ db BATTLEANIMOAMSET_0A, $07
db -1
-
-.Frameset_0e
- db BATTLEANIMOAMSET_0A, $08
+
+.Frameset_0e:
+ db BATTLEANIMOAMSET_0A, $08
db -1
-
-.Frameset_0f
+
+.Frameset_0f:
db BATTLEANIMOAMSET_0A, $04
- db BATTLEANIMOAMSET_0E, $04
+ db BATTLEANIMOAMSET_0E, $04
db -2
-
-.Frameset_10
+
+.Frameset_10:
db BATTLEANIMOAMSET_0F, $04
- db BATTLEANIMOAMSET_10, $04
+ db BATTLEANIMOAMSET_10, $04
db -2
-
-.Frameset_11
+
+.Frameset_11:
db BATTLEANIMOAMSET_10, $04
db BATTLEANIMOAMSET_0F, $04
db BATTLEANIMOAMSET_0E, $04
@@ -352,19 +352,19 @@ BattleAnimFrameData: ; ce85e
db BATTLEANIMOAMSET_0E, $04
db BATTLEANIMOAMSET_0A, $04
db BATTLEANIMOAMSET_0E, $04
- db BATTLEANIMOAMSET_0A, $04
+ db BATTLEANIMOAMSET_0A, $04
db -4
-
-.Frameset_12
+
+.Frameset_12:
db BATTLEANIMOAMSET_10, $01
db BATTLEANIMOAMSET_0F, $01
db BATTLEANIMOAMSET_12, $01
db BATTLEANIMOAMSET_11, $01
db BATTLEANIMOAMSET_12, $01
- db BATTLEANIMOAMSET_0F, $01
+ db BATTLEANIMOAMSET_0F, $01
db -2
-
-.Frameset_13
+
+.Frameset_13:
db BATTLEANIMOAMSET_10, $03
db BATTLEANIMOAMSET_0F, $03
db BATTLEANIMOAMSET_12, $01
@@ -375,23 +375,23 @@ BattleAnimFrameData: ; ce85e
db -3, $01
db BATTLEANIMOAMSET_12, $01
db -3, $01
- db BATTLEANIMOAMSET_12, $03
+ db BATTLEANIMOAMSET_12, $03
db -4
-
-.Frameset_14
- db BATTLEANIMOAMSET_13, $14
+
+.Frameset_14:
+ db BATTLEANIMOAMSET_13, $14
db -4
-
-.Frameset_15
+
+.Frameset_15:
db BATTLEANIMOAMSET_10, $01
- db BATTLEANIMOAMSET_0F, $01
+ db BATTLEANIMOAMSET_0F, $01
db -2
-
-.Frameset_16
- db BATTLEANIMOAMSET_14, $08
+
+.Frameset_16:
+ db BATTLEANIMOAMSET_14, $08
db -1
-
-.Frameset_17
+
+.Frameset_17:
db BATTLEANIMOAMSET_17, $04
db BATTLEANIMOAMSET_16, $08
db BATTLEANIMOAMSET_15, $08
@@ -401,109 +401,109 @@ BattleAnimFrameData: ; ce85e
db BATTLEANIMOAMSET_16, $48
db BATTLEANIMOAMSET_15, $48
db BATTLEANIMOAMSET_16, $48
- db BATTLEANIMOAMSET_17, $04
+ db BATTLEANIMOAMSET_17, $04
db -2
-
-.Frameset_56
- db BATTLEANIMOAMSET_69, $08
+
+.Frameset_56:
+ db BATTLEANIMOAMSET_69, $08
db -1
-
-.Frameset_57
+
+.Frameset_57:
db BATTLEANIMOAMSET_69, $20
db BATTLEANIMOAMSET_6A, $04
db BATTLEANIMOAMSET_6B, $04
db BATTLEANIMOAMSET_6D, $04
- db BATTLEANIMOAMSET_6C, $04
+ db BATTLEANIMOAMSET_6C, $04
db -1
-
-.Frameset_58
+
+.Frameset_58:
db BATTLEANIMOAMSET_6C, $08
- db BATTLEANIMOAMSET_6D, $08
+ db BATTLEANIMOAMSET_6D, $08
db -2
-
-.Frameset_18
+
+.Frameset_18:
db BATTLEANIMOAMSET_18, $04
db BATTLEANIMOAMSET_19, $04
- db BATTLEANIMOAMSET_1A, $04
+ db BATTLEANIMOAMSET_1A, $04
db -4
-
-.Frameset_19
- db BATTLEANIMOAMSET_1B, $08
+
+.Frameset_19:
+ db BATTLEANIMOAMSET_1B, $08
db -1
-
-.Frameset_1a
- db BATTLEANIMOAMSET_0F, $08
+
+.Frameset_1a:
+ db BATTLEANIMOAMSET_0F, $08
db -1
-
-.Frameset_1b
- db BATTLEANIMOAMSET_1C, $08
+
+.Frameset_1b:
+ db BATTLEANIMOAMSET_1C, $08
db -1
-
-.Frameset_1c
- db BATTLEANIMOAMSET_0A, $08
+
+.Frameset_1c:
+ db BATTLEANIMOAMSET_0A, $08
db -4
-
-.Frameset_1d
- db BATTLEANIMOAMSET_1D, $08
+
+.Frameset_1d:
+ db BATTLEANIMOAMSET_1D, $08
db -1
-
-.Frameset_1e
- db BATTLEANIMOAMSET_17, $08
+
+.Frameset_1e:
+ db BATTLEANIMOAMSET_17, $08
db -1
-
-.Frameset_1f
+
+.Frameset_1f:
db BATTLEANIMOAMSET_0F, $03
db BATTLEANIMOAMSET_10, $03
- db BATTLEANIMOAMSET_1E, $03
+ db BATTLEANIMOAMSET_1E, $03
db -1
-
-.Frameset_20
+
+.Frameset_20:
db BATTLEANIMOAMSET_1F, $10
- db BATTLEANIMOAMSET_20, $03
+ db BATTLEANIMOAMSET_20, $03
db -4
-
-.Frameset_21
- db BATTLEANIMOAMSET_20, $08
+
+.Frameset_21:
+ db BATTLEANIMOAMSET_20, $08
db -1
-
-.Frameset_22
+
+.Frameset_22:
db BATTLEANIMOAMSET_20, $08
db BATTLEANIMOAMSET_21, $08
db BATTLEANIMOAMSET_1B, $08
- db BATTLEANIMOAMSET_21, $08
+ db BATTLEANIMOAMSET_21, $08
db -2
-
-.Frameset_23
- db BATTLEANIMOAMSET_22, $08
+
+.Frameset_23:
+ db BATTLEANIMOAMSET_22, $08
db -1
-
-.Frameset_24
- db BATTLEANIMOAMSET_1B, $08
+
+.Frameset_24:
+ db BATTLEANIMOAMSET_1B, $08
db -1
-
-.Frameset_25
- db BATTLEANIMOAMSET_23, $08
+
+.Frameset_25:
+ db BATTLEANIMOAMSET_23, $08
db -1
-
-.Frameset_26
- db BATTLEANIMOAMSET_24, $08
+
+.Frameset_26:
+ db BATTLEANIMOAMSET_24, $08
db -1
-
-.Frameset_27
- db BATTLEANIMOAMSET_25, $08
+
+.Frameset_27:
+ db BATTLEANIMOAMSET_25, $08
db -1
-
-.Frameset_28
+
+.Frameset_28:
db BATTLEANIMOAMSET_26, $08
- db BATTLEANIMOAMSET_27, $08
+ db BATTLEANIMOAMSET_27, $08
db -1
-
-.Frameset_29
+
+.Frameset_29:
db BATTLEANIMOAMSET_28, $08
- db BATTLEANIMOAMSET_29, $08
+ db BATTLEANIMOAMSET_29, $08
db -4
-
-.Frameset_2a
+
+.Frameset_2a:
db BATTLEANIMOAMSET_2A, $01
db BATTLEANIMOAMSET_2B, $01
db BATTLEANIMOAMSET_2C, $01
@@ -512,29 +512,29 @@ BattleAnimFrameData: ; ce85e
db BATTLEANIMOAMSET_2D, $01
db BATTLEANIMOAMSET_2C, $01
db BATTLEANIMOAMSET_2B, $01
- db BATTLEANIMOAMSET_2A, $01
+ db BATTLEANIMOAMSET_2A, $01
db -4
-
-.Frameset_2b
+
+.Frameset_2b:
db BATTLEANIMOAMSET_14, $01
- db BATTLEANIMOAMSET_15, $01
+ db BATTLEANIMOAMSET_15, $01
db -2
-
-.Frameset_2c
+
+.Frameset_2c:
db BATTLEANIMOAMSET_2F, $04
- db BATTLEANIMOAMSET_30, $28
+ db BATTLEANIMOAMSET_30, $28
db -4
-
-.Frameset_2d
- db BATTLEANIMOAMSET_31, $08
+
+.Frameset_2d:
+ db BATTLEANIMOAMSET_31, $08
db -1
-
-.Frameset_2e
+
+.Frameset_2e:
db BATTLEANIMOAMSET_32, $20
db BATTLEANIMOAMSET_33, $20
db BATTLEANIMOAMSET_34, $20
- db BATTLEANIMOAMSET_35, $20 ; fallthrough
-.Frameset_2f
+ db BATTLEANIMOAMSET_35, $20 ; fallthrough
+.Frameset_2f:
db -3, $02
db BATTLEANIMOAMSET_35, $04
db -3, $02
@@ -542,42 +542,42 @@ BattleAnimFrameData: ; ce85e
db -3, $02
db BATTLEANIMOAMSET_35, $04
db -3, $02
- db BATTLEANIMOAMSET_35, $04
+ db BATTLEANIMOAMSET_35, $04
db -4
-
-.Frameset_30
+
+.Frameset_30:
db BATTLEANIMOAMSET_14, $04
- db BATTLEANIMOAMSET_15, $04
+ db BATTLEANIMOAMSET_15, $04
db -2
-
-.Frameset_31
+
+.Frameset_31:
db BATTLEANIMOAMSET_36, $02
db BATTLEANIMOAMSET_37, $02
db BATTLEANIMOAMSET_38, $02
- db BATTLEANIMOAMSET_39, $20
+ db BATTLEANIMOAMSET_39, $20
db -4
-
-.Frameset_32
+
+.Frameset_32:
db BATTLEANIMOAMSET_3A, $02
db BATTLEANIMOAMSET_3B, $02
db BATTLEANIMOAMSET_3C, $02
- db BATTLEANIMOAMSET_3D, $20
+ db BATTLEANIMOAMSET_3D, $20
db -4
-
-.Frameset_33
+
+.Frameset_33:
db BATTLEANIMOAMSET_3A, $42
db BATTLEANIMOAMSET_3B, $42
db BATTLEANIMOAMSET_3C, $42
- db BATTLEANIMOAMSET_3D, $60
+ db BATTLEANIMOAMSET_3D, $60
db -4
-
-.Frameset_34
+
+.Frameset_34:
db BATTLEANIMOAMSET_3E, $08
db BATTLEANIMOAMSET_3F, $08
- db BATTLEANIMOAMSET_40, $08
+ db BATTLEANIMOAMSET_40, $08
db -1
-
-.Frameset_35
+
+.Frameset_35:
db BATTLEANIMOAMSET_40, $02
db -3, $02
db BATTLEANIMOAMSET_40, $02
@@ -585,60 +585,60 @@ BattleAnimFrameData: ; ce85e
db BATTLEANIMOAMSET_41, $02
db -3, $02
db BATTLEANIMOAMSET_41, $02
- db -3, $02
+ db -3, $02
db -2
-
-.Frameset_36
+
+.Frameset_36:
db BATTLEANIMOAMSET_42, $02
db BATTLEANIMOAMSET_43, $02
db BATTLEANIMOAMSET_44, $02
- db BATTLEANIMOAMSET_45, $02
+ db BATTLEANIMOAMSET_45, $02
db -2
-
-.Frameset_37
+
+.Frameset_37:
db BATTLEANIMOAMSET_19, $02
- db -3, $02
+ db -3, $02
db -2
-
-.Frameset_38
+
+.Frameset_38:
db BATTLEANIMOAMSET_46, $04
- db BATTLEANIMOAMSET_47, $04
+ db BATTLEANIMOAMSET_47, $04
db -2
-
-.Frameset_39
+
+.Frameset_39:
db BATTLEANIMOAMSET_18, $02
- db -3, $02
+ db -3, $02
db -2
-
-.Frameset_3a
- db BATTLEANIMOAMSET_48, $08
+
+.Frameset_3a:
+ db BATTLEANIMOAMSET_48, $08
db -1
-
-.Frameset_3b
- db BATTLEANIMOAMSET_48, $48
+
+.Frameset_3b:
+ db BATTLEANIMOAMSET_48, $48
db -1
-
-.Frameset_3c
- db BATTLEANIMOAMSET_49, $08
+
+.Frameset_3c:
+ db BATTLEANIMOAMSET_49, $08
db -1
-
-.Frameset_3d
- db BATTLEANIMOAMSET_4A, $08
+
+.Frameset_3d:
+ db BATTLEANIMOAMSET_4A, $08
db -1
-
-.Frameset_43
+
+.Frameset_43:
db BATTLEANIMOAMSET_20, $10
db BATTLEANIMOAMSET_1F, $10
- db BATTLEANIMOAMSET_1E, $10
+ db BATTLEANIMOAMSET_1E, $10
db -1
-
-.Frameset_4c
+
+.Frameset_4c:
db BATTLEANIMOAMSET_20, $08
db BATTLEANIMOAMSET_1F, $08
- db BATTLEANIMOAMSET_1E, $08
+ db BATTLEANIMOAMSET_1E, $08
db -1
-
-.Frameset_44
+
+.Frameset_44:
db -3, $14
db BATTLEANIMOAMSET_55, $28
db BATTLEANIMOAMSET_54, $28
@@ -648,16 +648,16 @@ BattleAnimFrameData: ; ce85e
db -3, $04
db BATTLEANIMOAMSET_53, $04
db -3, $04
- db BATTLEANIMOAMSET_53, $04
+ db BATTLEANIMOAMSET_53, $04
db -4
-
-.Frameset_7e
+
+.Frameset_7e:
db BATTLEANIMOAMSET_1E, $08
db BATTLEANIMOAMSET_1F, $08
- db BATTLEANIMOAMSET_20, $08
+ db BATTLEANIMOAMSET_20, $08
db -4
-
-.Frameset_45
+
+.Frameset_45:
db -3, $00
db BATTLEANIMOAMSET_14, $00
db BATTLEANIMOAMSET_15, $00
@@ -665,52 +665,52 @@ BattleAnimFrameData: ; ce85e
db -3, $00
db BATTLEANIMOAMSET_16, $40
db BATTLEANIMOAMSET_15, $00
- db BATTLEANIMOAMSET_16, $00
+ db BATTLEANIMOAMSET_16, $00
db -2
-
-.Frameset_46
+
+.Frameset_46:
db BATTLEANIMOAMSET_56, $02
- db BATTLEANIMOAMSET_57, $04
+ db BATTLEANIMOAMSET_57, $04
db -4
-
-.Frameset_47
+
+.Frameset_47:
db BATTLEANIMOAMSET_56, $c2
- db BATTLEANIMOAMSET_57, $c4
+ db BATTLEANIMOAMSET_57, $c4
db -4
-
-.Frameset_48
+
+.Frameset_48:
db BATTLEANIMOAMSET_56, $01
db BATTLEANIMOAMSET_57, $01
db BATTLEANIMOAMSET_58, $01
db BATTLEANIMOAMSET_57, $c1
db BATTLEANIMOAMSET_58, $c1
- db BATTLEANIMOAMSET_57, $02
+ db BATTLEANIMOAMSET_57, $02
db -4
-
-.Frameset_49
+
+.Frameset_49:
db BATTLEANIMOAMSET_56, $c1
db BATTLEANIMOAMSET_57, $c1
db BATTLEANIMOAMSET_58, $c1
db BATTLEANIMOAMSET_57, $01
db BATTLEANIMOAMSET_58, $01
- db BATTLEANIMOAMSET_57, $c2
+ db BATTLEANIMOAMSET_57, $c2
db -4
-
-.Frameset_4a
+
+.Frameset_4a:
db BATTLEANIMOAMSET_57, $c1
db BATTLEANIMOAMSET_58, $c1
db BATTLEANIMOAMSET_57, $01
- db BATTLEANIMOAMSET_58, $01
+ db BATTLEANIMOAMSET_58, $01
db -2
-
-.Frameset_4b
+
+.Frameset_4b:
db BATTLEANIMOAMSET_59, $01
db BATTLEANIMOAMSET_5A, $01
db BATTLEANIMOAMSET_5B, $01
- db BATTLEANIMOAMSET_5C, $02
+ db BATTLEANIMOAMSET_5C, $02
db -4
-
-.Frameset_4d
+
+.Frameset_4d:
db BATTLEANIMOAMSET_0A, $0a
db BATTLEANIMOAMSET_0B, $43
db BATTLEANIMOAMSET_5D, $43
@@ -718,103 +718,103 @@ BattleAnimFrameData: ; ce85e
db BATTLEANIMOAMSET_0A, $82
db BATTLEANIMOAMSET_0B, $81
db BATTLEANIMOAMSET_5D, $01
- db BATTLEANIMOAMSET_0B, $01
+ db BATTLEANIMOAMSET_0B, $01
db -2
-
-.Frameset_4e
+
+.Frameset_4e:
db BATTLEANIMOAMSET_0A, $03
db BATTLEANIMOAMSET_0B, $47
db BATTLEANIMOAMSET_0A, $07
db BATTLEANIMOAMSET_0B, $07
- db BATTLEANIMOAMSET_0A, $03
+ db BATTLEANIMOAMSET_0A, $03
db -2
-
-.Frameset_4f
+
+.Frameset_4f:
+ db BATTLEANIMOAMSET_5E, $20
db BATTLEANIMOAMSET_5E, $20
- db BATTLEANIMOAMSET_5E, $20
db -4
-
-.Frameset_50
+
+.Frameset_50:
+ db BATTLEANIMOAMSET_5F, $20
db BATTLEANIMOAMSET_5F, $20
- db BATTLEANIMOAMSET_5F, $20
db -4
-
-.Frameset_51
- db BATTLEANIMOAMSET_60, $08
+
+.Frameset_51:
+ db BATTLEANIMOAMSET_60, $08
db -1
-
-.Frameset_52
+
+.Frameset_52:
db BATTLEANIMOAMSET_61, $01
db BATTLEANIMOAMSET_62, $01
- db BATTLEANIMOAMSET_63, $01
+ db BATTLEANIMOAMSET_63, $01
db -1
-
-.Frameset_53
+
+.Frameset_53:
db BATTLEANIMOAMSET_63, $07
- db BATTLEANIMOAMSET_64, $07
+ db BATTLEANIMOAMSET_64, $07
db -2
-
-.Frameset_54
+
+.Frameset_54:
db BATTLEANIMOAMSET_65, $01
db BATTLEANIMOAMSET_66, $01
- db BATTLEANIMOAMSET_67, $01
+ db BATTLEANIMOAMSET_67, $01
db -1
-
-.Frameset_55
+
+.Frameset_55:
db BATTLEANIMOAMSET_67, $07
- db BATTLEANIMOAMSET_68, $07
+ db BATTLEANIMOAMSET_68, $07
db -2
-
-.Frameset_59
- db BATTLEANIMOAMSET_6E, $08
+
+.Frameset_59:
+ db BATTLEANIMOAMSET_6E, $08
db -1
-
-.Frameset_5a
- db BATTLEANIMOAMSET_6F, $08
+
+.Frameset_5a:
+ db BATTLEANIMOAMSET_6F, $08
db -1
-
-.Frameset_5b
- db BATTLEANIMOAMSET_6E, $88
+
+.Frameset_5b:
+ db BATTLEANIMOAMSET_6E, $88
db -1
-
-.Frameset_5c
+
+.Frameset_5c:
db BATTLEANIMOAMSET_18, $04
db BATTLEANIMOAMSET_70, $04
db BATTLEANIMOAMSET_71, $04
db BATTLEANIMOAMSET_72, $04
- db BATTLEANIMOAMSET_73, $04
+ db BATTLEANIMOAMSET_73, $04
db -4
-
-.Frameset_5d
+
+.Frameset_5d:
db BATTLEANIMOAMSET_74, $04
- db BATTLEANIMOAMSET_75, $04
+ db BATTLEANIMOAMSET_75, $04
db -2
-
-.Frameset_5e
- db BATTLEANIMOAMSET_14, $08
+
+.Frameset_5e:
+ db BATTLEANIMOAMSET_14, $08
db -1
-
-.Frameset_7a
+
+.Frameset_7a:
db BATTLEANIMOAMSET_74, $03
db BATTLEANIMOAMSET_14, $03
db BATTLEANIMOAMSET_15, $03
db BATTLEANIMOAMSET_14, $03
- db BATTLEANIMOAMSET_15, $03
+ db BATTLEANIMOAMSET_15, $03
db -4
-
-.Frameset_af
+
+.Frameset_af:
db BATTLEANIMOAMSET_14, $00
db BATTLEANIMOAMSET_15, $00
db BATTLEANIMOAMSET_14, $00
db BATTLEANIMOAMSET_15, $00
- db BATTLEANIMOAMSET_74, $0c
+ db BATTLEANIMOAMSET_74, $0c
db -4
-
-.Frameset_5f
- db BATTLEANIMOAMSET_76, $08
+
+.Frameset_5f:
+ db BATTLEANIMOAMSET_76, $08
db -1
-
-.Frameset_60
+
+.Frameset_60:
db BATTLEANIMOAMSET_77, $01
db BATTLEANIMOAMSET_78, $01
db BATTLEANIMOAMSET_79, $01
@@ -827,146 +827,146 @@ BattleAnimFrameData: ; ce85e
db BATTLEANIMOAMSET_7A, $c1
db BATTLEANIMOAMSET_79, $c1
db BATTLEANIMOAMSET_78, $c1
- db BATTLEANIMOAMSET_77, $c1
+ db BATTLEANIMOAMSET_77, $c1
db -4
-
-.Frameset_61
+
+.Frameset_61:
db BATTLEANIMOAMSET_1B, $04
- db BATTLEANIMOAMSET_7E, $04
+ db BATTLEANIMOAMSET_7E, $04
db -2
-
-.Frameset_62
+
+.Frameset_62:
db BATTLEANIMOAMSET_1B, $44
- db BATTLEANIMOAMSET_7E, $44
+ db BATTLEANIMOAMSET_7E, $44
db -2
-
-.Frameset_63
- db BATTLEANIMOAMSET_7F, $08
+
+.Frameset_63:
+ db BATTLEANIMOAMSET_7F, $08
db -1
-
-.Frameset_64
- db BATTLEANIMOAMSET_25, $08
+
+.Frameset_64:
+ db BATTLEANIMOAMSET_25, $08
db -1
-
-.Frameset_65
- db BATTLEANIMOAMSET_80, $08
+
+.Frameset_65:
+ db BATTLEANIMOAMSET_80, $08
db -1
-
-.Frameset_66
+
+.Frameset_66:
db BATTLEANIMOAMSET_83, $07
db BATTLEANIMOAMSET_82, $07
db BATTLEANIMOAMSET_81, $07
db BATTLEANIMOAMSET_82, $07
db BATTLEANIMOAMSET_83, $07
db BATTLEANIMOAMSET_82, $07
- db BATTLEANIMOAMSET_81, $07
+ db BATTLEANIMOAMSET_81, $07
db -4
-
-.Frameset_67
- db BATTLEANIMOAMSET_1B, $10
+
+.Frameset_67:
+ db BATTLEANIMOAMSET_1B, $10
db -4
-
-.Frameset_68
+
+.Frameset_68:
db -3, $0f
db BATTLEANIMOAMSET_84, $0f
db BATTLEANIMOAMSET_85, $0f
db BATTLEANIMOAMSET_29, $0f
db BATTLEANIMOAMSET_28, $0f
- db BATTLEANIMOAMSET_86, $20
+ db BATTLEANIMOAMSET_86, $20
db -4
-
-.Frameset_69
+
+.Frameset_69:
db BATTLEANIMOAMSET_1B, $03
db BATTLEANIMOAMSET_87, $03
db BATTLEANIMOAMSET_88, $03
- db BATTLEANIMOAMSET_89, $03
+ db BATTLEANIMOAMSET_89, $03
db -4
-
-.Frameset_6a
+
+.Frameset_6a:
db BATTLEANIMOAMSET_8A, $02
db BATTLEANIMOAMSET_8B, $02
db BATTLEANIMOAMSET_8C, $02
- db BATTLEANIMOAMSET_8D, $02
+ db BATTLEANIMOAMSET_8D, $02
db -4
-
-.Frameset_6b
+
+.Frameset_6b:
db BATTLEANIMOAMSET_61, $02
db BATTLEANIMOAMSET_62, $02
- db BATTLEANIMOAMSET_63, $02
+ db BATTLEANIMOAMSET_63, $02
db -1
-
-.Frameset_6c
+
+.Frameset_6c:
db BATTLEANIMOAMSET_65, $02
db BATTLEANIMOAMSET_66, $02
- db BATTLEANIMOAMSET_67, $02
+ db BATTLEANIMOAMSET_67, $02
db -1
-
-.Frameset_6d
- db BATTLEANIMOAMSET_8E, $08
+
+.Frameset_6d:
+ db BATTLEANIMOAMSET_8E, $08
db -1
-
-.Frameset_6e
- db BATTLEANIMOAMSET_8E, $48
+
+.Frameset_6e:
+ db BATTLEANIMOAMSET_8E, $48
db -1
-
-.Frameset_6f
+
+.Frameset_6f:
db BATTLEANIMOAMSET_8F, $10
- db BATTLEANIMOAMSET_90, $10
+ db BATTLEANIMOAMSET_90, $10
db -2
-
-.Frameset_70
+
+.Frameset_70:
db BATTLEANIMOAMSET_91, $10
- db BATTLEANIMOAMSET_92, $10
+ db BATTLEANIMOAMSET_92, $10
db -2
-
-.Frameset_71
- db BATTLEANIMOAMSET_93, $08
+
+.Frameset_71:
+ db BATTLEANIMOAMSET_93, $08
db -1
-
-.Frameset_72
- db BATTLEANIMOAMSET_1E, $08
+
+.Frameset_72:
+ db BATTLEANIMOAMSET_1E, $08
db -1
-
-.Frameset_73
+
+.Frameset_73:
db BATTLEANIMOAMSET_1B, $07
- db BATTLEANIMOAMSET_94, $07
+ db BATTLEANIMOAMSET_94, $07
db -2
-
-.Frameset_74
- db BATTLEANIMOAMSET_95, $08
+
+.Frameset_74:
+ db BATTLEANIMOAMSET_95, $08
db -1
-
-.Frameset_75
- db BATTLEANIMOAMSET_96, $08
+
+.Frameset_75:
+ db BATTLEANIMOAMSET_96, $08
db -1
-
-.Frameset_76
- db BATTLEANIMOAMSET_95, $08
+
+.Frameset_76:
+ db BATTLEANIMOAMSET_95, $08
db -1
-
-.Frameset_77
+
+.Frameset_77:
db BATTLEANIMOAMSET_97, $01
- db BATTLEANIMOAMSET_97, $41
+ db BATTLEANIMOAMSET_97, $41
db -2
-
-.Frameset_78
- db BATTLEANIMOAMSET_98, $08
+
+.Frameset_78:
+ db BATTLEANIMOAMSET_98, $08
db -1
-
-.Frameset_79
+
+.Frameset_79:
db BATTLEANIMOAMSET_99, $20
db BATTLEANIMOAMSET_99, $20
db BATTLEANIMOAMSET_99, $20
db BATTLEANIMOAMSET_99, $20
db BATTLEANIMOAMSET_99, $20
- db BATTLEANIMOAMSET_9A, $08
+ db BATTLEANIMOAMSET_9A, $08
db -1
-
-.Frameset_7b
- db BATTLEANIMOAMSET_9B, $08
+
+.Frameset_7b:
+ db BATTLEANIMOAMSET_9B, $08
db -1
-
-.Frameset_7c
+
+.Frameset_7c:
db BATTLEANIMOAMSET_9C, $02
db BATTLEANIMOAMSET_9D, $02
db BATTLEANIMOAMSET_9E, $08
@@ -975,182 +975,182 @@ BattleAnimFrameData: ; ce85e
db -3, $02
db BATTLEANIMOAMSET_9E, $02
db -3, $02
- db BATTLEANIMOAMSET_9E, $02
+ db BATTLEANIMOAMSET_9E, $02
db -4
-
-.Frameset_7d
- db BATTLEANIMOAMSET_9F, $08
+
+.Frameset_7d:
+ db BATTLEANIMOAMSET_9F, $08
db -1
-
-.Frameset_7f
- db BATTLEANIMOAMSET_0F, $08
+
+.Frameset_7f:
+ db BATTLEANIMOAMSET_0F, $08
db -1
-
-.Frameset_80
- db BATTLEANIMOAMSET_6B, $18
+
+.Frameset_80:
+ db BATTLEANIMOAMSET_6B, $18
db -4
-
-.Frameset_81
- db BATTLEANIMOAMSET_A0, $01 ; fallthrough
-.Frameset_82
- db BATTLEANIMOAMSET_A1, $01 ; fallthrough
-.Frameset_83
- db BATTLEANIMOAMSET_A2, $01
+
+.Frameset_81:
+ db BATTLEANIMOAMSET_A0, $01 ; fallthrough
+.Frameset_82:
+ db BATTLEANIMOAMSET_A1, $01 ; fallthrough
+.Frameset_83:
+ db BATTLEANIMOAMSET_A2, $01
db -4
-
-.Frameset_84
- db BATTLEANIMOAMSET_A3, $08
+
+.Frameset_84:
+ db BATTLEANIMOAMSET_A3, $08
db -1
-
-.Frameset_85
+
+.Frameset_85:
db BATTLEANIMOAMSET_A4, $04
db BATTLEANIMOAMSET_A5, $04
db BATTLEANIMOAMSET_A6, $04
db BATTLEANIMOAMSET_A7, $04
db BATTLEANIMOAMSET_A6, $44
- db BATTLEANIMOAMSET_A5, $44
+ db BATTLEANIMOAMSET_A5, $44
db -2
-
-.Frameset_86
+
+.Frameset_86:
db BATTLEANIMOAMSET_A8, $04
db BATTLEANIMOAMSET_A9, $04
db BATTLEANIMOAMSET_AA, $04
db BATTLEANIMOAMSET_AB, $04
db BATTLEANIMOAMSET_AA, $44
- db BATTLEANIMOAMSET_A9, $44
+ db BATTLEANIMOAMSET_A9, $44
db -2
-
-.Frameset_87
- db BATTLEANIMOAMSET_1B, $08
+
+.Frameset_87:
+ db BATTLEANIMOAMSET_1B, $08
db -1
-
-.Frameset_88
- db BATTLEANIMOAMSET_AC, $08
+
+.Frameset_88:
+ db BATTLEANIMOAMSET_AC, $08
db -1
-
-.Frameset_89
- db BATTLEANIMOAMSET_AD, $08
+
+.Frameset_89:
+ db BATTLEANIMOAMSET_AD, $08
db -1
-
-.Frameset_8a
- db BATTLEANIMOAMSET_AE, $08
+
+.Frameset_8a:
+ db BATTLEANIMOAMSET_AE, $08
db -1
-
-.Frameset_8b
- db BATTLEANIMOAMSET_AF, $08
+
+.Frameset_8b:
+ db BATTLEANIMOAMSET_AF, $08
db -1
-
-.Frameset_8c
- db BATTLEANIMOAMSET_B0, $20
+
+.Frameset_8c:
+ db BATTLEANIMOAMSET_B0, $20
db -4
-
-.Frameset_8d
+
+.Frameset_8d:
db BATTLEANIMOAMSET_B1, $07
- db BATTLEANIMOAMSET_B1, $47
+ db BATTLEANIMOAMSET_B1, $47
db -2
-
-.Frameset_8e
- db BATTLEANIMOAMSET_B2, $08
+
+.Frameset_8e:
+ db BATTLEANIMOAMSET_B2, $08
db -1
-
-.Frameset_8f
- db BATTLEANIMOAMSET_B3, $08
+
+.Frameset_8f:
+ db BATTLEANIMOAMSET_B3, $08
db -1
-
-.Frameset_90
- db BATTLEANIMOAMSET_B3, $48
+
+.Frameset_90:
+ db BATTLEANIMOAMSET_B3, $48
db -1
-
-.Frameset_91
- db BATTLEANIMOAMSET_B3, $88
+
+.Frameset_91:
+ db BATTLEANIMOAMSET_B3, $88
db -1
-
-.Frameset_92
- db BATTLEANIMOAMSET_B3, $c8
+
+.Frameset_92:
+ db BATTLEANIMOAMSET_B3, $c8
db -1
-
-.Frameset_93
- db BATTLEANIMOAMSET_B5, $08
+
+.Frameset_93:
+ db BATTLEANIMOAMSET_B5, $08
db -1
-
-.Frameset_94
- db BATTLEANIMOAMSET_B5, $48
+
+.Frameset_94:
+ db BATTLEANIMOAMSET_B5, $48
db -1
-
-.Frameset_95
- db BATTLEANIMOAMSET_B5, $88
+
+.Frameset_95:
+ db BATTLEANIMOAMSET_B5, $88
db -1
-
-.Frameset_96
- db BATTLEANIMOAMSET_B5, $c8
+
+.Frameset_96:
+ db BATTLEANIMOAMSET_B5, $c8
db -1
-
-.Frameset_97
- db BATTLEANIMOAMSET_B4, $08
+
+.Frameset_97:
+ db BATTLEANIMOAMSET_B4, $08
db -1
-
-.Frameset_98
- db BATTLEANIMOAMSET_6B, $08
+
+.Frameset_98:
+ db BATTLEANIMOAMSET_6B, $08
db -1
-
-.Frameset_99
- db BATTLEANIMOAMSET_B6, $08
+
+.Frameset_99:
+ db BATTLEANIMOAMSET_B6, $08
db -1
-
-.Frameset_9a
- db BATTLEANIMOAMSET_B7, $20
+
+.Frameset_9a:
+ db BATTLEANIMOAMSET_B7, $20
db -1
-
-.Frameset_9b
- db BATTLEANIMOAMSET_1B, $20
+
+.Frameset_9b:
+ db BATTLEANIMOAMSET_1B, $20
db -1
-
-.Frameset_9c
- db BATTLEANIMOAMSET_B8, $20
+
+.Frameset_9c:
+ db BATTLEANIMOAMSET_B8, $20
db -1
-
-.Frameset_9d
- db BATTLEANIMOAMSET_B8, $60
+
+.Frameset_9d:
+ db BATTLEANIMOAMSET_B8, $60
db -1
-
-.Frameset_9e
- db BATTLEANIMOAMSET_B9, $20
+
+.Frameset_9e:
+ db BATTLEANIMOAMSET_B9, $20
db -1
-
-.Frameset_9f
- db BATTLEANIMOAMSET_BA, $20
+
+.Frameset_9f:
+ db BATTLEANIMOAMSET_BA, $20
db -1
-
-.Frameset_a0
- db BATTLEANIMOAMSET_BB, $60
+
+.Frameset_a0:
+ db BATTLEANIMOAMSET_BB, $60
db -1
-
-.Frameset_a1
- db BATTLEANIMOAMSET_BB, $20
+
+.Frameset_a1:
+ db BATTLEANIMOAMSET_BB, $20
db -1
-
-.Frameset_a2
- db BATTLEANIMOAMSET_BC, $20
+
+.Frameset_a2:
+ db BATTLEANIMOAMSET_BC, $20
db -1
-
-.Frameset_a3
+
+.Frameset_a3:
db BATTLEANIMOAMSET_BD, $0b
db BATTLEANIMOAMSET_BE, $0b
- db BATTLEANIMOAMSET_1B, $0b
+ db BATTLEANIMOAMSET_1B, $0b
db -4
-
-.Frameset_a4
+
+.Frameset_a4:
db BATTLEANIMOAMSET_BF, $04
db BATTLEANIMOAMSET_C0, $04
- db BATTLEANIMOAMSET_C1, $04
+ db BATTLEANIMOAMSET_C1, $04
db -4
-
-.Frameset_a5
+
+.Frameset_a5:
+ db BATTLEANIMOAMSET_C2, $20
db BATTLEANIMOAMSET_C2, $20
- db BATTLEANIMOAMSET_C2, $20
db -4
-
-.Frameset_a6
+
+.Frameset_a6:
db BATTLEANIMOAMSET_4B, $02
db BATTLEANIMOAMSET_4C, $02
db BATTLEANIMOAMSET_4D, $20
@@ -1165,10 +1165,10 @@ BattleAnimFrameData: ; ce85e
db -3, $02
db BATTLEANIMOAMSET_52, $02
db -3, $02
- db BATTLEANIMOAMSET_52, $02
+ db BATTLEANIMOAMSET_52, $02
db -4
-
-.Frameset_a7
+
+.Frameset_a7:
db BATTLEANIMOAMSET_4B, $c2
db BATTLEANIMOAMSET_4C, $c2
db BATTLEANIMOAMSET_4D, $e0
@@ -1183,88 +1183,88 @@ BattleAnimFrameData: ; ce85e
db -3, $02
db BATTLEANIMOAMSET_52, $c2
db -3, $02
- db BATTLEANIMOAMSET_52, $c2
+ db BATTLEANIMOAMSET_52, $c2
db -4
-
-.Frameset_a8
+
+.Frameset_a8:
db BATTLEANIMOAMSET_C3, $01
- db BATTLEANIMOAMSET_C3, $c1
+ db BATTLEANIMOAMSET_C3, $c1
db -2
-
-.Frameset_a9
- db BATTLEANIMOAMSET_C4, $20
+
+.Frameset_a9:
+ db BATTLEANIMOAMSET_C4, $20
db -1
-
-.Frameset_aa
+
+.Frameset_aa:
db BATTLEANIMOAMSET_C5, $04
db BATTLEANIMOAMSET_C6, $04
- db BATTLEANIMOAMSET_C7, $04
+ db BATTLEANIMOAMSET_C7, $04
db -4
-
-.Frameset_ab
+
+.Frameset_ab:
db BATTLEANIMOAMSET_C8, $01
- db BATTLEANIMOAMSET_C8, $41
+ db BATTLEANIMOAMSET_C8, $41
db -2
-
-.Frameset_ac
+
+.Frameset_ac:
db BATTLEANIMOAMSET_C9, $03
- db BATTLEANIMOAMSET_05, $03
+ db BATTLEANIMOAMSET_05, $03
db -4
-
-.Frameset_ad
+
+.Frameset_ad:
db BATTLEANIMOAMSET_CA, $20
db BATTLEANIMOAMSET_CB, $03
db BATTLEANIMOAMSET_CA, $03
- db BATTLEANIMOAMSET_CB, $03
+ db BATTLEANIMOAMSET_CB, $03
db -2
-
-.Frameset_ae
- db BATTLEANIMOAMSET_03, $a0
+
+.Frameset_ae:
+ db BATTLEANIMOAMSET_03, $a0
db -1
-
-.Frameset_b0
- db BATTLEANIMOAMSET_CC, $20
+
+.Frameset_b0:
+ db BATTLEANIMOAMSET_CC, $20
db -1
-
-.Frameset_b1
+
+.Frameset_b1:
db BATTLEANIMOAMSET_7F, $02
db BATTLEANIMOAMSET_25, $02
db BATTLEANIMOAMSET_80, $02
- db BATTLEANIMOAMSET_25, $02
+ db BATTLEANIMOAMSET_25, $02
db -2
-
-.Frameset_b2
+
+.Frameset_b2:
db BATTLEANIMOAMSET_CD, $04
db BATTLEANIMOAMSET_CE, $04
db BATTLEANIMOAMSET_CD, $c4
- db BATTLEANIMOAMSET_CE, $c4
+ db BATTLEANIMOAMSET_CE, $c4
db -2
-
-.Frameset_b3
+
+.Frameset_b3:
db BATTLEANIMOAMSET_CF, $04
db BATTLEANIMOAMSET_D0, $04
db BATTLEANIMOAMSET_D1, $04
- db BATTLEANIMOAMSET_D2, $04
+ db BATTLEANIMOAMSET_D2, $04
db -4
-
-.Frameset_b4
- db BATTLEANIMOAMSET_D3, $20
+
+.Frameset_b4:
+ db BATTLEANIMOAMSET_D3, $20
db -1
-
-.Frameset_b5
- db BATTLEANIMOAMSET_D4, $08
+
+.Frameset_b5:
+ db BATTLEANIMOAMSET_D4, $08
db -1
-
-.Frameset_b6
- db BATTLEANIMOAMSET_D5, $08
+
+.Frameset_b6:
+ db BATTLEANIMOAMSET_D5, $08
db -1
-
-.Frameset_b7
- db BATTLEANIMOAMSET_D6, $08
+
+.Frameset_b7:
+ db BATTLEANIMOAMSET_D6, $08
db -1
-
-.Frameset_b8
- db BATTLEANIMOAMSET_D7, $08
+
+.Frameset_b8:
+ db BATTLEANIMOAMSET_D7, $08
db -1
-
-; ceeae
+
+; ceeae
diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm
index 474b332ef..fbe48e558 100755
--- a/battle/objects/functions.asm
+++ b/battle/objects/functions.asm
@@ -12,7 +12,7 @@ DoBattleAnimFrame: ; ccfbe
jp [hl]
; ccfce
-.Jumptable
+.Jumptable:
dw BattleAnimFunction_00 ; 00
dw BattleAnimFunction_01 ; 01
dw BattleAnimFunction_02 ; 02
@@ -425,7 +425,7 @@ GetBallAnimPal: ; cd249 (33:5249)
ld e, a
pop af
ld [rSVBK], a
-.IsInArray
+.IsInArray:
ld a, [hli]
cp -1
jr z, .load
@@ -634,7 +634,7 @@ BattleAnimFunction_08: ; cd306 (33:5306)
call .SetCoords
ret
-.SetCoords
+.SetCoords:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@@ -4100,7 +4100,7 @@ BattleAnim_Sine: ; ce734 (33:6734)
inc a
ret
-.ApplySineWave
+.ApplySineWave:
ld e, a
ld a, d
ld d, 0
diff --git a/battle/objects/oam.asm b/battle/objects/oam.asm
index d7186b106..8ae6651a4 100755
--- a/battle/objects/oam.asm
+++ b/battle/objects/oam.asm
@@ -1,1086 +1,1086 @@
-
-BattleAnimOAMData: ; ceeae
-; vtile offset (?), length, address
- dbbw $00, 16, .OAMData_00 ; 00
- dbbw $04, 9, .OAMData_01 ; 01
- dbbw $08, 4, .OAMData_02 ; 02
- dbbw $09, 4, .OAMData_03 ; 03
- dbbw $0d, 4, .OAMData_04 ; 04
- dbbw $0f, 4, .OAMData_03 ; 05
- dbbw $13, 4, .OAMData_04 ; 06
- dbbw $04, 16, .OAMData_00 ; 07
- dbbw $08, 16, .OAMData_00 ; 08
- dbbw $08, 16, .OAMData_09 ; 09
- dbbw $00, 4, .OAMData_04 ; 0a
- dbbw $02, 4, .OAMData_03 ; 0b
- dbbw $06, 2, .OAMData_0c ; 0c
- dbbw $07, 2, .OAMData_0c ; 0d
- dbbw $02, 4, .OAMData_04 ; 0e
- dbbw $04, 1, .OAMData_0f ; 0f
- dbbw $05, 1, .OAMData_0f ; 10
- dbbw $00, 2, .OAMData_11 ; 11
- dbbw $02, 2, .OAMData_11 ; 12
- dbbw $00, 4, .OAMData_13 ; 13
- dbbw $00, 1, .OAMData_0f ; 14
- dbbw $01, 1, .OAMData_0f ; 15
- dbbw $02, 1, .OAMData_0f ; 16
- dbbw $03, 1, .OAMData_0f ; 17
- dbbw $00, 4, .OAMData_02 ; 18
- dbbw $01, 16, .OAMData_00 ; 19
- dbbw $05, 16, .OAMData_00 ; 1a
- dbbw $00, 4, .OAMData_03 ; 1b
- dbbw $05, 12, .OAMData_1c ; 1c
- dbbw $02, 4, .OAMData_02 ; 1d
- dbbw $06, 1, .OAMData_0f ; 1e
- dbbw $07, 1, .OAMData_0f ; 1f
- dbbw $08, 1, .OAMData_0f ; 20
- dbbw $04, 4, .OAMData_03 ; 21
- dbbw $09, 22, .OAMData_22 ; 22
- dbbw $04, 2, .OAMData_11 ; 23
- dbbw $06, 2, .OAMData_11 ; 24
- dbbw $0c, 1, .OAMData_0f ; 25
- dbbw $0a, 1, .OAMData_0f ; 26
- dbbw $0b, 4, .OAMData_02 ; 27
- dbbw $08, 4, .OAMData_04 ; 28
- dbbw $06, 4, .OAMData_04 ; 29
- dbbw $00, 5, .OAMData_2a ; 2a
- dbbw $03, 6, .OAMData_2b ; 2b
- dbbw $00, 7, .OAMData_2c ; 2c
- dbbw $03, 8, .OAMData_2d ; 2d
- dbbw $00, 9, .OAMData_2e ; 2e
- dbbw $00, 4, .OAMData_2f ; 2f
- dbbw $02, 4, .OAMData_30 ; 30
- dbbw $04, 6, .OAMData_31 ; 31
- dbbw $00, 2, .OAMData_32 ; 32
- dbbw $00, 7, .OAMData_33 ; 33
- dbbw $00, 14, .OAMData_32 ; 34
- dbbw $00, 21, .OAMData_33 ; 35
- dbbw $00, 2, .OAMData_36 ; 36
- dbbw $00, 6, .OAMData_36 ; 37
- dbbw $00, 10, .OAMData_36 ; 38
- dbbw $00, 14, .OAMData_36 ; 39
- dbbw $00, 2, .OAMData_3a ; 3a
- dbbw $00, 6, .OAMData_3a ; 3b
- dbbw $00, 10, .OAMData_3a ; 3c
- dbbw $00, 14, .OAMData_3a ; 3d
- dbbw $00, 4, .OAMData_3e ; 3e
- dbbw $00, 16, .OAMData_3e ; 3f
- dbbw $00, 26, .OAMData_3e ; 40
- dbbw $00, 26, .OAMData_41 ; 41
- dbbw $0e, 4, .OAMData_42 ; 42
- dbbw $0e, 8, .OAMData_42 ; 43
- dbbw $0e, 4, .OAMData_44 ; 44
- dbbw $0e, 8, .OAMData_44 ; 45
- dbbw $0e, 4, .OAMData_46 ; 46
- dbbw $0e, 4, .OAMData_47 ; 47
- dbbw $00, 6, .OAMData_48 ; 48
- dbbw $03, 4, .OAMData_49 ; 49
- dbbw $03, 2, .OAMData_4a ; 4a
- dbbw $01, 5, .OAMData_0f ; 4b
- dbbw $01, 6, .OAMData_4c ; 4c
- dbbw $01, 7, .OAMData_4d ; 4d
- dbbw $01, 3, .OAMData_4d ; 4e
- dbbw $01, 8, .OAMData_4f ; 4f
- dbbw $01, 9, .OAMData_50 ; 50
- dbbw $01, 10, .OAMData_51 ; 51
- dbbw $01, 6, .OAMData_51 ; 52
- dbbw $00, 9, .OAMData_01 ; 53
- dbbw $04, 4, .OAMData_02 ; 54
- dbbw $05, 4, .OAMData_02 ; 55
- dbbw $00, 2, .OAMData_56 ; 56
- dbbw $02, 2, .OAMData_56 ; 57
- dbbw $04, 2, .OAMData_56 ; 58
- dbbw $02, 4, .OAMData_59 ; 59
- dbbw $02, 4, .OAMData_5a ; 5a
- dbbw $02, 2, .OAMData_0c ; 5b
- dbbw $04, 2, .OAMData_0c ; 5c
- dbbw $06, 4, .OAMData_5d ; 5d
- dbbw $08, 2, .OAMData_0c ; 5e
- dbbw $09, 2, .OAMData_0c ; 5f
- dbbw $05, 2, .OAMData_60 ; 60
- dbbw $00, 2, .OAMData_61 ; 61
- dbbw $00, 5, .OAMData_61 ; 62
- dbbw $00, 9, .OAMData_61 ; 63
- dbbw $09, 9, .OAMData_61 ; 64
- dbbw $00, 4, .OAMData_65 ; 65
- dbbw $00, 7, .OAMData_65 ; 66
- dbbw $00, 9, .OAMData_65 ; 67
- dbbw $09, 9, .OAMData_65 ; 68
- dbbw $04, 1, .OAMData_69 ; 69
- dbbw $05, 2, .OAMData_6a ; 6a
- dbbw $06, 4, .OAMData_03 ; 6b
- dbbw $0a, 4, .OAMData_03 ; 6c
- dbbw $0e, 4, .OAMData_03 ; 6d
- dbbw $08, 5, .OAMData_6e ; 6e
- dbbw $0d, 3, .OAMData_6f ; 6f
- dbbw $01, 8, .OAMData_70 ; 70
- dbbw $03, 8, .OAMData_70 ; 71
- dbbw $05, 8, .OAMData_70 ; 72
- dbbw $07, 8, .OAMData_70 ; 73
- dbbw $06, 4, .OAMData_02 ; 74
- dbbw $07, 4, .OAMData_02 ; 75
- dbbw $0a, 2, .OAMData_76 ; 76
- dbbw $00, 1, .OAMData_77 ; 77
- dbbw $00, 3, .OAMData_78 ; 78
- dbbw $00, 6, .OAMData_79 ; 79
- dbbw $00, 9, .OAMData_7a ; 7a
- dbbw $00, 12, .OAMData_7b ; 7b
- dbbw $00, 14, .OAMData_7c ; 7c
- dbbw $00, 15, .OAMData_7d ; 7d
- dbbw $04, 4, .OAMData_03 ; 7e
- dbbw $08, 4, .OAMData_03 ; 7f
- dbbw $0d, 1, .OAMData_0f ; 80
- dbbw $0e, 4, .OAMData_81 ; 81
- dbbw $10, 1, .OAMData_0f ; 82
- dbbw $11, 1, .OAMData_0f ; 83
- dbbw $04, 2, .OAMData_6a ; 84
- dbbw $05, 2, .OAMData_6a ; 85
- dbbw $0a, 4, .OAMData_04 ; 86
- dbbw $00, 8, .OAMData_87 ; 87
- dbbw $00, 12, .OAMData_88 ; 88
- dbbw $00, 16, .OAMData_87 ; 89
- dbbw $09, 2, .OAMData_8a ; 8a
- dbbw $09, 4, .OAMData_8a ; 8b
- dbbw $09, 6, .OAMData_8a ; 8c
- dbbw $09, 8, .OAMData_8a ; 8d
- dbbw $12, 5, .OAMData_8e ; 8e
- dbbw $00, 4, .OAMData_8f ; 8f
- dbbw $04, 4, .OAMData_8f ; 90
- dbbw $08, 4, .OAMData_8f ; 91
- dbbw $0c, 4, .OAMData_8f ; 92
- dbbw $00, 6, .OAMData_93 ; 93
- dbbw $04, 4, .OAMData_03 ; 94
- dbbw $0a, 4, .OAMData_04 ; 95
- dbbw $15, 4, .OAMData_30 ; 96
- dbbw $04, 4, .OAMData_30 ; 97
- dbbw $0c, 4, .OAMData_04 ; 98
- dbbw $0a, 4, .OAMData_99 ; 99
- dbbw $0c, 4, .OAMData_03 ; 9a
- dbbw $00, 36, .OAMData_9b ; 9b
- dbbw $0d, 2, .OAMData_9c ; 9c
- dbbw $0d, 4, .OAMData_9c ; 9d
- dbbw $0d, 6, .OAMData_9c ; 9e
- dbbw $02, 8, .OAMData_9f ; 9f
- dbbw $08, 7, .OAMData_a0 ; a0
- dbbw $08, 5, .OAMData_a0 ; a1
- dbbw $08, 3, .OAMData_a0 ; a2
- dbbw $00, 16, .OAMData_1c ; a3
- dbbw $00, 9, .OAMData_a4 ; a4
- dbbw $06, 9, .OAMData_a4 ; a5
- dbbw $0c, 9, .OAMData_a4 ; a6
- dbbw $12, 9, .OAMData_a4 ; a7
- dbbw $18, 9, .OAMData_a4 ; a8
- dbbw $1e, 9, .OAMData_a4 ; a9
- dbbw $24, 9, .OAMData_a4 ; aa
- dbbw $2a, 9, .OAMData_a4 ; ab
- dbbw $03, 4, .OAMData_ac ; ac
- dbbw $12, 4, .OAMData_03 ; ad
- dbbw $10, 4, .OAMData_04 ; ae
- dbbw $16, 1, .OAMData_0f ; af
- dbbw $17, 4, .OAMData_02 ; b0
- dbbw $18, 4, .OAMData_03 ; b1
- dbbw $1c, 4, .OAMData_03 ; b2
- dbbw $20, 3, .OAMData_03 ; b3
- dbbw $23, 4, .OAMData_04 ; b4
- dbbw $25, 3, .OAMData_03 ; b5
- dbbw $17, 4, .OAMData_03 ; b6
- dbbw $0a, 16, .OAMData_00 ; b7
- dbbw $10, 16, .OAMData_1c ; b8
- dbbw $00, 16, .OAMData_1c ; b9
- dbbw $04, 4, .OAMData_03 ; ba
- dbbw $08, 2, .OAMData_11 ; bb
- dbbw $20, 6, .OAMData_bc ; bc
- dbbw $08, 1, .OAMData_0f ; bd
- dbbw $04, 4, .OAMData_03 ; be
- dbbw $1a, 4, .OAMData_30 ; bf
- dbbw $16, 9, .OAMData_01 ; c0
- dbbw $10, 16, .OAMData_c1 ; c1
- dbbw $09, 6, .OAMData_c2 ; c2
- dbbw $11, 9, .OAMData_c3 ; c3
- dbbw $0e, 4, .OAMData_03 ; c4
- dbbw $0b, 4, .OAMData_30 ; c5
- dbbw $1c, 6, .OAMData_02 ; c6
- dbbw $20, 16, .OAMData_c1 ; c7
- dbbw $05, 6, .OAMData_c8 ; c8
- dbbw $0b, 4, .OAMData_03 ; c9
- dbbw $09, 4, .OAMData_ca ; ca
- dbbw $0b, 4, .OAMData_04 ; cb
- dbbw $11, 13, .OAMData_cc ; cc
- dbbw $00, 9, .OAMData_c3 ; cd
- dbbw $09, 9, .OAMData_c3 ; ce
- dbbw $00, 12, .OAMData_cf ; cf
- dbbw $06, 12, .OAMData_cf ; d0
- dbbw $0c, 12, .OAMData_cf ; d1
- dbbw $12, 12, .OAMData_cf ; d2
- dbbw $00, 13, .OAMData_cc ; d3
- dbbw $00, 7, .OAMData_d4 ; d4
- dbbw $00, 6, .OAMData_d5 ; d5
- dbbw $00, 14, .OAMData_d6 ; d6
- dbbw $00, 12, .OAMData_d7 ; d7
-
-.OAMData_11
- dsprite -1, 0, -1, 4, $00, $00
- dsprite 0, 0, -1, 4, $01, $00
-
-.OAMData_56
- dsprite -1, 4, -1, 0, $00, $00
- dsprite -1, 4, 0, 0, $01, $00
-
-.OAMData_03
- dsprite -1, 0, -1, 0, $00, $00
- dsprite -1, 0, 0, 0, $01, $00
- dsprite 0, 0, -1, 0, $02, $00
- dsprite 0, 0, 0, 0, $03, $00
-
-.OAMData_02
- dsprite -1, 0, -1, 0, $00, $00
- dsprite -1, 0, 0, 0, $00, $20
- dsprite 0, 0, -1, 0, $00, $40
- dsprite 0, 0, 0, 0, $00, $60
-
-.OAMData_c3
- dsprite -2, 4, -2, 4, $00, $00
- dsprite -2, 4, -1, 4, $01, $00
- dsprite -2, 4, 0, 4, $02, $00
- dsprite -1, 4, -2, 4, $03, $00
- dsprite -1, 4, -1, 4, $04, $00
- dsprite -1, 4, 0, 4, $05, $00
- dsprite 0, 4, -2, 4, $06, $00
- dsprite 0, 4, -1, 4, $07, $00
- dsprite 0, 4, 0, 4, $08, $00
-
-.OAMData_01
- dsprite -2, 4, -2, 4, $00, $00
- dsprite -2, 4, -1, 4, $01, $00
- dsprite -2, 4, 0, 4, $00, $20
- dsprite -1, 4, -2, 4, $02, $00
- dsprite -1, 4, -1, 4, $03, $00
- dsprite -1, 4, 0, 4, $02, $60
- dsprite 0, 4, -2, 4, $00, $40
- dsprite 0, 4, -1, 4, $01, $60
- dsprite 0, 4, 0, 4, $00, $60
-
-.OAMData_cf
- dsprite -2, 0, -2, 4, $00, $00
- dsprite -2, 0, -1, 4, $01, $00
- dsprite -2, 0, 0, 4, $02, $00
- dsprite -1, 0, -2, 4, $03, $00
- dsprite -1, 0, -1, 4, $04, $00
- dsprite -1, 0, 0, 4, $05, $00
- dsprite 0, 0, -2, 4, $05, $60
- dsprite 0, 0, -1, 4, $04, $60
- dsprite 0, 0, 0, 4, $03, $60
- dsprite 1, 0, -2, 4, $02, $60
- dsprite 1, 0, -1, 4, $01, $60
- dsprite 1, 0, 0, 4, $00, $60
-
-.OAMData_1c
- dsprite -2, 0, -2, 0, $00, $00
- dsprite -2, 0, -1, 0, $01, $00
- dsprite -2, 0, 0, 0, $02, $00
- dsprite -2, 0, 1, 0, $03, $00
- dsprite -1, 0, -2, 0, $04, $00
- dsprite -1, 0, -1, 0, $05, $00
- dsprite -1, 0, 0, 0, $06, $00
- dsprite -1, 0, 1, 0, $07, $00
- dsprite 0, 0, -2, 0, $08, $00
- dsprite 0, 0, -1, 0, $09, $00
- dsprite 0, 0, 0, 0, $0a, $00
- dsprite 0, 0, 1, 0, $0b, $00
- dsprite 1, 0, -2, 0, $0c, $00
- dsprite 1, 0, -1, 0, $0d, $00
- dsprite 1, 0, 0, 0, $0e, $00
- dsprite 1, 0, 1, 0, $0f, $00
-
-.OAMData_00
- dsprite -2, 0, -2, 0, $00, $00
- dsprite -2, 0, -1, 0, $01, $00
- dsprite -1, 0, -2, 0, $02, $00
- dsprite -1, 0, -1, 0, $03, $00
- dsprite -2, 0, 0, 0, $01, $20
- dsprite -2, 0, 1, 0, $00, $20
- dsprite -1, 0, 0, 0, $03, $20
- dsprite -1, 0, 1, 0, $02, $20
- dsprite 0, 0, -2, 0, $02, $40
- dsprite 0, 0, -1, 0, $03, $40
- dsprite 1, 0, -2, 0, $00, $40
- dsprite 1, 0, -1, 0, $01, $40
- dsprite 0, 0, 0, 0, $03, $60
- dsprite 0, 0, 1, 0, $02, $60
- dsprite 1, 0, 0, 0, $01, $60
- dsprite 1, 0, 1, 0, $00, $60
-
-.OAMData_09
- dsprite -3, 4, -3, 4, $00, $00
- dsprite -3, 4, -2, 4, $01, $00
- dsprite -2, 4, -3, 4, $02, $00
- dsprite -2, 4, -2, 4, $03, $00
- dsprite -3, 4, 0, 4, $01, $20
- dsprite -3, 4, 1, 4, $00, $20
- dsprite -2, 4, 0, 4, $03, $20
- dsprite -2, 4, 1, 4, $02, $20
- dsprite 0, 4, -3, 4, $02, $40
- dsprite 0, 4, -2, 4, $03, $40
- dsprite 1, 4, -3, 4, $00, $40
- dsprite 1, 4, -2, 4, $01, $40
- dsprite 0, 4, 0, 4, $03, $60
- dsprite 0, 4, 1, 4, $02, $60
- dsprite 1, 4, 0, 4, $01, $60
- dsprite 1, 4, 1, 4, $00, $60
-
-.OAMData_0c
- dsprite -1, 4, -1, 0, $00, $00
- dsprite -1, 4, 0, 0, $00, $20
-
-.OAMData_6a
- dsprite 0, 0, -1, 0, $00, $00
- dsprite 0, 0, 0, 0, $00, $20
-
-.OAMData_04
- dsprite -1, 0, -1, 0, $00, $00
- dsprite -1, 0, 0, 0, $00, $20
- dsprite 0, 0, -1, 0, $01, $00
- dsprite 0, 0, 0, 0, $01, $20
-
-.OAMData_5d
- dsprite -1, 0, -1, 0, $00, $00
- dsprite -1, 0, 0, 0, $01, $00
- dsprite 0, 0, -1, 0, $00, $40
- dsprite 0, 0, 0, 0, $01, $40
-
-.OAMData_13
- dsprite -1, 2, -1, 0, $02, $00
- dsprite 0, 2, -1, 0, $03, $00
- dsprite -2, 6, 0, 0, $02, $00
- dsprite -1, 6, 0, 0, $03, $00
-
-.OAMData_22
- dsprite 1, 0, -11, 0, $01, $00
- dsprite 0, 0, -10, 0, $02, $00
- dsprite 0, 0, -9, 0, $03, $00
- dsprite 0, 0, -8, 0, $00, $00
- dsprite 0, 0, -7, 0, $03, $00
- dsprite 0, 0, -6, 0, $00, $00
- dsprite 0, 0, -5, 0, $03, $00
- dsprite 0, 0, -4, 0, $00, $00
- dsprite 0, 0, -3, 0, $03, $00
- dsprite 0, 0, -2, 0, $00, $00
- dsprite 0, 0, -1, 0, $01, $00
- dsprite -1, 0, 0, 0, $02, $00
- dsprite -1, 0, 1, 0, $03, $00
- dsprite -1, 0, 2, 0, $00, $00
- dsprite -1, 0, 3, 0, $03, $00
- dsprite -1, 0, 4, 0, $00, $00
- dsprite -1, 0, 5, 0, $03, $00
- dsprite -1, 0, 6, 0, $00, $00
- dsprite -1, 0, 7, 0, $03, $00
- dsprite -1, 0, 8, 0, $00, $00
- dsprite -1, 0, 9, 0, $01, $00
- dsprite -2, 0, 10, 0, $02, $00
-
-.OAMData_2a
- dsprite -3, 4, -1, 0, $00, $00
- dsprite -3, 4, 0, 0, $00, $20
- dsprite -2, 4, -1, 0, $01, $00
- dsprite -2, 4, 0, 0, $01, $20
- dsprite -1, 4, -1, 4, $02, $00
-
-.OAMData_2b
- dsprite -4, 4, -1, 0, $00, $00
- dsprite -4, 4, 0, 0, $00, $20
- dsprite -3, 4, -1, 0, $01, $00
- dsprite -3, 4, 0, 0, $01, $20
- dsprite -2, 4, -1, 4, $02, $00
- dsprite -1, 4, -1, 4, $02, $00
-
-.OAMData_2c
- dsprite -5, 4, -1, 0, $00, $00
- dsprite -5, 4, 0, 0, $00, $20
- dsprite -4, 4, -1, 0, $01, $00
- dsprite -4, 4, 0, 0, $01, $20
- dsprite -3, 4, -1, 4, $02, $00
- dsprite -2, 4, -1, 4, $02, $00
- dsprite -1, 4, -1, 4, $02, $00
-
-.OAMData_2d
- dsprite -6, 4, -1, 0, $00, $00
- dsprite -6, 4, 0, 0, $00, $20
- dsprite -5, 4, -1, 0, $01, $00
- dsprite -5, 4, 0, 0, $01, $20
- dsprite -4, 4, -1, 4, $02, $00
- dsprite -3, 4, -1, 4, $02, $00
- dsprite -2, 4, -1, 4, $02, $00
- dsprite -1, 4, -1, 4, $02, $00
-
-.OAMData_2e
- dsprite -7, 4, -1, 0, $00, $00
- dsprite -7, 4, 0, 0, $00, $20
- dsprite -6, 4, -1, 0, $01, $00
- dsprite -6, 4, 0, 0, $01, $20
- dsprite -5, 4, -1, 4, $02, $00
- dsprite -4, 4, -1, 4, $02, $00
- dsprite -3, 4, -1, 4, $02, $00
- dsprite -2, 4, -1, 4, $02, $00
- dsprite -1, 4, -1, 4, $02, $00
-
-.OAMData_2f
- dsprite -1, 0, -1, 0, $00, $00
- dsprite -1, 0, 0, 0, $00, $20
- dsprite 0, 0, -1, 0, $01, $00
- dsprite 0, 0, 0, 0, $00, $60
-
-.OAMData_30
- dsprite -1, 0, -1, 0, $00, $00
- dsprite -1, 0, 0, 0, $01, $00
- dsprite 0, 0, -1, 0, $01, $60
- dsprite 0, 0, 0, 0, $00, $60
-
-.OAMData_31
- dsprite -2, 4, -1, 0, $00, $00
- dsprite -2, 4, 0, 0, $01, $00
- dsprite -1, 4, -1, 0, $02, $00
- dsprite -1, 4, 0, 0, $03, $00
- dsprite 0, 4, -1, 0, $04, $00
- dsprite 0, 4, 0, 0, $05, $00
-
-.OAMData_76
- dsprite -1, 5, -1, 0, $00, $00
- dsprite -1, 1, 0, 0, $00, $00
-
-.OAMData_32
- dsprite -1, 0, -2, 4, $00, $00
- dsprite -1, 0, 0, 4, $00, $00
- dsprite -3, 0, -2, 4, $00, $00
- dsprite -3, 0, 0, 4, $00, $00
- dsprite -2, 0, -3, 4, $00, $00
- dsprite -2, 0, -2, 4, $01, $00
- dsprite -2, 0, -1, 4, $00, $00
- dsprite -2, 0, 0, 4, $01, $00
- dsprite -2, 0, 1, 4, $00, $00
- dsprite -1, 0, -4, 4, $00, $00
- dsprite -1, 0, -3, 4, $01, $00
- dsprite -1, 0, -1, 4, $01, $00
- dsprite -1, 0, 1, 4, $01, $00
- dsprite -1, 0, 2, 4, $00, $00
-
-.OAMData_33
- dsprite -2, 0, -2, 4, $00, $00
- dsprite -2, 0, 0, 4, $00, $00
- dsprite -1, 0, -3, 4, $00, $00
- dsprite -1, 0, -2, 4, $01, $00
- dsprite -1, 0, -1, 4, $00, $00
- dsprite -1, 0, 0, 4, $01, $00
- dsprite -1, 0, 1, 4, $00, $00
- dsprite -4, 0, -2, 4, $00, $00
- dsprite -4, 0, 0, 4, $00, $00
- dsprite -3, 0, -3, 4, $00, $00
- dsprite -3, 0, -2, 4, $01, $00
- dsprite -3, 0, -1, 4, $00, $00
- dsprite -3, 0, 0, 4, $01, $00
- dsprite -3, 0, 1, 4, $00, $00
- dsprite -2, 0, -4, 4, $00, $00
- dsprite -2, 0, -3, 4, $01, $00
- dsprite -2, 0, -1, 4, $01, $00
- dsprite -2, 0, 1, 4, $01, $00
- dsprite -2, 0, 2, 4, $00, $00
- dsprite -1, 0, -4, 4, $01, $00
- dsprite -1, 0, 2, 4, $01, $00
-
-.OAMData_36
- dsprite -7, 4, -1, 0, $00, $00
- dsprite -7, 4, 0, 0, $01, $00
- dsprite -6, 4, -1, 0, $02, $00
- dsprite -6, 4, 0, 0, $03, $00
- dsprite -5, 4, -1, 0, $04, $00
- dsprite -5, 4, 0, 0, $05, $00
- dsprite -4, 4, -1, 0, $06, $00
- dsprite -4, 4, 0, 0, $07, $00
- dsprite -3, 4, -1, 0, $08, $00
- dsprite -3, 4, 0, 0, $09, $00
- dsprite -2, 4, -1, 0, $0a, $00
- dsprite -2, 4, 0, 0, $0b, $00
- dsprite -1, 4, -1, 0, $0c, $00
- dsprite -1, 4, 0, 0, $0d, $00
-
-.OAMData_3a
- dsprite -7, 4, -1, 0, $0c, $00
- dsprite -7, 4, 0, 0, $0d, $00
- dsprite -6, 4, -1, 0, $08, $00
- dsprite -6, 4, 0, 0, $09, $00
- dsprite -5, 4, -1, 0, $04, $00
- dsprite -5, 4, 0, 0, $05, $00
- dsprite -4, 4, -1, 0, $00, $00
- dsprite -4, 4, 0, 0, $01, $00
- dsprite -3, 4, -1, 0, $02, $00
- dsprite -3, 4, 0, 0, $03, $00
- dsprite -2, 4, 0, 0, $02, $00
- dsprite -2, 4, 1, 0, $03, $00
- dsprite -1, 4, 0, 0, $0a, $00
- dsprite -1, 4, 1, 0, $0b, $00
-
-.OAMData_3e
- dsprite 1, 4, -2, 0, $00, $40
- dsprite 1, 4, -1, 0, $02, $40
- dsprite 1, 4, 0, 0, $02, $60
- dsprite 1, 4, 1, 0, $00, $60
- dsprite -1, 4, -3, 0, $09, $20
- dsprite -1, 4, -2, 0, $08, $20
- dsprite -1, 4, -1, 0, $06, $00
- dsprite -1, 4, 0, 0, $07, $00
- dsprite -1, 4, 1, 0, $08, $00
- dsprite -1, 4, 2, 0, $09, $00
- dsprite 0, 4, -3, 0, $01, $20
- dsprite 0, 4, -2, 0, $00, $20
- dsprite 0, 4, -1, 0, $0c, $00
- dsprite 0, 4, 0, 0, $0d, $00
- dsprite 0, 4, 1, 0, $00, $00
- dsprite 0, 4, 2, 0, $01, $00
- dsprite -3, 4, -2, 0, $00, $00
- dsprite -3, 4, -1, 0, $02, $00
- dsprite -3, 4, 0, 0, $02, $20
- dsprite -3, 4, 1, 0, $00, $20
- dsprite -2, 4, -3, 0, $03, $20
- dsprite -2, 4, -2, 0, $02, $20
- dsprite -2, 4, -1, 0, $04, $00
- dsprite -2, 4, 0, 0, $05, $00
- dsprite -2, 4, 1, 0, $02, $00
- dsprite -2, 4, 2, 0, $03, $00
-
-.OAMData_41
- dsprite -3, 4, -2, 0, $00, $00
- dsprite -3, 4, -1, 0, $02, $00
- dsprite -3, 4, 0, 0, $02, $20
- dsprite -3, 4, 1, 0, $00, $20
- dsprite -2, 4, -3, 4, $00, $00
- dsprite -2, 4, -2, 4, $01, $00
- dsprite -2, 4, -1, 0, $05, $20
- dsprite -2, 4, 0, 0, $04, $20
- dsprite -2, 4, 0, 4, $01, $20
- dsprite -2, 4, 1, 4, $00, $20
- dsprite -1, 4, -3, 4, $02, $00
- dsprite -1, 4, -2, 4, $03, $00
- dsprite -1, 4, -1, 0, $07, $20
- dsprite -1, 4, 0, 0, $06, $20
- dsprite -1, 4, 0, 4, $03, $20
- dsprite -1, 4, 1, 4, $02, $20
- dsprite 0, 4, -3, 4, $04, $00
- dsprite 0, 4, -2, 4, $05, $00
- dsprite 0, 4, -1, 0, $0d, $20
- dsprite 0, 4, 0, 0, $0c, $20
- dsprite 0, 4, 0, 4, $05, $20
- dsprite 0, 4, 1, 4, $04, $20
- dsprite 1, 4, -2, 0, $00, $40
- dsprite 1, 4, -1, 0, $02, $40
- dsprite 1, 4, 0, 0, $02, $60
- dsprite 1, 4, 1, 0, $00, $60
-
-.OAMData_42
- dsprite -3, 0, -1, 4, $02, $00
- dsprite 2, 0, -1, 4, $02, $60
- dsprite -1, 4, -3, 0, $01, $00
- dsprite -1, 4, 2, 0, $01, $60
- dsprite -4, 0, -1, 4, $02, $00
- dsprite 3, 0, -1, 4, $02, $60
- dsprite -1, 4, -4, 0, $01, $00
- dsprite -1, 4, 3, 0, $01, $60
-
-.OAMData_44
- dsprite -3, 5, -3, 5, $00, $20
- dsprite -3, 5, 1, 3, $00, $00
- dsprite 1, 3, -3, 5, $00, $60
- dsprite 1, 3, 1, 3, $00, $40
- dsprite -4, 5, -4, 5, $00, $20
- dsprite -4, 5, 2, 3, $00, $00
- dsprite 2, 3, -4, 5, $00, $60
- dsprite 2, 3, 2, 3, $00, $40
-
-.OAMData_46
- dsprite -3, 4, -1, 4, $02, $00
- dsprite 1, 4, -1, 4, $02, $60
- dsprite -1, 4, -3, 4, $01, $00
- dsprite -1, 4, 1, 4, $01, $60
-
-.OAMData_47
- dsprite -2, 0, -2, 0, $00, $20
- dsprite -2, 0, 1, 0, $00, $00
- dsprite 1, 0, -2, 0, $00, $60
- dsprite 1, 0, 1, 0, $00, $40
-
-.OAMData_48
- dsprite -3, 0, -1, 4, $00, $00
- dsprite -2, 0, -1, 2, $00, $00
- dsprite -1, 0, -1, 0, $00, $00
- dsprite 0, 0, -1, 0, $00, $00
- dsprite 1, 0, -1, 2, $00, $00
- dsprite 2, 0, -1, 4, $00, $00
-
-.OAMData_49
- dsprite -1, 4, -2, 0, $00, $20
- dsprite -1, 2, -1, 0, $00, $20
- dsprite -1, 2, 0, 0, $00, $00
- dsprite -1, 4, 1, 0, $00, $00
-
-.OAMData_4a
- dsprite -1, 4, -1, 0, $00, $60
- dsprite -1, 4, 0, 0, $00, $40
-
-.OAMData_0f
- dsprite -1, 4, -1, 4, $00, $00
- dsprite -1, 4, -2, 4, $01, $00
- dsprite -1, 4, -1, 4, $01, $20
- dsprite 0, 4, -2, 4, $01, $40
- dsprite 0, 4, -1, 4, $01, $60
-
-.OAMData_4c
- dsprite -1, 4, -1, 4, $00, $00
- dsprite 0, 2, -2, 6, $00, $00
- dsprite 0, 2, -3, 6, $01, $00
- dsprite 0, 2, -2, 6, $01, $20
- dsprite 1, 2, -3, 6, $01, $40
- dsprite 1, 2, -2, 6, $01, $60
-
-.OAMData_4d
- dsprite -1, 4, -1, 4, $00, $00
- dsprite 0, 2, -2, 6, $00, $00
- dsprite 1, 0, -2, 0, $00, $00
- dsprite 1, 0, -3, 0, $01, $00
- dsprite 1, 0, -2, 0, $01, $20
- dsprite 2, 0, -3, 0, $01, $40
- dsprite 2, 0, -2, 0, $01, $60
-
-.OAMData_4f
- dsprite -1, 4, -1, 4, $00, $00
- dsprite 0, 2, -2, 6, $00, $00
- dsprite 1, 0, -2, 0, $00, $00
- dsprite 1, 6, -3, 2, $00, $00
- dsprite 1, 6, -4, 2, $01, $00
- dsprite 1, 6, -3, 2, $01, $20
- dsprite 2, 6, -4, 2, $01, $40
- dsprite 2, 6, -3, 2, $01, $60
-
-.OAMData_50
- dsprite -1, 4, -1, 4, $00, $00
- dsprite 0, 2, -2, 6, $00, $00
- dsprite 1, 0, -2, 0, $00, $00
- dsprite 1, 6, -3, 2, $00, $00
- dsprite 2, 4, -4, 4, $00, $00
- dsprite 2, 4, -5, 4, $01, $00
- dsprite 2, 4, -4, 4, $01, $20
- dsprite 3, 4, -5, 4, $01, $40
- dsprite 3, 4, -4, 4, $01, $60
-
-.OAMData_51
- dsprite -1, 4, -1, 4, $00, $00
- dsprite 0, 2, -2, 6, $00, $00
- dsprite 1, 0, -2, 0, $00, $00
- dsprite 1, 6, -3, 2, $00, $00
- dsprite 2, 4, -4, 4, $00, $00
- dsprite 3, 2, -5, 6, $00, $00
- dsprite 3, 2, -6, 6, $01, $00
- dsprite 3, 2, -5, 6, $01, $20
- dsprite 4, 2, -6, 6, $01, $40
- dsprite 4, 2, -5, 6, $01, $60
-
-.OAMData_59
- dsprite -1, 4, -2, 0, $00, $00
- dsprite -1, 4, -1, 0, $01, $00
- dsprite -1, 4, 0, 0, $01, $20
- dsprite -1, 4, 1, 0, $00, $20
-
-.OAMData_5a
- dsprite -1, 4, -2, 0, $02, $00
- dsprite -1, 4, -1, 0, $01, $00
- dsprite -1, 4, 0, 0, $01, $20
- dsprite -1, 4, 1, 0, $02, $20
-
-.OAMData_60
- dsprite -1, 0, -1, 4, $00, $00
-
-.OAMData_69
- dsprite 0, 0, -1, 4, $00, $00
-
-.OAMData_61
- dsprite -1, 4, -4, 4, $00, $00
- dsprite -1, 4, -3, 4, $01, $00
- dsprite -1, 4, -2, 4, $02, $00
- dsprite -1, 4, -1, 4, $03, $00
- dsprite -1, 4, 0, 4, $04, $00
- dsprite -1, 4, 1, 4, $05, $00
- dsprite -1, 4, 2, 4, $06, $00
- dsprite -2, 4, 1, 4, $07, $00
- dsprite -2, 4, 2, 4, $08, $00
-
-.OAMData_65
- dsprite -2, 4, -4, 4, $08, $20
- dsprite -2, 4, -3, 4, $07, $20
- dsprite -1, 4, -4, 4, $06, $20
- dsprite -1, 4, -3, 4, $05, $20
- dsprite -1, 4, -2, 4, $04, $20
- dsprite -1, 4, -1, 4, $03, $20
- dsprite -1, 4, 0, 4, $02, $20
- dsprite -1, 4, 1, 4, $01, $20
- dsprite -1, 4, 2, 4, $00, $20
-
-.OAMData_d4
- dsprite 0, 0, -4, 4, $00, $10
- dsprite 0, 0, -3, 4, $01, $10
- dsprite 0, 0, -2, 4, $02, $10
- dsprite 0, 0, -1, 4, $03, $10
- dsprite 0, 0, 0, 4, $04, $10
- dsprite 0, 0, 1, 4, $05, $10
- dsprite 0, 0, 2, 4, $06, $10
-
-.OAMData_d6
- dsprite -1, 0, -4, 4, $00, $10
- dsprite 0, 0, -4, 4, $01, $10
- dsprite -1, 0, -3, 4, $02, $10
- dsprite 0, 0, -3, 4, $03, $10
- dsprite -1, 0, -2, 4, $04, $10
- dsprite 0, 0, -2, 4, $05, $10
- dsprite -1, 0, -1, 4, $06, $10
- dsprite 0, 0, -1, 4, $07, $10
- dsprite -1, 0, 0, 4, $08, $10
- dsprite 0, 0, 0, 4, $09, $10
- dsprite -1, 0, 1, 4, $0a, $10
- dsprite 0, 0, 1, 4, $0b, $10
- dsprite -1, 0, 2, 4, $0c, $10
- dsprite 0, 0, 2, 4, $0d, $10
-
-.OAMData_d5
- dsprite 0, 0, -3, 0, $00, $11
- dsprite 0, 0, -2, 0, $01, $11
- dsprite 0, 0, -1, 0, $02, $11
- dsprite 0, 0, 0, 0, $03, $11
- dsprite 0, 0, 1, 0, $04, $11
- dsprite 0, 0, 2, 0, $05, $11
-
-.OAMData_d7
- dsprite 0, 0, -3, 0, $00, $11
- dsprite 1, 0, -3, 0, $01, $11
- dsprite 0, 0, -2, 0, $02, $11
- dsprite 1, 0, -2, 0, $03, $11
- dsprite 0, 0, -1, 0, $04, $11
- dsprite 1, 0, -1, 0, $05, $11
- dsprite 0, 0, 0, 0, $06, $11
- dsprite 1, 0, 0, 0, $07, $11
- dsprite 0, 0, 1, 0, $08, $11
- dsprite 1, 0, 1, 0, $09, $11
- dsprite 0, 0, 2, 0, $0a, $11
- dsprite 1, 0, 2, 0, $0b, $11
-
-.OAMData_6e
- dsprite -2, 4, 0, 4, $00, $00
- dsprite -1, 4, -2, 4, $01, $00
- dsprite -1, 4, -1, 4, $02, $00
- dsprite -1, 4, 0, 4, $03, $00
- dsprite 0, 4, -2, 4, $04, $00
-
-.OAMData_6f
- dsprite -1, 4, -2, 4, $00, $00
- dsprite -1, 4, -1, 4, $01, $00
- dsprite -1, 4, 0, 4, $02, $00
-
-.OAMData_77
- dsprite -4, 4, 1, 4, $01, $60
-
-.OAMData_78
- dsprite -4, 4, 1, 4, $00, $00
- dsprite -4, 4, 0, 4, $01, $60
- dsprite -3, 4, 1, 4, $01, $60
-
-.OAMData_79
- dsprite -4, 4, 1, 4, $01, $00
- dsprite -4, 4, 0, 4, $00, $00
- dsprite -4, 4, -1, 4, $01, $60
- dsprite -3, 4, 1, 4, $00, $00
- dsprite -3, 4, 0, 4, $01, $60
- dsprite -2, 4, 1, 4, $01, $60
-
-.OAMData_7a
- dsprite -4, 4, -2, 4, $01, $60
- dsprite -4, 4, -1, 4, $00, $00
- dsprite -4, 4, 0, 4, $01, $00
- dsprite -3, 4, -1, 4, $01, $60
- dsprite -3, 4, 0, 4, $00, $00
- dsprite -3, 4, 1, 4, $01, $00
- dsprite -2, 4, 0, 4, $01, $60
- dsprite -2, 4, 1, 4, $00, $00
- dsprite -1, 4, 1, 4, $01, $60
-
-.OAMData_7b
- dsprite -4, 4, -3, 4, $01, $60
- dsprite -4, 4, -2, 4, $00, $00
- dsprite -4, 4, -1, 4, $01, $00
- dsprite -3, 4, -2, 4, $01, $60
- dsprite -3, 4, -1, 4, $00, $00
- dsprite -3, 4, 0, 4, $01, $00
- dsprite -2, 4, -1, 4, $01, $60
- dsprite -2, 4, 0, 4, $00, $00
- dsprite -2, 4, 1, 4, $01, $00
- dsprite -1, 4, 0, 4, $01, $60
- dsprite -1, 4, 1, 4, $00, $00
- dsprite 0, 4, 1, 4, $01, $60
-
-.OAMData_7c
- dsprite -4, 4, -3, 4, $00, $00
- dsprite -4, 4, -2, 4, $01, $00
- dsprite -3, 4, -3, 4, $01, $60
- dsprite -3, 4, -2, 4, $00, $00
- dsprite -3, 4, -1, 4, $01, $00
- dsprite -2, 4, -2, 4, $01, $60
- dsprite -2, 4, -1, 4, $00, $00
- dsprite -2, 4, 0, 4, $01, $00
- dsprite -1, 4, -1, 4, $01, $60
- dsprite -1, 4, 0, 4, $00, $00
- dsprite -1, 4, 1, 4, $01, $00
- dsprite 0, 4, 0, 4, $01, $60
- dsprite 0, 4, 1, 4, $00, $00
- dsprite 1, 4, 1, 4, $01, $60
-
-.OAMData_7d
- dsprite -4, 4, -3, 4, $01, $00
- dsprite -3, 4, -3, 4, $00, $00
- dsprite -3, 4, -2, 4, $01, $00
- dsprite -2, 4, -3, 4, $01, $60
- dsprite -2, 4, -2, 4, $00, $00
- dsprite -2, 4, -1, 4, $01, $00
- dsprite -1, 4, -2, 4, $01, $60
- dsprite -1, 4, -1, 4, $00, $00
- dsprite -1, 4, 0, 4, $01, $00
- dsprite 0, 4, -1, 4, $01, $60
- dsprite 0, 4, 0, 4, $00, $00
- dsprite 0, 4, 1, 4, $01, $00
- dsprite 1, 4, 0, 4, $01, $60
- dsprite 1, 4, 1, 4, $00, $00
- dsprite 2, 4, 1, 4, $01, $60
-
-.OAMData_70
- dsprite -2, 0, -1, 0, $00, $00
- dsprite -1, 0, -1, 0, $01, $00
- dsprite -2, 0, 0, 0, $00, $20
- dsprite -1, 0, 0, 0, $01, $20
- dsprite 0, 0, -1, 0, $01, $40
- dsprite 1, 0, -1, 0, $00, $40
- dsprite 0, 0, 0, 0, $01, $60
- dsprite 1, 0, 0, 0, $00, $60
-
-.OAMData_81
- dsprite -1, 0, -1, 0, $00, $00
- dsprite -1, 0, 0, 0, $01, $00
- dsprite 0, 0, -1, 0, $01, $60
- dsprite 0, 0, 0, 0, $00, $60
-
-.OAMData_87
- dsprite -2, 4, -1, 0, $00, $00
- dsprite -2, 4, 0, 0, $01, $00
- dsprite -1, 4, -1, 0, $02, $00
- dsprite -1, 4, 0, 0, $03, $00
- dsprite -1, 4, -1, 0, $00, $00
- dsprite -1, 4, 0, 0, $01, $00
- dsprite 0, 4, -1, 0, $02, $00
- dsprite 0, 4, 0, 0, $03, $00
- dsprite -3, 4, -1, 0, $00, $00
- dsprite -3, 4, 0, 0, $01, $00
- dsprite -2, 4, -1, 0, $02, $00
- dsprite -2, 4, 0, 0, $03, $00
- dsprite 0, 4, -1, 0, $00, $00
- dsprite 0, 4, 0, 0, $01, $00
- dsprite 1, 4, -1, 0, $02, $00
- dsprite 1, 4, 0, 0, $03, $00
-
-.OAMData_88
- dsprite -2, 0, -1, 0, $00, $00
- dsprite -2, 0, 0, 0, $01, $00
- dsprite -1, 0, -1, 0, $02, $00
- dsprite -1, 0, 0, 0, $03, $00
- dsprite -1, 0, -1, 0, $00, $00
- dsprite -1, 0, 0, 0, $01, $00
- dsprite 0, 0, -1, 0, $02, $00
- dsprite 0, 0, 0, 0, $03, $00
- dsprite 0, 0, -1, 0, $00, $00
- dsprite 0, 0, 0, 0, $01, $00
- dsprite 1, 0, -1, 0, $02, $00
- dsprite 1, 0, 0, 0, $03, $00
-
-.OAMData_8a
- dsprite -1, 4, -1, 4, $00, $00
- dsprite -1, 0, 0, 4, $00, $00
- dsprite -2, 4, 1, 4, $00, $00
- dsprite -2, 0, 2, 4, $00, $00
- dsprite -3, 4, 3, 4, $00, $00
- dsprite -3, 0, 4, 4, $00, $00
- dsprite -4, 0, 5, 4, $00, $00
- dsprite -5, 4, 6, 4, $00, $00
-
-.OAMData_8e
- dsprite -3, 4, -1, 4, $00, $00
- dsprite -2, 4, -1, 4, $01, $00
- dsprite -1, 4, -1, 4, $02, $00
- dsprite 0, 4, -1, 4, $01, $40
- dsprite 1, 4, -1, 4, $00, $40
-
-.OAMData_8f
- dsprite -1, 4, -2, 0, $00, $00
- dsprite -1, 4, -1, 0, $01, $00
- dsprite -1, 4, 0, 0, $02, $00
- dsprite -1, 4, 1, 0, $03, $00
-
-.OAMData_93
- dsprite -1, 0, -2, 4, $00, $00
- dsprite -1, 0, -1, 4, $01, $00
- dsprite -1, 0, 0, 4, $02, $00
- dsprite 0, 0, -2, 4, $03, $00
- dsprite 0, 0, -1, 4, $04, $00
- dsprite 0, 0, 0, 4, $05, $00
-
-.OAMData_99
- dsprite -1, 0, -1, 0, $00, $00
- dsprite -1, 0, 0, 0, $05, $00
- dsprite 0, 0, -1, 0, $01, $00
- dsprite 0, 0, 0, 0, $05, $00
-
-.OAMData_9b
- dsprite -4, 4, 1, 0, $00, $00
- dsprite -4, 4, 2, 0, $01, $00
- dsprite -3, 4, -1, 0, $02, $00
- dsprite -3, 4, 0, 0, $03, $00
- dsprite -3, 4, 1, 0, $04, $00
- dsprite -3, 4, 2, 0, $05, $00
- dsprite -3, 4, 3, 0, $06, $00
- dsprite -2, 4, -2, 0, $07, $00
- dsprite -2, 4, -1, 0, $08, $00
- dsprite -2, 4, 0, 0, $09, $00
- dsprite -2, 4, 1, 0, $0a, $00
- dsprite -2, 4, 2, 0, $0b, $00
- dsprite -2, 4, 3, 0, $0c, $00
- dsprite -2, 4, 4, 0, $0d, $00
- dsprite -1, 4, -3, 0, $0e, $00
- dsprite -1, 4, -2, 0, $0f, $00
- dsprite -1, 4, -1, 0, $10, $00
- dsprite -1, 4, 0, 0, $11, $00
- dsprite -1, 4, 1, 0, $12, $00
- dsprite -1, 4, 2, 0, $13, $00
- dsprite 0, 4, -5, 0, $14, $00
- dsprite 0, 4, -4, 0, $15, $00
- dsprite 0, 4, -3, 0, $16, $00
- dsprite 0, 4, -2, 0, $17, $00
- dsprite 0, 4, -1, 0, $18, $00
- dsprite 0, 4, 0, 0, $19, $00
- dsprite 0, 4, 1, 0, $1a, $00
- dsprite 0, 4, 2, 0, $1b, $00
- dsprite 0, 4, 3, 0, $1c, $00
- dsprite 1, 4, -5, 0, $1d, $00
- dsprite 1, 4, -4, 0, $1e, $00
- dsprite 1, 4, -2, 0, $1f, $00
- dsprite 1, 4, -1, 0, $20, $00
- dsprite 1, 4, 0, 0, $21, $00
- dsprite 1, 4, 1, 0, $22, $00
- dsprite 2, 4, 0, 0, $23, $00
-
-.OAMData_9c
- dsprite 0, 4, -1, 0, $02, $00
- dsprite 0, 4, 0, 0, $03, $00
- dsprite -1, 4, -1, 0, $01, $00
- dsprite -1, 4, 0, 0, $01, $20
- dsprite -2, 4, -1, 0, $00, $00
- dsprite -2, 4, 0, 0, $00, $20
-
-.OAMData_9f
- dsprite -1, 0, -2, 0, $00, $00
- dsprite -1, 0, -1, 0, $01, $00
- dsprite -1, 0, 0, 0, $02, $00
- dsprite -1, 0, 1, 0, $03, $00
- dsprite 0, 0, -2, 0, $04, $00
- dsprite 0, 0, -1, 0, $05, $00
- dsprite 0, 0, 0, 0, $06, $00
- dsprite 0, 0, 1, 0, $07, $00
-
-.OAMData_a0
- dsprite -2, 4, -1, 4, $00, $00
- dsprite -1, 4, -1, 4, $00, $00
- dsprite 0, 4, -1, 4, $00, $00
- dsprite -3, 4, -1, 4, $00, $00
- dsprite 1, 4, -1, 4, $00, $00
- dsprite -4, 4, -1, 4, $00, $00
- dsprite 2, 4, -1, 4, $00, $00
-
-.OAMData_a4
- dsprite -2, 4, -2, 4, $00, $00
- dsprite -2, 4, -1, 4, $01, $00
- dsprite -2, 4, 0, 4, $02, $00
- dsprite -1, 4, -2, 4, $03, $00
- dsprite -1, 4, -1, 4, $04, $00
- dsprite -1, 4, 0, 4, $05, $00
- dsprite 0, 4, -2, 4, $00, $40
- dsprite 0, 4, -1, 4, $01, $40
- dsprite 0, 4, 0, 4, $02, $40
-
-.OAMData_ac
- dsprite -1, 4, -2, 0, $00, $00
- dsprite -1, 4, -1, 0, $01, $00
- dsprite -1, 4, 0, 0, $01, $20
- dsprite -1, 4, 1, 0, $00, $20
-
-.OAMData_bc
- dsprite -1, 4, -3, 0, $00, $00
- dsprite -1, 4, -2, 0, $01, $00
- dsprite -1, 4, -1, 0, $02, $00
- dsprite -1, 4, 0, 0, $02, $20
- dsprite -1, 4, 1, 0, $01, $20
- dsprite -1, 4, 2, 0, $00, $20
-
-.OAMData_c1
- dsprite -2, 0, -2, 0, $00, $00
- dsprite -2, 0, -1, 0, $01, $00
- dsprite -2, 0, 0, 0, $02, $00
- dsprite -2, 0, 1, 0, $00, $20
- dsprite -1, 0, -2, 0, $03, $00
- dsprite -1, 0, -1, 0, $04, $00
- dsprite -1, 0, 0, 0, $04, $20
- dsprite -1, 0, 1, 0, $05, $00
- dsprite 0, 0, -2, 0, $05, $60
- dsprite 0, 0, -1, 0, $04, $40
- dsprite 0, 0, 0, 0, $04, $60
- dsprite 0, 0, 1, 0, $03, $60
- dsprite 1, 0, -2, 0, $00, $40
- dsprite 1, 0, -1, 0, $02, $60
- dsprite 1, 0, 0, 0, $01, $60
- dsprite 1, 0, 1, 0, $00, $60
-
-.OAMData_c2
- dsprite -1, 0, -2, 0, $00, $00
- dsprite -1, 0, -1, 0, $01, $00
- dsprite -1, 0, 0, 0, $00, $60
- dsprite 0, 0, -1, 0, $00, $00
- dsprite 0, 0, 0, 0, $01, $00
- dsprite 0, 0, 1, 0, $00, $60
-
-.OAMData_c8
- dsprite -1, 0, 1, 4, $00, $00
- dsprite -1, 0, 2, 4, $01, $00
- dsprite 0, 0, -1, 4, $02, $00
- dsprite 0, 0, 0, 4, $03, $00
- dsprite 0, 0, 1, 4, $04, $00
- dsprite 0, 0, 2, 4, $05, $00
-
-.OAMData_ca
- dsprite -1, 0, -1, 0, $00, $00
- dsprite -1, 0, 0, 0, $01, $60
- dsprite 0, 0, -1, 0, $01, $00
- dsprite 0, 0, 0, 0, $01, $20
-
-.OAMData_cc
- dsprite -2, 0, -13, 4, $00, $00
- dsprite -4, 0, -11, 4, $00, $00
- dsprite -1, 0, -9, 4, $00, $00
- dsprite -5, 0, -7, 4, $00, $00
- dsprite -3, 0, -5, 4, $00, $00
- dsprite -5, 0, -3, 4, $00, $00
- dsprite -3, 0, -1, 4, $00, $00
- dsprite -3, 0, 0, 4, $00, $00
- dsprite -5, 0, 2, 4, $00, $00
- dsprite 0, 0, 4, 4, $00, $00
- dsprite -2, 0, 6, 4, $00, $00
- dsprite -4, 0, 8, 4, $00, $00
- dsprite -2, 0, 10, 4, $00, $00
-; cfcf6
+
+BattleAnimOAMData: ; ceeae
+; vtile offset (?), length, address
+ dbbw $00, 16, .OAMData_00 ; 00
+ dbbw $04, 9, .OAMData_01 ; 01
+ dbbw $08, 4, .OAMData_02 ; 02
+ dbbw $09, 4, .OAMData_03 ; 03
+ dbbw $0d, 4, .OAMData_04 ; 04
+ dbbw $0f, 4, .OAMData_03 ; 05
+ dbbw $13, 4, .OAMData_04 ; 06
+ dbbw $04, 16, .OAMData_00 ; 07
+ dbbw $08, 16, .OAMData_00 ; 08
+ dbbw $08, 16, .OAMData_09 ; 09
+ dbbw $00, 4, .OAMData_04 ; 0a
+ dbbw $02, 4, .OAMData_03 ; 0b
+ dbbw $06, 2, .OAMData_0c ; 0c
+ dbbw $07, 2, .OAMData_0c ; 0d
+ dbbw $02, 4, .OAMData_04 ; 0e
+ dbbw $04, 1, .OAMData_0f ; 0f
+ dbbw $05, 1, .OAMData_0f ; 10
+ dbbw $00, 2, .OAMData_11 ; 11
+ dbbw $02, 2, .OAMData_11 ; 12
+ dbbw $00, 4, .OAMData_13 ; 13
+ dbbw $00, 1, .OAMData_0f ; 14
+ dbbw $01, 1, .OAMData_0f ; 15
+ dbbw $02, 1, .OAMData_0f ; 16
+ dbbw $03, 1, .OAMData_0f ; 17
+ dbbw $00, 4, .OAMData_02 ; 18
+ dbbw $01, 16, .OAMData_00 ; 19
+ dbbw $05, 16, .OAMData_00 ; 1a
+ dbbw $00, 4, .OAMData_03 ; 1b
+ dbbw $05, 12, .OAMData_1c ; 1c
+ dbbw $02, 4, .OAMData_02 ; 1d
+ dbbw $06, 1, .OAMData_0f ; 1e
+ dbbw $07, 1, .OAMData_0f ; 1f
+ dbbw $08, 1, .OAMData_0f ; 20
+ dbbw $04, 4, .OAMData_03 ; 21
+ dbbw $09, 22, .OAMData_22 ; 22
+ dbbw $04, 2, .OAMData_11 ; 23
+ dbbw $06, 2, .OAMData_11 ; 24
+ dbbw $0c, 1, .OAMData_0f ; 25
+ dbbw $0a, 1, .OAMData_0f ; 26
+ dbbw $0b, 4, .OAMData_02 ; 27
+ dbbw $08, 4, .OAMData_04 ; 28
+ dbbw $06, 4, .OAMData_04 ; 29
+ dbbw $00, 5, .OAMData_2a ; 2a
+ dbbw $03, 6, .OAMData_2b ; 2b
+ dbbw $00, 7, .OAMData_2c ; 2c
+ dbbw $03, 8, .OAMData_2d ; 2d
+ dbbw $00, 9, .OAMData_2e ; 2e
+ dbbw $00, 4, .OAMData_2f ; 2f
+ dbbw $02, 4, .OAMData_30 ; 30
+ dbbw $04, 6, .OAMData_31 ; 31
+ dbbw $00, 2, .OAMData_32 ; 32
+ dbbw $00, 7, .OAMData_33 ; 33
+ dbbw $00, 14, .OAMData_32 ; 34
+ dbbw $00, 21, .OAMData_33 ; 35
+ dbbw $00, 2, .OAMData_36 ; 36
+ dbbw $00, 6, .OAMData_36 ; 37
+ dbbw $00, 10, .OAMData_36 ; 38
+ dbbw $00, 14, .OAMData_36 ; 39
+ dbbw $00, 2, .OAMData_3a ; 3a
+ dbbw $00, 6, .OAMData_3a ; 3b
+ dbbw $00, 10, .OAMData_3a ; 3c
+ dbbw $00, 14, .OAMData_3a ; 3d
+ dbbw $00, 4, .OAMData_3e ; 3e
+ dbbw $00, 16, .OAMData_3e ; 3f
+ dbbw $00, 26, .OAMData_3e ; 40
+ dbbw $00, 26, .OAMData_41 ; 41
+ dbbw $0e, 4, .OAMData_42 ; 42
+ dbbw $0e, 8, .OAMData_42 ; 43
+ dbbw $0e, 4, .OAMData_44 ; 44
+ dbbw $0e, 8, .OAMData_44 ; 45
+ dbbw $0e, 4, .OAMData_46 ; 46
+ dbbw $0e, 4, .OAMData_47 ; 47
+ dbbw $00, 6, .OAMData_48 ; 48
+ dbbw $03, 4, .OAMData_49 ; 49
+ dbbw $03, 2, .OAMData_4a ; 4a
+ dbbw $01, 5, .OAMData_0f ; 4b
+ dbbw $01, 6, .OAMData_4c ; 4c
+ dbbw $01, 7, .OAMData_4d ; 4d
+ dbbw $01, 3, .OAMData_4d ; 4e
+ dbbw $01, 8, .OAMData_4f ; 4f
+ dbbw $01, 9, .OAMData_50 ; 50
+ dbbw $01, 10, .OAMData_51 ; 51
+ dbbw $01, 6, .OAMData_51 ; 52
+ dbbw $00, 9, .OAMData_01 ; 53
+ dbbw $04, 4, .OAMData_02 ; 54
+ dbbw $05, 4, .OAMData_02 ; 55
+ dbbw $00, 2, .OAMData_56 ; 56
+ dbbw $02, 2, .OAMData_56 ; 57
+ dbbw $04, 2, .OAMData_56 ; 58
+ dbbw $02, 4, .OAMData_59 ; 59
+ dbbw $02, 4, .OAMData_5a ; 5a
+ dbbw $02, 2, .OAMData_0c ; 5b
+ dbbw $04, 2, .OAMData_0c ; 5c
+ dbbw $06, 4, .OAMData_5d ; 5d
+ dbbw $08, 2, .OAMData_0c ; 5e
+ dbbw $09, 2, .OAMData_0c ; 5f
+ dbbw $05, 2, .OAMData_60 ; 60
+ dbbw $00, 2, .OAMData_61 ; 61
+ dbbw $00, 5, .OAMData_61 ; 62
+ dbbw $00, 9, .OAMData_61 ; 63
+ dbbw $09, 9, .OAMData_61 ; 64
+ dbbw $00, 4, .OAMData_65 ; 65
+ dbbw $00, 7, .OAMData_65 ; 66
+ dbbw $00, 9, .OAMData_65 ; 67
+ dbbw $09, 9, .OAMData_65 ; 68
+ dbbw $04, 1, .OAMData_69 ; 69
+ dbbw $05, 2, .OAMData_6a ; 6a
+ dbbw $06, 4, .OAMData_03 ; 6b
+ dbbw $0a, 4, .OAMData_03 ; 6c
+ dbbw $0e, 4, .OAMData_03 ; 6d
+ dbbw $08, 5, .OAMData_6e ; 6e
+ dbbw $0d, 3, .OAMData_6f ; 6f
+ dbbw $01, 8, .OAMData_70 ; 70
+ dbbw $03, 8, .OAMData_70 ; 71
+ dbbw $05, 8, .OAMData_70 ; 72
+ dbbw $07, 8, .OAMData_70 ; 73
+ dbbw $06, 4, .OAMData_02 ; 74
+ dbbw $07, 4, .OAMData_02 ; 75
+ dbbw $0a, 2, .OAMData_76 ; 76
+ dbbw $00, 1, .OAMData_77 ; 77
+ dbbw $00, 3, .OAMData_78 ; 78
+ dbbw $00, 6, .OAMData_79 ; 79
+ dbbw $00, 9, .OAMData_7a ; 7a
+ dbbw $00, 12, .OAMData_7b ; 7b
+ dbbw $00, 14, .OAMData_7c ; 7c
+ dbbw $00, 15, .OAMData_7d ; 7d
+ dbbw $04, 4, .OAMData_03 ; 7e
+ dbbw $08, 4, .OAMData_03 ; 7f
+ dbbw $0d, 1, .OAMData_0f ; 80
+ dbbw $0e, 4, .OAMData_81 ; 81
+ dbbw $10, 1, .OAMData_0f ; 82
+ dbbw $11, 1, .OAMData_0f ; 83
+ dbbw $04, 2, .OAMData_6a ; 84
+ dbbw $05, 2, .OAMData_6a ; 85
+ dbbw $0a, 4, .OAMData_04 ; 86
+ dbbw $00, 8, .OAMData_87 ; 87
+ dbbw $00, 12, .OAMData_88 ; 88
+ dbbw $00, 16, .OAMData_87 ; 89
+ dbbw $09, 2, .OAMData_8a ; 8a
+ dbbw $09, 4, .OAMData_8a ; 8b
+ dbbw $09, 6, .OAMData_8a ; 8c
+ dbbw $09, 8, .OAMData_8a ; 8d
+ dbbw $12, 5, .OAMData_8e ; 8e
+ dbbw $00, 4, .OAMData_8f ; 8f
+ dbbw $04, 4, .OAMData_8f ; 90
+ dbbw $08, 4, .OAMData_8f ; 91
+ dbbw $0c, 4, .OAMData_8f ; 92
+ dbbw $00, 6, .OAMData_93 ; 93
+ dbbw $04, 4, .OAMData_03 ; 94
+ dbbw $0a, 4, .OAMData_04 ; 95
+ dbbw $15, 4, .OAMData_30 ; 96
+ dbbw $04, 4, .OAMData_30 ; 97
+ dbbw $0c, 4, .OAMData_04 ; 98
+ dbbw $0a, 4, .OAMData_99 ; 99
+ dbbw $0c, 4, .OAMData_03 ; 9a
+ dbbw $00, 36, .OAMData_9b ; 9b
+ dbbw $0d, 2, .OAMData_9c ; 9c
+ dbbw $0d, 4, .OAMData_9c ; 9d
+ dbbw $0d, 6, .OAMData_9c ; 9e
+ dbbw $02, 8, .OAMData_9f ; 9f
+ dbbw $08, 7, .OAMData_a0 ; a0
+ dbbw $08, 5, .OAMData_a0 ; a1
+ dbbw $08, 3, .OAMData_a0 ; a2
+ dbbw $00, 16, .OAMData_1c ; a3
+ dbbw $00, 9, .OAMData_a4 ; a4
+ dbbw $06, 9, .OAMData_a4 ; a5
+ dbbw $0c, 9, .OAMData_a4 ; a6
+ dbbw $12, 9, .OAMData_a4 ; a7
+ dbbw $18, 9, .OAMData_a4 ; a8
+ dbbw $1e, 9, .OAMData_a4 ; a9
+ dbbw $24, 9, .OAMData_a4 ; aa
+ dbbw $2a, 9, .OAMData_a4 ; ab
+ dbbw $03, 4, .OAMData_ac ; ac
+ dbbw $12, 4, .OAMData_03 ; ad
+ dbbw $10, 4, .OAMData_04 ; ae
+ dbbw $16, 1, .OAMData_0f ; af
+ dbbw $17, 4, .OAMData_02 ; b0
+ dbbw $18, 4, .OAMData_03 ; b1
+ dbbw $1c, 4, .OAMData_03 ; b2
+ dbbw $20, 3, .OAMData_03 ; b3
+ dbbw $23, 4, .OAMData_04 ; b4
+ dbbw $25, 3, .OAMData_03 ; b5
+ dbbw $17, 4, .OAMData_03 ; b6
+ dbbw $0a, 16, .OAMData_00 ; b7
+ dbbw $10, 16, .OAMData_1c ; b8
+ dbbw $00, 16, .OAMData_1c ; b9
+ dbbw $04, 4, .OAMData_03 ; ba
+ dbbw $08, 2, .OAMData_11 ; bb
+ dbbw $20, 6, .OAMData_bc ; bc
+ dbbw $08, 1, .OAMData_0f ; bd
+ dbbw $04, 4, .OAMData_03 ; be
+ dbbw $1a, 4, .OAMData_30 ; bf
+ dbbw $16, 9, .OAMData_01 ; c0
+ dbbw $10, 16, .OAMData_c1 ; c1
+ dbbw $09, 6, .OAMData_c2 ; c2
+ dbbw $11, 9, .OAMData_c3 ; c3
+ dbbw $0e, 4, .OAMData_03 ; c4
+ dbbw $0b, 4, .OAMData_30 ; c5
+ dbbw $1c, 6, .OAMData_02 ; c6
+ dbbw $20, 16, .OAMData_c1 ; c7
+ dbbw $05, 6, .OAMData_c8 ; c8
+ dbbw $0b, 4, .OAMData_03 ; c9
+ dbbw $09, 4, .OAMData_ca ; ca
+ dbbw $0b, 4, .OAMData_04 ; cb
+ dbbw $11, 13, .OAMData_cc ; cc
+ dbbw $00, 9, .OAMData_c3 ; cd
+ dbbw $09, 9, .OAMData_c3 ; ce
+ dbbw $00, 12, .OAMData_cf ; cf
+ dbbw $06, 12, .OAMData_cf ; d0
+ dbbw $0c, 12, .OAMData_cf ; d1
+ dbbw $12, 12, .OAMData_cf ; d2
+ dbbw $00, 13, .OAMData_cc ; d3
+ dbbw $00, 7, .OAMData_d4 ; d4
+ dbbw $00, 6, .OAMData_d5 ; d5
+ dbbw $00, 14, .OAMData_d6 ; d6
+ dbbw $00, 12, .OAMData_d7 ; d7
+
+.OAMData_11:
+ dsprite -1, 0, -1, 4, $00, $00
+ dsprite 0, 0, -1, 4, $01, $00
+
+.OAMData_56:
+ dsprite -1, 4, -1, 0, $00, $00
+ dsprite -1, 4, 0, 0, $01, $00
+
+.OAMData_03:
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite -1, 0, 0, 0, $01, $00
+ dsprite 0, 0, -1, 0, $02, $00
+ dsprite 0, 0, 0, 0, $03, $00
+
+.OAMData_02:
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite -1, 0, 0, 0, $00, $20
+ dsprite 0, 0, -1, 0, $00, $40
+ dsprite 0, 0, 0, 0, $00, $60
+
+.OAMData_c3:
+ dsprite -2, 4, -2, 4, $00, $00
+ dsprite -2, 4, -1, 4, $01, $00
+ dsprite -2, 4, 0, 4, $02, $00
+ dsprite -1, 4, -2, 4, $03, $00
+ dsprite -1, 4, -1, 4, $04, $00
+ dsprite -1, 4, 0, 4, $05, $00
+ dsprite 0, 4, -2, 4, $06, $00
+ dsprite 0, 4, -1, 4, $07, $00
+ dsprite 0, 4, 0, 4, $08, $00
+
+.OAMData_01:
+ dsprite -2, 4, -2, 4, $00, $00
+ dsprite -2, 4, -1, 4, $01, $00
+ dsprite -2, 4, 0, 4, $00, $20
+ dsprite -1, 4, -2, 4, $02, $00
+ dsprite -1, 4, -1, 4, $03, $00
+ dsprite -1, 4, 0, 4, $02, $60
+ dsprite 0, 4, -2, 4, $00, $40
+ dsprite 0, 4, -1, 4, $01, $60
+ dsprite 0, 4, 0, 4, $00, $60
+
+.OAMData_cf:
+ dsprite -2, 0, -2, 4, $00, $00
+ dsprite -2, 0, -1, 4, $01, $00
+ dsprite -2, 0, 0, 4, $02, $00
+ dsprite -1, 0, -2, 4, $03, $00
+ dsprite -1, 0, -1, 4, $04, $00
+ dsprite -1, 0, 0, 4, $05, $00
+ dsprite 0, 0, -2, 4, $05, $60
+ dsprite 0, 0, -1, 4, $04, $60
+ dsprite 0, 0, 0, 4, $03, $60
+ dsprite 1, 0, -2, 4, $02, $60
+ dsprite 1, 0, -1, 4, $01, $60
+ dsprite 1, 0, 0, 4, $00, $60
+
+.OAMData_1c:
+ dsprite -2, 0, -2, 0, $00, $00
+ dsprite -2, 0, -1, 0, $01, $00
+ dsprite -2, 0, 0, 0, $02, $00
+ dsprite -2, 0, 1, 0, $03, $00
+ dsprite -1, 0, -2, 0, $04, $00
+ dsprite -1, 0, -1, 0, $05, $00
+ dsprite -1, 0, 0, 0, $06, $00
+ dsprite -1, 0, 1, 0, $07, $00
+ dsprite 0, 0, -2, 0, $08, $00
+ dsprite 0, 0, -1, 0, $09, $00
+ dsprite 0, 0, 0, 0, $0a, $00
+ dsprite 0, 0, 1, 0, $0b, $00
+ dsprite 1, 0, -2, 0, $0c, $00
+ dsprite 1, 0, -1, 0, $0d, $00
+ dsprite 1, 0, 0, 0, $0e, $00
+ dsprite 1, 0, 1, 0, $0f, $00
+
+.OAMData_00:
+ dsprite -2, 0, -2, 0, $00, $00
+ dsprite -2, 0, -1, 0, $01, $00
+ dsprite -1, 0, -2, 0, $02, $00
+ dsprite -1, 0, -1, 0, $03, $00
+ dsprite -2, 0, 0, 0, $01, $20
+ dsprite -2, 0, 1, 0, $00, $20
+ dsprite -1, 0, 0, 0, $03, $20
+ dsprite -1, 0, 1, 0, $02, $20
+ dsprite 0, 0, -2, 0, $02, $40
+ dsprite 0, 0, -1, 0, $03, $40
+ dsprite 1, 0, -2, 0, $00, $40
+ dsprite 1, 0, -1, 0, $01, $40
+ dsprite 0, 0, 0, 0, $03, $60
+ dsprite 0, 0, 1, 0, $02, $60
+ dsprite 1, 0, 0, 0, $01, $60
+ dsprite 1, 0, 1, 0, $00, $60
+
+.OAMData_09:
+ dsprite -3, 4, -3, 4, $00, $00
+ dsprite -3, 4, -2, 4, $01, $00
+ dsprite -2, 4, -3, 4, $02, $00
+ dsprite -2, 4, -2, 4, $03, $00
+ dsprite -3, 4, 0, 4, $01, $20
+ dsprite -3, 4, 1, 4, $00, $20
+ dsprite -2, 4, 0, 4, $03, $20
+ dsprite -2, 4, 1, 4, $02, $20
+ dsprite 0, 4, -3, 4, $02, $40
+ dsprite 0, 4, -2, 4, $03, $40
+ dsprite 1, 4, -3, 4, $00, $40
+ dsprite 1, 4, -2, 4, $01, $40
+ dsprite 0, 4, 0, 4, $03, $60
+ dsprite 0, 4, 1, 4, $02, $60
+ dsprite 1, 4, 0, 4, $01, $60
+ dsprite 1, 4, 1, 4, $00, $60
+
+.OAMData_0c:
+ dsprite -1, 4, -1, 0, $00, $00
+ dsprite -1, 4, 0, 0, $00, $20
+
+.OAMData_6a:
+ dsprite 0, 0, -1, 0, $00, $00
+ dsprite 0, 0, 0, 0, $00, $20
+
+.OAMData_04:
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite -1, 0, 0, 0, $00, $20
+ dsprite 0, 0, -1, 0, $01, $00
+ dsprite 0, 0, 0, 0, $01, $20
+
+.OAMData_5d:
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite -1, 0, 0, 0, $01, $00
+ dsprite 0, 0, -1, 0, $00, $40
+ dsprite 0, 0, 0, 0, $01, $40
+
+.OAMData_13:
+ dsprite -1, 2, -1, 0, $02, $00
+ dsprite 0, 2, -1, 0, $03, $00
+ dsprite -2, 6, 0, 0, $02, $00
+ dsprite -1, 6, 0, 0, $03, $00
+
+.OAMData_22:
+ dsprite 1, 0, -11, 0, $01, $00
+ dsprite 0, 0, -10, 0, $02, $00
+ dsprite 0, 0, -9, 0, $03, $00
+ dsprite 0, 0, -8, 0, $00, $00
+ dsprite 0, 0, -7, 0, $03, $00
+ dsprite 0, 0, -6, 0, $00, $00
+ dsprite 0, 0, -5, 0, $03, $00
+ dsprite 0, 0, -4, 0, $00, $00
+ dsprite 0, 0, -3, 0, $03, $00
+ dsprite 0, 0, -2, 0, $00, $00
+ dsprite 0, 0, -1, 0, $01, $00
+ dsprite -1, 0, 0, 0, $02, $00
+ dsprite -1, 0, 1, 0, $03, $00
+ dsprite -1, 0, 2, 0, $00, $00
+ dsprite -1, 0, 3, 0, $03, $00
+ dsprite -1, 0, 4, 0, $00, $00
+ dsprite -1, 0, 5, 0, $03, $00
+ dsprite -1, 0, 6, 0, $00, $00
+ dsprite -1, 0, 7, 0, $03, $00
+ dsprite -1, 0, 8, 0, $00, $00
+ dsprite -1, 0, 9, 0, $01, $00
+ dsprite -2, 0, 10, 0, $02, $00
+
+.OAMData_2a:
+ dsprite -3, 4, -1, 0, $00, $00
+ dsprite -3, 4, 0, 0, $00, $20
+ dsprite -2, 4, -1, 0, $01, $00
+ dsprite -2, 4, 0, 0, $01, $20
+ dsprite -1, 4, -1, 4, $02, $00
+
+.OAMData_2b:
+ dsprite -4, 4, -1, 0, $00, $00
+ dsprite -4, 4, 0, 0, $00, $20
+ dsprite -3, 4, -1, 0, $01, $00
+ dsprite -3, 4, 0, 0, $01, $20
+ dsprite -2, 4, -1, 4, $02, $00
+ dsprite -1, 4, -1, 4, $02, $00
+
+.OAMData_2c:
+ dsprite -5, 4, -1, 0, $00, $00
+ dsprite -5, 4, 0, 0, $00, $20
+ dsprite -4, 4, -1, 0, $01, $00
+ dsprite -4, 4, 0, 0, $01, $20
+ dsprite -3, 4, -1, 4, $02, $00
+ dsprite -2, 4, -1, 4, $02, $00
+ dsprite -1, 4, -1, 4, $02, $00
+
+.OAMData_2d:
+ dsprite -6, 4, -1, 0, $00, $00
+ dsprite -6, 4, 0, 0, $00, $20
+ dsprite -5, 4, -1, 0, $01, $00
+ dsprite -5, 4, 0, 0, $01, $20
+ dsprite -4, 4, -1, 4, $02, $00
+ dsprite -3, 4, -1, 4, $02, $00
+ dsprite -2, 4, -1, 4, $02, $00
+ dsprite -1, 4, -1, 4, $02, $00
+
+.OAMData_2e:
+ dsprite -7, 4, -1, 0, $00, $00
+ dsprite -7, 4, 0, 0, $00, $20
+ dsprite -6, 4, -1, 0, $01, $00
+ dsprite -6, 4, 0, 0, $01, $20
+ dsprite -5, 4, -1, 4, $02, $00
+ dsprite -4, 4, -1, 4, $02, $00
+ dsprite -3, 4, -1, 4, $02, $00
+ dsprite -2, 4, -1, 4, $02, $00
+ dsprite -1, 4, -1, 4, $02, $00
+
+.OAMData_2f:
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite -1, 0, 0, 0, $00, $20
+ dsprite 0, 0, -1, 0, $01, $00
+ dsprite 0, 0, 0, 0, $00, $60
+
+.OAMData_30:
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite -1, 0, 0, 0, $01, $00
+ dsprite 0, 0, -1, 0, $01, $60
+ dsprite 0, 0, 0, 0, $00, $60
+
+.OAMData_31:
+ dsprite -2, 4, -1, 0, $00, $00
+ dsprite -2, 4, 0, 0, $01, $00
+ dsprite -1, 4, -1, 0, $02, $00
+ dsprite -1, 4, 0, 0, $03, $00
+ dsprite 0, 4, -1, 0, $04, $00
+ dsprite 0, 4, 0, 0, $05, $00
+
+.OAMData_76:
+ dsprite -1, 5, -1, 0, $00, $00
+ dsprite -1, 1, 0, 0, $00, $00
+
+.OAMData_32:
+ dsprite -1, 0, -2, 4, $00, $00
+ dsprite -1, 0, 0, 4, $00, $00
+ dsprite -3, 0, -2, 4, $00, $00
+ dsprite -3, 0, 0, 4, $00, $00
+ dsprite -2, 0, -3, 4, $00, $00
+ dsprite -2, 0, -2, 4, $01, $00
+ dsprite -2, 0, -1, 4, $00, $00
+ dsprite -2, 0, 0, 4, $01, $00
+ dsprite -2, 0, 1, 4, $00, $00
+ dsprite -1, 0, -4, 4, $00, $00
+ dsprite -1, 0, -3, 4, $01, $00
+ dsprite -1, 0, -1, 4, $01, $00
+ dsprite -1, 0, 1, 4, $01, $00
+ dsprite -1, 0, 2, 4, $00, $00
+
+.OAMData_33:
+ dsprite -2, 0, -2, 4, $00, $00
+ dsprite -2, 0, 0, 4, $00, $00
+ dsprite -1, 0, -3, 4, $00, $00
+ dsprite -1, 0, -2, 4, $01, $00
+ dsprite -1, 0, -1, 4, $00, $00
+ dsprite -1, 0, 0, 4, $01, $00
+ dsprite -1, 0, 1, 4, $00, $00
+ dsprite -4, 0, -2, 4, $00, $00
+ dsprite -4, 0, 0, 4, $00, $00
+ dsprite -3, 0, -3, 4, $00, $00
+ dsprite -3, 0, -2, 4, $01, $00
+ dsprite -3, 0, -1, 4, $00, $00
+ dsprite -3, 0, 0, 4, $01, $00
+ dsprite -3, 0, 1, 4, $00, $00
+ dsprite -2, 0, -4, 4, $00, $00
+ dsprite -2, 0, -3, 4, $01, $00
+ dsprite -2, 0, -1, 4, $01, $00
+ dsprite -2, 0, 1, 4, $01, $00
+ dsprite -2, 0, 2, 4, $00, $00
+ dsprite -1, 0, -4, 4, $01, $00
+ dsprite -1, 0, 2, 4, $01, $00
+
+.OAMData_36:
+ dsprite -7, 4, -1, 0, $00, $00
+ dsprite -7, 4, 0, 0, $01, $00
+ dsprite -6, 4, -1, 0, $02, $00
+ dsprite -6, 4, 0, 0, $03, $00
+ dsprite -5, 4, -1, 0, $04, $00
+ dsprite -5, 4, 0, 0, $05, $00
+ dsprite -4, 4, -1, 0, $06, $00
+ dsprite -4, 4, 0, 0, $07, $00
+ dsprite -3, 4, -1, 0, $08, $00
+ dsprite -3, 4, 0, 0, $09, $00
+ dsprite -2, 4, -1, 0, $0a, $00
+ dsprite -2, 4, 0, 0, $0b, $00
+ dsprite -1, 4, -1, 0, $0c, $00
+ dsprite -1, 4, 0, 0, $0d, $00
+
+.OAMData_3a:
+ dsprite -7, 4, -1, 0, $0c, $00
+ dsprite -7, 4, 0, 0, $0d, $00
+ dsprite -6, 4, -1, 0, $08, $00
+ dsprite -6, 4, 0, 0, $09, $00
+ dsprite -5, 4, -1, 0, $04, $00
+ dsprite -5, 4, 0, 0, $05, $00
+ dsprite -4, 4, -1, 0, $00, $00
+ dsprite -4, 4, 0, 0, $01, $00
+ dsprite -3, 4, -1, 0, $02, $00
+ dsprite -3, 4, 0, 0, $03, $00
+ dsprite -2, 4, 0, 0, $02, $00
+ dsprite -2, 4, 1, 0, $03, $00
+ dsprite -1, 4, 0, 0, $0a, $00
+ dsprite -1, 4, 1, 0, $0b, $00
+
+.OAMData_3e:
+ dsprite 1, 4, -2, 0, $00, $40
+ dsprite 1, 4, -1, 0, $02, $40
+ dsprite 1, 4, 0, 0, $02, $60
+ dsprite 1, 4, 1, 0, $00, $60
+ dsprite -1, 4, -3, 0, $09, $20
+ dsprite -1, 4, -2, 0, $08, $20
+ dsprite -1, 4, -1, 0, $06, $00
+ dsprite -1, 4, 0, 0, $07, $00
+ dsprite -1, 4, 1, 0, $08, $00
+ dsprite -1, 4, 2, 0, $09, $00
+ dsprite 0, 4, -3, 0, $01, $20
+ dsprite 0, 4, -2, 0, $00, $20
+ dsprite 0, 4, -1, 0, $0c, $00
+ dsprite 0, 4, 0, 0, $0d, $00
+ dsprite 0, 4, 1, 0, $00, $00
+ dsprite 0, 4, 2, 0, $01, $00
+ dsprite -3, 4, -2, 0, $00, $00
+ dsprite -3, 4, -1, 0, $02, $00
+ dsprite -3, 4, 0, 0, $02, $20
+ dsprite -3, 4, 1, 0, $00, $20
+ dsprite -2, 4, -3, 0, $03, $20
+ dsprite -2, 4, -2, 0, $02, $20
+ dsprite -2, 4, -1, 0, $04, $00
+ dsprite -2, 4, 0, 0, $05, $00
+ dsprite -2, 4, 1, 0, $02, $00
+ dsprite -2, 4, 2, 0, $03, $00
+
+.OAMData_41:
+ dsprite -3, 4, -2, 0, $00, $00
+ dsprite -3, 4, -1, 0, $02, $00
+ dsprite -3, 4, 0, 0, $02, $20
+ dsprite -3, 4, 1, 0, $00, $20
+ dsprite -2, 4, -3, 4, $00, $00
+ dsprite -2, 4, -2, 4, $01, $00
+ dsprite -2, 4, -1, 0, $05, $20
+ dsprite -2, 4, 0, 0, $04, $20
+ dsprite -2, 4, 0, 4, $01, $20
+ dsprite -2, 4, 1, 4, $00, $20
+ dsprite -1, 4, -3, 4, $02, $00
+ dsprite -1, 4, -2, 4, $03, $00
+ dsprite -1, 4, -1, 0, $07, $20
+ dsprite -1, 4, 0, 0, $06, $20
+ dsprite -1, 4, 0, 4, $03, $20
+ dsprite -1, 4, 1, 4, $02, $20
+ dsprite 0, 4, -3, 4, $04, $00
+ dsprite 0, 4, -2, 4, $05, $00
+ dsprite 0, 4, -1, 0, $0d, $20
+ dsprite 0, 4, 0, 0, $0c, $20
+ dsprite 0, 4, 0, 4, $05, $20
+ dsprite 0, 4, 1, 4, $04, $20
+ dsprite 1, 4, -2, 0, $00, $40
+ dsprite 1, 4, -1, 0, $02, $40
+ dsprite 1, 4, 0, 0, $02, $60
+ dsprite 1, 4, 1, 0, $00, $60
+
+.OAMData_42:
+ dsprite -3, 0, -1, 4, $02, $00
+ dsprite 2, 0, -1, 4, $02, $60
+ dsprite -1, 4, -3, 0, $01, $00
+ dsprite -1, 4, 2, 0, $01, $60
+ dsprite -4, 0, -1, 4, $02, $00
+ dsprite 3, 0, -1, 4, $02, $60
+ dsprite -1, 4, -4, 0, $01, $00
+ dsprite -1, 4, 3, 0, $01, $60
+
+.OAMData_44:
+ dsprite -3, 5, -3, 5, $00, $20
+ dsprite -3, 5, 1, 3, $00, $00
+ dsprite 1, 3, -3, 5, $00, $60
+ dsprite 1, 3, 1, 3, $00, $40
+ dsprite -4, 5, -4, 5, $00, $20
+ dsprite -4, 5, 2, 3, $00, $00
+ dsprite 2, 3, -4, 5, $00, $60
+ dsprite 2, 3, 2, 3, $00, $40
+
+.OAMData_46:
+ dsprite -3, 4, -1, 4, $02, $00
+ dsprite 1, 4, -1, 4, $02, $60
+ dsprite -1, 4, -3, 4, $01, $00
+ dsprite -1, 4, 1, 4, $01, $60
+
+.OAMData_47:
+ dsprite -2, 0, -2, 0, $00, $20
+ dsprite -2, 0, 1, 0, $00, $00
+ dsprite 1, 0, -2, 0, $00, $60
+ dsprite 1, 0, 1, 0, $00, $40
+
+.OAMData_48:
+ dsprite -3, 0, -1, 4, $00, $00
+ dsprite -2, 0, -1, 2, $00, $00
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite 0, 0, -1, 0, $00, $00
+ dsprite 1, 0, -1, 2, $00, $00
+ dsprite 2, 0, -1, 4, $00, $00
+
+.OAMData_49:
+ dsprite -1, 4, -2, 0, $00, $20
+ dsprite -1, 2, -1, 0, $00, $20
+ dsprite -1, 2, 0, 0, $00, $00
+ dsprite -1, 4, 1, 0, $00, $00
+
+.OAMData_4a:
+ dsprite -1, 4, -1, 0, $00, $60
+ dsprite -1, 4, 0, 0, $00, $40
+
+.OAMData_0f:
+ dsprite -1, 4, -1, 4, $00, $00
+ dsprite -1, 4, -2, 4, $01, $00
+ dsprite -1, 4, -1, 4, $01, $20
+ dsprite 0, 4, -2, 4, $01, $40
+ dsprite 0, 4, -1, 4, $01, $60
+
+.OAMData_4c:
+ dsprite -1, 4, -1, 4, $00, $00
+ dsprite 0, 2, -2, 6, $00, $00
+ dsprite 0, 2, -3, 6, $01, $00
+ dsprite 0, 2, -2, 6, $01, $20
+ dsprite 1, 2, -3, 6, $01, $40
+ dsprite 1, 2, -2, 6, $01, $60
+
+.OAMData_4d:
+ dsprite -1, 4, -1, 4, $00, $00
+ dsprite 0, 2, -2, 6, $00, $00
+ dsprite 1, 0, -2, 0, $00, $00
+ dsprite 1, 0, -3, 0, $01, $00
+ dsprite 1, 0, -2, 0, $01, $20
+ dsprite 2, 0, -3, 0, $01, $40
+ dsprite 2, 0, -2, 0, $01, $60
+
+.OAMData_4f:
+ dsprite -1, 4, -1, 4, $00, $00
+ dsprite 0, 2, -2, 6, $00, $00
+ dsprite 1, 0, -2, 0, $00, $00
+ dsprite 1, 6, -3, 2, $00, $00
+ dsprite 1, 6, -4, 2, $01, $00
+ dsprite 1, 6, -3, 2, $01, $20
+ dsprite 2, 6, -4, 2, $01, $40
+ dsprite 2, 6, -3, 2, $01, $60
+
+.OAMData_50:
+ dsprite -1, 4, -1, 4, $00, $00
+ dsprite 0, 2, -2, 6, $00, $00
+ dsprite 1, 0, -2, 0, $00, $00
+ dsprite 1, 6, -3, 2, $00, $00
+ dsprite 2, 4, -4, 4, $00, $00
+ dsprite 2, 4, -5, 4, $01, $00
+ dsprite 2, 4, -4, 4, $01, $20
+ dsprite 3, 4, -5, 4, $01, $40
+ dsprite 3, 4, -4, 4, $01, $60
+
+.OAMData_51:
+ dsprite -1, 4, -1, 4, $00, $00
+ dsprite 0, 2, -2, 6, $00, $00
+ dsprite 1, 0, -2, 0, $00, $00
+ dsprite 1, 6, -3, 2, $00, $00
+ dsprite 2, 4, -4, 4, $00, $00
+ dsprite 3, 2, -5, 6, $00, $00
+ dsprite 3, 2, -6, 6, $01, $00
+ dsprite 3, 2, -5, 6, $01, $20
+ dsprite 4, 2, -6, 6, $01, $40
+ dsprite 4, 2, -5, 6, $01, $60
+
+.OAMData_59:
+ dsprite -1, 4, -2, 0, $00, $00
+ dsprite -1, 4, -1, 0, $01, $00
+ dsprite -1, 4, 0, 0, $01, $20
+ dsprite -1, 4, 1, 0, $00, $20
+
+.OAMData_5a:
+ dsprite -1, 4, -2, 0, $02, $00
+ dsprite -1, 4, -1, 0, $01, $00
+ dsprite -1, 4, 0, 0, $01, $20
+ dsprite -1, 4, 1, 0, $02, $20
+
+.OAMData_60:
+ dsprite -1, 0, -1, 4, $00, $00
+
+.OAMData_69:
+ dsprite 0, 0, -1, 4, $00, $00
+
+.OAMData_61:
+ dsprite -1, 4, -4, 4, $00, $00
+ dsprite -1, 4, -3, 4, $01, $00
+ dsprite -1, 4, -2, 4, $02, $00
+ dsprite -1, 4, -1, 4, $03, $00
+ dsprite -1, 4, 0, 4, $04, $00
+ dsprite -1, 4, 1, 4, $05, $00
+ dsprite -1, 4, 2, 4, $06, $00
+ dsprite -2, 4, 1, 4, $07, $00
+ dsprite -2, 4, 2, 4, $08, $00
+
+.OAMData_65:
+ dsprite -2, 4, -4, 4, $08, $20
+ dsprite -2, 4, -3, 4, $07, $20
+ dsprite -1, 4, -4, 4, $06, $20
+ dsprite -1, 4, -3, 4, $05, $20
+ dsprite -1, 4, -2, 4, $04, $20
+ dsprite -1, 4, -1, 4, $03, $20
+ dsprite -1, 4, 0, 4, $02, $20
+ dsprite -1, 4, 1, 4, $01, $20
+ dsprite -1, 4, 2, 4, $00, $20
+
+.OAMData_d4:
+ dsprite 0, 0, -4, 4, $00, $10
+ dsprite 0, 0, -3, 4, $01, $10
+ dsprite 0, 0, -2, 4, $02, $10
+ dsprite 0, 0, -1, 4, $03, $10
+ dsprite 0, 0, 0, 4, $04, $10
+ dsprite 0, 0, 1, 4, $05, $10
+ dsprite 0, 0, 2, 4, $06, $10
+
+.OAMData_d6:
+ dsprite -1, 0, -4, 4, $00, $10
+ dsprite 0, 0, -4, 4, $01, $10
+ dsprite -1, 0, -3, 4, $02, $10
+ dsprite 0, 0, -3, 4, $03, $10
+ dsprite -1, 0, -2, 4, $04, $10
+ dsprite 0, 0, -2, 4, $05, $10
+ dsprite -1, 0, -1, 4, $06, $10
+ dsprite 0, 0, -1, 4, $07, $10
+ dsprite -1, 0, 0, 4, $08, $10
+ dsprite 0, 0, 0, 4, $09, $10
+ dsprite -1, 0, 1, 4, $0a, $10
+ dsprite 0, 0, 1, 4, $0b, $10
+ dsprite -1, 0, 2, 4, $0c, $10
+ dsprite 0, 0, 2, 4, $0d, $10
+
+.OAMData_d5:
+ dsprite 0, 0, -3, 0, $00, $11
+ dsprite 0, 0, -2, 0, $01, $11
+ dsprite 0, 0, -1, 0, $02, $11
+ dsprite 0, 0, 0, 0, $03, $11
+ dsprite 0, 0, 1, 0, $04, $11
+ dsprite 0, 0, 2, 0, $05, $11
+
+.OAMData_d7:
+ dsprite 0, 0, -3, 0, $00, $11
+ dsprite 1, 0, -3, 0, $01, $11
+ dsprite 0, 0, -2, 0, $02, $11
+ dsprite 1, 0, -2, 0, $03, $11
+ dsprite 0, 0, -1, 0, $04, $11
+ dsprite 1, 0, -1, 0, $05, $11
+ dsprite 0, 0, 0, 0, $06, $11
+ dsprite 1, 0, 0, 0, $07, $11
+ dsprite 0, 0, 1, 0, $08, $11
+ dsprite 1, 0, 1, 0, $09, $11
+ dsprite 0, 0, 2, 0, $0a, $11
+ dsprite 1, 0, 2, 0, $0b, $11
+
+.OAMData_6e:
+ dsprite -2, 4, 0, 4, $00, $00
+ dsprite -1, 4, -2, 4, $01, $00
+ dsprite -1, 4, -1, 4, $02, $00
+ dsprite -1, 4, 0, 4, $03, $00
+ dsprite 0, 4, -2, 4, $04, $00
+
+.OAMData_6f:
+ dsprite -1, 4, -2, 4, $00, $00
+ dsprite -1, 4, -1, 4, $01, $00
+ dsprite -1, 4, 0, 4, $02, $00
+
+.OAMData_77:
+ dsprite -4, 4, 1, 4, $01, $60
+
+.OAMData_78:
+ dsprite -4, 4, 1, 4, $00, $00
+ dsprite -4, 4, 0, 4, $01, $60
+ dsprite -3, 4, 1, 4, $01, $60
+
+.OAMData_79:
+ dsprite -4, 4, 1, 4, $01, $00
+ dsprite -4, 4, 0, 4, $00, $00
+ dsprite -4, 4, -1, 4, $01, $60
+ dsprite -3, 4, 1, 4, $00, $00
+ dsprite -3, 4, 0, 4, $01, $60
+ dsprite -2, 4, 1, 4, $01, $60
+
+.OAMData_7a:
+ dsprite -4, 4, -2, 4, $01, $60
+ dsprite -4, 4, -1, 4, $00, $00
+ dsprite -4, 4, 0, 4, $01, $00
+ dsprite -3, 4, -1, 4, $01, $60
+ dsprite -3, 4, 0, 4, $00, $00
+ dsprite -3, 4, 1, 4, $01, $00
+ dsprite -2, 4, 0, 4, $01, $60
+ dsprite -2, 4, 1, 4, $00, $00
+ dsprite -1, 4, 1, 4, $01, $60
+
+.OAMData_7b:
+ dsprite -4, 4, -3, 4, $01, $60
+ dsprite -4, 4, -2, 4, $00, $00
+ dsprite -4, 4, -1, 4, $01, $00
+ dsprite -3, 4, -2, 4, $01, $60
+ dsprite -3, 4, -1, 4, $00, $00
+ dsprite -3, 4, 0, 4, $01, $00
+ dsprite -2, 4, -1, 4, $01, $60
+ dsprite -2, 4, 0, 4, $00, $00
+ dsprite -2, 4, 1, 4, $01, $00
+ dsprite -1, 4, 0, 4, $01, $60
+ dsprite -1, 4, 1, 4, $00, $00
+ dsprite 0, 4, 1, 4, $01, $60
+
+.OAMData_7c:
+ dsprite -4, 4, -3, 4, $00, $00
+ dsprite -4, 4, -2, 4, $01, $00
+ dsprite -3, 4, -3, 4, $01, $60
+ dsprite -3, 4, -2, 4, $00, $00
+ dsprite -3, 4, -1, 4, $01, $00
+ dsprite -2, 4, -2, 4, $01, $60
+ dsprite -2, 4, -1, 4, $00, $00
+ dsprite -2, 4, 0, 4, $01, $00
+ dsprite -1, 4, -1, 4, $01, $60
+ dsprite -1, 4, 0, 4, $00, $00
+ dsprite -1, 4, 1, 4, $01, $00
+ dsprite 0, 4, 0, 4, $01, $60
+ dsprite 0, 4, 1, 4, $00, $00
+ dsprite 1, 4, 1, 4, $01, $60
+
+.OAMData_7d:
+ dsprite -4, 4, -3, 4, $01, $00
+ dsprite -3, 4, -3, 4, $00, $00
+ dsprite -3, 4, -2, 4, $01, $00
+ dsprite -2, 4, -3, 4, $01, $60
+ dsprite -2, 4, -2, 4, $00, $00
+ dsprite -2, 4, -1, 4, $01, $00
+ dsprite -1, 4, -2, 4, $01, $60
+ dsprite -1, 4, -1, 4, $00, $00
+ dsprite -1, 4, 0, 4, $01, $00
+ dsprite 0, 4, -1, 4, $01, $60
+ dsprite 0, 4, 0, 4, $00, $00
+ dsprite 0, 4, 1, 4, $01, $00
+ dsprite 1, 4, 0, 4, $01, $60
+ dsprite 1, 4, 1, 4, $00, $00
+ dsprite 2, 4, 1, 4, $01, $60
+
+.OAMData_70:
+ dsprite -2, 0, -1, 0, $00, $00
+ dsprite -1, 0, -1, 0, $01, $00
+ dsprite -2, 0, 0, 0, $00, $20
+ dsprite -1, 0, 0, 0, $01, $20
+ dsprite 0, 0, -1, 0, $01, $40
+ dsprite 1, 0, -1, 0, $00, $40
+ dsprite 0, 0, 0, 0, $01, $60
+ dsprite 1, 0, 0, 0, $00, $60
+
+.OAMData_81:
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite -1, 0, 0, 0, $01, $00
+ dsprite 0, 0, -1, 0, $01, $60
+ dsprite 0, 0, 0, 0, $00, $60
+
+.OAMData_87:
+ dsprite -2, 4, -1, 0, $00, $00
+ dsprite -2, 4, 0, 0, $01, $00
+ dsprite -1, 4, -1, 0, $02, $00
+ dsprite -1, 4, 0, 0, $03, $00
+ dsprite -1, 4, -1, 0, $00, $00
+ dsprite -1, 4, 0, 0, $01, $00
+ dsprite 0, 4, -1, 0, $02, $00
+ dsprite 0, 4, 0, 0, $03, $00
+ dsprite -3, 4, -1, 0, $00, $00
+ dsprite -3, 4, 0, 0, $01, $00
+ dsprite -2, 4, -1, 0, $02, $00
+ dsprite -2, 4, 0, 0, $03, $00
+ dsprite 0, 4, -1, 0, $00, $00
+ dsprite 0, 4, 0, 0, $01, $00
+ dsprite 1, 4, -1, 0, $02, $00
+ dsprite 1, 4, 0, 0, $03, $00
+
+.OAMData_88:
+ dsprite -2, 0, -1, 0, $00, $00
+ dsprite -2, 0, 0, 0, $01, $00
+ dsprite -1, 0, -1, 0, $02, $00
+ dsprite -1, 0, 0, 0, $03, $00
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite -1, 0, 0, 0, $01, $00
+ dsprite 0, 0, -1, 0, $02, $00
+ dsprite 0, 0, 0, 0, $03, $00
+ dsprite 0, 0, -1, 0, $00, $00
+ dsprite 0, 0, 0, 0, $01, $00
+ dsprite 1, 0, -1, 0, $02, $00
+ dsprite 1, 0, 0, 0, $03, $00
+
+.OAMData_8a:
+ dsprite -1, 4, -1, 4, $00, $00
+ dsprite -1, 0, 0, 4, $00, $00
+ dsprite -2, 4, 1, 4, $00, $00
+ dsprite -2, 0, 2, 4, $00, $00
+ dsprite -3, 4, 3, 4, $00, $00
+ dsprite -3, 0, 4, 4, $00, $00
+ dsprite -4, 0, 5, 4, $00, $00
+ dsprite -5, 4, 6, 4, $00, $00
+
+.OAMData_8e:
+ dsprite -3, 4, -1, 4, $00, $00
+ dsprite -2, 4, -1, 4, $01, $00
+ dsprite -1, 4, -1, 4, $02, $00
+ dsprite 0, 4, -1, 4, $01, $40
+ dsprite 1, 4, -1, 4, $00, $40
+
+.OAMData_8f:
+ dsprite -1, 4, -2, 0, $00, $00
+ dsprite -1, 4, -1, 0, $01, $00
+ dsprite -1, 4, 0, 0, $02, $00
+ dsprite -1, 4, 1, 0, $03, $00
+
+.OAMData_93:
+ dsprite -1, 0, -2, 4, $00, $00
+ dsprite -1, 0, -1, 4, $01, $00
+ dsprite -1, 0, 0, 4, $02, $00
+ dsprite 0, 0, -2, 4, $03, $00
+ dsprite 0, 0, -1, 4, $04, $00
+ dsprite 0, 0, 0, 4, $05, $00
+
+.OAMData_99:
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite -1, 0, 0, 0, $05, $00
+ dsprite 0, 0, -1, 0, $01, $00
+ dsprite 0, 0, 0, 0, $05, $00
+
+.OAMData_9b:
+ dsprite -4, 4, 1, 0, $00, $00
+ dsprite -4, 4, 2, 0, $01, $00
+ dsprite -3, 4, -1, 0, $02, $00
+ dsprite -3, 4, 0, 0, $03, $00
+ dsprite -3, 4, 1, 0, $04, $00
+ dsprite -3, 4, 2, 0, $05, $00
+ dsprite -3, 4, 3, 0, $06, $00
+ dsprite -2, 4, -2, 0, $07, $00
+ dsprite -2, 4, -1, 0, $08, $00
+ dsprite -2, 4, 0, 0, $09, $00
+ dsprite -2, 4, 1, 0, $0a, $00
+ dsprite -2, 4, 2, 0, $0b, $00
+ dsprite -2, 4, 3, 0, $0c, $00
+ dsprite -2, 4, 4, 0, $0d, $00
+ dsprite -1, 4, -3, 0, $0e, $00
+ dsprite -1, 4, -2, 0, $0f, $00
+ dsprite -1, 4, -1, 0, $10, $00
+ dsprite -1, 4, 0, 0, $11, $00
+ dsprite -1, 4, 1, 0, $12, $00
+ dsprite -1, 4, 2, 0, $13, $00
+ dsprite 0, 4, -5, 0, $14, $00
+ dsprite 0, 4, -4, 0, $15, $00
+ dsprite 0, 4, -3, 0, $16, $00
+ dsprite 0, 4, -2, 0, $17, $00
+ dsprite 0, 4, -1, 0, $18, $00
+ dsprite 0, 4, 0, 0, $19, $00
+ dsprite 0, 4, 1, 0, $1a, $00
+ dsprite 0, 4, 2, 0, $1b, $00
+ dsprite 0, 4, 3, 0, $1c, $00
+ dsprite 1, 4, -5, 0, $1d, $00
+ dsprite 1, 4, -4, 0, $1e, $00
+ dsprite 1, 4, -2, 0, $1f, $00
+ dsprite 1, 4, -1, 0, $20, $00
+ dsprite 1, 4, 0, 0, $21, $00
+ dsprite 1, 4, 1, 0, $22, $00
+ dsprite 2, 4, 0, 0, $23, $00
+
+.OAMData_9c:
+ dsprite 0, 4, -1, 0, $02, $00
+ dsprite 0, 4, 0, 0, $03, $00
+ dsprite -1, 4, -1, 0, $01, $00
+ dsprite -1, 4, 0, 0, $01, $20
+ dsprite -2, 4, -1, 0, $00, $00
+ dsprite -2, 4, 0, 0, $00, $20
+
+.OAMData_9f:
+ dsprite -1, 0, -2, 0, $00, $00
+ dsprite -1, 0, -1, 0, $01, $00
+ dsprite -1, 0, 0, 0, $02, $00
+ dsprite -1, 0, 1, 0, $03, $00
+ dsprite 0, 0, -2, 0, $04, $00
+ dsprite 0, 0, -1, 0, $05, $00
+ dsprite 0, 0, 0, 0, $06, $00
+ dsprite 0, 0, 1, 0, $07, $00
+
+.OAMData_a0:
+ dsprite -2, 4, -1, 4, $00, $00
+ dsprite -1, 4, -1, 4, $00, $00
+ dsprite 0, 4, -1, 4, $00, $00
+ dsprite -3, 4, -1, 4, $00, $00
+ dsprite 1, 4, -1, 4, $00, $00
+ dsprite -4, 4, -1, 4, $00, $00
+ dsprite 2, 4, -1, 4, $00, $00
+
+.OAMData_a4:
+ dsprite -2, 4, -2, 4, $00, $00
+ dsprite -2, 4, -1, 4, $01, $00
+ dsprite -2, 4, 0, 4, $02, $00
+ dsprite -1, 4, -2, 4, $03, $00
+ dsprite -1, 4, -1, 4, $04, $00
+ dsprite -1, 4, 0, 4, $05, $00
+ dsprite 0, 4, -2, 4, $00, $40
+ dsprite 0, 4, -1, 4, $01, $40
+ dsprite 0, 4, 0, 4, $02, $40
+
+.OAMData_ac:
+ dsprite -1, 4, -2, 0, $00, $00
+ dsprite -1, 4, -1, 0, $01, $00
+ dsprite -1, 4, 0, 0, $01, $20
+ dsprite -1, 4, 1, 0, $00, $20
+
+.OAMData_bc:
+ dsprite -1, 4, -3, 0, $00, $00
+ dsprite -1, 4, -2, 0, $01, $00
+ dsprite -1, 4, -1, 0, $02, $00
+ dsprite -1, 4, 0, 0, $02, $20
+ dsprite -1, 4, 1, 0, $01, $20
+ dsprite -1, 4, 2, 0, $00, $20
+
+.OAMData_c1:
+ dsprite -2, 0, -2, 0, $00, $00
+ dsprite -2, 0, -1, 0, $01, $00
+ dsprite -2, 0, 0, 0, $02, $00
+ dsprite -2, 0, 1, 0, $00, $20
+ dsprite -1, 0, -2, 0, $03, $00
+ dsprite -1, 0, -1, 0, $04, $00
+ dsprite -1, 0, 0, 0, $04, $20
+ dsprite -1, 0, 1, 0, $05, $00
+ dsprite 0, 0, -2, 0, $05, $60
+ dsprite 0, 0, -1, 0, $04, $40
+ dsprite 0, 0, 0, 0, $04, $60
+ dsprite 0, 0, 1, 0, $03, $60
+ dsprite 1, 0, -2, 0, $00, $40
+ dsprite 1, 0, -1, 0, $02, $60
+ dsprite 1, 0, 0, 0, $01, $60
+ dsprite 1, 0, 1, 0, $00, $60
+
+.OAMData_c2:
+ dsprite -1, 0, -2, 0, $00, $00
+ dsprite -1, 0, -1, 0, $01, $00
+ dsprite -1, 0, 0, 0, $00, $60
+ dsprite 0, 0, -1, 0, $00, $00
+ dsprite 0, 0, 0, 0, $01, $00
+ dsprite 0, 0, 1, 0, $00, $60
+
+.OAMData_c8:
+ dsprite -1, 0, 1, 4, $00, $00
+ dsprite -1, 0, 2, 4, $01, $00
+ dsprite 0, 0, -1, 4, $02, $00
+ dsprite 0, 0, 0, 4, $03, $00
+ dsprite 0, 0, 1, 4, $04, $00
+ dsprite 0, 0, 2, 4, $05, $00
+
+.OAMData_ca:
+ dsprite -1, 0, -1, 0, $00, $00
+ dsprite -1, 0, 0, 0, $01, $60
+ dsprite 0, 0, -1, 0, $01, $00
+ dsprite 0, 0, 0, 0, $01, $20
+
+.OAMData_cc:
+ dsprite -2, 0, -13, 4, $00, $00
+ dsprite -4, 0, -11, 4, $00, $00
+ dsprite -1, 0, -9, 4, $00, $00
+ dsprite -5, 0, -7, 4, $00, $00
+ dsprite -3, 0, -5, 4, $00, $00
+ dsprite -5, 0, -3, 4, $00, $00
+ dsprite -3, 0, -1, 4, $00, $00
+ dsprite -3, 0, 0, 4, $00, $00
+ dsprite -5, 0, 2, 4, $00, $00
+ dsprite 0, 0, 4, 4, $00, $00
+ dsprite -2, 0, 6, 4, $00, $00
+ dsprite -4, 0, 8, 4, $00, $00
+ dsprite -2, 0, 10, 4, $00, $00
+; cfcf6
diff --git a/battle/used_move_text.asm b/battle/used_move_text.asm
index b526d1233..5b7fcef1a 100755
--- a/battle/used_move_text.asm
+++ b/battle/used_move_text.asm
@@ -82,10 +82,10 @@ UsedMoveText_CheckObedience: ; 105e10
ret
; 105e1a
-.UsedInsteadText
+.UsedInsteadText:
text_jump _UsedInsteadText
start_asm
-.GetMoveNameText
+.GetMoveNameText:
ld hl, MoveNameText
ret
; 105e23
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 09:08:35 +0000