45 files changed, 1268 insertions, 521 deletions
diff --git a/src/constants/sprite_constants.asm b/src/constants/sprite_constants.asm
index df7abd9..d61dbe9 100644
--- a/src/constants/sprite_constants.asm
+++ b/src/constants/sprite_constants.asm
@@ -30,44 +30,131 @@ SPRITE_ANIM_LENGTH EQU const_value
 	const SPRITE_ANIM_FLAG_4
 	const SPRITE_ANIM_FLAG_5
 	const SPRITE_ANIM_FLAG_6
-	const SPRITE_ANIM_FLAG_SKIP_DRAW
+	const SPRITE_ANIM_FLAG_UNSKIPPABLE
 
 SPRITE_FRAME_OFFSET_SIZE EQU 4
 
-	const_def 1
-	const SPRITE_RONALD   ; $01
-	const SPRITE_DRMASON  ; $02
-	const SPRITE_ISHIHARA ; $03
-	const SPRITE_IMAKUNI  ; $04
-	const SPRITE_NIKKI    ; $05
-	const SPRITE_RICK     ; $06
-	const SPRITE_KEN      ; $07
-	const SPRITE_AMY      ; $08
-	const SPRITE_ISAAC    ; $09
-	const SPRITE_MITCH    ; $0A
-	const SPRITE_GENE     ; $0B
-	const SPRITE_MURRAY   ; $0C
-	const SPRITE_COURTNEY ; $0D
-	const SPRITE_STEVE    ; $0E
-	const SPRITE_JACK     ; $0F
-	const SPRITE_ROD      ; $10
-	const SPRITE_BOY1     ; $11
-	const SPRITE_BOY2     ; $12
-	const SPRITE_BOY3     ; $13
-	const SPRITE_BUTCH    ; $14
-	const SPRITE_BOY4     ; $15
-	const SPRITE_JOSHUA   ; $16
-	const SPRITE_BOY5     ; $17
-	const SPRITE_TECH     ; $18
-	const SPRITE_CHAP     ; $19
-	const SPRITE_GUIDE    ; $1A
-	const SPRITE_PAPPY    ; $1B
-	const SPRITE_GIRL1    ; $1C
-	const SPRITE_GIRL2    ; $1D
-	const SPRITE_GIRL3    ; $1E
-	const SPRITE_GIRL4    ; $1F
-	const SPRITE_GIRL5    ; $20
-	const SPRITE_CLERK    ; $21
-	const SPRITE_HOST     ; $22
-	const SPRITE_WOMAN    ; $23
-	const SPRITE_GRANNY   ; $24
+	const_def
+	const SPRITE_OW_PLAYER        ; $00
+	const SPRITE_OW_RONALD        ; $01
+	const SPRITE_OW_DRMASON       ; $02
+	const SPRITE_OW_ISHIHARA      ; $03
+	const SPRITE_OW_IMAKUNI       ; $04
+	const SPRITE_OW_NIKKI         ; $05
+	const SPRITE_OW_RICK          ; $06
+	const SPRITE_OW_KEN           ; $07
+	const SPRITE_OW_AMY           ; $08
+	const SPRITE_OW_ISAAC         ; $09
+	const SPRITE_OW_MITCH         ; $0a
+	const SPRITE_OW_GENE          ; $0b
+	const SPRITE_OW_MURRAY        ; $0c
+	const SPRITE_OW_COURTNEY      ; $0d
+	const SPRITE_OW_STEVE         ; $0e
+	const SPRITE_OW_JACK          ; $0f
+	const SPRITE_OW_ROD           ; $10
+	const SPRITE_OW_BOY           ; $11
+	const SPRITE_OW_LAD           ; $12
+	const SPRITE_OW_SPECS         ; $13
+	const SPRITE_OW_BUTCH         ; $14
+	const SPRITE_OW_MANIA         ; $15
+	const SPRITE_OW_JOSHUA        ; $16
+	const SPRITE_OW_HOOD          ; $17
+	const SPRITE_OW_TECH          ; $18
+	const SPRITE_OW_CHAP          ; $19
+	const SPRITE_OW_MAN           ; $1a
+	const SPRITE_OW_PAPPY         ; $1b
+	const SPRITE_OW_GIRL          ; $1c
+	const SPRITE_OW_LASS1         ; $1d
+	const SPRITE_OW_LASS2         ; $1e
+	const SPRITE_OW_LASS3         ; $1f
+	const SPRITE_OW_SWIMMER       ; $20
+	const SPRITE_OW_CLERK         ; $21
+	const SPRITE_OW_GAL           ; $22
+	const SPRITE_OW_WOMAN         ; $23
+	const SPRITE_OW_GRANNY        ; $24
+	const SPRITE_OW_MAP_OAM       ; $25
+	const SPRITE_DUEL_0           ; $26
+	const SPRITE_DUEL_63          ; $27
+	const SPRITE_DUEL_GLOW        ; $28
+	const SPRITE_DUEL_1           ; $29
+	const SPRITE_DUEL_2           ; $2a
+	const SPRITE_DUEL_55          ; $2b
+	const SPRITE_DUEL_58          ; $2c
+	const SPRITE_DUEL_3           ; $2d
+	const SPRITE_DUEL_4           ; $2e
+	const SPRITE_DUEL_5           ; $2f
+	const SPRITE_DUEL_6           ; $30
+	const SPRITE_DUEL_59          ; $31
+	const SPRITE_DUEL_7           ; $32
+	const SPRITE_DUEL_8           ; $33
+	const SPRITE_DUEL_9           ; $34
+	const SPRITE_DUEL_10          ; $35
+	const SPRITE_DUEL_61          ; $36
+	const SPRITE_DUEL_11          ; $37
+	const SPRITE_DUEL_12          ; $38
+	const SPRITE_DUEL_13          ; $39
+	const SPRITE_DUEL_62          ; $3a
+	const SPRITE_DUEL_14          ; $3b
+	const SPRITE_DUEL_15          ; $3c
+	const SPRITE_DUEL_16          ; $3d
+	const SPRITE_DUEL_17          ; $3e
+	const SPRITE_DUEL_18          ; $3f
+	const SPRITE_DUEL_19          ; $40
+	const SPRITE_DUEL_20          ; $41
+	const SPRITE_DUEL_21          ; $42
+	const SPRITE_DUEL_22          ; $43
+	const SPRITE_DUEL_23          ; $44
+	const SPRITE_DUEL_24          ; $45
+	const SPRITE_DUEL_25          ; $46
+	const SPRITE_DUEL_26          ; $47
+	const SPRITE_DUEL_27          ; $48
+	const SPRITE_DUEL_28          ; $49
+	const SPRITE_DUEL_29          ; $4a
+	const SPRITE_DUEL_56          ; $4b
+	const SPRITE_DUEL_30          ; $4c
+	const SPRITE_DUEL_31          ; $4d
+	const SPRITE_DUEL_32          ; $4e
+	const SPRITE_DUEL_33          ; $4f
+	const SPRITE_DUEL_34          ; $50
+	const SPRITE_DUEL_35          ; $51
+	const SPRITE_DUEL_66          ; $52
+	const SPRITE_DUEL_36          ; $53
+	const SPRITE_DUEL_37          ; $54
+	const SPRITE_DUEL_57          ; $55
+	const SPRITE_DUEL_38          ; $56
+	const SPRITE_DUEL_39          ; $57
+	const SPRITE_DUEL_40          ; $58
+	const SPRITE_DUEL_41          ; $59
+	const SPRITE_DUEL_42          ; $5a
+	const SPRITE_DUEL_43          ; $5b
+	const SPRITE_DUEL_44          ; $5c
+	const SPRITE_DUEL_60          ; $5d
+	const SPRITE_DUEL_64          ; $5e
+	const SPRITE_DUEL_45          ; $5f
+	const SPRITE_DUEL_46          ; $60
+	const SPRITE_DUEL_47          ; $61
+	const SPRITE_DUEL_48          ; $62
+	const SPRITE_DUEL_49          ; $63
+	const SPRITE_DUEL_50          ; $64
+	const SPRITE_DUEL_51          ; $65
+	const SPRITE_DUEL_52          ; $66
+	const SPRITE_DUEL_53          ; $67
+	const SPRITE_DUEL_54          ; $68
+	const SPRITE_BOOSTER_PACK_OAM ; $69
+	const SPRITE_PRESS_START      ; $6a
+	const SPRITE_GRASS            ; $6b
+	const SPRITE_FIRE             ; $6c
+	const SPRITE_WATER            ; $6d
+	const SPRITE_COLORLESS        ; $6e
+	const SPRITE_LIGHTNING        ; $6f
+	const SPRITE_PSYCHIC          ; $70
+	const SPRITE_FIGHTING         ; $71
+
+; Animation constants
+	const_def
+	const ANIM_SPRITE_ID
+	const ANIM_PALETTE_ID
+	const ANIM_SPRITE_ANIM_ID
+	const ANIM_SPRITE_ANIM_FLAGS
+	const ANIM_SOUND_FX_ID
+	const ANIM_HANDLER_FUNCTION
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index 7880a8b..d7280b6 100644
--- a/src/data/npcs.asm
+++ b/src/data/npcs.asm
@@ -121,7 +121,7 @@ NPCHeaderPointers:
 
 DrMasonNPCHeader:
 	db NPC_DRMASON
-	db SPRITE_DRMASON
+	db SPRITE_OW_DRMASON
 	db $00
 	db $26 ; palette and animation
 	db $00
@@ -134,7 +134,7 @@ DrMasonNPCHeader:
 
 Ronald1NPCHeader:
 	db NPC_RONALD1
-	db SPRITE_RONALD
+	db SPRITE_OW_RONALD
 	db $04
 	db $0e
 	db $00
@@ -147,7 +147,7 @@ Ronald1NPCHeader:
 
 Ronald2NPCHeader:
 	db NPC_RONALD2
-	db SPRITE_RONALD
+	db SPRITE_OW_RONALD
 	db $04
 	db $0e
 	db $00
@@ -160,7 +160,7 @@ Ronald2NPCHeader:
 
 Ronald3NPCHeader:
 	db NPC_RONALD3
-	db SPRITE_RONALD
+	db SPRITE_OW_RONALD
 	db $04
 	db $0e
 	db $00
@@ -173,7 +173,7 @@ Ronald3NPCHeader:
 
 IshiharaNPCHeader:
 	db NPC_ISHIHARA
-	db SPRITE_ISHIHARA
+	db SPRITE_OW_ISHIHARA
 	db $04
 	db $22
 	db $00
@@ -186,7 +186,7 @@ IshiharaNPCHeader:
 
 ImakuniNPCHeader:
 	db NPC_IMAKUNI
-	db SPRITE_IMAKUNI
+	db SPRITE_OW_IMAKUNI
 	db $00
 	db $0e
 	db $00
@@ -199,7 +199,7 @@ ImakuniNPCHeader:
 
 SamNPCHeader:
 	db NPC_SAM
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -212,7 +212,7 @@ SamNPCHeader:
 
 Tech1NPCHeader:
 	db NPC_TECH1
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -225,7 +225,7 @@ Tech1NPCHeader:
 
 Tech2NPCHeader:
 	db NPC_TECH2
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -238,7 +238,7 @@ Tech2NPCHeader:
 
 Tech3NPCHeader:
 	db NPC_TECH3
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -251,7 +251,7 @@ Tech3NPCHeader:
 
 Tech4NPCHeader:
 	db NPC_TECH4
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -264,7 +264,7 @@ Tech4NPCHeader:
 
 Tech5NPCHeader:
 	db NPC_TECH5
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -277,7 +277,7 @@ Tech5NPCHeader:
 
 Tech6NPCHeader:
 	db NPC_TECH6
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -290,7 +290,7 @@ Tech6NPCHeader:
 
 Clerk1NPCHeader:
 	db NPC_CLERK1
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -303,7 +303,7 @@ Clerk1NPCHeader:
 
 Clerk2NPCHeader:
 	db NPC_CLERK2
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -316,7 +316,7 @@ Clerk2NPCHeader:
 
 Clerk3NPCHeader:
 	db NPC_CLERK3
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -329,7 +329,7 @@ Clerk3NPCHeader:
 
 Clerk4NPCHeader:
 	db NPC_CLERK4
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -342,7 +342,7 @@ Clerk4NPCHeader:
 
 Clerk5NPCHeader:
 	db NPC_CLERK5
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -355,7 +355,7 @@ Clerk5NPCHeader:
 
 Clerk6NPCHeader:
 	db NPC_CLERK6
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -368,7 +368,7 @@ Clerk6NPCHeader:
 
 Clerk7NPCHeader:
 	db NPC_CLERK7
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -381,7 +381,7 @@ Clerk7NPCHeader:
 
 Clerk8NPCHeader:
 	db NPC_CLERK8
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -394,7 +394,7 @@ Clerk8NPCHeader:
 
 Clerk9NPCHeader:
 	db NPC_CLERK9
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -407,7 +407,7 @@ Clerk9NPCHeader:
 
 ChrisNPCHeader:
 	db NPC_CHRIS
-	db SPRITE_BOY4
+	db SPRITE_OW_MANIA
 	db $00
 	db $26
 	db $00
@@ -420,7 +420,7 @@ ChrisNPCHeader:
 
 MichaelNPCHeader:
 	db NPC_MICHAEL
-	db SPRITE_BOY4
+	db SPRITE_OW_MANIA
 	db $00
 	db $26
 	db $00
@@ -433,7 +433,7 @@ MichaelNPCHeader:
 
 JessicaNPCHeader:
 	db NPC_JESSICA
-	db SPRITE_GIRL4
+	db SPRITE_OW_LASS3
 	db $04
 	db $1a
 	db $00
@@ -446,7 +446,7 @@ JessicaNPCHeader:
 
 MitchNPCHeader:
 	db NPC_MITCH
-	db SPRITE_MITCH
+	db SPRITE_OW_MITCH
 	db $00
 	db $0e
 	db $00
@@ -459,7 +459,7 @@ MitchNPCHeader:
 
 MatthewNPCHeader:
 	db NPC_MATTHEW
-	db SPRITE_BOY4
+	db SPRITE_OW_MANIA
 	db $00
 	db $16
 	db $00
@@ -472,7 +472,7 @@ MatthewNPCHeader:
 
 RyanNPCHeader:
 	db NPC_RYAN
-	db SPRITE_BOY1
+	db SPRITE_OW_BOY
 	db $00
 	db $26
 	db $00
@@ -485,7 +485,7 @@ RyanNPCHeader:
 
 AndrewNPCHeader:
 	db NPC_ANDREW
-	db SPRITE_GUIDE
+	db SPRITE_OW_MAN
 	db $00
 	db $16
 	db $00
@@ -498,7 +498,7 @@ AndrewNPCHeader:
 
 GeneNPCHeader:
 	db NPC_GENE
-	db SPRITE_GENE
+	db SPRITE_OW_GENE
 	db $04
 	db $1e
 	db $00
@@ -511,7 +511,7 @@ GeneNPCHeader:
 
 SaraNPCHeader:
 	db NPC_SARA
-	db SPRITE_GIRL5
+	db SPRITE_OW_SWIMMER
 	db $00
 	db $0e
 	db $00
@@ -524,7 +524,7 @@ SaraNPCHeader:
 
 AmandaNPCHeader:
 	db NPC_AMANDA
-	db SPRITE_GIRL5
+	db SPRITE_OW_SWIMMER
 	db $00
 	db $16
 	db $00
@@ -537,7 +537,7 @@ AmandaNPCHeader:
 
 JoshuaNPCHeader:
 	db NPC_JOSHUA
-	db SPRITE_JOSHUA
+	db SPRITE_OW_JOSHUA
 	db $00
 	db $26
 	db $00
@@ -550,7 +550,7 @@ JoshuaNPCHeader:
 
 AmyNPCHeader:
 	db NPC_AMY
-	db SPRITE_AMY
+	db SPRITE_OW_AMY
 	db $08
 	db $2e
 	db $10
@@ -563,7 +563,7 @@ AmyNPCHeader:
 
 JenniferNPCHeader:
 	db NPC_JENNIFER
-	db SPRITE_GIRL1
+	db SPRITE_OW_GIRL
 	db $04
 	db $0e
 	db $00
@@ -576,7 +576,7 @@ JenniferNPCHeader:
 
 NicholasNPCHeader:
 	db NPC_NICHOLAS
-	db SPRITE_BOY5
+	db SPRITE_OW_HOOD
 	db $04
 	db $1e
 	db $00
@@ -589,7 +589,7 @@ NicholasNPCHeader:
 
 BrandonNPCHeader:
 	db NPC_BRANDON
-	db SPRITE_BOY5
+	db SPRITE_OW_HOOD
 	db $04
 	db $1e
 	db $00
@@ -602,7 +602,7 @@ BrandonNPCHeader:
 
 IsaacNPCHeader:
 	db NPC_ISAAC
-	db SPRITE_ISAAC
+	db SPRITE_OW_ISAAC
 	db $00
 	db $16
 	db $00
@@ -615,7 +615,7 @@ IsaacNPCHeader:
 
 BrittanyNPCHeader:
 	db NPC_BRITTANY
-	db SPRITE_GIRL1
+	db SPRITE_OW_GIRL
 	db $04
 	db $0e
 	db $00
@@ -628,7 +628,7 @@ BrittanyNPCHeader:
 
 KristinNPCHeader:
 	db NPC_KRISTIN
-	db SPRITE_GIRL3
+	db SPRITE_OW_LASS2
 	db $00
 	db $1e
 	db $00
@@ -641,7 +641,7 @@ KristinNPCHeader:
 
 HeatherNPCHeader:
 	db NPC_HEATHER
-	db SPRITE_GIRL2
+	db SPRITE_OW_LASS1
 	db $04
 	db $22
 	db $00
@@ -654,7 +654,7 @@ HeatherNPCHeader:
 
 NikkiNPCHeader:
 	db NPC_NIKKI
-	db SPRITE_NIKKI
+	db SPRITE_OW_NIKKI
 	db $00
 	db $1a
 	db $00
@@ -667,7 +667,7 @@ NikkiNPCHeader:
 
 RobertNPCHeader:
 	db NPC_ROBERT
-	db SPRITE_BOY1
+	db SPRITE_OW_BOY
 	db $04
 	db $16
 	db $00
@@ -680,7 +680,7 @@ RobertNPCHeader:
 
 DanielNPCHeader:
 	db NPC_DANIEL
-	db SPRITE_BOY2
+	db SPRITE_OW_LAD
 	db $04
 	db $1a
 	db $00
@@ -693,7 +693,7 @@ DanielNPCHeader:
 
 StephanieNPCHeader:
 	db NPC_STEPHANIE
-	db SPRITE_GIRL1
+	db SPRITE_OW_GIRL
 	db $04
 	db $0e
 	db $00
@@ -706,7 +706,7 @@ StephanieNPCHeader:
 
 Murray1NPCHeader:
 	db NPC_MURRAY1
-	db SPRITE_MURRAY
+	db SPRITE_OW_MURRAY
 	db $00
 	db $12
 	db $00
@@ -719,7 +719,7 @@ Murray1NPCHeader:
 
 Murray2NPCHeader:
 	db NPC_MURRAY2
-	db SPRITE_MURRAY
+	db SPRITE_OW_MURRAY
 	db $03
 	db $15
 	db $10
@@ -732,7 +732,7 @@ Murray2NPCHeader:
 
 JosephNPCHeader:
 	db NPC_JOSEPH
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -745,7 +745,7 @@ JosephNPCHeader:
 
 DavidNPCHeader:
 	db NPC_DAVID
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -758,7 +758,7 @@ DavidNPCHeader:
 
 ErikNPCHeader:
 	db NPC_ERIK
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -771,7 +771,7 @@ ErikNPCHeader:
 
 RickNPCHeader:
 	db NPC_RICK
-	db SPRITE_RICK
+	db SPRITE_OW_RICK
 	db $00
 	db $0e
 	db $00
@@ -784,7 +784,7 @@ RickNPCHeader:
 
 JohnNPCHeader:
 	db NPC_JOHN
-	db SPRITE_BOY2
+	db SPRITE_OW_LAD
 	db $04
 	db $1a
 	db $00
@@ -797,7 +797,7 @@ JohnNPCHeader:
 
 AdamNPCHeader:
 	db NPC_ADAM
-	db SPRITE_BOY3
+	db SPRITE_OW_SPECS
 	db $00
 	db $22
 	db $00
@@ -810,7 +810,7 @@ AdamNPCHeader:
 
 JonathanNPCHeader:
 	db NPC_JONATHAN
-	db SPRITE_BOY1
+	db SPRITE_OW_BOY
 	db $04
 	db $16
 	db $00
@@ -823,7 +823,7 @@ JonathanNPCHeader:
 
 KenNPCHeader:
 	db NPC_KEN
-	db SPRITE_KEN
+	db SPRITE_OW_KEN
 	db $04
 	db $1e
 	db $00
@@ -836,7 +836,7 @@ KenNPCHeader:
 
 CourtneyNPCHeader:
 	db NPC_COURTNEY
-	db SPRITE_COURTNEY
+	db SPRITE_OW_COURTNEY
 	db $00
 	db $12
 	db $00
@@ -849,7 +849,7 @@ CourtneyNPCHeader:
 
 SteveNPCHeader:
 	db NPC_STEVE
-	db SPRITE_STEVE
+	db SPRITE_OW_STEVE
 	db $00
 	db $2a
 	db $00
@@ -862,7 +862,7 @@ SteveNPCHeader:
 
 JackNPCHeader:
 	db NPC_JACK
-	db SPRITE_JACK
+	db SPRITE_OW_JACK
 	db $00
 	db $26
 	db $00
@@ -875,7 +875,7 @@ JackNPCHeader:
 
 RodNPCHeader:
 	db NPC_ROD
-	db SPRITE_ROD
+	db SPRITE_OW_ROD
 	db $00
 	db $0e
 	db $00
@@ -888,7 +888,7 @@ RodNPCHeader:
 
 Clerk10NPCHeader:
 	db NPC_CLERK10
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -901,7 +901,7 @@ Clerk10NPCHeader:
 
 GiftCenterClerkNPCHeader:
 	db NPC_GIFT_CENTER_CLERK
-	db SPRITE_CLERK
+	db SPRITE_OW_CLERK
 	db $0a
 	db $30
 	db $00
@@ -914,7 +914,7 @@ GiftCenterClerkNPCHeader:
 
 Man1NPCHeader:
 	db NPC_MAN1
-	db SPRITE_GUIDE
+	db SPRITE_OW_MAN
 	db $00
 	db $16
 	db $00
@@ -927,7 +927,7 @@ Man1NPCHeader:
 
 Woman1NPCHeader:
 	db NPC_WOMAN1
-	db SPRITE_WOMAN
+	db SPRITE_OW_WOMAN
 	db $04
 	db $1e
 	db $00
@@ -940,7 +940,7 @@ Woman1NPCHeader:
 
 Chap1NPCHeader:
 	db NPC_CHAP1
-	db SPRITE_CHAP
+	db SPRITE_OW_CHAP
 	db $00
 	db $1a
 	db $00
@@ -953,7 +953,7 @@ Chap1NPCHeader:
 
 Gal1NPCHeader:
 	db NPC_GAL1
-	db SPRITE_HOST
+	db SPRITE_OW_GAL
 	db $00
 	db $16
 	db $00
@@ -966,7 +966,7 @@ Gal1NPCHeader:
 
 Lass1NPCHeader:
 	db NPC_LASS1
-	db SPRITE_GIRL3
+	db SPRITE_OW_LASS2
 	db $00
 	db $1e
 	db $00
@@ -979,7 +979,7 @@ Lass1NPCHeader:
 
 Chap2NPCHeader:
 	db NPC_CHAP2
-	db SPRITE_CHAP
+	db SPRITE_OW_CHAP
 	db $00
 	db $1a
 	db $00
@@ -992,7 +992,7 @@ Chap2NPCHeader:
 
 Lass2NPCHeader:
 	db NPC_LASS2
-	db SPRITE_GIRL3
+	db SPRITE_OW_LASS2
 	db $00
 	db $1e
 	db $00
@@ -1005,7 +1005,7 @@ Lass2NPCHeader:
 
 Pappy1NPCHeader:
 	db NPC_PAPPY1
-	db SPRITE_PAPPY
+	db SPRITE_OW_PAPPY
 	db $00
 	db $22
 	db $00
@@ -1018,7 +1018,7 @@ Pappy1NPCHeader:
 
 Lad1NPCHeader:
 	db NPC_LAD1
-	db SPRITE_BOY2
+	db SPRITE_OW_LAD
 	db $04
 	db $1a
 	db $00
@@ -1031,7 +1031,7 @@ Lad1NPCHeader:
 
 Lad2NPCHeader:
 	db NPC_LAD2
-	db SPRITE_BOY1
+	db SPRITE_OW_BOY
 	db $04
 	db $16
 	db $00
@@ -1044,7 +1044,7 @@ Lad2NPCHeader:
 
 Chap3NPCHeader:
 	db NPC_CHAP3
-	db SPRITE_CHAP
+	db SPRITE_OW_CHAP
 	db $00
 	db $1a
 	db $00
@@ -1057,7 +1057,7 @@ Chap3NPCHeader:
 
 Clerk12NPCHeader:
 	db NPC_CLERK12
-	db SPRITE_HOST
+	db SPRITE_OW_GAL
 	db $00
 	db $16
 	db $00
@@ -1070,7 +1070,7 @@ Clerk12NPCHeader:
 
 Clerk13NPCHeader:
 	db NPC_CLERK13
-	db SPRITE_HOST
+	db SPRITE_OW_GAL
 	db $00
 	db $16
 	db $00
@@ -1083,7 +1083,7 @@ Clerk13NPCHeader:
 
 HostNPCHeader:
 	db NPC_HOST
-	db SPRITE_HOST
+	db SPRITE_OW_GAL
 	db $00
 	db $16
 	db $00
@@ -1096,7 +1096,7 @@ HostNPCHeader:
 
 Specs1NPCHeader:
 	db NPC_SPECS1
-	db SPRITE_BOY3
+	db SPRITE_OW_SPECS
 	db $00
 	db $22
 	db $00
@@ -1109,7 +1109,7 @@ Specs1NPCHeader:
 
 ButchNPCHeader:
 	db NPC_BUTCH
-	db SPRITE_BUTCH
+	db SPRITE_OW_BUTCH
 	db $00
 	db $16
 	db $00
@@ -1122,7 +1122,7 @@ ButchNPCHeader:
 
 Granny1NPCHeader:
 	db NPC_GRANNY1
-	db SPRITE_GRANNY
+	db SPRITE_OW_GRANNY
 	db $00
 	db $16
 	db $00
@@ -1135,7 +1135,7 @@ Granny1NPCHeader:
 
 Lass3NPCHeader:
 	db NPC_LASS3
-	db SPRITE_GIRL2
+	db SPRITE_OW_LASS1
 	db $04
 	db $22
 	db $00
@@ -1148,7 +1148,7 @@ Lass3NPCHeader:
 
 Man2NPCHeader:
 	db NPC_MAN2
-	db SPRITE_GUIDE
+	db SPRITE_OW_MAN
 	db $00
 	db $16
 	db $00
@@ -1161,7 +1161,7 @@ Man2NPCHeader:
 
 Pappy2NPCHeader:
 	db NPC_PAPPY2
-	db SPRITE_PAPPY
+	db SPRITE_OW_PAPPY
 	db $00
 	db $22
 	db $00
@@ -1174,7 +1174,7 @@ Pappy2NPCHeader:
 
 Lass4NPCHeader:
 	db NPC_LASS4
-	db SPRITE_GIRL2
+	db SPRITE_OW_LASS1
 	db $04
 	db $22
 	db $00
@@ -1187,7 +1187,7 @@ Lass4NPCHeader:
 
 Hood1NPCHeader:
 	db NPC_HOOD1
-	db SPRITE_BOY5
+	db SPRITE_OW_HOOD
 	db $04
 	db $1e
 	db $00
@@ -1200,7 +1200,7 @@ Hood1NPCHeader:
 
 Granny2NPCHeader:
 	db NPC_GRANNY2
-	db SPRITE_GRANNY
+	db SPRITE_OW_GRANNY
 	db $00
 	db $16
 	db $00
@@ -1213,7 +1213,7 @@ Granny2NPCHeader:
 
 Gal2NPCHeader:
 	db NPC_GAL2
-	db SPRITE_HOST
+	db SPRITE_OW_GAL
 	db $00
 	db $16
 	db $00
@@ -1226,7 +1226,7 @@ Gal2NPCHeader:
 
 Lad3NPCHeader:
 	db NPC_LAD3
-	db SPRITE_BOY2
+	db SPRITE_OW_LAD
 	db $04
 	db $1a
 	db $00
@@ -1239,7 +1239,7 @@ Lad3NPCHeader:
 
 Gal3NPCHeader:
 	db NPC_GAL3
-	db SPRITE_HOST
+	db SPRITE_OW_GAL
 	db $00
 	db $16
 	db $00
@@ -1252,7 +1252,7 @@ Gal3NPCHeader:
 
 Chap4NPCHeader:
 	db NPC_CHAP4
-	db SPRITE_CHAP
+	db SPRITE_OW_CHAP
 	db $00
 	db $1a
 	db $00
@@ -1265,7 +1265,7 @@ Chap4NPCHeader:
 
 Man3NPCHeader:
 	db NPC_MAN3
-	db SPRITE_GUIDE
+	db SPRITE_OW_MAN
 	db $00
 	db $16
 	db $00
@@ -1278,7 +1278,7 @@ Man3NPCHeader:
 
 Specs2NPCHeader:
 	db NPC_SPECS2
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -1291,7 +1291,7 @@ Specs2NPCHeader:
 
 Specs3NPCHeader:
 	db NPC_SPECS3
-	db SPRITE_BOY3
+	db SPRITE_OW_SPECS
 	db $00
 	db $22
 	db $00
@@ -1304,7 +1304,7 @@ Specs3NPCHeader:
 
 Woman2NPCHeader:
 	db NPC_WOMAN2
-	db SPRITE_WOMAN
+	db SPRITE_OW_WOMAN
 	db $04
 	db $1e
 	db $00
@@ -1317,7 +1317,7 @@ Woman2NPCHeader:
 
 ManiaNPCHeader:
 	db NPC_MANIA
-	db SPRITE_BOY4
+	db SPRITE_OW_MANIA
 	db $00
 	db $26
 	db $00
@@ -1330,7 +1330,7 @@ ManiaNPCHeader:
 
 Pappy3NPCHeader:
 	db NPC_PAPPY3
-	db SPRITE_PAPPY
+	db SPRITE_OW_PAPPY
 	db $00
 	db $22
 	db $00
@@ -1343,7 +1343,7 @@ Pappy3NPCHeader:
 
 Gal4NPCHeader:
 	db NPC_GAL4
-	db SPRITE_HOST
+	db SPRITE_OW_GAL
 	db $00
 	db $16
 	db $00
@@ -1356,7 +1356,7 @@ Gal4NPCHeader:
 
 ChampNPCHeader:
 	db NPC_CHAMP
-	db SPRITE_BOY4
+	db SPRITE_OW_MANIA
 	db $00
 	db $26
 	db $00
@@ -1369,7 +1369,7 @@ ChampNPCHeader:
 
 Hood2NPCHeader:
 	db NPC_HOOD2
-	db SPRITE_BOY5
+	db SPRITE_OW_HOOD
 	db $04
 	db $1e
 	db $00
@@ -1382,7 +1382,7 @@ Hood2NPCHeader:
 
 Lass5NPCHeader:
 	db NPC_LASS5
-	db SPRITE_GIRL4
+	db SPRITE_OW_LASS3
 	db $04
 	db $1a
 	db $00
@@ -1395,7 +1395,7 @@ Lass5NPCHeader:
 
 Chap5NPCHeader:
 	db NPC_CHAP5
-	db SPRITE_CHAP
+	db SPRITE_OW_CHAP
 	db $00
 	db $1a
 	db $00
@@ -1408,7 +1408,7 @@ Chap5NPCHeader:
 
 AaronNPCHeader:
 	db NPC_AARON
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -1421,7 +1421,7 @@ AaronNPCHeader:
 
 GuideNPCHeader:
 	db NPC_GUIDE
-	db SPRITE_GUIDE
+	db SPRITE_OW_MAN
 	db $00
 	db $16
 	db $00
@@ -1434,7 +1434,7 @@ GuideNPCHeader:
 
 Tech7NPCHeader:
 	db NPC_TECH7
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
@@ -1447,7 +1447,7 @@ Tech7NPCHeader:
 
 Tech8NPCHeader:
 	db NPC_TECH8
-	db SPRITE_TECH
+	db SPRITE_OW_TECH
 	db $00
 	db $0e
 	db $00
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index 1b5d5f1..6f99e6a 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -268,8 +268,8 @@ Func_c1f8: ; c1f8 (3:41f8)
 	ld [wd112], a
 	ld [wd3b8], a
 	call EnableSRAM
-	ld a, [s0a007]
-	ld [wd421], a
+	ld a, [sAnimationsDisabled]
+	ld [wAnimationsDisabled], a
 	ld a, [s0a006]
 	ld [wTextSpeed], a
 	call DisableSRAM
@@ -579,10 +579,13 @@ Func_c4b9: ; c4b9 (3:44b9)
 .asm_c4d1
 	ld a, b
 	ld [wd337], a
-	ld a, $0
+
+	; load Player's sprite for overworld
+	ld a, SPRITE_OW_PLAYER
 	farcall CreateSpriteAndAnimBufferEntry
 	ld a, [wWhichSprite]
 	ld [wPlayerSpriteIndex], a
+
 	ld b, $2
 	ld a, [wCurMap]
 	cp OVERWORLD_MAP
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index c8f1f88..439ab52 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -1175,8 +1175,8 @@ MainMenu_NewGame: ; 12704 (4:6704)
 	call DisplayPlayerNamingScreen
 	farcall Func_1996e
 	call EnableSRAM
-	ld a, [s0a007]
-	ld [wd421], a
+	ld a, [sAnimationsDisabled]
+	ld [wAnimationsDisabled], a
 	ld a, [s0a006]
 	ld [wTextSpeed], a
 	call DisableSRAM
@@ -1481,7 +1481,7 @@ LoadSpriteDataForAnimationFrame: ; 12a5b (4:6a5b)
 	ld bc, SPRITE_ANIM_FLAGS - SPRITE_ANIM_TILE_ID
 	add hl, bc
 	ld a, [hl]
-	and 1 << SPRITE_ANIM_FLAG_SKIP_DRAW
+	and 1 << SPRITE_ANIM_FLAG_UNSKIPPABLE
 	jr nz, .quit
 	ld bc, SPRITE_ANIM_FRAME_BANK - SPRITE_ANIM_FLAGS
 	add hl, bc
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 4dcad9d..2260d7e 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -1466,7 +1466,7 @@ Func_1996e: ; 1996e (6:596e)
 	ld [s0a006], a
 	ld [wTextSpeed], a
 	xor a
-	ld [s0a007], a
+	ld [sAnimationsDisabled], a
 	ld [s0a009], a
 	ld [s0a004], a
 	ld [s0a005], a
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index caf3c48..8b63166 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -605,21 +605,23 @@ Func_1c8ef: ; 1c8ef (7:48ef)
 	push de
 	call Func_1cab3
 ; hl: pointer
-	ld a, [wd421]
+
+	ld a, [wAnimationsDisabled]
 	or a
 	jr z, .check_to_play_sfx
-
+	; animations are disabled
 	push hl
-	lb bc, 0, $03
+	ld bc, ANIM_SPRITE_ANIM_FLAGS
 	add hl, bc
 	ld a, [hl]
-	and %10000000
+	; if flag is set, play animation anyway
+	and (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE)
 	pop hl
 	jr z, .return
 
 .check_to_play_sfx
 	push hl
-	lb bc, 0, $04
+	ld bc, ANIM_SOUND_FX_ID
 	add hl, bc
 	ld a, [hl]
 	pop hl
@@ -628,8 +630,12 @@ Func_1c8ef: ; 1c8ef (7:48ef)
 	call PlaySFX
 
 .calc_addr
+; this data field is always $00,
+; so this calculation is unnecessary
+; seems like there was supposed to be
+; more than 1 function to handle animation
 	push hl
-	lb bc, 0, $05
+	ld bc, ANIM_HANDLER_FUNCTION
 	add hl, bc
 	ld a, [hl]
 	rlca
@@ -652,13 +658,14 @@ Func_1c8ef: ; 1c8ef (7:48ef)
 	ret
 
 .address
-	dw .asm_1c94a
+	dw .handler_func
 
-.asm_1c94a ; 1c94a (7:494a)
-; if any of the first 3 bytes is $00, return carry
+.handler_func ; 1c94a (7:494a)
+; if any of ANIM_SPRITE_ID, ANIM_PALETTE_ID and ANIM_SPRITE_ANIM_ID
+; are 0, then return
 	ld e, l
 	ld d, h
-	ld c, 3
+	ld c, ANIM_SPRITE_ANIM_ID + 1
 .loop
 	ld a, [de]
 	or a
@@ -667,7 +674,7 @@ Func_1c8ef: ; 1c8ef (7:48ef)
 	dec c
 	jr nz, .loop
 
-	ld a, [hli]
+	ld a, [hli] ; ANIM_SPRITE_ID
 	farcall CreateSpriteAndAnimBufferEntry
 	ld a, [wWhichSprite]
 	ld [wAnimationQueue], a ; push an animation to the queue
@@ -676,15 +683,16 @@ Func_1c8ef: ; 1c8ef (7:48ef)
 	ld [wVRAMTileOffset], a
 	ld [wd4cb], a
 
-	ld a, [hli]
+	ld a, [hli] ; ANIM_PALETTE_ID
 	farcall Func_80418
+	ld a, [hli] ; ANIM_SPRITE_ANIM_ID
 
-	ld a, [hli]
 	push af
-	ld a, [hli]
-	ld [wd42b], a
+	ld a, [hli] ; ANIM_SPRITE_ANIM_FLAGS
+	ld [wAnimFlags], a
 	call Func_1c980
 	pop af
+
 	farcall StartNewSpriteAnimation
 	or a
 	jr .done
@@ -703,7 +711,7 @@ Func_1c980: ; 1c980 (7:4980)
 	call Func_1c9a2
 
 	push af
-	and %01100000
+	and (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_5)
 	or [hl]
 	ld [hli], a
 	ld a, b
@@ -711,10 +719,10 @@ Func_1c980: ; 1c980 (7:4980)
 	ld [hl], c ; SPRITE_ANIM_COORD_Y
 	pop af
 
-	lb bc, 0, SPRITE_ANIM_FLAGS - SPRITE_ANIM_COORD_Y
+	ld bc, SPRITE_ANIM_FLAGS - SPRITE_ANIM_COORD_Y
 	add hl, bc
 	ld c, a
-	and %00000011
+	and (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT)
 	or [hl]
 	ld [hl], a
 	pop bc
@@ -728,8 +736,8 @@ Func_1c980: ; 1c980 (7:4980)
 Func_1c9a2: ; 1c9a2 (7:49a2)
 	push hl
 	ld c, 0
-	ld a, [wd42b]
-	and %00000100
+	ld a, [wAnimFlags]
+	and (1 << SPRITE_ANIM_FLAG_SPEED)
 	jr nz, .calc_addr
 
 	ld a, [wd4ae]
@@ -768,48 +776,20 @@ Func_1c9a2: ; 1c9a2 (7:49a2)
 	inc hl
 	ld c, [hl]
 	inc hl
-	ld a, [wd42b]
+	ld a, [wAnimFlags]
 	and [hl]
 	pop hl
 	ret
 
 Data_1c9e0:
-	db $01
-	db $01
-	db $01
-	db $01
-	db $01
-	db $01
-	db $02
-	db $02
-	db $02
-	db $02
-	db $02
-	db $02
-	db $03
-	db $04
-	db $05
-	db $06
-	db $07
-	db $08
-	db $03
-	db $04
-	db $05
-	db $06
-	db $07
-	db $08
-	db $09
-	db $0a
-	db $0b
-	db $0c
-	db $0d
-	db $0e
-	db $09
-	db $0a
-	db $0b
-	db $0c
-	db $0d
-	db $0e
+	db $01, $01, $01, $01, $01, $01 ; player
+	db $02, $02, $02, $02, $02, $02 ; opponent
+
+	db $03, $04, $05, $06, $07, $08 ; player
+	db $03, $04, $05, $06, $07, $08 ; opponent
+
+	db $09, $0a, $0b, $0c, $0d, $0e ; player
+	db $09, $0a, $0b, $0c, $0d, $0e ; opponent
 
 macro_1ca04: MACRO
 	db \1
@@ -819,21 +799,21 @@ ENDM
 
 Data_1ca04:
 ; x coord, y coord, animation flags
-	macro_1ca04 $58, $58, %00001000
-	macro_1ca04 $28, $50, %00000000
-	macro_1ca04 $88, $30, %01100011
-	macro_1ca04 $58, $48, %00000000
-	macro_1ca04 $18, $60, %00000000
-	macro_1ca04 $38, $60, %00000000
-	macro_1ca04 $58, $60, %00000000
-	macro_1ca04 $78, $60, %00000000
-	macro_1ca04 $98, $60, %00000000
-	macro_1ca04 $58, $50, %00000000
-	macro_1ca04 $98, $28, %00000000
-	macro_1ca04 $78, $28, %00000000
-	macro_1ca04 $58, $28, %00000000
-	macro_1ca04 $38, $28, %00000000
-	macro_1ca04 $18, $28, %00000000
+	macro_1ca04 $58, $58, (1 << SPRITE_ANIM_FLAG_3)
+	macro_1ca04 $28, $50, $00
+	macro_1ca04 $88, $30, (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT)
+	macro_1ca04 $58, $48, $00
+	macro_1ca04 $18, $60, $00
+	macro_1ca04 $38, $60, $00
+	macro_1ca04 $58, $60, $00
+	macro_1ca04 $78, $60, $00
+	macro_1ca04 $98, $60, $00
+	macro_1ca04 $58, $50, $00
+	macro_1ca04 $98, $28, $00
+	macro_1ca04 $78, $28, $00
+	macro_1ca04 $58, $28, $00
+	macro_1ca04 $38, $28, $00
+	macro_1ca04 $18, $28, $00
 
 Func_1ca31: ; 1ca31 (7:4a31)
 	push hl
@@ -919,6 +899,7 @@ Func_1ca6e: ; 1ca6e (7:4a6e)
 	ret
 ; 0x1cab3
 
+; gets data from Animations for anim ID in a
 Func_1cab3: ; 1cab3 (7:4ab3)
 	push bc
 	ld a, [wTempAnimation]
@@ -929,7 +910,7 @@ Func_1cab3: ; 1cab3 (7:4ab3)
 	ld c, l
 	add hl, hl ; hl = anim * 4
 	add hl, bc ; hl = anim * 6
-	ld bc, Data_1ce32
+	ld bc, Animations
 	add hl, bc
 	pop bc
 	ret
@@ -1107,8 +1088,8 @@ Func_1cbcc: ; 1cbcc (7:4bcc)
 	farcall CreateSpriteAndAnimBufferEntry
 	ld a, [wWhichSprite]
 	ld [de], a
-	ld a, $80
-	ld [wd42b], a
+	ld a, (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE)
+	ld [wAnimFlags], a
 	ld c, SPRITE_ANIM_COORD_X
 	call GetSpriteAnimBufferProperty
 	call Func_1c9a2
@@ -1218,7 +1199,7 @@ Func_1cc66: ; 1cc66 (7:4c66)
 ; 0x1cc76
 
 Func_1cc76: ; 1cc76 (7:4c76)
-	ld a, [wd421]
+	ld a, [wAnimationsDisabled]
 	or a
 	jr nz, .asm_1cc9e
 	ld a, [wTempAnimation]
@@ -1457,114 +1438,784 @@ Func_1ce03: ; 1ce03 (7:4e03)
 
 	INCROM $1ce22, $1ce32
 
-macro_1ce32: MACRO
-	db \1
-	db \2
-	db \3
-	db \4
-	db \5
-	db \6
-ENDM
+; data for each animation ID (see src/constants/sprite_constants.asm)
+Animations: ; 1ce32 (7:4e32)
+	; $00
+	db $00 ; sprite ID
+	db $00 ; paletteID
+	db $00 ; anim ID
+	db $00 ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $01
+	db $28 ; sprite ID
+	db $1f ; paletteID
+	db $47 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $11 ; sound FX ID
+	db $00 ; handler function
+
+	; $02
+	db $29 ; sprite ID
+	db $20 ; paletteID
+	db $48 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $12 ; sound FX ID
+	db $00 ; handler function
+
+	; $03
+	db $2a ; sprite ID
+	db $21 ; paletteID
+	db $49 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $13 ; sound FX ID
+	db $00 ; handler function
+
+	; $04
+	db $2b ; sprite ID
+	db $22 ; paletteID
+	db $4a ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $14 ; sound FX ID
+	db $00 ; handler function
+
+	; $05
+	db $2c ; sprite ID
+	db $23 ; paletteID
+	db $4b ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $15 ; sound FX ID
+	db $00 ; handler function
+
+	; $06
+	db $2d ; sprite ID
+	db $24 ; paletteID
+	db $4c ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $16 ; sound FX ID
+	db $00 ; handler function
+
+	; $07
+	db $2d ; sprite ID
+	db $24 ; paletteID
+	db $4d ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $16 ; sound FX ID
+	db $00 ; handler function
+
+	; $08
+	db $2d ; sprite ID
+	db $24 ; paletteID
+	db $4e ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $17 ; sound FX ID
+	db $00 ; handler function
+
+	; $09
+	db $2e ; sprite ID
+	db $25 ; paletteID
+	db $00 ; anim ID
+	db $00 ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $0a
+	db $2f ; sprite ID
+	db $26 ; paletteID
+	db $5c ; anim ID
+	db $00 ; anim flags
+	db $18 ; sound FX ID
+	db $00 ; handler function
+
+	; $0b
+	db $30 ; sprite ID
+	db $27 ; paletteID
+	db $5e ; anim ID
+	db $00 ; anim flags
+	db $19 ; sound FX ID
+	db $00 ; handler function
+
+	; $0c
+	db $31 ; sprite ID
+	db $28 ; paletteID
+	db $5f ; anim ID
+	db $00 ; anim flags
+	db $1a ; sound FX ID
+	db $00 ; handler function
+
+	; $0d
+	db $32 ; sprite ID
+	db $29 ; paletteID
+	db $60 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $1b ; sound FX ID
+	db $00 ; handler function
+
+	; $0e
+	db $33 ; sprite ID
+	db $2a ; paletteID
+	db $61 ; anim ID
+	db $00 ; anim flags
+	db $1c ; sound FX ID
+	db $00 ; handler function
+
+	; $0f
+	db $33 ; sprite ID
+	db $2a ; paletteID
+	db $62 ; anim ID
+	db $00 ; anim flags
+	db $1d ; sound FX ID
+	db $00 ; handler function
+
+	; $10
+	db $34 ; sprite ID
+	db $2b ; paletteID
+	db $63 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $1e ; sound FX ID
+	db $00 ; handler function
+
+	; $11
+	db $35 ; sprite ID
+	db $2c ; paletteID
+	db $64 ; anim ID
+	db $00 ; anim flags
+	db $1f ; sound FX ID
+	db $00 ; handler function
+
+	; $12
+	db $36 ; sprite ID
+	db $2d ; paletteID
+	db $69 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $20 ; sound FX ID
+	db $00 ; handler function
+
+	; $13
+	db $37 ; sprite ID
+	db $2e ; paletteID
+	db $6a ; anim ID
+	db $00 ; anim flags
+	db $21 ; sound FX ID
+	db $00 ; handler function
+
+	; $14
+	db $38 ; sprite ID
+	db $2f ; paletteID
+	db $6b ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $22 ; sound FX ID
+	db $00 ; handler function
+
+	; $15
+	db $39 ; sprite ID
+	db $30 ; paletteID
+	db $6c ; anim ID
+	db $00 ; anim flags
+	db $23 ; sound FX ID
+	db $00 ; handler function
+
+	; $16
+	db $3a ; sprite ID
+	db $31 ; paletteID
+	db $6d ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $24 ; sound FX ID
+	db $00 ; handler function
+
+	; $17
+	db $3b ; sprite ID
+	db $32 ; paletteID
+	db $6e ; anim ID
+	db $00 ; anim flags
+	db $25 ; sound FX ID
+	db $00 ; handler function
+
+	; $18
+	db $3c ; sprite ID
+	db $33 ; paletteID
+	db $6f ; anim ID
+	db $00 ; anim flags
+	db $26 ; sound FX ID
+	db $00 ; handler function
+
+	; $19
+	db $3d ; sprite ID
+	db $34 ; paletteID
+	db $70 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) ; anim flags
+	db $27 ; sound FX ID
+	db $00 ; handler function
+
+	; $1a
+	db $3e ; sprite ID
+	db $35 ; paletteID
+	db $71 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) ; anim flags
+	db $28 ; sound FX ID
+	db $00 ; handler function
+
+	; $1b
+	db $3f ; sprite ID
+	db $36 ; paletteID
+	db $72 ; anim ID
+	db $00 ; anim flags
+	db $29 ; sound FX ID
+	db $00 ; handler function
+
+	; $1c
+	db $3f ; sprite ID
+	db $36 ; paletteID
+	db $73 ; anim ID
+	db $00 ; anim flags
+	db $2a ; sound FX ID
+	db $00 ; handler function
+
+	; $1d
+	db $40 ; sprite ID
+	db $37 ; paletteID
+	db $74 ; anim ID
+	db $00 ; anim flags
+	db $2b ; sound FX ID
+	db $00 ; handler function
+
+	; $1e
+	db $40 ; sprite ID
+	db $37 ; paletteID
+	db $75 ; anim ID
+	db $00 ; anim flags
+	db $52 ; sound FX ID
+	db $00 ; handler function
+
+	; $1f
+	db $40 ; sprite ID
+	db $37 ; paletteID
+	db $76 ; anim ID
+	db $00 ; anim flags
+	db $53 ; sound FX ID
+	db $00 ; handler function
+
+	; $20
+	db $41 ; sprite ID
+	db $38 ; paletteID
+	db $77 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
+	db $2c ; sound FX ID
+	db $00 ; handler function
+
+	; $21
+	db $42 ; sprite ID
+	db $39 ; paletteID
+	db $78 ; anim ID
+	db $00 ; anim flags
+	db $2d ; sound FX ID
+	db $00 ; handler function
+
+	; $22
+	db $43 ; sprite ID
+	db $3a ; paletteID
+	db $7a ; anim ID
+	db $00 ; anim flags
+	db $2d ; sound FX ID
+	db $00 ; handler function
+
+	; $23
+	db $44 ; sprite ID
+	db $3b ; paletteID
+	db $7b ; anim ID
+	db $00 ; anim flags
+	db $2e ; sound FX ID
+	db $00 ; handler function
+
+	; $24
+	db $42 ; sprite ID
+	db $39 ; paletteID
+	db $79 ; anim ID
+	db $00 ; anim flags
+	db $2f ; sound FX ID
+	db $00 ; handler function
+
+	; $25
+	db $45 ; sprite ID
+	db $3c ; paletteID
+	db $7c ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
+	db $30 ; sound FX ID
+	db $00 ; handler function
+
+	; $26
+	db $46 ; sprite ID
+	db $3d ; paletteID
+	db $7d ; anim ID
+	db $00 ; anim flags
+	db $31 ; sound FX ID
+	db $00 ; handler function
+
+	; $27
+	db $47 ; sprite ID
+	db $3e ; paletteID
+	db $7e ; anim ID
+	db $00 ; anim flags
+	db $32 ; sound FX ID
+	db $00 ; handler function
+
+	; $28
+	db $48 ; sprite ID
+	db $3f ; paletteID
+	db $7f ; anim ID
+	db $00 ; anim flags
+	db $33 ; sound FX ID
+	db $00 ; handler function
+
+	; $29
+	db $49 ; sprite ID
+	db $40 ; paletteID
+	db $80 ; anim ID
+	db $00 ; anim flags
+	db $34 ; sound FX ID
+	db $00 ; handler function
+
+	; $2a
+	db $4a ; sprite ID
+	db $41 ; paletteID
+	db $81 ; anim ID
+	db $00 ; anim flags
+	db $35 ; sound FX ID
+	db $00 ; handler function
+
+	; $2b
+	db $4b ; sprite ID
+	db $42 ; paletteID
+	db $82 ; anim ID
+	db $00 ; anim flags
+	db $36 ; sound FX ID
+	db $00 ; handler function
+
+	; $2c
+	db $4c ; sprite ID
+	db $43 ; paletteID
+	db $83 ; anim ID
+	db $00 ; anim flags
+	db $37 ; sound FX ID
+	db $00 ; handler function
+
+	; $2d
+	db $4d ; sprite ID
+	db $44 ; paletteID
+	db $84 ; anim ID
+	db $00 ; anim flags
+	db $38 ; sound FX ID
+	db $00 ; handler function
+
+	; $2e
+	db $4e ; sprite ID
+	db $45 ; paletteID
+	db $85 ; anim ID
+	db $00 ; anim flags
+	db $39 ; sound FX ID
+	db $00 ; handler function
+
+	; $2f
+	db $4f ; sprite ID
+	db $46 ; paletteID
+	db $86 ; anim ID
+	db $00 ; anim flags
+	db $3a ; sound FX ID
+	db $00 ; handler function
+
+	; $30
+	db $50 ; sprite ID
+	db $47 ; paletteID
+	db $87 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
+	db $3b ; sound FX ID
+	db $00 ; handler function
+
+	; $31
+	db $51 ; sprite ID
+	db $48 ; paletteID
+	db $88 ; anim ID
+	db $00 ; anim flags
+	db $3c ; sound FX ID
+	db $00 ; handler function
+
+	; $32
+	db $52 ; sprite ID
+	db $49 ; paletteID
+	db $89 ; anim ID
+	db $00 ; anim flags
+	db $3d ; sound FX ID
+	db $00 ; handler function
+
+	; $33
+	db $53 ; sprite ID
+	db $4a ; paletteID
+	db $8a ; anim ID
+	db $00 ; anim flags
+	db $3e ; sound FX ID
+	db $00 ; handler function
+
+	; $34
+	db $54 ; sprite ID
+	db $4b ; paletteID
+	db $8b ; anim ID
+	db $00 ; anim flags
+	db $3f ; sound FX ID
+	db $00 ; handler function
+
+	; $35
+	db $55 ; sprite ID
+	db $4c ; paletteID
+	db $8c ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $40 ; sound FX ID
+	db $00 ; handler function
+
+	; $36
+	db $56 ; sprite ID
+	db $4d ; paletteID
+	db $8d ; anim ID
+	db $00 ; anim flags
+	db $41 ; sound FX ID
+	db $00 ; handler function
+
+	; $37
+	db $57 ; sprite ID
+	db $4e ; paletteID
+	db $8e ; anim ID
+	db $00 ; anim flags
+	db $42 ; sound FX ID
+	db $00 ; handler function
+
+	; $38
+	db $58 ; sprite ID
+	db $4f ; paletteID
+	db $8f ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $43 ; sound FX ID
+	db $00 ; handler function
+
+	; $39
+	db $59 ; sprite ID
+	db $50 ; paletteID
+	db $90 ; anim ID
+	db $00 ; anim flags
+	db $44 ; sound FX ID
+	db $00 ; handler function
+
+	; $3a
+	db $5a ; sprite ID
+	db $51 ; paletteID
+	db $92 ; anim ID
+	db $00 ; anim flags
+	db $45 ; sound FX ID
+	db $00 ; handler function
+
+	; $3b
+	db $5b ; sprite ID
+	db $52 ; paletteID
+	db $93 ; anim ID
+	db $00 ; anim flags
+	db $46 ; sound FX ID
+	db $00 ; handler function
+
+	; $3c
+	db $5c ; sprite ID
+	db $53 ; paletteID
+	db $94 ; anim ID
+	db $00 ; anim flags
+	db $47 ; sound FX ID
+	db $00 ; handler function
+
+	; $3d
+	db $5c ; sprite ID
+	db $53 ; paletteID
+	db $95 ; anim ID
+	db $00 ; anim flags
+	db $48 ; sound FX ID
+	db $00 ; handler function
+
+	; $3e
+	db $5d ; sprite ID
+	db $54 ; paletteID
+	db $97 ; anim ID
+	db $00 ; anim flags
+	db $49 ; sound FX ID
+	db $00 ; handler function
+
+	; $3f
+	db $5e ; sprite ID
+	db $55 ; paletteID
+	db $99 ; anim ID
+	db $00 ; anim flags
+	db $4a ; sound FX ID
+	db $00 ; handler function
+
+	; $40
+	db $4a ; sprite ID
+	db $56 ; paletteID
+	db $81 ; anim ID
+	db $00 ; anim flags
+	db $4b ; sound FX ID
+	db $00 ; handler function
+
+	; $41
+	db $5c ; sprite ID
+	db $53 ; paletteID
+	db $96 ; anim ID
+	db $00 ; anim flags
+	db $47 ; sound FX ID
+	db $00 ; handler function
+
+	; $42
+	db $2d ; sprite ID
+	db $24 ; paletteID
+	db $4d ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $16 ; sound FX ID
+	db $00 ; handler function
+
+	; $43
+	db $2d ; sprite ID
+	db $24 ; paletteID
+	db $4e ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $17 ; sound FX ID
+	db $00 ; handler function
+
+	; $44
+	db $2f ; sprite ID
+	db $26 ; paletteID
+	db $5c ; anim ID
+	db $00 ; anim flags
+	db $18 ; sound FX ID
+	db $00 ; handler function
+
+	; $45
+	db $3a ; sprite ID
+	db $31 ; paletteID
+	db $6d ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $24 ; sound FX ID
+	db $00 ; handler function
+
+	; $46
+	db $5f ; sprite ID
+	db $57 ; paletteID
+	db $9a ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db $11 ; sound FX ID
+	db $00 ; handler function
+
+	; $47
+	db $35 ; sprite ID
+	db $2c ; paletteID
+	db $65 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $5c ; sound FX ID
+	db $00 ; handler function
+
+	; $48
+	db $35 ; sprite ID
+	db $2c ; paletteID
+	db $66 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $49
+	db $5d ; sprite ID
+	db $54 ; paletteID
+	db $98 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $4c ; sound FX ID
+	db $00 ; handler function
+
+	; $4a
+	db $59 ; sprite ID
+	db $50 ; paletteID
+	db $91 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $4d ; sound FX ID
+	db $00 ; handler function
+
+	; $4b
+	db $60 ; sprite ID
+	db $58 ; paletteID
+	db $9b ; anim ID
+	db $00 ; anim flags
+	db $4e ; sound FX ID
+	db $00 ; handler function
+
+	; $4c
+	db $61 ; sprite ID
+	db $59 ; paletteID
+	db $9c ; anim ID
+	db $00 ; anim flags
+	db $4f ; sound FX ID
+	db $00 ; handler function
+
+	; $4d
+	db $62 ; sprite ID
+	db $5a ; paletteID
+	db $9d ; anim ID
+	db $00 ; anim flags
+	db $50 ; sound FX ID
+	db $00 ; handler function
+
+	; $4e
+	db $35 ; sprite ID
+	db $2c ; paletteID
+	db $67 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $51 ; sound FX ID
+	db $00 ; handler function
+
+	; $4f
+	db $35 ; sprite ID
+	db $2c ; paletteID
+	db $68 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $51 ; sound FX ID
+	db $00 ; handler function
+
+	; $50
+	db $63 ; sprite ID
+	db $5b ; paletteID
+	db $9e ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $51
+	db $63 ; sprite ID
+	db $5b ; paletteID
+	db $9f ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $07 ; sound FX ID
+	db $00 ; handler function
+
+	; $52
+	db $63 ; sprite ID
+	db $5b ; paletteID
+	db $a0 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $07 ; sound FX ID
+	db $00 ; handler function
+
+	; $53
+	db $63 ; sprite ID
+	db $5b ; paletteID
+	db $a1 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $07 ; sound FX ID
+	db $00 ; handler function
+
+	; $54
+	db $63 ; sprite ID
+	db $5b ; paletteID
+	db $a2 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $55
+	db $63 ; sprite ID
+	db $5b ; paletteID
+	db $a3 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $56
+	db $63 ; sprite ID
+	db $5b ; paletteID
+	db $a4 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $57
+	db $63 ; sprite ID
+	db $5b ; paletteID
+	db $a5 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $58
+	db $64 ; sprite ID
+	db $5c ; paletteID
+	db $a7 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $59
+	db $64 ; sprite ID
+	db $5c ; paletteID
+	db $a8 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $0b ; sound FX ID
+	db $00 ; handler function
+
+	; $5a
+	db $64 ; sprite ID
+	db $5c ; paletteID
+	db $a9 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $0b ; sound FX ID
+	db $00 ; handler function
+
+	; $5b
+	db $64 ; sprite ID
+	db $5c ; paletteID
+	db $aa ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $5c
+	db $64 ; sprite ID
+	db $5c ; paletteID
+	db $ab ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $5d
+	db $65 ; sprite ID
+	db $5d ; paletteID
+	db $ac ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $5e
+	db $65 ; sprite ID
+	db $5d ; paletteID
+	db $ad ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $5f
+	db $65 ; sprite ID
+	db $5d ; paletteID
+	db $ae ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; $60
+	db $63 ; sprite ID
+	db $5b ; paletteID
+	db $a6 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
 
-Data_1ce32: ; 1ce32 (7:4e32)
-; sprite ID, palette ID, anim ID, anim flags, sound fx ID, ?
-	macro_1ce32 $00, $00, $00, $00,                               $00, $00 ; $00
-	macro_1ce32 $28, $1f, $47, %10000000,                         $11, $00 ; $01
-	macro_1ce32 $29, $20, $48, %10000000,                         $12, $00 ; $02
-	macro_1ce32 $2a, $21, $49, %10000000,                         $13, $00 ; $03
-	macro_1ce32 $2b, $22, $4a, %10000000,                         $14, $00 ; $04
-	macro_1ce32 $2c, $23, $4b, %10000000,                         $15, $00 ; $05
-	macro_1ce32 $2d, $24, $4c, %10000000,                         $16, $00 ; $06
-	macro_1ce32 $2d, $24, $4d, %10000000,                         $16, $00 ; $07
-	macro_1ce32 $2d, $24, $4e, %10000000,                         $17, $00 ; $08
-	macro_1ce32 $2e, $25, $00, $00,                               $00, $00 ; $09
-	macro_1ce32 $2f, $26, $5c, $00,                               $18, $00 ; $0a
-	macro_1ce32 $30, $27, $5e, $00,                               $19, $00 ; $0b
-	macro_1ce32 $31, $28, $5f, $00,                               $1a, $00 ; $0c
-	macro_1ce32 $32, $29, $60, %00000100,                         $1b, $00 ; $0d
-	macro_1ce32 $33, $2a, $61, $00,                               $1c, $00 ; $0e
-	macro_1ce32 $33, $2a, $62, $00,                               $1d, $00 ; $0f
-	macro_1ce32 $34, $2b, $63, %00000100,                         $1e, $00 ; $10
-	macro_1ce32 $35, $2c, $64, $00,                               $1f, $00 ; $11
-	macro_1ce32 $36, $2d, $69, %00000100,                         $20, $00 ; $12
-	macro_1ce32 $37, $2e, $6a, $00,                               $21, $00 ; $13
-	macro_1ce32 $38, $2f, $6b, %00000100,                         $22, $00 ; $14
-	macro_1ce32 $39, $30, $6c, $00,                               $23, $00 ; $15
-	macro_1ce32 $3a, $31, $6d, %00000100,                         $24, $00 ; $16
-	macro_1ce32 $3b, $32, $6e, $00,                               $25, $00 ; $17
-	macro_1ce32 $3c, $33, $6f, $00,                               $26, $00 ; $18
-	macro_1ce32 $3d, $34, $70, %01000000 | %00000010,             $27, $00 ; $19
-	macro_1ce32 $3e, $35, $71, %01000000 | %00000010,             $28, $00 ; $1a
-	macro_1ce32 $3f, $36, $72, $00,                               $29, $00 ; $1b
-	macro_1ce32 $3f, $36, $73, $00,                               $2a, $00 ; $1c
-	macro_1ce32 $40, $37, $74, $00,                               $2b, $00 ; $1d
-	macro_1ce32 $40, $37, $75, $00,                               $52, $00 ; $1e
-	macro_1ce32 $40, $37, $76, $00,                               $53, $00 ; $1f
-	macro_1ce32 $41, $38, $77, %00100000 | %00000001,             $2c, $00 ; $20
-	macro_1ce32 $42, $39, $78, $00,                               $2d, $00 ; $21
-	macro_1ce32 $43, $3a, $7a, $00,                               $2d, $00 ; $22
-	macro_1ce32 $44, $3b, $7b, $00,                               $2e, $00 ; $23
-	macro_1ce32 $42, $39, $79, $00,                               $2f, $00 ; $24
-	macro_1ce32 $45, $3c, $7c, %00100000 | %00000001,             $30, $00 ; $25
-	macro_1ce32 $46, $3d, $7d, $00,                               $31, $00 ; $26
-	macro_1ce32 $47, $3e, $7e, $00,                               $32, $00 ; $27
-	macro_1ce32 $48, $3f, $7f, $00,                               $33, $00 ; $28
-	macro_1ce32 $49, $40, $80, $00,                               $34, $00 ; $29
-	macro_1ce32 $4a, $41, $81, $00,                               $35, $00 ; $2a
-	macro_1ce32 $4b, $42, $82, $00,                               $36, $00 ; $2b
-	macro_1ce32 $4c, $43, $83, $00,                               $37, $00 ; $2c
-	macro_1ce32 $4d, $44, $84, $00,                               $38, $00 ; $2d
-	macro_1ce32 $4e, $45, $85, $00,                               $39, $00 ; $2e
-	macro_1ce32 $4f, $46, $86, $00,                               $3a, $00 ; $2f
-	macro_1ce32 $50, $47, $87, %00100000 | %00000001,             $3b, $00 ; $30
-	macro_1ce32 $51, $48, $88, $00,                               $3c, $00 ; $31
-	macro_1ce32 $52, $49, $89, $00,                               $3d, $00 ; $32
-	macro_1ce32 $53, $4a, $8a, $00,                               $3e, $00 ; $33
-	macro_1ce32 $54, $4b, $8b, $00,                               $3f, $00 ; $34
-	macro_1ce32 $55, $4c, $8c, %00000100,                         $40, $00 ; $35
-	macro_1ce32 $56, $4d, $8d, $00,                               $41, $00 ; $36
-	macro_1ce32 $57, $4e, $8e, $00,                               $42, $00 ; $37
-	macro_1ce32 $58, $4f, $8f, %00000100,                         $43, $00 ; $38
-	macro_1ce32 $59, $50, $90, $00,                               $44, $00 ; $39
-	macro_1ce32 $5a, $51, $92, $00,                               $45, $00 ; $3a
-	macro_1ce32 $5b, $52, $93, $00,                               $46, $00 ; $3b
-	macro_1ce32 $5c, $53, $94, $00,                               $47, $00 ; $3c
-	macro_1ce32 $5c, $53, $95, $00,                               $48, $00 ; $3d
-	macro_1ce32 $5d, $54, $97, $00,                               $49, $00 ; $3e
-	macro_1ce32 $5e, $55, $99, $00,                               $4a, $00 ; $3f
-	macro_1ce32 $4a, $56, $81, $00,                               $4b, $00 ; $40
-	macro_1ce32 $5c, $53, $96, $00,                               $47, $00 ; $41
-	macro_1ce32 $2d, $24, $4d, %10000000,                         $16, $00 ; $42
-	macro_1ce32 $2d, $24, $4e, %10000000,                         $17, $00 ; $43
-	macro_1ce32 $2f, $26, $5c, $00,                               $18, $00 ; $44
-	macro_1ce32 $3a, $31, $6d, %00000100,                         $24, $00 ; $45
-	macro_1ce32 $5f, $57, $9a, %10000000,                         $11, $00 ; $46
-	macro_1ce32 $35, $2c, $65, %00000100,                         $5c, $00 ; $47
-	macro_1ce32 $35, $2c, $66, %00000100,                         $00, $00 ; $48
-	macro_1ce32 $5d, $54, $98, %00000100,                         $4c, $00 ; $49
-	macro_1ce32 $59, $50, $91, %00000100,                         $4d, $00 ; $4a
-	macro_1ce32 $60, $58, $9b, $00,                               $4e, $00 ; $4b
-	macro_1ce32 $61, $59, $9c, $00,                               $4f, $00 ; $4c
-	macro_1ce32 $62, $5a, $9d, $00,                               $50, $00 ; $4d
-	macro_1ce32 $35, $2c, $67, %0000100,                          $51, $00 ; $4e
-	macro_1ce32 $35, $2c, $68, %0000100,                          $51, $00 ; $4f
-	macro_1ce32 $63, $5b, $9e, %10000000 | %00001000 | %00000100, $00, $00 ; $50
-	macro_1ce32 $63, $5b, $9f, %10000000 | %00001000 | %00000100, $07, $00 ; $51
-	macro_1ce32 $63, $5b, $a0, %10000000 | %00001000 | %00000100, $07, $00 ; $52
-	macro_1ce32 $63, $5b, $a1, %10000000 | %00001000 | %00000100, $07, $00 ; $53
-	macro_1ce32 $63, $5b, $a2, %10000000 | %00000100,             $00, $00 ; $54
-	macro_1ce32 $63, $5b, $a3, %10000000 | %00001000 | %00000100, $00, $00 ; $55
-	macro_1ce32 $63, $5b, $a4, %10000000 | %00001000 | %00000100, $00, $00 ; $56
-	macro_1ce32 $63, $5b, $a5, %10000000 | %00001000 | %00000100, $00, $00 ; $57
-	macro_1ce32 $64, $5c, $a7, %10000000 | %00001000 | %00000100, $00, $00 ; $58
-	macro_1ce32 $64, $5c, $a8, %10000000 | %00001000 | %00000100, $0b, $00 ; $59
-	macro_1ce32 $64, $5c, $a9, %10000000 | %00001000 | %00000100, $0b, $00 ; $5a
-	macro_1ce32 $64, $5c, $aa, %10000000 | %00000100,             $00, $00 ; $5b
-	macro_1ce32 $64, $5c, $ab, %10000000 | %00000100,             $00, $00 ; $5c
-	macro_1ce32 $65, $5d, $ac, %10000000 | %00000100,             $00, $00 ; $5d
-	macro_1ce32 $65, $5d, $ad, %10000000 | %00000100,             $00, $00 ; $5e
-	macro_1ce32 $65, $5d, $ae, %10000000 | %00000100,             $00, $00 ; $5f
-	macro_1ce32 $63, $5b, $a6, %10000000 | %00000100,             $00, $00 ; $60
 ; 0x1d078
 
 Func_1d078: ; 1d078 (7:5078)
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 4e33470..e0db1f7 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -888,120 +888,120 @@ gfx_pointer: MACRO
 ENDM
 
 MapDataPointers_8116b: ; 8116b (20:516b)
-	gfx_pointer OWSpritePlayer,     $14 ; $00
-	gfx_pointer RonaldOWGfx,        $14 ; $01
-	gfx_pointer DoctorMasonOWGfx,   $14 ; $02
-	gfx_pointer OWSprite0,          $14 ; $03
-	gfx_pointer OWSprite1,          $14 ; $04
-	gfx_pointer OWSprite2,          $14 ; $05
-	gfx_pointer OWSprite3,          $14 ; $06
-	gfx_pointer OWSprite4,          $14 ; $07
-	gfx_pointer OWSprite5,          $1b ; $08
-	gfx_pointer OWSprite6,          $14 ; $09
-	gfx_pointer OWSprite7,          $14 ; $0a
-	gfx_pointer OWSprite8,          $14 ; $0b
-	gfx_pointer OWSprite9,          $14 ; $0c
-	gfx_pointer OWSprite10,         $14 ; $0d
-	gfx_pointer OWSprite11,         $14 ; $0e
-	gfx_pointer OWSprite12,         $14 ; $0f
-	gfx_pointer OWSprite13,         $14 ; $10
-	gfx_pointer OWSprite14,         $14 ; $11
-	gfx_pointer OWSprite15,         $14 ; $12
-	gfx_pointer OWSprite16,         $14 ; $13
-	gfx_pointer OWSprite17,         $14 ; $14
-	gfx_pointer OWSprite18,         $14 ; $15
-	gfx_pointer OWSprite19,         $14 ; $16
-	gfx_pointer OWSprite20,         $14 ; $17
-	gfx_pointer OWSprite21,         $14 ; $18
-	gfx_pointer OWSprite22,         $14 ; $19
-	gfx_pointer OWSprite23,         $14 ; $1a
-	gfx_pointer OWSprite24,         $14 ; $1b
-	gfx_pointer OWSprite25,         $14 ; $1c
-	gfx_pointer OWSprite26,         $14 ; $1d
-	gfx_pointer OWSprite27,         $14 ; $1e
-	gfx_pointer OWSprite28,         $14 ; $1f
-	gfx_pointer OWSprite29,         $14 ; $20
-	gfx_pointer HelpDeskLadyGfx,    $08 ; $21
-	gfx_pointer OWSprite30,         $14 ; $22
-	gfx_pointer OWSprite31,         $14 ; $23
-	gfx_pointer OWSprite32,         $14 ; $24
-	gfx_pointer OverworldMapOAMGfx, $08 ; $25
-	gfx_pointer Duel0Gfx,           $16 ; $26
-	gfx_pointer Duel63Gfx,          $0a ; $27
-	gfx_pointer Duel65Gfx,          $0b ; $28
-	gfx_pointer Duel1Gfx,           $06 ; $29
-	gfx_pointer Duel2Gfx,           $08 ; $2a
-	gfx_pointer Duel55Gfx,          $02 ; $2b
-	gfx_pointer Duel58Gfx,          $04 ; $2c
-	gfx_pointer Duel3Gfx,           $09 ; $2d
-	gfx_pointer Duel4Gfx,           $12 ; $2e
-	gfx_pointer Duel5Gfx,           $09 ; $2f
-	gfx_pointer Duel6Gfx,           $11 ; $30
-	gfx_pointer Duel59Gfx,          $03 ; $31
-	gfx_pointer Duel7Gfx,           $2d ; $32
-	gfx_pointer Duel8Gfx,           $0d ; $33
-	gfx_pointer Duel9Gfx,           $1c ; $34
-	gfx_pointer Duel10Gfx,          $4c ; $35
-	gfx_pointer Duel61Gfx,          $03 ; $36
-	gfx_pointer Duel11Gfx,          $1b ; $37
-	gfx_pointer Duel12Gfx,          $07 ; $38
-	gfx_pointer Duel13Gfx,          $0c ; $39
-	gfx_pointer Duel62Gfx,          $01 ; $3a
-	gfx_pointer Duel14Gfx,          $22 ; $3b
-	gfx_pointer Duel15Gfx,          $20 ; $3c
-	gfx_pointer Duel16Gfx,          $0a ; $3d
-	gfx_pointer Duel17Gfx,          $25 ; $3e
-	gfx_pointer Duel18Gfx,          $18 ; $3f
-	gfx_pointer Duel19Gfx,          $1b ; $40
-	gfx_pointer Duel20Gfx,          $08 ; $41
-	gfx_pointer Duel21Gfx,          $0d ; $42
-	gfx_pointer Duel22Gfx,          $22 ; $43
-	gfx_pointer Duel23Gfx,          $0c ; $44
-	gfx_pointer Duel24Gfx,          $25 ; $45
-	gfx_pointer Duel25Gfx,          $22 ; $46
-	gfx_pointer Duel26Gfx,          $0c ; $47
-	gfx_pointer Duel27Gfx,          $4c ; $48
-	gfx_pointer Duel28Gfx,          $08 ; $49
-	gfx_pointer Duel29Gfx,          $07 ; $4a
-	gfx_pointer Duel56Gfx,          $01 ; $4b
-	gfx_pointer Duel30Gfx,          $1a ; $4c
-	gfx_pointer Duel31Gfx,          $0a ; $4d
-	gfx_pointer Duel32Gfx,          $2e ; $4e
-	gfx_pointer Duel33Gfx,          $08 ; $4f
-	gfx_pointer Duel34Gfx,          $07 ; $50
-	gfx_pointer Duel35Gfx,          $1c ; $51
-	gfx_pointer Duel66Gfx,          $04 ; $52
-	gfx_pointer Duel36Gfx,          $08 ; $53
-	gfx_pointer Duel37Gfx,          $0b ; $54
-	gfx_pointer Duel57Gfx,          $01 ; $55
-	gfx_pointer Duel38Gfx,          $1c ; $56
-	gfx_pointer Duel39Gfx,          $16 ; $57
-	gfx_pointer Duel40Gfx,          $10 ; $58
-	gfx_pointer Duel41Gfx,          $0f ; $59
-	gfx_pointer Duel42Gfx,          $07 ; $5a
-	gfx_pointer Duel43Gfx,          $0a ; $5b
-	gfx_pointer Duel44Gfx,          $09 ; $5c
-	gfx_pointer Duel60Gfx,          $02 ; $5d
-	gfx_pointer Duel64Gfx,          $02 ; $5e
-	gfx_pointer Duel45Gfx,          $03 ; $5f
-	gfx_pointer Duel46Gfx,          $08 ; $60
-	gfx_pointer Duel47Gfx,          $0f ; $61
-	gfx_pointer Duel48Gfx,          $03 ; $62
-	gfx_pointer Duel49Gfx,          $05 ; $63
-	gfx_pointer Duel50Gfx,          $17 ; $64
-	gfx_pointer Duel51Gfx,          $36 ; $65
-	gfx_pointer Duel52Gfx,          $0b ; $66
-	gfx_pointer Duel53Gfx,          $06 ; $67
-	gfx_pointer Duel54Gfx,          $16 ; $68
-	gfx_pointer BoosterPackOAMGfx,  $20 ; $69
-	gfx_pointer PressStartGfx,      $14 ; $6a
-	gfx_pointer GrassGfx,           $04 ; $6b
-	gfx_pointer FireGfx,            $04 ; $6c
-	gfx_pointer WaterGfx,           $04 ; $6d
-	gfx_pointer ColorlessGfx,       $04 ; $6e
-	gfx_pointer LightningGfx,       $04 ; $6f
-	gfx_pointer PsychicGfx,         $04 ; $70
-	gfx_pointer FightingGfx,        $04 ; $71
+	gfx_pointer OWPlayerGfx,        $14 ; SPRITE_OW_PLAYER
+	gfx_pointer OWRonaldGfx,        $14 ; SPRITE_OW_RONALD
+	gfx_pointer OWDrMasonGfx,       $14 ; SPRITE_OW_DRMASON
+	gfx_pointer OWIshiharaGfx,      $14 ; SPRITE_OW_ISHIHARA
+	gfx_pointer OWImakuniGfx,       $14 ; SPRITE_OW_IMAKUNI
+	gfx_pointer OWNikkiGfx,         $14 ; SPRITE_OW_NIKKI
+	gfx_pointer OWRickGfx,          $14 ; SPRITE_OW_RICK
+	gfx_pointer OWKenGfx,           $14 ; SPRITE_OW_KEN
+	gfx_pointer OWAmyGfx,           $1b ; SPRITE_OW_AMY
+	gfx_pointer OWIsaacGfx,         $14 ; SPRITE_OW_ISAAC
+	gfx_pointer OWMitchGfx,         $14 ; SPRITE_OW_MITCH
+	gfx_pointer OWGeneGfx,          $14 ; SPRITE_OW_GENE
+	gfx_pointer OWMurrayGfx,        $14 ; SPRITE_OW_MURRAY
+	gfx_pointer OWCourtneyGfx,      $14 ; SPRITE_OW_COURTNEY
+	gfx_pointer OWSteveGfx,         $14 ; SPRITE_OW_STEVE
+	gfx_pointer OWJackGfx,          $14 ; SPRITE_OW_JACK
+	gfx_pointer OWRodGfx,           $14 ; SPRITE_OW_ROD
+	gfx_pointer OWBoyGfx,           $14 ; SPRITE_OW_BOY
+	gfx_pointer OWLadGfx,           $14 ; SPRITE_OW_LAD
+	gfx_pointer OWSpecsGfx,         $14 ; SPRITE_OW_SPECS
+	gfx_pointer OWButchGfx,         $14 ; SPRITE_OW_BUTCH
+	gfx_pointer OWManiaGfx,         $14 ; SPRITE_OW_MANIA
+	gfx_pointer OWJoshuaGfx,        $14 ; SPRITE_OW_JOSHUA
+	gfx_pointer OWHoodGfx,          $14 ; SPRITE_OW_HOOD
+	gfx_pointer OWTechGfx,          $14 ; SPRITE_OW_TECH
+	gfx_pointer OWChapGfx,          $14 ; SPRITE_OW_CHAP
+	gfx_pointer OWManGfx,           $14 ; SPRITE_OW_MAN
+	gfx_pointer OWPappyGfx,         $14 ; SPRITE_OW_PAPPY
+	gfx_pointer OWGirlGfx,          $14 ; SPRITE_OW_GIRL
+	gfx_pointer OWLass1Gfx,         $14 ; SPRITE_OW_LASS1
+	gfx_pointer OWLass2Gfx,         $14 ; SPRITE_OW_LASS2
+	gfx_pointer OWLass3Gfx,         $14 ; SPRITE_OW_LASS3
+	gfx_pointer OWSwimmerGfx,       $14 ; SPRITE_OW_SWIMMER
+	gfx_pointer OWClerkGfx,         $08 ; SPRITE_OW_CLERK
+	gfx_pointer OWGalGfx,           $14 ; SPRITE_OW_GAL
+	gfx_pointer OWWomanGfx,         $14 ; SPRITE_OW_WOMAN
+	gfx_pointer OWGrannyGfx,        $14 ; SPRITE_OW_GRANNY
+	gfx_pointer OverworldMapOAMGfx, $08 ; SPRITE_OW_MAP_OAM
+	gfx_pointer Duel0Gfx,           $16 ; SPRITE_DUEL_0
+	gfx_pointer Duel63Gfx,          $0a ; SPRITE_DUEL_63
+	gfx_pointer DuelGlowGfx,        $0b ; SPRITE_DUEL_GLOW
+	gfx_pointer Duel1Gfx,           $06 ; SPRITE_DUEL_1
+	gfx_pointer Duel2Gfx,           $08 ; SPRITE_DUEL_2
+	gfx_pointer Duel55Gfx,          $02 ; SPRITE_DUEL_55
+	gfx_pointer Duel58Gfx,          $04 ; SPRITE_DUEL_58
+	gfx_pointer Duel3Gfx,           $09 ; SPRITE_DUEL_3
+	gfx_pointer Duel4Gfx,           $12 ; SPRITE_DUEL_4
+	gfx_pointer Duel5Gfx,           $09 ; SPRITE_DUEL_5
+	gfx_pointer Duel6Gfx,           $11 ; SPRITE_DUEL_6
+	gfx_pointer Duel59Gfx,          $03 ; SPRITE_DUEL_59
+	gfx_pointer Duel7Gfx,           $2d ; SPRITE_DUEL_7
+	gfx_pointer Duel8Gfx,           $0d ; SPRITE_DUEL_8
+	gfx_pointer Duel9Gfx,           $1c ; SPRITE_DUEL_9
+	gfx_pointer Duel10Gfx,          $4c ; SPRITE_DUEL_10
+	gfx_pointer Duel61Gfx,          $03 ; SPRITE_DUEL_61
+	gfx_pointer Duel11Gfx,          $1b ; SPRITE_DUEL_11
+	gfx_pointer Duel12Gfx,          $07 ; SPRITE_DUEL_12
+	gfx_pointer Duel13Gfx,          $0c ; SPRITE_DUEL_13
+	gfx_pointer Duel62Gfx,          $01 ; SPRITE_DUEL_62
+	gfx_pointer Duel14Gfx,          $22 ; SPRITE_DUEL_14
+	gfx_pointer Duel15Gfx,          $20 ; SPRITE_DUEL_15
+	gfx_pointer Duel16Gfx,          $0a ; SPRITE_DUEL_16
+	gfx_pointer Duel17Gfx,          $25 ; SPRITE_DUEL_17
+	gfx_pointer Duel18Gfx,          $18 ; SPRITE_DUEL_18
+	gfx_pointer Duel19Gfx,          $1b ; SPRITE_DUEL_19
+	gfx_pointer Duel20Gfx,          $08 ; SPRITE_DUEL_20
+	gfx_pointer Duel21Gfx,          $0d ; SPRITE_DUEL_21
+	gfx_pointer Duel22Gfx,          $22 ; SPRITE_DUEL_22
+	gfx_pointer Duel23Gfx,          $0c ; SPRITE_DUEL_23
+	gfx_pointer Duel24Gfx,          $25 ; SPRITE_DUEL_24
+	gfx_pointer Duel25Gfx,          $22 ; SPRITE_DUEL_25
+	gfx_pointer Duel26Gfx,          $0c ; SPRITE_DUEL_26
+	gfx_pointer Duel27Gfx,          $4c ; SPRITE_DUEL_27
+	gfx_pointer Duel28Gfx,          $08 ; SPRITE_DUEL_28
+	gfx_pointer Duel29Gfx,          $07 ; SPRITE_DUEL_29
+	gfx_pointer Duel56Gfx,          $01 ; SPRITE_DUEL_56
+	gfx_pointer Duel30Gfx,          $1a ; SPRITE_DUEL_30
+	gfx_pointer Duel31Gfx,          $0a ; SPRITE_DUEL_31
+	gfx_pointer Duel32Gfx,          $2e ; SPRITE_DUEL_32
+	gfx_pointer Duel33Gfx,          $08 ; SPRITE_DUEL_33
+	gfx_pointer Duel34Gfx,          $07 ; SPRITE_DUEL_34
+	gfx_pointer Duel35Gfx,          $1c ; SPRITE_DUEL_35
+	gfx_pointer Duel66Gfx,          $04 ; SPRITE_DUEL_66
+	gfx_pointer Duel36Gfx,          $08 ; SPRITE_DUEL_36
+	gfx_pointer Duel37Gfx,          $0b ; SPRITE_DUEL_37
+	gfx_pointer Duel57Gfx,          $01 ; SPRITE_DUEL_57
+	gfx_pointer Duel38Gfx,          $1c ; SPRITE_DUEL_38
+	gfx_pointer Duel39Gfx,          $16 ; SPRITE_DUEL_39
+	gfx_pointer Duel40Gfx,          $10 ; SPRITE_DUEL_40
+	gfx_pointer Duel41Gfx,          $0f ; SPRITE_DUEL_41
+	gfx_pointer Duel42Gfx,          $07 ; SPRITE_DUEL_42
+	gfx_pointer Duel43Gfx,          $0a ; SPRITE_DUEL_43
+	gfx_pointer Duel44Gfx,          $09 ; SPRITE_DUEL_44
+	gfx_pointer Duel60Gfx,          $02 ; SPRITE_DUEL_60
+	gfx_pointer Duel64Gfx,          $02 ; SPRITE_DUEL_64
+	gfx_pointer Duel45Gfx,          $03 ; SPRITE_DUEL_45
+	gfx_pointer Duel46Gfx,          $08 ; SPRITE_DUEL_46
+	gfx_pointer Duel47Gfx,          $0f ; SPRITE_DUEL_47
+	gfx_pointer Duel48Gfx,          $03 ; SPRITE_DUEL_48
+	gfx_pointer Duel49Gfx,          $05 ; SPRITE_DUEL_49
+	gfx_pointer Duel50Gfx,          $17 ; SPRITE_DUEL_50
+	gfx_pointer Duel51Gfx,          $36 ; SPRITE_DUEL_51
+	gfx_pointer Duel52Gfx,          $0b ; SPRITE_DUEL_52
+	gfx_pointer Duel53Gfx,          $06 ; SPRITE_DUEL_53
+	gfx_pointer Duel54Gfx,          $16 ; SPRITE_DUEL_54
+	gfx_pointer BoosterPackOAMGfx,  $20 ; SPRITE_BOOSTER_PACK_OAM
+	gfx_pointer PressStartGfx,      $14 ; SPRITE_PRESS_START
+	gfx_pointer GrassGfx,           $04 ; SPRITE_GRASS
+	gfx_pointer FireGfx,            $04 ; SPRITE_FIRE
+	gfx_pointer WaterGfx,           $04 ; SPRITE_WATER
+	gfx_pointer ColorlessGfx,       $04 ; SPRITE_COLORLESS
+	gfx_pointer LightningGfx,       $04 ; SPRITE_LIGHTNING
+	gfx_pointer PsychicGfx,         $04 ; SPRITE_PSYCHIC
+	gfx_pointer FightingGfx,        $04 ; SPRITE_FIGHTING
 
 ; \1 = anim data pointer
 anim_data_pointer: MACRO
diff --git a/src/gfx.asm b/src/gfx.asm
index 726cf3e..f20dd20 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -114,7 +114,7 @@ GrassClubTilesetGfx: ; 8b91e (22:791e)
 	dw $57
 	INCBIN "gfx/tilesets/grassclub.2bpp"
 
-OWSpritePlayer:: ; 8be90 (22:7e90)
+OWPlayerGfx:: ; 8be90 (22:7e90)
 	dw $14
 	INCBIN "gfx/overworld_sprites/player.2bpp"
 
@@ -257,9 +257,9 @@ CopyrightGfx: ; 93ce4 (24:7ce4)
 	dw $24
 	INCBIN "gfx/copyright.2bpp"
 
-HelpDeskLadyGfx:: ; 93f26 (24:7f26)
+OWClerkGfx:: ; 93f26 (24:7f26)
 	dw $8
-	INCBIN "gfx/overworld_sprites/help_desk_lady.2bpp"
+	INCBIN "gfx/overworld_sprites/clerk.2bpp"
 
 Duel59Gfx:: ; 93fa8 (24:7fa8)
 	dw $3
@@ -319,7 +319,7 @@ CompaniesGfx: ; 97b94 (25:7b94)
 	dw $31
 	INCBIN "gfx/companies.2bpp"
 
-RonaldOWGfx:: ; 97ea6 (25:7ea6)
+OWRonaldGfx:: ; 97ea6 (25:7ea6)
 	dw $14
 	INCBIN "gfx/overworld_sprites/ronald.2bpp"
 
@@ -351,7 +351,7 @@ Titlescreen6Gfx: ; 9b0b6 (26:70b6)
 	dw $d4
 	INCBIN "gfx/titlescreen/titlescreen6.2bpp"
 
-DoctorMasonOWGfx:: ; 9bdf8 (26:7df8)
+OWDrMasonGfx:: ; 9bdf8 (26:7df8)
 	dw $14
 	INCBIN "gfx/overworld_sprites/doctormason.2bpp"
 
@@ -539,129 +539,129 @@ AaronGfx: ; a1694 (28:5694)
 	dw $24
 	INCBIN "gfx/duelists/aaron.2bpp"
 
-OWSprite0:: ; a18d6 (28:58d6)
+OWIshiharaGfx:: ; a18d6 (28:58d6)
 	dw $14
-	INCBIN "gfx/overworld_sprites/0.2bpp"
+	INCBIN "gfx/overworld_sprites/ishihara.2bpp"
 
-OWSprite1:: ; a1a18 (28:5a18)
+OWImakuniGfx:: ; a1a18 (28:5a18)
 	dw $14
-	INCBIN "gfx/overworld_sprites/1.2bpp"
+	INCBIN "gfx/overworld_sprites/imakuni.2bpp"
 
-OWSprite2:: ; a1b5a (28:5b5a)
+OWNikkiGfx:: ; a1b5a (28:5b5a)
 	dw $14
-	INCBIN "gfx/overworld_sprites/2.2bpp"
+	INCBIN "gfx/overworld_sprites/nikki.2bpp"
 
-OWSprite3:: ; a1c9c (28:5c9c)
+OWRickGfx:: ; a1c9c (28:5c9c)
 	dw $14
-	INCBIN "gfx/overworld_sprites/3.2bpp"
+	INCBIN "gfx/overworld_sprites/rick.2bpp"
 
-OWSprite4:: ; a1dde (28:5dde)
+OWKenGfx:: ; a1dde (28:5dde)
 	dw $14
-	INCBIN "gfx/overworld_sprites/4.2bpp"
+	INCBIN "gfx/overworld_sprites/ken.2bpp"
 
-OWSprite5:: ; a1f20 (28:5f20)
+OWAmyGfx:: ; a1f20 (28:5f20)
 	dw $1b
-	INCBIN "gfx/overworld_sprites/5.2bpp"
+	INCBIN "gfx/overworld_sprites/amy.2bpp"
 
-OWSprite6:: ; a20d2 (28:60d2)
+OWIsaacGfx:: ; a20d2 (28:60d2)
 	dw $14
-	INCBIN "gfx/overworld_sprites/6.2bpp"
+	INCBIN "gfx/overworld_sprites/isaac.2bpp"
 
-OWSprite7:: ; a2214 (28:6214)
+OWMitchGfx:: ; a2214 (28:6214)
 	dw $14
-	INCBIN "gfx/overworld_sprites/7.2bpp"
+	INCBIN "gfx/overworld_sprites/mitch.2bpp"
 
-OWSprite8:: ; a2356 (28:6356)
+OWGeneGfx:: ; a2356 (28:6356)
 	dw $14
-	INCBIN "gfx/overworld_sprites/8.2bpp"
+	INCBIN "gfx/overworld_sprites/gene.2bpp"
 
-OWSprite9:: ; a2498 (28:6498)
+OWMurrayGfx:: ; a2498 (28:6498)
 	dw $14
-	INCBIN "gfx/overworld_sprites/9.2bpp"
+	INCBIN "gfx/overworld_sprites/murray.2bpp"
 
-OWSprite10:: ; a25da (28:65da)
+OWCourtneyGfx:: ; a25da (28:65da)
 	dw $14
-	INCBIN "gfx/overworld_sprites/10.2bpp"
+	INCBIN "gfx/overworld_sprites/courtney.2bpp"
 
-OWSprite11:: ; a271c (28:671c)
+OWSteveGfx:: ; a271c (28:671c)
 	dw $14
-	INCBIN "gfx/overworld_sprites/11.2bpp"
+	INCBIN "gfx/overworld_sprites/steve.2bpp"
 
-OWSprite12:: ; a285e (28:685e)
+OWJackGfx:: ; a285e (28:685e)
 	dw $14
-	INCBIN "gfx/overworld_sprites/12.2bpp"
+	INCBIN "gfx/overworld_sprites/jack.2bpp"
 
-OWSprite13:: ; a29a0 (28:69a0)
+OWRodGfx:: ; a29a0 (28:69a0)
 	dw $14
-	INCBIN "gfx/overworld_sprites/13.2bpp"
+	INCBIN "gfx/overworld_sprites/rod.2bpp"
 
-OWSprite14:: ; a2ae2 (28:6ae2)
+OWBoyGfx:: ; a2ae2 (28:6ae2)
 	dw $14
-	INCBIN "gfx/overworld_sprites/14.2bpp"
+	INCBIN "gfx/overworld_sprites/youngster.2bpp"
 
-OWSprite15:: ; a2c24 (28:6c24)
+OWLadGfx:: ; a2c24 (28:6c24)
 	dw $14
-	INCBIN "gfx/overworld_sprites/15.2bpp"
+	INCBIN "gfx/overworld_sprites/lad.2bpp"
 
-OWSprite16:: ; a2d66 (28:6d66)
+OWSpecsGfx:: ; a2d66 (28:6d66)
 	dw $14
-	INCBIN "gfx/overworld_sprites/16.2bpp"
+	INCBIN "gfx/overworld_sprites/specs.2bpp"
 
-OWSprite17:: ; a2ea8 (28:6ea8)
+OWButchGfx:: ; a2ea8 (28:6ea8)
 	dw $14
-	INCBIN "gfx/overworld_sprites/17.2bpp"
+	INCBIN "gfx/overworld_sprites/butch.2bpp"
 
-OWSprite18:: ; a2fea (28:6fea)
+OWManiaGfx:: ; a2fea (28:6fea)
 	dw $14
-	INCBIN "gfx/overworld_sprites/18.2bpp"
+	INCBIN "gfx/overworld_sprites/mania.2bpp"
 
-OWSprite19:: ; a312c (28:712c)
+OWJoshuaGfx:: ; a312c (28:712c)
 	dw $14
-	INCBIN "gfx/overworld_sprites/19.2bpp"
+	INCBIN "gfx/overworld_sprites/joshua.2bpp"
 
-OWSprite20:: ; a326e (28:726e)
+OWHoodGfx:: ; a326e (28:726e)
 	dw $14
-	INCBIN "gfx/overworld_sprites/20.2bpp"
+	INCBIN "gfx/overworld_sprites/hood.2bpp"
 
-OWSprite21:: ; a33b0 (28:73b0)
+OWTechGfx:: ; a33b0 (28:73b0)
 	dw $14
-	INCBIN "gfx/overworld_sprites/21.2bpp"
+	INCBIN "gfx/overworld_sprites/tech.2bpp"
 
-OWSprite22:: ; a34f2 (28:74f2)
+OWChapGfx:: ; a34f2 (28:74f2)
 	dw $14
-	INCBIN "gfx/overworld_sprites/22.2bpp"
+	INCBIN "gfx/overworld_sprites/chap.2bpp"
 
-OWSprite23:: ; a3634 (28:7634)
+OWManGfx:: ; a3634 (28:7634)
 	dw $14
-	INCBIN "gfx/overworld_sprites/23.2bpp"
+	INCBIN "gfx/overworld_sprites/man.2bpp"
 
-OWSprite24:: ; a3776 (28:7776)
+OWPappyGfx:: ; a3776 (28:7776)
 	dw $14
-	INCBIN "gfx/overworld_sprites/24.2bpp"
+	INCBIN "gfx/overworld_sprites/pappy.2bpp"
 
-OWSprite25:: ; a38b8 (28:78b8)
+OWGirlGfx:: ; a38b8 (28:78b8)
 	dw $14
-	INCBIN "gfx/overworld_sprites/25.2bpp"
+	INCBIN "gfx/overworld_sprites/girl.2bpp"
 
-OWSprite26:: ; a39fa (28:79fa)
+OWLass1Gfx:: ; a39fa (28:79fa)
 	dw $14
-	INCBIN "gfx/overworld_sprites/26.2bpp"
+	INCBIN "gfx/overworld_sprites/lass1.2bpp"
 
-OWSprite27:: ; a3b3c (28:7b3c)
+OWLass2Gfx:: ; a3b3c (28:7b3c)
 	dw $14
-	INCBIN "gfx/overworld_sprites/27.2bpp"
+	INCBIN "gfx/overworld_sprites/lass2.2bpp"
 
-OWSprite28:: ; a3c7e (28:7c7e)
+OWLass3Gfx:: ; a3c7e (28:7c7e)
 	dw $14
-	INCBIN "gfx/overworld_sprites/28.2bpp"
+	INCBIN "gfx/overworld_sprites/lass3.2bpp"
 
-OWSprite29:: ; a3dc0 (28:7dc0)
+OWSwimmerGfx:: ; a3dc0 (28:7dc0)
 	dw $14
-	INCBIN "gfx/overworld_sprites/29.2bpp"
+	INCBIN "gfx/overworld_sprites/swimmer.2bpp"
 
-Duel65Gfx:: ; a3f02 (28:7f02)
+DuelGlowGfx:: ; a3f02 (28:7f02)
 	dw $b
-	INCBIN "gfx/duel/anims/65.2bpp"
+	INCBIN "gfx/duel/anims/glow.2bpp"
 
 Duel66Gfx:: ; a3fb4 (28:7fb4)
 	dw $4
@@ -673,17 +673,17 @@ Palette117:: ; a3ff6 (28:7ff6)
 
 SECTION "Gfx 11", ROMX
 
-OWSprite30:: ; a4000 (29:4000)
+OWGalGfx:: ; a4000 (29:4000)
 	dw $14
-	INCBIN "gfx/overworld_sprites/30.2bpp"
+	INCBIN "gfx/overworld_sprites/gal.2bpp"
 
-OWSprite31:: ; a4142 (29:4142)
+OWWomanGfx:: ; a4142 (29:4142)
 	dw $14
-	INCBIN "gfx/overworld_sprites/31.2bpp"
+	INCBIN "gfx/overworld_sprites/woman.2bpp"
 
-OWSprite32:: ; a4284 (29:4284)
+OWGrannyGfx:: ; a4284 (29:4284)
 	dw $14
-	INCBIN "gfx/overworld_sprites/32.2bpp"
+	INCBIN "gfx/overworld_sprites/granny.2bpp"
 
 Duel0Gfx:: ; a43c6 (29:43c6)
 	dw $16
diff --git a/src/gfx/duel/anims/65.png b/src/gfx/duel/anims/glow.png
index 212a40d..212a40d 100644
--- a/src/gfx/duel/anims/65.png
+++ b/src/gfx/duel/anims/glow.png
diff --git a/src/gfx/overworld_sprites/5.png b/src/gfx/overworld_sprites/amy.png
index d46c9bb..d46c9bb 100644
--- a/src/gfx/overworld_sprites/5.png
+++ b/src/gfx/overworld_sprites/amy.png
diff --git a/src/gfx/overworld_sprites/17.png b/src/gfx/overworld_sprites/butch.png
index 2f696e6..2f696e6 100644
--- a/src/gfx/overworld_sprites/17.png
+++ b/src/gfx/overworld_sprites/butch.png
diff --git a/src/gfx/overworld_sprites/22.png b/src/gfx/overworld_sprites/chap.png
index 2d47555..2d47555 100644
--- a/src/gfx/overworld_sprites/22.png
+++ b/src/gfx/overworld_sprites/chap.png
diff --git a/src/gfx/overworld_sprites/help_desk_lady.png b/src/gfx/overworld_sprites/clerk.png
index 92bb5ef..92bb5ef 100644
--- a/src/gfx/overworld_sprites/help_desk_lady.png
+++ b/src/gfx/overworld_sprites/clerk.png
diff --git a/src/gfx/overworld_sprites/10.png b/src/gfx/overworld_sprites/courtney.png
index e63ba2b..e63ba2b 100644
--- a/src/gfx/overworld_sprites/10.png
+++ b/src/gfx/overworld_sprites/courtney.png
diff --git a/src/gfx/overworld_sprites/30.png b/src/gfx/overworld_sprites/gal.png
index ef25140..ef25140 100644
--- a/src/gfx/overworld_sprites/30.png
+++ b/src/gfx/overworld_sprites/gal.png
diff --git a/src/gfx/overworld_sprites/8.png b/src/gfx/overworld_sprites/gene.png
index 2527ae9..2527ae9 100644
--- a/src/gfx/overworld_sprites/8.png
+++ b/src/gfx/overworld_sprites/gene.png
diff --git a/src/gfx/overworld_sprites/25.png b/src/gfx/overworld_sprites/girl.png
index 1e161da..1e161da 100644
--- a/src/gfx/overworld_sprites/25.png
+++ b/src/gfx/overworld_sprites/girl.png
diff --git a/src/gfx/overworld_sprites/32.png b/src/gfx/overworld_sprites/granny.png
index 7d3fac1..7d3fac1 100644
--- a/src/gfx/overworld_sprites/32.png
+++ b/src/gfx/overworld_sprites/granny.png
diff --git a/src/gfx/overworld_sprites/20.png b/src/gfx/overworld_sprites/hood.png
index 3da8ad9..3da8ad9 100644
--- a/src/gfx/overworld_sprites/20.png
+++ b/src/gfx/overworld_sprites/hood.png
diff --git a/src/gfx/overworld_sprites/1.png b/src/gfx/overworld_sprites/imakuni.png
index b3fa35f..b3fa35f 100644
--- a/src/gfx/overworld_sprites/1.png
+++ b/src/gfx/overworld_sprites/imakuni.png
diff --git a/src/gfx/overworld_sprites/6.png b/src/gfx/overworld_sprites/isaac.png
index 2423fd1..2423fd1 100644
--- a/src/gfx/overworld_sprites/6.png
+++ b/src/gfx/overworld_sprites/isaac.png
diff --git a/src/gfx/overworld_sprites/0.png b/src/gfx/overworld_sprites/ishihara.png
index 0eceeb6..0eceeb6 100644
--- a/src/gfx/overworld_sprites/0.png
+++ b/src/gfx/overworld_sprites/ishihara.png
diff --git a/src/gfx/overworld_sprites/12.png b/src/gfx/overworld_sprites/jack.png
index b24cd69..b24cd69 100644
--- a/src/gfx/overworld_sprites/12.png
+++ b/src/gfx/overworld_sprites/jack.png
diff --git a/src/gfx/overworld_sprites/19.png b/src/gfx/overworld_sprites/joshua.png
index 437a376..437a376 100644
--- a/src/gfx/overworld_sprites/19.png
+++ b/src/gfx/overworld_sprites/joshua.png
diff --git a/src/gfx/overworld_sprites/4.png b/src/gfx/overworld_sprites/ken.png
index a12569b..a12569b 100644
--- a/src/gfx/overworld_sprites/4.png
+++ b/src/gfx/overworld_sprites/ken.png
diff --git a/src/gfx/overworld_sprites/15.png b/src/gfx/overworld_sprites/lad.png
index 67a227d..67a227d 100644
--- a/src/gfx/overworld_sprites/15.png
+++ b/src/gfx/overworld_sprites/lad.png
diff --git a/src/gfx/overworld_sprites/26.png b/src/gfx/overworld_sprites/lass1.png
index 6a5f4cd..6a5f4cd 100644
--- a/src/gfx/overworld_sprites/26.png
+++ b/src/gfx/overworld_sprites/lass1.png
diff --git a/src/gfx/overworld_sprites/27.png b/src/gfx/overworld_sprites/lass2.png
index 7b738e4..7b738e4 100644
--- a/src/gfx/overworld_sprites/27.png
+++ b/src/gfx/overworld_sprites/lass2.png
diff --git a/src/gfx/overworld_sprites/28.png b/src/gfx/overworld_sprites/lass3.png
index 0ba9e64..0ba9e64 100644
--- a/src/gfx/overworld_sprites/28.png
+++ b/src/gfx/overworld_sprites/lass3.png
diff --git a/src/gfx/overworld_sprites/23.png b/src/gfx/overworld_sprites/man.png
index 8432c39..8432c39 100644
--- a/src/gfx/overworld_sprites/23.png
+++ b/src/gfx/overworld_sprites/man.png
diff --git a/src/gfx/overworld_sprites/18.png b/src/gfx/overworld_sprites/mania.png
index 97281b6..97281b6 100644
--- a/src/gfx/overworld_sprites/18.png
+++ b/src/gfx/overworld_sprites/mania.png
diff --git a/src/gfx/overworld_sprites/7.png b/src/gfx/overworld_sprites/mitch.png
index c7f1d29..c7f1d29 100644
--- a/src/gfx/overworld_sprites/7.png
+++ b/src/gfx/overworld_sprites/mitch.png
diff --git a/src/gfx/overworld_sprites/9.png b/src/gfx/overworld_sprites/murray.png
index 69c5451..69c5451 100644
--- a/src/gfx/overworld_sprites/9.png
+++ b/src/gfx/overworld_sprites/murray.png
diff --git a/src/gfx/overworld_sprites/2.png b/src/gfx/overworld_sprites/nikki.png
index 0bda3be..0bda3be 100644
--- a/src/gfx/overworld_sprites/2.png
+++ b/src/gfx/overworld_sprites/nikki.png
diff --git a/src/gfx/overworld_sprites/24.png b/src/gfx/overworld_sprites/pappy.png
index 0d7b908..0d7b908 100644
--- a/src/gfx/overworld_sprites/24.png
+++ b/src/gfx/overworld_sprites/pappy.png
diff --git a/src/gfx/overworld_sprites/3.png b/src/gfx/overworld_sprites/rick.png
index 2fac558..2fac558 100644
--- a/src/gfx/overworld_sprites/3.png
+++ b/src/gfx/overworld_sprites/rick.png
diff --git a/src/gfx/overworld_sprites/13.png b/src/gfx/overworld_sprites/rod.png
index d55c62c..d55c62c 100644
--- a/src/gfx/overworld_sprites/13.png
+++ b/src/gfx/overworld_sprites/rod.png
diff --git a/src/gfx/overworld_sprites/16.png b/src/gfx/overworld_sprites/specs.png
index 0baa4eb..0baa4eb 100644
--- a/src/gfx/overworld_sprites/16.png
+++ b/src/gfx/overworld_sprites/specs.png
diff --git a/src/gfx/overworld_sprites/11.png b/src/gfx/overworld_sprites/steve.png
index 4a231fe..4a231fe 100644
--- a/src/gfx/overworld_sprites/11.png
+++ b/src/gfx/overworld_sprites/steve.png
diff --git a/src/gfx/overworld_sprites/29.png b/src/gfx/overworld_sprites/swimmer.png
index 5926395..5926395 100644
--- a/src/gfx/overworld_sprites/29.png
+++ b/src/gfx/overworld_sprites/swimmer.png
diff --git a/src/gfx/overworld_sprites/21.png b/src/gfx/overworld_sprites/tech.png
index 7d07d78..7d07d78 100644
--- a/src/gfx/overworld_sprites/21.png
+++ b/src/gfx/overworld_sprites/tech.png
diff --git a/src/gfx/overworld_sprites/31.png b/src/gfx/overworld_sprites/woman.png
index 1494e05..1494e05 100644
--- a/src/gfx/overworld_sprites/31.png
+++ b/src/gfx/overworld_sprites/woman.png
diff --git a/src/gfx/overworld_sprites/14.png b/src/gfx/overworld_sprites/youngster.png
index 0026093..0026093 100644
--- a/src/gfx/overworld_sprites/14.png
+++ b/src/gfx/overworld_sprites/youngster.png
diff --git a/src/sram.asm b/src/sram.asm
index f9c1a9e..6abe5d7 100644
--- a/src/sram.asm
+++ b/src/sram.asm
@@ -11,8 +11,12 @@ s0a005:: ; a005
 	ds $1
 s0a006:: ; a006
 	ds $1
-s0a007:: ; a007
+
+; store settings for animation enabled/disabled
+; 0 means enabled, 1 means disabled
+sAnimationsDisabled:: ; a007
 	ds $1
+
 s0a008:: ; a008
 	ds $1
 s0a009:: ; a009
diff --git a/src/wram.asm b/src/wram.asm
index 4670637..794ff56 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -2343,7 +2343,9 @@ wd41f:: ; d41f
 wd420:: ; d420
 	ds $1
 
-wd421:: ; d421
+; store settings for animation enabled/disabled
+; 0 means enabled, 1 means disabled
+wAnimationsDisabled:: ; d421
 	ds $1
 
 ; holds an animation to play
@@ -2359,7 +2361,7 @@ wAnimationQueue:: ; d423
 wd42a:: ; d42a
 	ds $1
 
-wd42b:: ; d42b
+wAnimFlags:: ; d42b
 	ds $1
 
 wd42c:: ; d42c