summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/duel_animations.asm190
-rw-r--r--src/data/map_headers.asm71
-rw-r--r--src/data/npcs.asm460
3 files changed, 360 insertions, 361 deletions
diff --git a/src/data/duel_animations.asm b/src/data/duel_animations.asm
index 5447b98..ba1e0f9 100644
--- a/src/data/duel_animations.asm
+++ b/src/data/duel_animations.asm
@@ -11,7 +11,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_GLOW
db SPRITE_DUEL_GLOW ; sprite ID
db PALETTE_31 ; palette ID
- db $47 ; anim ID
+ db SPRITE_ANIM_71 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_11 ; sound FX ID
db $00 ; handler function
@@ -19,7 +19,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_PARALYSIS
db SPRITE_DUEL_1 ; sprite ID
db PALETTE_32 ; palette ID
- db $48 ; anim ID
+ db SPRITE_ANIM_72 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_12 ; sound FX ID
db $00 ; handler function
@@ -27,7 +27,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_SLEEP
db SPRITE_DUEL_2 ; sprite ID
db PALETTE_33 ; palette ID
- db $49 ; anim ID
+ db SPRITE_ANIM_73 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_13 ; sound FX ID
db $00 ; handler function
@@ -35,7 +35,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_CONFUSION
db SPRITE_DUEL_55 ; sprite ID
db PALETTE_34 ; palette ID
- db $4a ; anim ID
+ db SPRITE_ANIM_74 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_14 ; sound FX ID
db $00 ; handler function
@@ -43,7 +43,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_POISON
db SPRITE_DUEL_58 ; sprite ID
db PALETTE_35 ; palette ID
- db $4b ; anim ID
+ db SPRITE_ANIM_75 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_15 ; sound FX ID
db $00 ; handler function
@@ -51,7 +51,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_6
db SPRITE_DUEL_3 ; sprite ID
db PALETTE_36 ; palette ID
- db $4c ; anim ID
+ db SPRITE_ANIM_76 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_16 ; sound FX ID
db $00 ; handler function
@@ -59,7 +59,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_HIT
db SPRITE_DUEL_3 ; sprite ID
db PALETTE_36 ; palette ID
- db $4d ; anim ID
+ db SPRITE_ANIM_77 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_16 ; sound FX ID
db $00 ; handler function
@@ -67,7 +67,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BIG_HIT
db SPRITE_DUEL_3 ; sprite ID
db PALETTE_36 ; palette ID
- db $4e ; anim ID
+ db SPRITE_ANIM_78 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_17 ; sound FX ID
db $00 ; handler function
@@ -83,7 +83,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_THUNDER_SHOCK
db SPRITE_DUEL_5 ; sprite ID
db PALETTE_38 ; palette ID
- db $5c ; anim ID
+ db SPRITE_ANIM_92 ; anim ID
db $00 ; anim flags
db SFX_18 ; sound FX ID
db $00 ; handler function
@@ -91,7 +91,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_LIGHTNING
db SPRITE_DUEL_6 ; sprite ID
db PALETTE_39 ; palette ID
- db $5e ; anim ID
+ db SPRITE_ANIM_94 ; anim ID
db $00 ; anim flags
db SFX_19 ; sound FX ID
db $00 ; handler function
@@ -99,7 +99,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BORDER_SPARK
db SPRITE_DUEL_59 ; sprite ID
db PALETTE_40 ; palette ID
- db $5f ; anim ID
+ db SPRITE_ANIM_95 ; anim ID
db $00 ; anim flags
db SFX_1A ; sound FX ID
db $00 ; handler function
@@ -107,7 +107,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BIG_LIGHTNING
db SPRITE_DUEL_7 ; sprite ID
db PALETTE_41 ; palette ID
- db $60 ; anim ID
+ db SPRITE_ANIM_96 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_1B ; sound FX ID
db $00 ; handler function
@@ -115,7 +115,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_SMALL_FLAME
db SPRITE_DUEL_8 ; sprite ID
db PALETTE_42 ; palette ID
- db $61 ; anim ID
+ db SPRITE_ANIM_97 ; anim ID
db $00 ; anim flags
db SFX_1C ; sound FX ID
db $00 ; handler function
@@ -123,7 +123,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BIG_FLAME
db SPRITE_DUEL_8 ; sprite ID
db PALETTE_42 ; palette ID
- db $62 ; anim ID
+ db SPRITE_ANIM_98 ; anim ID
db $00 ; anim flags
db SFX_1D ; sound FX ID
db $00 ; handler function
@@ -131,7 +131,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_FIRE_SPIN
db SPRITE_DUEL_9 ; sprite ID
db PALETTE_43 ; palette ID
- db $63 ; anim ID
+ db SPRITE_ANIM_99 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_1E ; sound FX ID
db $00 ; handler function
@@ -139,7 +139,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_DIVE_BOMB
db SPRITE_DUEL_10 ; sprite ID
db PALETTE_44 ; palette ID
- db $64 ; anim ID
+ db SPRITE_ANIM_100 ; anim ID
db $00 ; anim flags
db SFX_1F ; sound FX ID
db $00 ; handler function
@@ -147,7 +147,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_WATER_JETS
db SPRITE_DUEL_61 ; sprite ID
db PALETTE_45 ; palette ID
- db $69 ; anim ID
+ db SPRITE_ANIM_105 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_20 ; sound FX ID
db $00 ; handler function
@@ -155,7 +155,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_WATER_GUN
db SPRITE_DUEL_11 ; sprite ID
db PALETTE_46 ; palette ID
- db $6a ; anim ID
+ db SPRITE_ANIM_106 ; anim ID
db $00 ; anim flags
db SFX_21 ; sound FX ID
db $00 ; handler function
@@ -163,7 +163,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_WHIRLPOOL
db SPRITE_DUEL_12 ; sprite ID
db PALETTE_47 ; palette ID
- db $6b ; anim ID
+ db SPRITE_ANIM_107 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_22 ; sound FX ID
db $00 ; handler function
@@ -171,7 +171,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_HYDRO_PUMP
db SPRITE_DUEL_13 ; sprite ID
db PALETTE_48 ; palette ID
- db $6c ; anim ID
+ db SPRITE_ANIM_108 ; anim ID
db $00 ; anim flags
db SFX_23 ; sound FX ID
db $00 ; handler function
@@ -179,7 +179,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BLIZZARD
db SPRITE_DUEL_62 ; sprite ID
db PALETTE_49 ; palette ID
- db $6d ; anim ID
+ db SPRITE_ANIM_109 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_24 ; sound FX ID
db $00 ; handler function
@@ -187,7 +187,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_PSYCHIC
db SPRITE_DUEL_14 ; sprite ID
db PALETTE_50 ; palette ID
- db $6e ; anim ID
+ db SPRITE_ANIM_110 ; anim ID
db $00 ; anim flags
db SFX_25 ; sound FX ID
db $00 ; handler function
@@ -195,7 +195,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_GLARE
db SPRITE_DUEL_15 ; sprite ID
db PALETTE_51 ; palette ID
- db $6f ; anim ID
+ db SPRITE_ANIM_111 ; anim ID
db $00 ; anim flags
db SFX_26 ; sound FX ID
db $00 ; handler function
@@ -203,7 +203,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BEAM
db SPRITE_DUEL_16 ; sprite ID
db PALETTE_52 ; palette ID
- db $70 ; anim ID
+ db SPRITE_ANIM_112 ; anim ID
db (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) ; anim flags
db SFX_27 ; sound FX ID
db $00 ; handler function
@@ -211,7 +211,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_HYPER_BEAM
db SPRITE_DUEL_17 ; sprite ID
db PALETTE_53 ; palette ID
- db $71 ; anim ID
+ db SPRITE_ANIM_113 ; anim ID
db (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) ; anim flags
db SFX_28 ; sound FX ID
db $00 ; handler function
@@ -219,7 +219,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_ROCK_THROW
db SPRITE_DUEL_18 ; sprite ID
db PALETTE_54 ; palette ID
- db $72 ; anim ID
+ db SPRITE_ANIM_114 ; anim ID
db $00 ; anim flags
db SFX_29 ; sound FX ID
db $00 ; handler function
@@ -227,7 +227,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_STONE_BARRAGE
db SPRITE_DUEL_18 ; sprite ID
db PALETTE_54 ; palette ID
- db $73 ; anim ID
+ db SPRITE_ANIM_115 ; anim ID
db $00 ; anim flags
db SFX_2A ; sound FX ID
db $00 ; handler function
@@ -235,7 +235,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_PUNCH
db SPRITE_DUEL_19 ; sprite ID
db PALETTE_55 ; palette ID
- db $74 ; anim ID
+ db SPRITE_ANIM_116 ; anim ID
db $00 ; anim flags
db SFX_2B ; sound FX ID
db $00 ; handler function
@@ -243,7 +243,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_THUNDERPUNCH
db SPRITE_DUEL_19 ; sprite ID
db PALETTE_55 ; palette ID
- db $75 ; anim ID
+ db SPRITE_ANIM_117 ; anim ID
db $00 ; anim flags
db SFX_52 ; sound FX ID
db $00 ; handler function
@@ -251,7 +251,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_FIRE_PUNCH
db SPRITE_DUEL_19 ; sprite ID
db PALETTE_55 ; palette ID
- db $76 ; anim ID
+ db SPRITE_ANIM_118 ; anim ID
db $00 ; anim flags
db SFX_53 ; sound FX ID
db $00 ; handler function
@@ -259,7 +259,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_STRETCH_KICK
db SPRITE_DUEL_20 ; sprite ID
db PALETTE_56 ; palette ID
- db $77 ; anim ID
+ db SPRITE_ANIM_119 ; anim ID
db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
db SFX_2C ; sound FX ID
db $00 ; handler function
@@ -267,7 +267,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_SLASH
db SPRITE_DUEL_21 ; sprite ID
db PALETTE_57 ; palette ID
- db $78 ; anim ID
+ db SPRITE_ANIM_120 ; anim ID
db $00 ; anim flags
db SFX_2D ; sound FX ID
db $00 ; handler function
@@ -275,7 +275,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_WHIP
db SPRITE_DUEL_22 ; sprite ID
db PALETTE_58 ; palette ID
- db $7a ; anim ID
+ db SPRITE_ANIM_122 ; anim ID
db $00 ; anim flags
db SFX_2D ; sound FX ID
db $00 ; handler function
@@ -283,7 +283,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_TEAR
db SPRITE_DUEL_23 ; sprite ID
db PALETTE_59 ; palette ID
- db $7b ; anim ID
+ db SPRITE_ANIM_123 ; anim ID
db $00 ; anim flags
db SFX_2E ; sound FX ID
db $00 ; handler function
@@ -291,7 +291,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_FURY_SWIPES
db SPRITE_DUEL_21 ; sprite ID
db PALETTE_57 ; palette ID
- db $79 ; anim ID
+ db SPRITE_ANIM_121 ; anim ID
db $00 ; anim flags
db SFX_2F ; sound FX ID
db $00 ; handler function
@@ -299,7 +299,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_DRILL
db SPRITE_DUEL_24 ; sprite ID
db PALETTE_60 ; palette ID
- db $7c ; anim ID
+ db SPRITE_ANIM_124 ; anim ID
db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
db SFX_30 ; sound FX ID
db $00 ; handler function
@@ -307,7 +307,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_POT_SMASH
db SPRITE_DUEL_25 ; sprite ID
db PALETTE_61 ; palette ID
- db $7d ; anim ID
+ db SPRITE_ANIM_125 ; anim ID
db $00 ; anim flags
db SFX_31 ; sound FX ID
db $00 ; handler function
@@ -315,7 +315,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BONEMERANG
db SPRITE_DUEL_26 ; sprite ID
db PALETTE_62 ; palette ID
- db $7e ; anim ID
+ db SPRITE_ANIM_126 ; anim ID
db $00 ; anim flags
db SFX_32 ; sound FX ID
db $00 ; handler function
@@ -323,7 +323,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_SEISMIC_TOSS
db SPRITE_DUEL_27 ; sprite ID
db PALETTE_63 ; palette ID
- db $7f ; anim ID
+ db SPRITE_ANIM_127 ; anim ID
db $00 ; anim flags
db SFX_33 ; sound FX ID
db $00 ; handler function
@@ -331,7 +331,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_NEEDLES
db SPRITE_DUEL_28 ; sprite ID
db PALETTE_64 ; palette ID
- db $80 ; anim ID
+ db SPRITE_ANIM_128 ; anim ID
db $00 ; anim flags
db SFX_34 ; sound FX ID
db $00 ; handler function
@@ -339,7 +339,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_WHITE_GAS
db SPRITE_DUEL_29 ; sprite ID
db PALETTE_65 ; palette ID
- db $81 ; anim ID
+ db SPRITE_ANIM_129 ; anim ID
db $00 ; anim flags
db SFX_35 ; sound FX ID
db $00 ; handler function
@@ -347,7 +347,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_POWDER
db SPRITE_DUEL_56 ; sprite ID
db PALETTE_66 ; palette ID
- db $82 ; anim ID
+ db SPRITE_ANIM_130 ; anim ID
db $00 ; anim flags
db SFX_36 ; sound FX ID
db $00 ; handler function
@@ -355,7 +355,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_GOO
db SPRITE_DUEL_30 ; sprite ID
db PALETTE_67 ; palette ID
- db $83 ; anim ID
+ db SPRITE_ANIM_131 ; anim ID
db $00 ; anim flags
db SFX_37 ; sound FX ID
db $00 ; handler function
@@ -363,7 +363,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BUBBLES
db SPRITE_DUEL_31 ; sprite ID
db PALETTE_68 ; palette ID
- db $84 ; anim ID
+ db SPRITE_ANIM_132 ; anim ID
db $00 ; anim flags
db SFX_38 ; sound FX ID
db $00 ; handler function
@@ -371,7 +371,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_STRING_SHOT
db SPRITE_DUEL_32 ; sprite ID
db PALETTE_69 ; palette ID
- db $85 ; anim ID
+ db SPRITE_ANIM_133 ; anim ID
db $00 ; anim flags
db SFX_39 ; sound FX ID
db $00 ; handler function
@@ -379,7 +379,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BOYFRIENDS
db SPRITE_DUEL_33 ; sprite ID
db PALETTE_70 ; palette ID
- db $86 ; anim ID
+ db SPRITE_ANIM_134 ; anim ID
db $00 ; anim flags
db SFX_3A ; sound FX ID
db $00 ; handler function
@@ -387,7 +387,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_LURE
db SPRITE_DUEL_34 ; sprite ID
db PALETTE_71 ; palette ID
- db $87 ; anim ID
+ db SPRITE_ANIM_135 ; anim ID
db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
db SFX_3B ; sound FX ID
db $00 ; handler function
@@ -395,7 +395,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_TOXIC
db SPRITE_DUEL_35 ; sprite ID
db PALETTE_72 ; palette ID
- db $88 ; anim ID
+ db SPRITE_ANIM_136 ; anim ID
db $00 ; anim flags
db SFX_3C ; sound FX ID
db $00 ; handler function
@@ -403,7 +403,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_CONFUSE_RAY
db SPRITE_DUEL_66 ; sprite ID
db PALETTE_73 ; palette ID
- db $89 ; anim ID
+ db SPRITE_ANIM_137 ; anim ID
db $00 ; anim flags
db SFX_3D ; sound FX ID
db $00 ; handler function
@@ -411,7 +411,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_SING
db SPRITE_DUEL_36 ; sprite ID
db PALETTE_74 ; palette ID
- db $8a ; anim ID
+ db SPRITE_ANIM_138 ; anim ID
db $00 ; anim flags
db SFX_3E ; sound FX ID
db $00 ; handler function
@@ -419,7 +419,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_SUPERSONIC
db SPRITE_DUEL_37 ; sprite ID
db PALETTE_75 ; palette ID
- db $8b ; anim ID
+ db SPRITE_ANIM_139 ; anim ID
db $00 ; anim flags
db SFX_3F ; sound FX ID
db $00 ; handler function
@@ -427,7 +427,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_PETAL_DANCE
db SPRITE_DUEL_57 ; sprite ID
db PALETTE_76 ; palette ID
- db $8c ; anim ID
+ db SPRITE_ANIM_140 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_40 ; sound FX ID
db $00 ; handler function
@@ -435,7 +435,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_PROTECT
db SPRITE_DUEL_38 ; sprite ID
db PALETTE_77 ; palette ID
- db $8d ; anim ID
+ db SPRITE_ANIM_141 ; anim ID
db $00 ; anim flags
db SFX_41 ; sound FX ID
db $00 ; handler function
@@ -443,7 +443,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BARRIER
db SPRITE_DUEL_39 ; sprite ID
db PALETTE_78 ; palette ID
- db $8e ; anim ID
+ db SPRITE_ANIM_142 ; anim ID
db $00 ; anim flags
db SFX_42 ; sound FX ID
db $00 ; handler function
@@ -451,7 +451,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_QUICK_ATTACK
db SPRITE_DUEL_40 ; sprite ID
db PALETTE_79 ; palette ID
- db $8f ; anim ID
+ db SPRITE_ANIM_143 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_43 ; sound FX ID
db $00 ; handler function
@@ -459,7 +459,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_WHIRLWIND
db SPRITE_DUEL_41 ; sprite ID
db PALETTE_80 ; palette ID
- db $90 ; anim ID
+ db SPRITE_ANIM_144 ; anim ID
db $00 ; anim flags
db SFX_44 ; sound FX ID
db $00 ; handler function
@@ -467,7 +467,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_CRY
db SPRITE_DUEL_42 ; sprite ID
db PALETTE_81 ; palette ID
- db $92 ; anim ID
+ db SPRITE_ANIM_146 ; anim ID
db $00 ; anim flags
db SFX_45 ; sound FX ID
db $00 ; handler function
@@ -475,7 +475,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_QUESTION_MARK
db SPRITE_DUEL_43 ; sprite ID
db PALETTE_82 ; palette ID
- db $93 ; anim ID
+ db SPRITE_ANIM_147 ; anim ID
db $00 ; anim flags
db SFX_46 ; sound FX ID
db $00 ; handler function
@@ -483,7 +483,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_SELFDESTRUCT
db SPRITE_DUEL_44 ; sprite ID
db PALETTE_83 ; palette ID
- db $94 ; anim ID
+ db SPRITE_ANIM_148 ; anim ID
db $00 ; anim flags
db SFX_47 ; sound FX ID
db $00 ; handler function
@@ -491,7 +491,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BIG_SELFDESTRUCT_1
db SPRITE_DUEL_44 ; sprite ID
db PALETTE_83 ; palette ID
- db $95 ; anim ID
+ db SPRITE_ANIM_149 ; anim ID
db $00 ; anim flags
db SFX_48 ; sound FX ID
db $00 ; handler function
@@ -499,7 +499,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_HEAL
db SPRITE_DUEL_60 ; sprite ID
db PALETTE_84 ; palette ID
- db $97 ; anim ID
+ db SPRITE_ANIM_151 ; anim ID
db $00 ; anim flags
db SFX_49 ; sound FX ID
db $00 ; handler function
@@ -507,7 +507,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_DRAIN
db SPRITE_DUEL_64 ; sprite ID
db PALETTE_85 ; palette ID
- db $99 ; anim ID
+ db SPRITE_ANIM_153 ; anim ID
db $00 ; anim flags
db SFX_4A ; sound FX ID
db $00 ; handler function
@@ -515,7 +515,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_DARK_GAS
db SPRITE_DUEL_29 ; sprite ID
db PALETTE_86 ; palette ID
- db $81 ; anim ID
+ db SPRITE_ANIM_129 ; anim ID
db $00 ; anim flags
db SFX_4B ; sound FX ID
db $00 ; handler function
@@ -523,7 +523,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BIG_SELFDESTRUCT_2
db SPRITE_DUEL_44 ; sprite ID
db PALETTE_83 ; palette ID
- db $96 ; anim ID
+ db SPRITE_ANIM_150 ; anim ID
db $00 ; anim flags
db SFX_47 ; sound FX ID
db $00 ; handler function
@@ -531,7 +531,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_66
db SPRITE_DUEL_3 ; sprite ID
db PALETTE_36 ; palette ID
- db $4d ; anim ID
+ db SPRITE_ANIM_77 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_16 ; sound FX ID
db $00 ; handler function
@@ -539,7 +539,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_67
db SPRITE_DUEL_3 ; sprite ID
db PALETTE_36 ; palette ID
- db $4e ; anim ID
+ db SPRITE_ANIM_78 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_17 ; sound FX ID
db $00 ; handler function
@@ -547,7 +547,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_68
db SPRITE_DUEL_5 ; sprite ID
db PALETTE_38 ; palette ID
- db $5c ; anim ID
+ db SPRITE_ANIM_92 ; anim ID
db $00 ; anim flags
db SFX_18 ; sound FX ID
db $00 ; handler function
@@ -555,7 +555,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_69
db SPRITE_DUEL_62 ; sprite ID
db PALETTE_49 ; palette ID
- db $6d ; anim ID
+ db SPRITE_ANIM_109 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_24 ; sound FX ID
db $00 ; handler function
@@ -563,7 +563,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_70
db SPRITE_DUEL_45 ; sprite ID
db PALETTE_87 ; palette ID
- db $9a ; anim ID
+ db SPRITE_ANIM_154 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
db SFX_11 ; sound FX ID
db $00 ; handler function
@@ -571,7 +571,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_71
db SPRITE_DUEL_10 ; sprite ID
db PALETTE_44 ; palette ID
- db $65 ; anim ID
+ db SPRITE_ANIM_101 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_5C ; sound FX ID
db $00 ; handler function
@@ -579,7 +579,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_72
db SPRITE_DUEL_10 ; sprite ID
db PALETTE_44 ; palette ID
- db $66 ; anim ID
+ db SPRITE_ANIM_102 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -587,7 +587,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_73
db SPRITE_DUEL_60 ; sprite ID
db PALETTE_84 ; palette ID
- db $98 ; anim ID
+ db SPRITE_ANIM_152 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_4C ; sound FX ID
db $00 ; handler function
@@ -595,7 +595,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_74
db SPRITE_DUEL_41 ; sprite ID
db PALETTE_80 ; palette ID
- db $91 ; anim ID
+ db SPRITE_ANIM_145 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_4D ; sound FX ID
db $00 ; handler function
@@ -603,7 +603,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_EXPAND
db SPRITE_DUEL_46 ; sprite ID
db PALETTE_88 ; palette ID
- db $9b ; anim ID
+ db SPRITE_ANIM_155 ; anim ID
db $00 ; anim flags
db SFX_4E ; sound FX ID
db $00 ; handler function
@@ -611,7 +611,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_76
db SPRITE_DUEL_47 ; sprite ID
db PALETTE_89 ; palette ID
- db $9c ; anim ID
+ db SPRITE_ANIM_156 ; anim ID
db $00 ; anim flags
db SFX_4F ; sound FX ID
db $00 ; handler function
@@ -619,7 +619,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_THUNDER_WAVE
db SPRITE_DUEL_48 ; sprite ID
db PALETTE_90 ; palette ID
- db $9d ; anim ID
+ db SPRITE_ANIM_157 ; anim ID
db $00 ; anim flags
db SFX_50 ; sound FX ID
db $00 ; handler function
@@ -627,7 +627,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_78
db SPRITE_DUEL_10 ; sprite ID
db PALETTE_44 ; palette ID
- db $67 ; anim ID
+ db SPRITE_ANIM_103 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_51 ; sound FX ID
db $00 ; handler function
@@ -635,7 +635,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_79
db SPRITE_DUEL_10 ; sprite ID
db PALETTE_44 ; palette ID
- db $68 ; anim ID
+ db SPRITE_ANIM_104 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_51 ; sound FX ID
db $00 ; handler function
@@ -643,7 +643,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_80
db SPRITE_DUEL_49 ; sprite ID
db PALETTE_91 ; palette ID
- db $9e ; anim ID
+ db SPRITE_ANIM_158 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -651,7 +651,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_PLAYER_SHUFFLE
db SPRITE_DUEL_49 ; sprite ID
db PALETTE_91 ; palette ID
- db $9f ; anim ID
+ db SPRITE_ANIM_159 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_07 ; sound FX ID
db $00 ; handler function
@@ -659,7 +659,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_OPP_SHUFFLE
db SPRITE_DUEL_49 ; sprite ID
db PALETTE_91 ; palette ID
- db $a0 ; anim ID
+ db SPRITE_ANIM_160 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_07 ; sound FX ID
db $00 ; handler function
@@ -667,7 +667,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BOTH_SHUFFLE
db SPRITE_DUEL_49 ; sprite ID
db PALETTE_91 ; palette ID
- db $a1 ; anim ID
+ db SPRITE_ANIM_161 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_07 ; sound FX ID
db $00 ; handler function
@@ -675,7 +675,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_84
db SPRITE_DUEL_49 ; sprite ID
db PALETTE_91 ; palette ID
- db $a2 ; anim ID
+ db SPRITE_ANIM_162 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -683,7 +683,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_BOTH_DRAW
db SPRITE_DUEL_49 ; sprite ID
db PALETTE_91 ; palette ID
- db $a3 ; anim ID
+ db SPRITE_ANIM_163 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -691,7 +691,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_PLAYER_DRAW
db SPRITE_DUEL_49 ; sprite ID
db PALETTE_91 ; palette ID
- db $a4 ; anim ID
+ db SPRITE_ANIM_164 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -699,7 +699,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_OPP_DRAW
db SPRITE_DUEL_49 ; sprite ID
db PALETTE_91 ; palette ID
- db $a5 ; anim ID
+ db SPRITE_ANIM_165 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -707,7 +707,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_COIN_SPIN
db SPRITE_DUEL_50 ; sprite ID
db PALETTE_92 ; palette ID
- db $a7 ; anim ID
+ db SPRITE_ANIM_167 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -715,7 +715,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_COIN_TOSS1
db SPRITE_DUEL_50 ; sprite ID
db PALETTE_92 ; palette ID
- db $a8 ; anim ID
+ db SPRITE_ANIM_168 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_0B ; sound FX ID
db $00 ; handler function
@@ -723,7 +723,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_COIN_TOSS2
db SPRITE_DUEL_50 ; sprite ID
db PALETTE_92 ; palette ID
- db $a9 ; anim ID
+ db SPRITE_ANIM_169 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_0B ; sound FX ID
db $00 ; handler function
@@ -731,7 +731,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_COIN_TAILS
db SPRITE_DUEL_50 ; sprite ID
db PALETTE_92 ; palette ID
- db $aa ; anim ID
+ db SPRITE_ANIM_170 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -739,7 +739,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_COIN_HEADS
db SPRITE_DUEL_50 ; sprite ID
db PALETTE_92 ; palette ID
- db $ab ; anim ID
+ db SPRITE_ANIM_171 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -747,7 +747,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_DUEL_WIN
db SPRITE_DUEL_WON_LOST_DRAW ; sprite ID
db PALETTE_93 ; palette ID
- db $ac ; anim ID
+ db SPRITE_ANIM_172 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -755,7 +755,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_DUEL_LOSS
db SPRITE_DUEL_WON_LOST_DRAW ; sprite ID
db PALETTE_93 ; palette ID
- db $ad ; anim ID
+ db SPRITE_ANIM_173 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -763,7 +763,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_DUEL_DRAW
db SPRITE_DUEL_WON_LOST_DRAW ; sprite ID
db PALETTE_93 ; palette ID
- db $ae ; anim ID
+ db SPRITE_ANIM_174 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
@@ -771,7 +771,7 @@ Animations: ; 1ce32 (7:4e32)
; DUEL_ANIM_96
db SPRITE_DUEL_49 ; sprite ID
db PALETTE_91 ; palette ID
- db $a6 ; anim ID
+ db SPRITE_ANIM_166 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
diff --git a/src/data/map_headers.asm b/src/data/map_headers.asm
index 01b67c8..ca53160 100644
--- a/src/data/map_headers.asm
+++ b/src/data/map_headers.asm
@@ -1,37 +1,36 @@
-; TODO: figure out the rest of the data for each map
-; related to the table at 20:4e5d
MapHeaders: ; 1c374 (7:4374)
- db TILEMAP_OVERWORLD_MAP, TILEMAP_OVERWORLD_MAP_CGB, $00, MAP_SGB_PALS_1, $01, MUSIC_OVERWORLD ; OVERWORLD_MAP
- db TILEMAP_MASON_LABORATORY, TILEMAP_MASON_LABORATORY_CGB, $00, MAP_SGB_PALS_2, $02, MUSIC_OVERWORLD ; MASON_LABORATORY
- db TILEMAP_DECK_MACHINE_ROOM, TILEMAP_DECK_MACHINE_ROOM_CGB, $00, MAP_SGB_PALS_2, $02, MUSIC_OVERWORLD ; DECK_MACHINE_ROOM
- db TILEMAP_ISHIHARA, TILEMAP_ISHIHARA_CGB, $00, MAP_SGB_PALS_3, $03, MUSIC_OVERWORLD ; ISHIHARAS_HOUSE
- db TILEMAP_FIGHTING_CLUB_ENTRANCE, TILEMAP_FIGHTING_CLUB_ENTRANCE_CGB, $00, MAP_SGB_PALS_3, $04, MUSIC_OVERWORLD ; FIGHTING_CLUB_ENTRANCE
- db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, $00, MAP_SGB_PALS_3, $0c, MUSIC_OVERWORLD ; FIGHTING_CLUB_LOBBY
- db TILEMAP_FIGHTING_CLUB, TILEMAP_FIGHTING_CLUB_CGB, $00, MAP_SGB_PALS_4, $0d, MUSIC_CLUB_3 ; FIGHTING_CLUB
- db TILEMAP_ROCK_CLUB_ENTRANCE, TILEMAP_ROCK_CLUB_ENTRANCE_CGB, $00, MAP_SGB_PALS_3, $05, MUSIC_OVERWORLD ; ROCK_CLUB_ENTRANCE
- db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, $00, MAP_SGB_PALS_3, $0c, MUSIC_OVERWORLD ; ROCK_CLUB_LOBBY
- db TILEMAP_ROCK_CLUB, TILEMAP_ROCK_CLUB_CGB, $00, MAP_SGB_PALS_4, $0e, MUSIC_CLUB_2 ; ROCK_CLUB
- db TILEMAP_WATER_CLUB_ENTRANCE, TILEMAP_WATER_CLUB_ENTRANCE_CGB, $00, MAP_SGB_PALS_3, $06, MUSIC_OVERWORLD ; WATER_CLUB_ENTRANCE
- db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, $00, MAP_SGB_PALS_3, $0c, MUSIC_OVERWORLD ; WATER_CLUB_LOBBY
- db TILEMAP_WATER_CLUB, TILEMAP_WATER_CLUB_CGB, $00, MAP_SGB_PALS_2, $0f, MUSIC_CLUB_2 ; WATER_CLUB
- db TILEMAP_LIGHTNING_CLUB_ENTRANCE, TILEMAP_LIGHTNING_CLUB_ENTRANCE_CGB, $00, MAP_SGB_PALS_3, $07, MUSIC_OVERWORLD ; LIGHTNING_CLUB_ENTRANCE
- db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, $00, MAP_SGB_PALS_3, $0c, MUSIC_OVERWORLD ; LIGHTNING_CLUB_LOBBY
- db TILEMAP_LIGHTNING_CLUB, TILEMAP_LIGHTNING_CLUB_CGB, $00, MAP_SGB_PALS_5, $10, MUSIC_CLUB_1 ; LIGHTNING_CLUB
- db TILEMAP_GRASS_CLUB_ENTRANCE, TILEMAP_GRASS_CLUB_ENTRANCE_CGB, $00, MAP_SGB_PALS_3, $08, MUSIC_OVERWORLD ; GRASS_CLUB_ENTRANCE
- db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, $00, MAP_SGB_PALS_3, $0c, MUSIC_OVERWORLD ; GRASS_CLUB_LOBBY
- db TILEMAP_GRASS_CLUB, TILEMAP_GRASS_CLUB_CGB, $00, MAP_SGB_PALS_6, $11, MUSIC_CLUB_1 ; GRASS_CLUB
- db TILEMAP_PSYCHIC_CLUB_ENTRANCE, TILEMAP_PSYCHIC_CLUB_ENTRANCE_CGB, $00, MAP_SGB_PALS_3, $09, MUSIC_OVERWORLD ; PSYCHIC_CLUB_ENTRANCE
- db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, $00, MAP_SGB_PALS_3, $0c, MUSIC_OVERWORLD ; PSYCHIC_CLUB_LOBBY
- db TILEMAP_PSYCHIC_CLUB, TILEMAP_PSYCHIC_CLUB_CGB, $00, MAP_SGB_PALS_7, $12, MUSIC_CLUB_2 ; PSYCHIC_CLUB
- db TILEMAP_SCIENCE_CLUB_ENTRANCE, TILEMAP_SCIENCE_CLUB_ENTRANCE_CGB, $00, MAP_SGB_PALS_3, $0a, MUSIC_OVERWORLD ; SCIENCE_CLUB_ENTRANCE
- db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, $00, MAP_SGB_PALS_3, $0c, MUSIC_OVERWORLD ; SCIENCE_CLUB_LOBBY
- db TILEMAP_SCIENCE_CLUB, TILEMAP_SCIENCE_CLUB_CGB, $00, MAP_SGB_PALS_6, $13, MUSIC_CLUB_3 ; SCIENCE_CLUB
- db TILEMAP_FIRE_CLUB_ENTRANCE, TILEMAP_FIRE_CLUB_ENTRANCE_CGB, $00, MAP_SGB_PALS_3, $0b, MUSIC_OVERWORLD ; FIRE_CLUB_ENTRANCE
- db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, $00, MAP_SGB_PALS_3, $0c, MUSIC_OVERWORLD ; FIRE_CLUB_LOBBY
- db TILEMAP_FIRE_CLUB, TILEMAP_FIRE_CLUB_CGB, $00, MAP_SGB_PALS_8, $14, MUSIC_CLUB_3 ; FIRE_CLUB
- db TILEMAP_CHALLENGE_HALL_ENTRANCE, TILEMAP_CHALLENGE_HALL_ENTRANCE_CGB, $00, MAP_SGB_PALS_3, $04, MUSIC_OVERWORLD ; CHALLENGE_HALL_ENTRANCE
- db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, $00, MAP_SGB_PALS_3, $0c, MUSIC_OVERWORLD ; CHALLENGE_HALL_LOBBY
- db TILEMAP_CHALLENGE_HALL, TILEMAP_CHALLENGE_HALL_CGB, $00, MAP_SGB_PALS_9, $15, MUSIC_OVERWORLD ; CHALLENGE_HALL
- db TILEMAP_POKEMON_DOME_ENTRANCE, TILEMAP_POKEMON_DOME_ENTRANCE_CGB, $00, MAP_SGB_PALS_10, $16, MUSIC_OVERWORLD ; POKEMON_DOME_ENTRANCE
- db TILEMAP_POKEMON_DOME, TILEMAP_POKEMON_DOME_CGB, $00, MAP_SGB_PALS_10, $17, MUSIC_POKEMON_DOME ; POKEMON_DOME
- db TILEMAP_HALL_OF_HONOR, TILEMAP_HALL_OF_HONOR_CGB, $00, MAP_SGB_PALS_10, $18, MUSIC_HALL_OF_HONOR ; HALL_OF_HONOR
+; sgb tilemap, cgb tilemap, initial cgb palette (always 0), sgb palette, final cgb palette, song
+ db TILEMAP_OVERWORLD_MAP, TILEMAP_OVERWORLD_MAP_CGB, PALETTE_0, MAP_SGB_PALS_1, PALETTE_1, MUSIC_OVERWORLD ; OVERWORLD_MAP
+ db TILEMAP_MASON_LABORATORY, TILEMAP_MASON_LABORATORY_CGB, PALETTE_0, MAP_SGB_PALS_2, PALETTE_2, MUSIC_OVERWORLD ; MASON_LABORATORY
+ db TILEMAP_DECK_MACHINE_ROOM, TILEMAP_DECK_MACHINE_ROOM_CGB, PALETTE_0, MAP_SGB_PALS_2, PALETTE_2, MUSIC_OVERWORLD ; DECK_MACHINE_ROOM
+ db TILEMAP_ISHIHARA, TILEMAP_ISHIHARA_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_3, MUSIC_OVERWORLD ; ISHIHARAS_HOUSE
+ db TILEMAP_FIGHTING_CLUB_ENTRANCE, TILEMAP_FIGHTING_CLUB_ENTRANCE_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_4, MUSIC_OVERWORLD ; FIGHTING_CLUB_ENTRANCE
+ db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_12, MUSIC_OVERWORLD ; FIGHTING_CLUB_LOBBY
+ db TILEMAP_FIGHTING_CLUB, TILEMAP_FIGHTING_CLUB_CGB, PALETTE_0, MAP_SGB_PALS_4, PALETTE_13, MUSIC_CLUB_3 ; FIGHTING_CLUB
+ db TILEMAP_ROCK_CLUB_ENTRANCE, TILEMAP_ROCK_CLUB_ENTRANCE_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_5, MUSIC_OVERWORLD ; ROCK_CLUB_ENTRANCE
+ db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_12, MUSIC_OVERWORLD ; ROCK_CLUB_LOBBY
+ db TILEMAP_ROCK_CLUB, TILEMAP_ROCK_CLUB_CGB, PALETTE_0, MAP_SGB_PALS_4, PALETTE_14, MUSIC_CLUB_2 ; ROCK_CLUB
+ db TILEMAP_WATER_CLUB_ENTRANCE, TILEMAP_WATER_CLUB_ENTRANCE_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_6, MUSIC_OVERWORLD ; WATER_CLUB_ENTRANCE
+ db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_12, MUSIC_OVERWORLD ; WATER_CLUB_LOBBY
+ db TILEMAP_WATER_CLUB, TILEMAP_WATER_CLUB_CGB, PALETTE_0, MAP_SGB_PALS_2, PALETTE_15, MUSIC_CLUB_2 ; WATER_CLUB
+ db TILEMAP_LIGHTNING_CLUB_ENTRANCE, TILEMAP_LIGHTNING_CLUB_ENTRANCE_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_7, MUSIC_OVERWORLD ; LIGHTNING_CLUB_ENTRANCE
+ db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_12, MUSIC_OVERWORLD ; LIGHTNING_CLUB_LOBBY
+ db TILEMAP_LIGHTNING_CLUB, TILEMAP_LIGHTNING_CLUB_CGB, PALETTE_0, MAP_SGB_PALS_5, PALETTE_16, MUSIC_CLUB_1 ; LIGHTNING_CLUB
+ db TILEMAP_GRASS_CLUB_ENTRANCE, TILEMAP_GRASS_CLUB_ENTRANCE_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_8, MUSIC_OVERWORLD ; GRASS_CLUB_ENTRANCE
+ db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_12, MUSIC_OVERWORLD ; GRASS_CLUB_LOBBY
+ db TILEMAP_GRASS_CLUB, TILEMAP_GRASS_CLUB_CGB, PALETTE_0, MAP_SGB_PALS_6, PALETTE_17, MUSIC_CLUB_1 ; GRASS_CLUB
+ db TILEMAP_PSYCHIC_CLUB_ENTRANCE, TILEMAP_PSYCHIC_CLUB_ENTRANCE_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_9, MUSIC_OVERWORLD ; PSYCHIC_CLUB_ENTRANCE
+ db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_12, MUSIC_OVERWORLD ; PSYCHIC_CLUB_LOBBY
+ db TILEMAP_PSYCHIC_CLUB, TILEMAP_PSYCHIC_CLUB_CGB, PALETTE_0, MAP_SGB_PALS_7, PALETTE_18, MUSIC_CLUB_2 ; PSYCHIC_CLUB
+ db TILEMAP_SCIENCE_CLUB_ENTRANCE, TILEMAP_SCIENCE_CLUB_ENTRANCE_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_10, MUSIC_OVERWORLD ; SCIENCE_CLUB_ENTRANCE
+ db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_12, MUSIC_OVERWORLD ; SCIENCE_CLUB_LOBBY
+ db TILEMAP_SCIENCE_CLUB, TILEMAP_SCIENCE_CLUB_CGB, PALETTE_0, MAP_SGB_PALS_6, PALETTE_19, MUSIC_CLUB_3 ; SCIENCE_CLUB
+ db TILEMAP_FIRE_CLUB_ENTRANCE, TILEMAP_FIRE_CLUB_ENTRANCE_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_11, MUSIC_OVERWORLD ; FIRE_CLUB_ENTRANCE
+ db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_12, MUSIC_OVERWORLD ; FIRE_CLUB_LOBBY
+ db TILEMAP_FIRE_CLUB, TILEMAP_FIRE_CLUB_CGB, PALETTE_0, MAP_SGB_PALS_8, PALETTE_20, MUSIC_CLUB_3 ; FIRE_CLUB
+ db TILEMAP_CHALLENGE_HALL_ENTRANCE, TILEMAP_CHALLENGE_HALL_ENTRANCE_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_4, MUSIC_OVERWORLD ; CHALLENGE_HALL_ENTRANCE
+ db TILEMAP_CLUB_LOBBY, TILEMAP_CLUB_LOBBY_CGB, PALETTE_0, MAP_SGB_PALS_3, PALETTE_12, MUSIC_OVERWORLD ; CHALLENGE_HALL_LOBBY
+ db TILEMAP_CHALLENGE_HALL, TILEMAP_CHALLENGE_HALL_CGB, PALETTE_0, MAP_SGB_PALS_9, PALETTE_21, MUSIC_OVERWORLD ; CHALLENGE_HALL
+ db TILEMAP_POKEMON_DOME_ENTRANCE, TILEMAP_POKEMON_DOME_ENTRANCE_CGB, PALETTE_0, MAP_SGB_PALS_10, PALETTE_22, MUSIC_OVERWORLD ; POKEMON_DOME_ENTRANCE
+ db TILEMAP_POKEMON_DOME, TILEMAP_POKEMON_DOME_CGB, PALETTE_0, MAP_SGB_PALS_10, PALETTE_23, MUSIC_POKEMON_DOME ; POKEMON_DOME
+ db TILEMAP_HALL_OF_HONOR, TILEMAP_HALL_OF_HONOR_CGB, PALETTE_0, MAP_SGB_PALS_10, PALETTE_24, MUSIC_HALL_OF_HONOR ; HALL_OF_HONOR
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index d03147f..57b9c76 100644
--- a/src/data/npcs.asm
+++ b/src/data/npcs.asm
@@ -122,8 +122,8 @@ NPCHeaderPointers:
DrMasonNPCHeader:
db NPC_DRMASON
db SPRITE_OW_DRMASON
- db $00
- db $26 ; palette and animation
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_WHITE_NPC_UP
db $00
dw Script_DrMason
tx DrMasonNPCName
@@ -135,8 +135,8 @@ DrMasonNPCHeader:
Ronald1NPCHeader:
db NPC_RONALD1
db SPRITE_OW_RONALD
- db $04
- db $0e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Ronald
tx RonaldNPCName
@@ -148,8 +148,8 @@ Ronald1NPCHeader:
Ronald2NPCHeader:
db NPC_RONALD2
db SPRITE_OW_RONALD
- db $04
- db $0e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Ronald
tx RonaldNPCName
@@ -161,8 +161,8 @@ Ronald2NPCHeader:
Ronald3NPCHeader:
db NPC_RONALD3
db SPRITE_OW_RONALD
- db $04
- db $0e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Ronald
tx RonaldNPCName
@@ -174,8 +174,8 @@ Ronald3NPCHeader:
IshiharaNPCHeader:
db NPC_ISHIHARA
db SPRITE_OW_ISHIHARA
- db $04
- db $22
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_PURPLE_NPC_UP
db $00
dw Script_Ishihara
tx IshiharaNPCName
@@ -187,8 +187,8 @@ IshiharaNPCHeader:
ImakuniNPCHeader:
db NPC_IMAKUNI
db SPRITE_OW_IMAKUNI
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Imakuni
tx ImakuniNPCName
@@ -200,8 +200,8 @@ ImakuniNPCHeader:
SamNPCHeader:
db NPC_SAM
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Sam
tx SamNPCName
@@ -213,8 +213,8 @@ SamNPCHeader:
Tech1NPCHeader:
db NPC_TECH1
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Tech1
tx TechNPCName
@@ -226,8 +226,8 @@ Tech1NPCHeader:
Tech2NPCHeader:
db NPC_TECH2
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Tech2
tx TechNPCName
@@ -239,8 +239,8 @@ Tech2NPCHeader:
Tech3NPCHeader:
db NPC_TECH3
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Tech3
tx TechNPCName
@@ -252,8 +252,8 @@ Tech3NPCHeader:
Tech4NPCHeader:
db NPC_TECH4
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Tech4
tx TechNPCName
@@ -265,8 +265,8 @@ Tech4NPCHeader:
Tech5NPCHeader:
db NPC_TECH5
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Tech5
tx TechNPCName
@@ -278,8 +278,8 @@ Tech5NPCHeader:
Tech6NPCHeader:
db NPC_TECH6
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Tech6
tx TechNPCName
@@ -291,8 +291,8 @@ Tech6NPCHeader:
Clerk1NPCHeader:
db NPC_CLERK1
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_Clerk1
tx ClerkNPCName2
@@ -304,8 +304,8 @@ Clerk1NPCHeader:
Clerk2NPCHeader:
db NPC_CLERK2
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_Clerk2
tx ClerkNPCName2
@@ -317,8 +317,8 @@ Clerk2NPCHeader:
Clerk3NPCHeader:
db NPC_CLERK3
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_Clerk3
tx ClerkNPCName2
@@ -330,8 +330,8 @@ Clerk3NPCHeader:
Clerk4NPCHeader:
db NPC_CLERK4
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_Clerk4
tx ClerkNPCName2
@@ -343,8 +343,8 @@ Clerk4NPCHeader:
Clerk5NPCHeader:
db NPC_CLERK5
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_Clerk5
tx ClerkNPCName2
@@ -356,8 +356,8 @@ Clerk5NPCHeader:
Clerk6NPCHeader:
db NPC_CLERK6
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_Clerk6
tx ClerkNPCName2
@@ -369,8 +369,8 @@ Clerk6NPCHeader:
Clerk7NPCHeader:
db NPC_CLERK7
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_Clerk7
tx ClerkNPCName2
@@ -382,8 +382,8 @@ Clerk7NPCHeader:
Clerk8NPCHeader:
db NPC_CLERK8
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_Clerk8
tx ClerkNPCName2
@@ -395,8 +395,8 @@ Clerk8NPCHeader:
Clerk9NPCHeader:
db NPC_CLERK9
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_Clerk9
tx ClerkNPCName2
@@ -408,8 +408,8 @@ Clerk9NPCHeader:
ChrisNPCHeader:
db NPC_CHRIS
db SPRITE_OW_MANIA
- db $00
- db $26
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_WHITE_NPC_UP
db $00
dw Script_Chris
tx ChrisNPCName
@@ -421,8 +421,8 @@ ChrisNPCHeader:
MichaelNPCHeader:
db NPC_MICHAEL
db SPRITE_OW_MANIA
- db $00
- db $26
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_WHITE_NPC_UP
db $00
dw Script_Michael
tx MichaelNPCName
@@ -434,8 +434,8 @@ MichaelNPCHeader:
JessicaNPCHeader:
db NPC_JESSICA
db SPRITE_OW_LASS3
- db $04
- db $1a
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Jessica
tx JessicaNPCName
@@ -447,8 +447,8 @@ JessicaNPCHeader:
MitchNPCHeader:
db NPC_MITCH
db SPRITE_OW_MITCH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Mitch
tx MitchNPCName
@@ -460,8 +460,8 @@ MitchNPCHeader:
MatthewNPCHeader:
db NPC_MATTHEW
db SPRITE_OW_MANIA
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Matthew
tx MatthewNPCName
@@ -473,8 +473,8 @@ MatthewNPCHeader:
RyanNPCHeader:
db NPC_RYAN
db SPRITE_OW_BOY
- db $00
- db $26
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_WHITE_NPC_UP
db $00
dw Script_Ryan
tx RyanNPCName
@@ -486,8 +486,8 @@ RyanNPCHeader:
AndrewNPCHeader:
db NPC_ANDREW
db SPRITE_OW_MAN
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Andrew
tx AndrewNPCName
@@ -499,8 +499,8 @@ AndrewNPCHeader:
GeneNPCHeader:
db NPC_GENE
db SPRITE_OW_GENE
- db $04
- db $1e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Gene
tx GeneNPCName
@@ -512,8 +512,8 @@ GeneNPCHeader:
SaraNPCHeader:
db NPC_SARA
db SPRITE_OW_SWIMMER
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Sara
tx SaraNPCName
@@ -525,8 +525,8 @@ SaraNPCHeader:
AmandaNPCHeader:
db NPC_AMANDA
db SPRITE_OW_SWIMMER
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Amanda
tx AmandaNPCName
@@ -538,8 +538,8 @@ AmandaNPCHeader:
JoshuaNPCHeader:
db NPC_JOSHUA
db SPRITE_OW_JOSHUA
- db $00
- db $26
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_WHITE_NPC_UP
db $00
dw Script_Joshua
tx JoshuaNPCName
@@ -551,8 +551,8 @@ JoshuaNPCHeader:
AmyNPCHeader:
db NPC_AMY
db SPRITE_OW_AMY
- db $08
- db $2e
+ db SPRITE_ANIM_SGB_AMY_LAYING
+ db SPRITE_ANIM_CGB_AMY_LAYING
db NPC_FLAG_DIRECTIONLESS
dw Script_Amy
tx AmyNPCName
@@ -564,8 +564,8 @@ AmyNPCHeader:
JenniferNPCHeader:
db NPC_JENNIFER
db SPRITE_OW_GIRL
- db $04
- db $0e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Jennifer
tx JenniferNPCName
@@ -577,8 +577,8 @@ JenniferNPCHeader:
NicholasNPCHeader:
db NPC_NICHOLAS
db SPRITE_OW_HOOD
- db $04
- db $1e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Nicholas
tx NicholasNPCName
@@ -590,8 +590,8 @@ NicholasNPCHeader:
BrandonNPCHeader:
db NPC_BRANDON
db SPRITE_OW_HOOD
- db $04
- db $1e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Brandon
tx BrandonNPCName
@@ -603,8 +603,8 @@ BrandonNPCHeader:
IsaacNPCHeader:
db NPC_ISAAC
db SPRITE_OW_ISAAC
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Isaac
tx IsaacNPCName
@@ -616,8 +616,8 @@ IsaacNPCHeader:
BrittanyNPCHeader:
db NPC_BRITTANY
db SPRITE_OW_GIRL
- db $04
- db $0e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Brittany
tx BrittanyNPCName
@@ -629,8 +629,8 @@ BrittanyNPCHeader:
KristinNPCHeader:
db NPC_KRISTIN
db SPRITE_OW_LASS2
- db $00
- db $1e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Kristin
tx KristinNPCName
@@ -642,8 +642,8 @@ KristinNPCHeader:
HeatherNPCHeader:
db NPC_HEATHER
db SPRITE_OW_LASS1
- db $04
- db $22
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_PURPLE_NPC_UP
db $00
dw Script_Heather
tx HeatherNPCName
@@ -655,8 +655,8 @@ HeatherNPCHeader:
NikkiNPCHeader:
db NPC_NIKKI
db SPRITE_OW_NIKKI
- db $00
- db $1a
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Nikki
tx NikkiNPCName
@@ -668,8 +668,8 @@ NikkiNPCHeader:
RobertNPCHeader:
db NPC_ROBERT
db SPRITE_OW_BOY
- db $04
- db $16
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Robert
tx RobertNPCName
@@ -681,8 +681,8 @@ RobertNPCHeader:
DanielNPCHeader:
db NPC_DANIEL
db SPRITE_OW_LAD
- db $04
- db $1a
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Daniel
tx DanielNPCName
@@ -694,8 +694,8 @@ DanielNPCHeader:
StephanieNPCHeader:
db NPC_STEPHANIE
db SPRITE_OW_GIRL
- db $04
- db $0e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Stephanie
tx StephanieNPCName
@@ -707,8 +707,8 @@ StephanieNPCHeader:
Murray1NPCHeader:
db NPC_MURRAY1
db SPRITE_OW_MURRAY
- db $00
- db $12
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_PINK_NPC_UP
db $00
dw Script_Murray
tx MurrayNPCName
@@ -720,8 +720,8 @@ Murray1NPCHeader:
Murray2NPCHeader:
db NPC_MURRAY2
db SPRITE_OW_MURRAY
- db $03
- db $15
+ db SPRITE_ANIM_LIGHT_NPC_LEFT
+ db SPRITE_ANIM_PINK_NPC_LEFT
db NPC_FLAG_DIRECTIONLESS
dw Script_Murray
tx MurrayNPCName
@@ -733,8 +733,8 @@ Murray2NPCHeader:
JosephNPCHeader:
db NPC_JOSEPH
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Joseph
tx JosephNPCName
@@ -746,8 +746,8 @@ JosephNPCHeader:
DavidNPCHeader:
db NPC_DAVID
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_David
tx DavidNPCName
@@ -759,8 +759,8 @@ DavidNPCHeader:
ErikNPCHeader:
db NPC_ERIK
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Erik
tx ErikNPCName
@@ -772,8 +772,8 @@ ErikNPCHeader:
RickNPCHeader:
db NPC_RICK
db SPRITE_OW_RICK
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Rick
tx RickNPCName
@@ -785,8 +785,8 @@ RickNPCHeader:
JohnNPCHeader:
db NPC_JOHN
db SPRITE_OW_LAD
- db $04
- db $1a
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_John
tx JohnNPCName
@@ -798,8 +798,8 @@ JohnNPCHeader:
AdamNPCHeader:
db NPC_ADAM
db SPRITE_OW_SPECS
- db $00
- db $22
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_PURPLE_NPC_UP
db $00
dw Script_Adam
tx AdamNPCName
@@ -811,8 +811,8 @@ AdamNPCHeader:
JonathanNPCHeader:
db NPC_JONATHAN
db SPRITE_OW_BOY
- db $04
- db $16
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Jonathan
tx JonathanNPCName
@@ -824,8 +824,8 @@ JonathanNPCHeader:
KenNPCHeader:
db NPC_KEN
db SPRITE_OW_KEN
- db $04
- db $1e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Ken
tx KenNPCName
@@ -837,8 +837,8 @@ KenNPCHeader:
CourtneyNPCHeader:
db NPC_COURTNEY
db SPRITE_OW_COURTNEY
- db $00
- db $12
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_PINK_NPC_UP
db $00
dw Script_Courtney
tx CourtneyNPCName
@@ -850,8 +850,8 @@ CourtneyNPCHeader:
SteveNPCHeader:
db NPC_STEVE
db SPRITE_OW_STEVE
- db $00
- db $2a
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_INDIGO_NPC_UP
db $00
dw Script_Steve
tx SteveNPCName
@@ -863,8 +863,8 @@ SteveNPCHeader:
JackNPCHeader:
db NPC_JACK
db SPRITE_OW_JACK
- db $00
- db $26
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_WHITE_NPC_UP
db $00
dw Script_Jack
tx JackNPCName
@@ -876,8 +876,8 @@ JackNPCHeader:
RodNPCHeader:
db NPC_ROD
db SPRITE_OW_ROD
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Rod
tx RodNPCName
@@ -889,8 +889,8 @@ RodNPCHeader:
Clerk10NPCHeader:
db NPC_CLERK10
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_Clerk10
tx ClerkNPCName
@@ -902,8 +902,8 @@ Clerk10NPCHeader:
GiftCenterClerkNPCHeader:
db NPC_GIFT_CENTER_CLERK
db SPRITE_OW_CLERK
- db $0a
- db $30
+ db SPRITE_ANIM_SGB_CLERK_NPC_UP
+ db SPRITE_ANIM_CGB_CLERK_NPC_UP
db $00
dw Script_GiftCenterClerk
tx ClerkNPCName
@@ -915,8 +915,8 @@ GiftCenterClerkNPCHeader:
Man1NPCHeader:
db NPC_MAN1
db SPRITE_OW_MAN
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Man1
tx ManNPCName
@@ -928,8 +928,8 @@ Man1NPCHeader:
Woman1NPCHeader:
db NPC_WOMAN1
db SPRITE_OW_WOMAN
- db $04
- db $1e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Woman1
tx WomanNPCName
@@ -941,8 +941,8 @@ Woman1NPCHeader:
Chap1NPCHeader:
db NPC_CHAP1
db SPRITE_OW_CHAP
- db $00
- db $1a
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Chap1
tx ChapNPCName
@@ -954,8 +954,8 @@ Chap1NPCHeader:
Gal1NPCHeader:
db NPC_GAL1
db SPRITE_OW_GAL
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Gal1
tx GalNPCName
@@ -967,8 +967,8 @@ Gal1NPCHeader:
Lass1NPCHeader:
db NPC_LASS1
db SPRITE_OW_LASS2
- db $00
- db $1e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Lass1
tx LassNPCName
@@ -980,8 +980,8 @@ Lass1NPCHeader:
Chap2NPCHeader:
db NPC_CHAP2
db SPRITE_OW_CHAP
- db $00
- db $1a
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Chap2
tx ChapNPCName
@@ -993,8 +993,8 @@ Chap2NPCHeader:
Lass2NPCHeader:
db NPC_LASS2
db SPRITE_OW_LASS2
- db $00
- db $1e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Lass2
tx LassNPCName
@@ -1006,8 +1006,8 @@ Lass2NPCHeader:
Pappy1NPCHeader:
db NPC_PAPPY1
db SPRITE_OW_PAPPY
- db $00
- db $22
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_PURPLE_NPC_UP
db $00
dw Script_Pappy1
tx PappyNPCName
@@ -1019,8 +1019,8 @@ Pappy1NPCHeader:
Lad1NPCHeader:
db NPC_LAD1
db SPRITE_OW_LAD
- db $04
- db $1a
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Lad1
tx LadNPCName
@@ -1032,8 +1032,8 @@ Lad1NPCHeader:
Lad2NPCHeader:
db NPC_LAD2
db SPRITE_OW_BOY
- db $04
- db $16
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Lad2
tx LadNPCName
@@ -1045,8 +1045,8 @@ Lad2NPCHeader:
Chap3NPCHeader:
db NPC_CHAP3
db SPRITE_OW_CHAP
- db $00
- db $1a
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Chap3
tx ChapNPCName
@@ -1058,8 +1058,8 @@ Chap3NPCHeader:
Clerk12NPCHeader:
db NPC_CLERK12
db SPRITE_OW_GAL
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Clerk12
tx ClerkNPCName2
@@ -1071,8 +1071,8 @@ Clerk12NPCHeader:
Clerk13NPCHeader:
db NPC_CLERK13
db SPRITE_OW_GAL
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Clerk13
tx ClerkNPCName2
@@ -1084,8 +1084,8 @@ Clerk13NPCHeader:
HostNPCHeader:
db NPC_HOST
db SPRITE_OW_GAL
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Host
tx HostNPCName
@@ -1097,8 +1097,8 @@ HostNPCHeader:
Specs1NPCHeader:
db NPC_SPECS1
db SPRITE_OW_SPECS
- db $00
- db $22
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_PURPLE_NPC_UP
db $00
dw Script_Specs1
tx SpecsNPCName
@@ -1110,8 +1110,8 @@ Specs1NPCHeader:
ButchNPCHeader:
db NPC_BUTCH
db SPRITE_OW_BUTCH
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Butch
tx ButchNPCName
@@ -1123,8 +1123,8 @@ ButchNPCHeader:
Granny1NPCHeader:
db NPC_GRANNY1
db SPRITE_OW_GRANNY
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Granny1
tx GrannyNPCName
@@ -1136,8 +1136,8 @@ Granny1NPCHeader:
Lass3NPCHeader:
db NPC_LASS3
db SPRITE_OW_LASS1
- db $04
- db $22
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_PURPLE_NPC_UP
db $00
dw Script_Lass3
tx LassNPCName
@@ -1149,8 +1149,8 @@ Lass3NPCHeader:
Man2NPCHeader:
db NPC_MAN2
db SPRITE_OW_MAN
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Man2
tx ManNPCName
@@ -1162,8 +1162,8 @@ Man2NPCHeader:
Pappy2NPCHeader:
db NPC_PAPPY2
db SPRITE_OW_PAPPY
- db $00
- db $22
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_PURPLE_NPC_UP
db $00
dw Script_Pappy2
tx PappyNPCName
@@ -1175,8 +1175,8 @@ Pappy2NPCHeader:
Lass4NPCHeader:
db NPC_LASS4
db SPRITE_OW_LASS1
- db $04
- db $22
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_PURPLE_NPC_UP
db $00
dw Script_Lass4
tx LassNPCName
@@ -1188,8 +1188,8 @@ Lass4NPCHeader:
Hood1NPCHeader:
db NPC_HOOD1
db SPRITE_OW_HOOD
- db $04
- db $1e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Hood1
tx HoodNPCName
@@ -1201,8 +1201,8 @@ Hood1NPCHeader:
Granny2NPCHeader:
db NPC_GRANNY2
db SPRITE_OW_GRANNY
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Granny2
tx GrannyNPCName
@@ -1214,8 +1214,8 @@ Granny2NPCHeader:
Gal2NPCHeader:
db NPC_GAL2
db SPRITE_OW_GAL
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Gal2
tx GalNPCName
@@ -1227,8 +1227,8 @@ Gal2NPCHeader:
Lad3NPCHeader:
db NPC_LAD3
db SPRITE_OW_LAD
- db $04
- db $1a
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Lad3
tx LadNPCName
@@ -1240,8 +1240,8 @@ Lad3NPCHeader:
Gal3NPCHeader:
db NPC_GAL3
db SPRITE_OW_GAL
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Gal3
tx GalNPCName
@@ -1253,8 +1253,8 @@ Gal3NPCHeader:
Chap4NPCHeader:
db NPC_CHAP4
db SPRITE_OW_CHAP
- db $00
- db $1a
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Chap4
tx ChapNPCName
@@ -1266,8 +1266,8 @@ Chap4NPCHeader:
Man3NPCHeader:
db NPC_MAN3
db SPRITE_OW_MAN
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Man3
tx ManNPCName
@@ -1279,8 +1279,8 @@ Man3NPCHeader:
Specs2NPCHeader:
db NPC_SPECS2
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Specs2
tx SpecsNPCName
@@ -1292,8 +1292,8 @@ Specs2NPCHeader:
Specs3NPCHeader:
db NPC_SPECS3
db SPRITE_OW_SPECS
- db $00
- db $22
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_PURPLE_NPC_UP
db $00
dw Script_Specs3
tx SpecsNPCName
@@ -1305,8 +1305,8 @@ Specs3NPCHeader:
Woman2NPCHeader:
db NPC_WOMAN2
db SPRITE_OW_WOMAN
- db $04
- db $1e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Woman2
tx WomanNPCName
@@ -1318,8 +1318,8 @@ Woman2NPCHeader:
ManiaNPCHeader:
db NPC_MANIA
db SPRITE_OW_MANIA
- db $00
- db $26
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_WHITE_NPC_UP
db $00
dw Script_Mania
tx ManiaNPCName
@@ -1331,8 +1331,8 @@ ManiaNPCHeader:
Pappy3NPCHeader:
db NPC_PAPPY3
db SPRITE_OW_PAPPY
- db $00
- db $22
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_PURPLE_NPC_UP
db $00
dw Script_Pappy3
tx PappyNPCName
@@ -1344,8 +1344,8 @@ Pappy3NPCHeader:
Gal4NPCHeader:
db NPC_GAL4
db SPRITE_OW_GAL
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Gal4
tx GalNPCName
@@ -1357,8 +1357,8 @@ Gal4NPCHeader:
ChampNPCHeader:
db NPC_CHAMP
db SPRITE_OW_MANIA
- db $00
- db $26
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_WHITE_NPC_UP
db $00
dw Script_Champ
tx ChampNPCName
@@ -1370,8 +1370,8 @@ ChampNPCHeader:
Hood2NPCHeader:
db NPC_HOOD2
db SPRITE_OW_HOOD
- db $04
- db $1e
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
dw Script_Hood2
tx HoodNPCName
@@ -1383,8 +1383,8 @@ Hood2NPCHeader:
Lass5NPCHeader:
db NPC_LASS5
db SPRITE_OW_LASS3
- db $04
- db $1a
+ db SPRITE_ANIM_DARK_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Lass5
tx LassNPCName
@@ -1396,8 +1396,8 @@ Lass5NPCHeader:
Chap5NPCHeader:
db NPC_CHAP5
db SPRITE_OW_CHAP
- db $00
- db $1a
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_GREEN_NPC_UP
db $00
dw Script_Chap5
tx ChapNPCName
@@ -1409,8 +1409,8 @@ Chap5NPCHeader:
AaronNPCHeader:
db NPC_AARON
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Aaron
tx AaronNPCName
@@ -1422,8 +1422,8 @@ AaronNPCHeader:
GuideNPCHeader:
db NPC_GUIDE
db SPRITE_OW_MAN
- db $00
- db $16
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_YELLOW_NPC_UP
db $00
dw Script_Guide
tx GuideNPCName
@@ -1435,8 +1435,8 @@ GuideNPCHeader:
Tech7NPCHeader:
db NPC_TECH7
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Tech7
tx TechNPCName
@@ -1448,8 +1448,8 @@ Tech7NPCHeader:
Tech8NPCHeader:
db NPC_TECH8
db SPRITE_OW_TECH
- db $00
- db $0e
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_BLUE_NPC_UP
db $00
dw Script_Tech8
tx TechNPCName
@@ -1460,63 +1460,63 @@ Tech8NPCHeader:
TorchNPCHeader:
db NPC_TORCH
- db $26
- db $3a
- db $3a
+ db SPRITE_DUEL_0
+ db SPRITE_ANIM_TORCH
+ db SPRITE_ANIM_TORCH
db NPC_FLAG_DIRECTIONLESS
dw Script_Torch
LegendaryCardTopLeftNPCHeader:
db NPC_LEGENDARY_CARD_TOP_LEFT
- db $27
- db $3b
- db $41
+ db SPRITE_DUEL_63
+ db SPRITE_ANIM_SGB_CARD_TOP_LEFT
+ db SPRITE_ANIM_CGB_CARD_TOP_LEFT
db NPC_FLAG_DIRECTIONLESS | NPC_FLAG_UNKNOWN
dw Script_LegendaryCardTopLeft
LegendaryCardTopRightNPCHeader:
db NPC_LEGENDARY_CARD_TOP_RIGHT
- db $27
- db $3c
- db $42
+ db SPRITE_DUEL_63
+ db SPRITE_ANIM_SGB_CARD_TOP_RIGHT
+ db SPRITE_ANIM_CGB_CARD_TOP_RIGHT
db NPC_FLAG_DIRECTIONLESS | NPC_FLAG_UNKNOWN
dw Script_LegendaryCardTopRight
LegendaryCardLeftSparkNPCHeader:
db NPC_LEGENDARY_CARD_LEFT_SPARK
- db $27
- db $3d
- db $43
+ db SPRITE_DUEL_63
+ db SPRITE_ANIM_SGB_CARD_LEFT_SPARK
+ db SPRITE_ANIM_CGB_CARD_LEFT_SPARK
db NPC_FLAG_DIRECTIONLESS | NPC_FLAG_UNKNOWN
dw Script_LegendaryCardLeftSpark
LegendaryCardBottomLeftNPCHeader:
db NPC_LEGENDARY_CARD_BOTTOM_LEFT
- db $27
- db $3e
- db $44
+ db SPRITE_DUEL_63
+ db SPRITE_ANIM_SGB_CARD_BOTTOM_LEFT
+ db SPRITE_ANIM_CGB_CARD_BOTTOM_LEFT
db NPC_FLAG_DIRECTIONLESS | NPC_FLAG_UNKNOWN
dw Script_LegendaryCardBottomLeft
LegendaryCardBottomRightNPCHeader:
db NPC_LEGENDARY_CARD_BOTTOM_RIGHT
- db $27
- db $3f
- db $45
+ db SPRITE_DUEL_63
+ db SPRITE_ANIM_SGB_CARD_BOTTOM_RIGHT
+ db SPRITE_ANIM_CGB_CARD_BOTTOM_RIGHT
db NPC_FLAG_DIRECTIONLESS | NPC_FLAG_UNKNOWN
dw Script_LegendaryCardBottomRight
LegendaryCardRightSparkNPCHeader:
db NPC_LEGENDARY_CARD_RIGHT_SPARK
- db $27
- db $40
- db $46
+ db SPRITE_DUEL_63
+ db SPRITE_ANIM_SGB_CARD_RIGHT_SPARK
+ db SPRITE_ANIM_CGB_CARD_RIGHT_SPARK
db NPC_FLAG_DIRECTIONLESS | NPC_FLAG_UNKNOWN
dw Script_LegendaryCardRightSpark
DummyNPCHeader:
db $00
- db $00
- db $00
- db $1e
+ db SPRITE_OW_PLAYER
+ db SPRITE_ANIM_LIGHT_NPC_UP
+ db SPRITE_ANIM_RED_NPC_UP
db $00
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 22:21:39 +0000