Start cleaning up.

7 files changed, 279 insertions, 255 deletions

diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
index 702e6716..c564c5de 100755
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -1,4 +1,5 @@
 SpriteAnimFrameData:
+; entries correspond to SPRITE_ANIM_FRAMESET_* constants
 	dw .Frameset_00
 	dw .Frameset_PartyMon
 	dw .Frameset_PartyMonWithMail
@@ -49,7 +50,7 @@ SpriteAnimFrameData:
 	dw .Frameset_Leaf
 	dw .Frameset_CutTree
 	dw .Frameset_EggCrack
-	dw .Frameset_EggHatch
+	dw .Frameset_EggHatch1
 	dw .Frameset_EggHatch2
 	dw .Frameset_EggHatch3
 	dw .Frameset_EggHatch4
@@ -354,7 +355,7 @@ ENDC
 	frame SPRITE_ANIM_OAMSET_EGG_CRACK, 32
 	endanim
 
-.Frameset_EggHatch:
+.Frameset_EggHatch1:
 	frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32
 	endanim
 
diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm
index fa5b0965..9bf98477 100755
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -87,54 +87,54 @@ SpriteAnimOAMData:
 	dbw $00, .OAMData_CutTree4                 ; SPRITE_ANIM_OAMSET_CUT_TREE_4
 	dbw $00, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_EGG_CRACK
 	dbw $01, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_EGG_HATCH
-	IF DEF(_GOLD)
+IF DEF(_GOLD)
 	dbw $00, .OAMData_GSIntroHoOh1             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1
 	dbw $00, .OAMData_GSIntroHoOh2             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2
 	dbw $00, .OAMData_GSIntroHoOh3             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3
 	dbw $00, .OAMData_GSIntroHoOh4             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4
 	dbw $00, .OAMData_GSIntroHoOh5             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5
-	ELIF DEF(_SILVER)
-	dbw $00, .OAMData_GSIntroLugia1             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1
-	dbw $20, .OAMData_GSIntroLugia1             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2
-	dbw $40, .OAMData_GSIntroLugia2             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3
-	dbw $60, .OAMData_GSIntroLugia2             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4
-	dbw $00, .OAMData_GSIntroLugia1             ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5
-	ENDC
+ELIF DEF(_SILVER)
+	dbw $00, .OAMData_GSIntroLugia1            ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1
+	dbw $20, .OAMData_GSIntroLugia1            ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2
+	dbw $40, .OAMData_GSIntroLugia2            ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3
+	dbw $60, .OAMData_GSIntroLugia2            ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4
+	dbw $00, .OAMData_GSIntroLugia1            ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5
+ENDC
 	dbw $04, .OAMData_Tree                     ; SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2
 
-.OAMData_1x1_Palette0
+.OAMData_1x1_Palette0:
 	db 1
 	dbsprite -1, -1,  4,  4, $00, 0
 
-.OAMData_GSIntroShellder
+.OAMData_GSIntroShellder:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, 0
 	dbsprite  0, -1,  0,  0, $01, 0
 	dbsprite -1,  0,  0,  0, $10, 0
 	dbsprite  0,  0,  0,  0, $11, 0
 
-.OAMData_GSIntroStar
+.OAMData_GSIntroStar:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, 0
 	dbsprite  0, -1,  0,  0, $00, 0 | X_FLIP
 	dbsprite -1,  0,  0,  0, $01, 0
 	dbsprite  0,  0,  0,  0, $01, 0 | X_FLIP
 
-.OAMData_TradePokeBall1
+.OAMData_TradePokeBall1:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, 0 | PRIORITY
 	dbsprite  0, -1,  0,  0, $00, 0 | X_FLIP | PRIORITY
 	dbsprite -1,  0,  0,  0, $01, 0 | PRIORITY
 	dbsprite  0,  0,  0,  0, $01, 0 | X_FLIP | PRIORITY
 
-.OAMData_8df09
+.OAMData_8df09:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, 0
 	dbsprite  0, -1,  0,  0, $00, 0 | X_FLIP
 	dbsprite -1,  0,  0,  0, $00, 0 | Y_FLIP
 	dbsprite  0,  0,  0,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_TradeTubeBulge
+.OAMData_TradeTubeBulge:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, 7
 	dbsprite  0, -1,  0,  0, $00, 7 | X_FLIP
@@ -148,7 +148,7 @@ SpriteAnimOAMData:
 	dbsprite -1,  0,  0,  0, $00, 0 | Y_FLIP | PRIORITY
 	dbsprite  0,  0,  0,  0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY
 
-.OAMData_TradePoofBubble
+.OAMData_TradePoofBubble:
 	db 16
 	dbsprite -2, -2,  0,  0, $00, 0
 	dbsprite -1, -2,  0,  0, $01, 0
@@ -167,7 +167,7 @@ SpriteAnimOAMData:
 	dbsprite  0,  1,  0,  0, $01, 0 | X_FLIP | Y_FLIP
 	dbsprite  1,  1,  0,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_GSIntroBigFireball
+.OAMData_GSIntroBigFireball:
 	db 36
 	dbsprite -3, -3,  0,  0, $00, 0
 	dbsprite -2, -3,  0,  0, $01, 0
@@ -206,7 +206,7 @@ SpriteAnimOAMData:
 	dbsprite  1,  2,  0,  0, $01, 0 | X_FLIP | Y_FLIP
 	dbsprite  2,  2,  0,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_Unused43_4A
+.OAMData_Unused43_4A:
 	db 9
 	dbsprite -2, -2,  4,  4, $00, 0
 	dbsprite -1, -2,  4,  4, $01, 0
@@ -218,7 +218,7 @@ SpriteAnimOAMData:
 	dbsprite -1,  0,  4,  4, $21, 0
 	dbsprite  0,  0,  4,  4, $22, 0
 
-.OAMData_GSIntroJigglypuffPikachu
+.OAMData_GSIntroJigglypuffPikachu:
 	db 16
 	dbsprite -2, -2,  0,  0, $00, 0
 	dbsprite -1, -2,  0,  0, $01, 0
@@ -237,7 +237,7 @@ SpriteAnimOAMData:
 	dbsprite  0,  1,  0,  0, $32, 0
 	dbsprite  1,  1,  0,  0, $33, 0
 
-.OAMData_GSIntroStarter
+.OAMData_GSIntroStarter:
 	db 25
 	dbsprite -3, -3,  4,  4, $00, 0
 	dbsprite -3, -2,  4,  4, $01, 0
@@ -304,49 +304,49 @@ SpriteAnimOAMData:
 	dbsprite  1,  2,  0,  0, $22, 0
 	dbsprite  2,  2,  0,  0, $23, 0
 
-.OAMData_RedWalk
+.OAMData_RedWalk:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, PAL_OW_RED
 	dbsprite  0, -1,  0,  0, $01, PAL_OW_RED
 	dbsprite -1,  0,  0,  0, $02, PAL_OW_RED
 	dbsprite  0,  0,  0,  0, $03, PAL_OW_RED
 
-.OAMData_MagnetTrainRed
+.OAMData_MagnetTrainRed:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, PAL_OW_RED | PRIORITY
 	dbsprite  0, -1,  0,  0, $01, PAL_OW_RED | PRIORITY
 	dbsprite -1,  0,  0,  0, $02, PAL_OW_RED | PRIORITY
 	dbsprite  0,  0,  0,  0, $03, PAL_OW_RED | PRIORITY
 
-.OAMData_PartyMonWithMail1
+.OAMData_PartyMonWithMail1:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, PAL_OW_RED
 	dbsprite  0, -1,  0,  0, $01, PAL_OW_RED
 	dbsprite -1,  0,  0,  0, $08, PAL_OW_RED
 	dbsprite  0,  0,  0,  0, $03, PAL_OW_RED
 
-.OAMData_PartyMonWithMail2
+.OAMData_PartyMonWithMail2:
 	db 4
 	dbsprite -1, -1,  0,  0, $04, PAL_OW_RED
 	dbsprite  0, -1,  0,  0, $05, PAL_OW_RED
 	dbsprite -1,  0,  0,  0, $08, PAL_OW_RED
 	dbsprite  0,  0,  0,  0, $07, PAL_OW_RED
 
-.OAMData_PartyMonWithItem1
+.OAMData_PartyMonWithItem1:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, PAL_OW_RED
 	dbsprite  0, -1,  0,  0, $01, PAL_OW_RED
 	dbsprite -1,  0,  0,  0, $09, PAL_OW_RED
 	dbsprite  0,  0,  0,  0, $03, PAL_OW_RED
 
-.OAMData_PartyMonWithItem2
+.OAMData_PartyMonWithItem2:
 	db 4
 	dbsprite -1, -1,  0,  0, $04, PAL_OW_RED
 	dbsprite  0, -1,  0,  0, $05, PAL_OW_RED
 	dbsprite -1,  0,  0,  0, $09, PAL_OW_RED
 	dbsprite  0,  0,  0,  0, $07, PAL_OW_RED
 
-.OAMData_GSIntroMagikarp
+.OAMData_GSIntroMagikarp:
 	db 6
 	dbsprite -2, -1,  4,  0, $00, 1
 	dbsprite -1, -1,  4,  0, $01, 1
@@ -355,7 +355,7 @@ SpriteAnimOAMData:
 	dbsprite -1,  0,  4,  0, $11, 1
 	dbsprite  0,  0,  4,  0, $12, 1
 
-.OAMData_8e1e9
+.OAMData_8e1e9:
 	db 10
 	db $f4, $f0, $00, $00
 	db $f4, $f8, $01, $00
@@ -368,7 +368,7 @@ SpriteAnimOAMData:
 	db $04, $f8, $09, $00
 	db $04, $00, $0a, $00
 
-.OAMData_8e212
+.OAMData_8e212:
 	db 27
 	db $e8, $e8, $00, $00
 	db $e8, $f0, $01, $00
@@ -398,7 +398,7 @@ SpriteAnimOAMData:
 	db $10, $08, $54, $80
 	db $10, $10, $55, $80
 
-.OAMData_8e27f
+.OAMData_8e27f:
 	db 27
 	db $e8, $e8, $0d, $00
 	db $e8, $f0, $0e, $00
@@ -428,7 +428,7 @@ SpriteAnimOAMData:
 	db $10, $08, $54, $80
 	db $10, $10, $55, $80
 
-.OAMData_GSIntroLapras
+.OAMData_GSIntroLapras:
 	db 29
 	dbsprite -3, -3,  0,  0, $00, 0
 	dbsprite -2, -3,  0,  0, $01, 0
@@ -460,12 +460,12 @@ SpriteAnimOAMData:
 	dbsprite  1,  2,  0,  0, $54, 0 | PRIORITY
 	dbsprite  2,  2,  0,  0, $55, 0 | PRIORITY
 
-.OAMData_GSIntroNote
+.OAMData_GSIntroNote:
 	db 2
 	dbsprite -1, -1,  4,  0, $00, 0
 	dbsprite -1,  0,  4,  0, $10, 0
 
-.OAMData_GSIntroPikachuTail
+.OAMData_GSIntroPikachuTail:
 	db 5
 	dbsprite  3, -2,  0,  0, $00, 0
 	dbsprite  4, -2,  0,  0, $01, 0
@@ -473,25 +473,25 @@ SpriteAnimOAMData:
 	dbsprite  3, -1,  0,  0, $03, 0
 	dbsprite  2,  0,  0,  0, $04, 0
 
-.OAMData_Leaf
+.OAMData_Leaf:
 	db 1
 	dbsprite -1, -1,  4,  4, $00, PAL_OW_TREE
 
-.OAMData_Tree
+.OAMData_Tree:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, PAL_OW_TREE
 	dbsprite  0, -1,  0,  0, $01, PAL_OW_TREE
 	dbsprite -1,  0,  0,  0, $02, PAL_OW_TREE
 	dbsprite  0,  0,  0,  0, $03, PAL_OW_TREE
 
-.OAMData_TextEntryCursor
+.OAMData_TextEntryCursor:
 	db 4
 	dbsprite -1, -1,  7,  7, $00, 0
 	dbsprite  0, -1,  0,  7, $00, 0 | X_FLIP
 	dbsprite -1,  0,  7,  0, $00, 0 | Y_FLIP
 	dbsprite  0,  0,  0,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_TextEntryCursorBig
+.OAMData_TextEntryCursorBig:
 	db 10
 	dbsprite  0, -1,  0,  7, $00, 0
 	dbsprite  1, -1,  0,  7, $01, 0
@@ -504,7 +504,7 @@ SpriteAnimOAMData:
 	dbsprite  3,  0,  0,  0, $01, 0 | Y_FLIP
 	dbsprite  4,  0,  0,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_GSIntroGameFreakLogo
+.OAMData_GSIntroGameFreakLogo:
 	db 15
 	dbsprite -2, -3,  4,  4, $00, 1 | OBP_NUM
 	dbsprite -1, -3,  4,  4, $01, 1 | OBP_NUM
@@ -522,7 +522,7 @@ SpriteAnimOAMData:
 	dbsprite -1,  1,  4,  4, $0d, 1 | OBP_NUM
 	dbsprite  0,  1,  4,  4, $0e, 1 | OBP_NUM
 
-.OAMData_SlotsGolem
+.OAMData_SlotsGolem:
 	db 6
 	dbsprite -2, -2,  4,  4, $00, 5 | OBP_NUM
 	dbsprite -1, -2,  4,  4, $02, 5 | OBP_NUM
@@ -531,7 +531,7 @@ SpriteAnimOAMData:
 	dbsprite -1,  0,  4,  4, $06, 5 | OBP_NUM
 	dbsprite  0,  0,  4,  4, $04, 5 | OBP_NUM | X_FLIP
 
-.OAMData_SlotsChansey1
+.OAMData_SlotsChansey1:
 	db 6
 	dbsprite -2, -2,  4,  4, $00, 6 | OBP_NUM
 	dbsprite -1, -2,  4,  4, $02, 6 | OBP_NUM
@@ -540,7 +540,7 @@ SpriteAnimOAMData:
 	dbsprite -1,  0,  4,  4, $08, 6 | OBP_NUM
 	dbsprite  0,  0,  4,  4, $0a, 6 | OBP_NUM
 
-.OAMData_SlotsChansey2
+.OAMData_SlotsChansey2:
 	db 6
 	dbsprite -2, -2,  4,  4, $00, 6 | OBP_NUM
 	dbsprite -1, -2,  4,  4, $02, 6 | OBP_NUM
@@ -549,7 +549,7 @@ SpriteAnimOAMData:
 	dbsprite -1,  0,  4,  4, $0e, 6 | OBP_NUM
 	dbsprite  0,  0,  4,  4, $10, 6 | OBP_NUM
 
-.OAMData_SlotsChansey3
+.OAMData_SlotsChansey3:
 	db 6
 	dbsprite -2, -2,  4,  4, $00, 6 | OBP_NUM
 	dbsprite -1, -2,  4,  4, $02, 6 | OBP_NUM
@@ -558,7 +558,7 @@ SpriteAnimOAMData:
 	dbsprite -1,  0,  4,  4, $14, 6 | OBP_NUM
 	dbsprite  0,  0,  4,  4, $16, 6 | OBP_NUM
 
-.OAMData_SlotsChansey4
+.OAMData_SlotsChansey4:
 	db 6
 	dbsprite -2, -2,  4,  4, $00, 6 | OBP_NUM
 	dbsprite -1, -2,  4,  4, $02, 6 | OBP_NUM
@@ -567,7 +567,7 @@ SpriteAnimOAMData:
 	dbsprite -1,  0,  4,  4, $1a, 6 | OBP_NUM
 	dbsprite  0,  0,  4,  4, $1c, 6 | OBP_NUM
 
-.OAMData_SlotsChansey5
+.OAMData_SlotsChansey5:
 	db 6
 	dbsprite -2, -2,  4,  4, $1e, 6 | OBP_NUM
 	dbsprite -1, -2,  4,  4, $20, 6 | OBP_NUM
@@ -576,13 +576,13 @@ SpriteAnimOAMData:
 	dbsprite -1,  0,  4,  4, $26, 6 | OBP_NUM
 	dbsprite  0,  0,  4,  4, $28, 6 | OBP_NUM
 
-.OAMData_RadioTuningKnob
+.OAMData_RadioTuningKnob:
 	db 3
 	dbsprite -1, -2,  4,  4, $00, 0 | OBP_NUM
 	dbsprite -1, -1,  4,  4, $00, 0 | OBP_NUM
 	dbsprite -1,  0,  4,  4, $00, 0 | OBP_NUM
 
-.OAMData_Unused4B
+.OAMData_Unused4B:
 	db 6
 	dbsprite  0,  0,  0,  0, $00, 0
 	dbsprite  1,  0,  0,  0, $01, 0
@@ -591,28 +591,28 @@ SpriteAnimOAMData:
 	dbsprite  4,  0,  0,  0, $02, 0
 	dbsprite  5,  0,  0,  0, $03, 0
 
-.OAMData_Unused4C
+.OAMData_Unused4C:
 	db 4
 	dbsprite  0,  0,  0,  0, $00, 0
 	dbsprite  1,  0,  0,  0, $01, 0
 	dbsprite  2,  0,  0,  0, $02, 0
 	dbsprite  3,  0,  0,  0, $03, 0
 
-.OAMData_CutTree2
+.OAMData_CutTree2:
 	db 4
 	dbsprite -2, -1,  6,  0, $00, PAL_OW_TREE
 	dbsprite  0, -1,  2,  0, $01, PAL_OW_TREE
 	dbsprite -2,  0,  6,  0, $02, PAL_OW_TREE
 	dbsprite  0,  0,  2,  0, $03, PAL_OW_TREE
 
-.OAMData_CutTree3
+.OAMData_CutTree3:
 	db 4
 	dbsprite -2, -1,  4,  0, $00, PAL_OW_TREE
 	dbsprite  0, -1,  4,  0, $01, PAL_OW_TREE
 	dbsprite -2,  0,  4,  0, $02, PAL_OW_TREE
 	dbsprite  0,  0,  4,  0, $03, PAL_OW_TREE
 
-.OAMData_CutTree4
+.OAMData_CutTree4:
 	db 4
 	dbsprite -2, -1,  0,  0, $00, PAL_OW_TREE
 	dbsprite  1, -1,  0,  0, $01, PAL_OW_TREE
@@ -620,7 +620,7 @@ SpriteAnimOAMData:
 	dbsprite  1,  0,  0,  0, $03, PAL_OW_TREE
 
 IF DEF(_GOLD)
-.OAMData_GSIntroHoOh1
+.OAMData_GSIntroHoOh1:
 	db 19
 	dbsprite -4, -1,  0,  0, $00, 0
 	dbsprite -3, -2,  0,  0, $02, 0
@@ -642,7 +642,7 @@ IF DEF(_GOLD)
 	dbsprite  3, -2,  0,  0, $22, 0
 	dbsprite  3,  0,  0,  0, $24, 0
 
-.OAMData_GSIntroHoOh2
+.OAMData_GSIntroHoOh2:
 	db 16
 	dbsprite -4, -1,  0,  0, $00, 0
 	dbsprite -3, -2,  0,  0, $02, 0
@@ -661,7 +661,7 @@ IF DEF(_GOLD)
 	dbsprite  3, -2,  0,  0, $22, 0
 	dbsprite  3,  0,  0,  0, $24, 0
 
-.OAMData_GSIntroHoOh3
+.OAMData_GSIntroHoOh3:
 	db 15
 	dbsprite -4, -1,  0,  0, $00, 0
 	dbsprite -3, -2,  0,  0, $02, 0
@@ -679,7 +679,7 @@ IF DEF(_GOLD)
 	dbsprite  3, -2,  0,  0, $22, 0
 	dbsprite  3,  0,  0,  0, $24, 0
 
-.OAMData_GSIntroHoOh4
+.OAMData_GSIntroHoOh4:
 	db 17
 	dbsprite -4, -1,  0,  0, $00, 0
 	dbsprite -3, -2,  0,  0, $02, 0
@@ -699,7 +699,7 @@ IF DEF(_GOLD)
 	dbsprite  3, -2,  0,  0, $22, 0
 	dbsprite  3,  0,  0,  0, $24, 0
 
-.OAMData_GSIntroHoOh5
+.OAMData_GSIntroHoOh5:
 	db 17
 	dbsprite -4, -1,  0,  0, $00, 0
 	dbsprite -3, -2,  0,  0, $02, 0
@@ -719,7 +719,7 @@ IF DEF(_GOLD)
 	dbsprite  3, -2,  0,  0, $22, 0
 	dbsprite  3,  0,  0,  0, $24, 0
 
-.OAMData_GSTitleTrail
+.OAMData_GSTitleTrail:
 	db 1
 	dbsprite -1, -1,  4,  4, $00, 1 | OBP_NUM
 
@@ -822,7 +822,7 @@ ELIF DEF(_SILVER)
 	db $f8, $18, $74, $00
 	db $f8, $20, $76, $00
 
-.OAMData_GSTitleTrail
+.OAMData_GSTitleTrail:
 	db 2
 	db $f8, $f8, $00, $00
 	db $f8, $00, $02, $00
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm
index 34a5ec4e..4de4d347 100755
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -25,9 +25,8 @@ DoBattleTransition:
 
 .loop
 	ld a, [wJumptableIndex]
-	bit 7, a
+	bit 7, a ; BATTLETRANSITION_END?
 	jr nz, .done
-
 	call BattleTransitionJumptable
 	call DelayFrame
 	jr .loop
@@ -74,7 +73,7 @@ DoBattleTransition:
 	ret
 
 ConvertTrainerBattlePokeballTilesTo2bpp:
-	ld hl, wc700
+	ld hl, wDecompressScratch
 	ld bc, $28 tiles
 .loop
 	ld [hl], -1
@@ -84,7 +83,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp:
 	or b
 	jr nz, .loop
 
-	ld de, wc700
+	ld de, wDecompressScratch
 	ld hl, vBGMap2
 	ld b, BANK(@)
 	ld c, $28
@@ -101,16 +100,7 @@ TrainerBattlePokeballTiles:
 INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
 
 BattleTransitionJumptable:
-	ld a, [wJumptableIndex]
-	ld e, a
-	ld d, 0
-	ld hl, .Jumptable
-	add hl, de
-	add hl, de
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	jp hl
+	jumptable .Jumptable, wJumptableIndex
 
 .Jumptable
 	dw StartTrainerBattle_DetermineWhichAnimation ; 00
@@ -604,12 +594,10 @@ StartTrainerBattle_LoadPokeBallGraphics:
 	ld de, wBGPals2 palette PAL_BG_TEXT
 	ld bc, 1 palettes
 	call CopyBytes
-
 	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	ld a, %00000111
 	call ByteFill
-
 	ld a, 1
 	ldh [hCGBPalUpdate], a
 	call DelayFrame
@@ -689,6 +677,7 @@ StartTrainerBattle_DrawSineWave:
 StartTrainerBattle_ZoomToBlack:
 	farcall Function55a1
 	ld de, .boxes
+
 .loop
 	ld a, [de]
 	cp -1
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm
index 16c3235c..178f05d3 100755
--- a/engine/gfx/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
@@ -54,9 +54,9 @@ DoAnimFrame:
 	dw .FlyFrom
 	dw .FlyLeaf
 	dw .FlyTo
-	dw .Function8d885
+	dw .GSIntroHoOhLugia
 
-.Null
+.Null:
 	ret
 
 .PartyMon
@@ -137,36 +137,36 @@ DoAnimFrame:
 	ld [hl], 8 * 3
 	ret
 
-.Function8d528:
-	ld hl, $0d
+.Function8d528
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
 	cp $40
-	jr nc, .asm_554a
+	jr nc, .asm_8d54a
 
-	ld hl, $07
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	dec [hl]
-	ld hl, $0c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	add $02
 	ld [hl], a
 	ld d, $08
 	call .Sprites_Sine
-	ld hl, $0006
+	ld hl, SPRITEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
 	ret
 
-.asm_554a
+.asm_8d54a
 	call DeinitializeSprite
 	ret
 
-.Function8d54e:
+.Function8d54e
 	ld a, [wGlobalAnimYOffset]
-	ld hl, $0005
+	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	add [hl]
 	cp $b0
@@ -178,58 +178,61 @@ DoAnimFrame:
 	call .AnonymousJumptable
 	jp hl
 
-; anonymous jumptable
+; Anonymous dw (see .AnonymousJumptable)
 	dw .Function8d565
 	dw .Function8d576
 
 .Function8d565
 	call .IncrementJumptableIndex
 
-	ld hl, $0000
+	ld hl, SPRITEANIMSTRUCT_INDEX
 	add hl, bc
 	ld a, [hl]
+
 	and $03
 	swap a
-	ld hl, $000c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld [hl], a
-.Function8d576:
+
+.Function8d576
 	ld de, $0201
 	ldh a, [hSGB]
 	and a
-	jr z, .asm_5581
+	jr z, .asm_8d581
 	ld de, $0402
-.asm_5581:
-	ld hl, $06
+
+.asm_8d581
+	ld hl, SPRITEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld a, [hl]
 	cp $f0
-	jr nc, .asm_559e
+	jr nc, .asm_8d59e
 
 	add d
 	ld [hl], a
-	ld hl, $0c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	add e
 	ld [hl], a
 	ld d, $08
 	call .Sprites_Sine
-	ld hl, $07
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
 	ret
 
-.asm_559e
+.asm_8d59e
 	call DeinitializeSprite
 	ret
 
 .Function8d5a2:
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $b0
-	jr nc, .asm_55bb
+	jr nc, .asm_8d5bb
 
 	inc [hl]
 	ld hl, SPRITEANIMSTRUCT_0C
@@ -239,12 +242,12 @@ DoAnimFrame:
 	and $1
 	ret z
 
-	ld hl, $0005
+	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	inc [hl]
 	ret
 
-.asm_55bb:
+.asm_8d5bb:
 	call DeinitializeSprite
 	ret
 
@@ -258,75 +261,75 @@ DoAnimFrame:
 	dw .Function8d5f3
 
 .Function8d5c9:
-	call .Call_023_560b
+	call .Function8d60b
 	ret z
 
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $58
-	jr c, .asm_55d8
+	jr c, .asm_8d5d8
 
 	dec [hl]
 	ret
 
 
-.asm_55d8:
+.asm_8d5d8:
 	call .IncrementJumptableIndex
-	ld hl, $0d
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld [hl], $b0
 	ret
 
 .Function8d5e2:
-	call .Call_023_560b
-	ld hl, $0d
+	call .Function8d60b
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr z, .asm_55ef
+	jr z, .asm_8d5ef
 
 	dec [hl]
 	ret
 
-.asm_55ef:
+.asm_8d5ef
 	call .IncrementJumptableIndex
 	ret
 
-.Function8d5f3:
-	call .Call_023_560b
+.Function8d5f3
+	call .Function8d60b
 	ret z
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $d0
-	jr z, .asm_5602
+	jr z, .asm_8d602
 	dec [hl]
 	ret
 
-.asm_5602:
+.asm_8d602
 	call DeinitializeSprite
 	ld a, $1
 	ld [wBattleMonLevel], a
 	ret
 
-.Call_023_560b:
-	ld hl, $0c
+.Function8d60b
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
 	ld d, 4
 	call .Sprites_Sine
-	ld hl, $07
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, $0c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	and $1
 	ret
 
-.Function8d623:
+.Function8d623
 	call .AnonymousJumptable
 	jp hl
 
@@ -342,36 +345,41 @@ DoAnimFrame:
 	and $1
 	swap a
 	sla a
-	ld hl, $0c
+
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld [hl], a
 .Function8d63e:
-	ld hl, $06
+	ld hl, SPRITEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld a, [hl]
 	cp $80
-	jr nc, .asm_5667
+	jr nc, .asm_8d667
 	inc [hl]
 	ld d, $04
-	ld hl, $000c
+
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	add $02
 	ld [hl], a
 	call .Sprites_Sine
-	ld hl, $07
+
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, $0c
+
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	and $2
 	ret z
-	ld hl, $05
+
+	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	dec [hl]
 	ret
 
-.asm_5667:
+.asm_8d667:
 	call DeinitializeSprite
 	ret
 
@@ -388,19 +396,19 @@ DoAnimFrame:
 	and a
 	ret z
 	call .IncrementJumptableIndex
-	ld a, $0c
+	ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF_2
 	call _ReinitSpriteAnimFrame
 .Function8d680:
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $d0
-	jr z, .asm_568c
+	jr z, .asm_8d68c
 	dec [hl]
 	dec [hl]
 	ret
 
-.asm_568c:
+.asm_8d68c:
 	call DeinitializeSprite
 	ret
 
@@ -415,77 +423,77 @@ DoAnimFrame:
 	dw .Function8d6f2
 
 .Function8d69c:
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $80
-	jr z, .asm_56a7
+	jr z, .asm_8d6a7
 	dec [hl]
 	ret
 
-.asm_56a7:
+.asm_8d6a7:
 	call .IncrementJumptableIndex
-	ld hl, $0d
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld [hl], $30
-	ld a, $0e
+	ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_2
 	call _ReinitSpriteAnimFrame
 	ret
 
 .Function8d6b6:
-	ld hl, $0d
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr z, .asm_56c0
+	jr z, .asm_8d6c0
 	dec [hl]
 	ret
 
-.asm_56c0:
+.asm_8d6c0:
 	call .IncrementJumptableIndex
-	ld a, $0f
+	ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_3
 	call _ReinitSpriteAnimFrame
 	ret
 
 .Function8d6c9:
-	ld hl, $0c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	add $04
 	ld [hl], a
 	ld d, $04
 	call .Sprites_Sine
-	ld hl, $07
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $50
-	jr z, .asm_56e9
+	jr z, .asm_8d6e9
 	dec [hl]
 	dec [hl]
 	dec [hl]
 	dec [hl]
 	ret
 
-.asm_56e9:
+.asm_8d6e9:
 	ld a, 1
 	ld [wBattleMonLevel], a
 	call .IncrementJumptableIndex
 	ret
 
 .Function8d6f2:
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $d0
-	jr z, .asm_56fe
+	jr z, .asm_8d6fe
 	dec [hl]
 	dec [hl]
 	ret
 
-.asm_56fe:
+.asm_8d6fe:
 	call DeinitializeSprite
 	ret
 
@@ -499,56 +507,59 @@ DoAnimFrame:
 	dw .Function8d73c
 
 .Function8d70c:
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $80
-	jr z, .asm_5717
+	jr z, .asm_8d717
 	dec [hl]
 	ret
 
-.asm_5717:
+.asm_8d717:
 	call .IncrementJumptableIndex
-	ld hl, $0d
+
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld [hl], $30
-	ld a, $11
+	ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL_2
 	call _ReinitSpriteAnimFrame
 	ret
 
 .Function8d726:
-	ld hl, $0d
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr z, .asm_5738
+	jr z, .asm_8d738
 	dec [hl]
 	cp $20
 	ret nz
-	ld a, $10
+	ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL
 	call _ReinitSpriteAnimFrame
 	ret
 
-.asm_5738:
+.asm_8d738:
 	call .IncrementJumptableIndex
 	ret
 
 .Function8d73c:
-	ld hl, $0c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	add $04
 	ld [hl], a
 	ld d, $04
 	call .Sprites_Sine
-	ld hl, $07
+
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, $04
+
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $d0
-	jr z, .asm_5761
+	jr z, .asm_8d761
 	dec [hl]
 	dec [hl]
 	ld a, [wBattleMonLevel]
@@ -558,7 +569,7 @@ DoAnimFrame:
 	dec [hl]
 	ret
 
-.asm_5761:
+.asm_8d761:
 	call DeinitializeSprite
 	ret
 
@@ -582,37 +593,41 @@ DoAnimFrame:
 	and $3
 	swap a
 	add e
-	ld hl, $0c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld [hl], a
 	ret
 
 .Function8d786:
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	dec [hl]
 	dec [hl]
 	dec [hl]
 	dec [hl]
-	ld hl, $0d
+
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
 	ld d, a
 	add $8
 	ld [hl], a
-	ld hl, $0c
+
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	push af
 	push de
 	call .Sprites_Sine
-	ld hl, $07
+
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
 	pop de
 	pop af
 	call .Sprites_Cosine
-	ld hl, $06
+
+	ld hl, SPRITEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
 	ret
@@ -627,16 +642,16 @@ DoAnimFrame:
 
 .Function8d7b9:
 	call .IncrementJumptableIndex
-	ld hl, $0c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld [hl], $30
-	ld hl, $0d
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld [hl], $30
 	ret
 
 .Function8d7c9:
-	ld hl, $0c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	cp $3c
@@ -646,17 +661,20 @@ DoAnimFrame:
 	inc [hl]
 	ld d, $90
 	call .Sprites_Sine
-	ld hl, $07
+
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, $0d
+
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
 	inc [hl]
 	ld d, $90
 	call .Sprites_Cosine
-	ld hl, $06
+
+	ld hl, SPRITEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
 	ret
@@ -671,16 +689,16 @@ DoAnimFrame:
 
 .Function8d7f7:
 	call .IncrementJumptableIndex
-	ld hl, $0c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld [hl], $30
-	ld hl, $0d
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld [hl], $10
 	ret
 
 .Function8d807:
-	ld hl, $0c
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	cp $3c
@@ -689,17 +707,17 @@ DoAnimFrame:
 	inc [hl]
 	ld d, $90
 	call .Sprites_Sine
-	ld hl, $07
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	ld hl, $0d
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
 	inc [hl]
 	ld d, $90
 	call .Sprites_Cosine
-	ld hl, $06
+	ld hl, SPRITEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld [hl], a
 	ret
@@ -713,53 +731,63 @@ IF DEF(_GOLD)
 	dw .Function8d835
 	dw .Function8d84c
 
-.Function8d835:
+.Function8d835
 	call .IncrementJumptableIndex
-	ld hl, 0
+
+	ld hl, SPRITEANIMSTRUCT_INDEX
 	add hl, bc
 	ld a, [hl]
-	ld hl, $0d
+
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	and $3
 	ld [hl], a
 	inc [hl]
 	swap a
-	ld hl, $0c
+
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld [hl], a
-.Function8d84c:
-	ld hl, $04
+
+.Function8d84c
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $a4
-	jr nc, .asm_5881
-	ld hl, $0d
+	jr nc, .asm_8d881
+
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	add $4
-	ld hl, $04
+
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld [hl], a
-	ld hl, $05
+
+	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	inc [hl]
-	ld hl, $0d
+
+	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
 	sla a
 	sla a
 	ld d, 2
-	ld hl, $0c
+
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	add $3
 	ld [hl], a
 	call .Sprites_Sine
-	ld hl, $07
+
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
 	ret
 
-.asm_5881:
+.asm_8d881:
 	call DeinitializeSprite
 	ret
 
@@ -774,7 +802,8 @@ ELIF DEF(_SILVER)
 	swap a
 	add $3
 	ld d, a
-	ld hl, $0c
+
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [wIntroSceneTimer]
 	and $30
@@ -783,26 +812,27 @@ ELIF DEF(_SILVER)
 	add [hl]
 	ld [hl], a
 	call .Sprites_Sine
-	ld hl, $07
+
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
 .Function8d856:
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
 	cp $a4
-	jr nc, .asm_5863
+	jr nc, .asm_8d863
 	add $4
 	ld [hl], a
 	ret
 
-.asm_5863
+.asm_8d863
 	call DeinitializeSprite
 	ret
 ENDC
 
-.Function8d885:
-	ld hl, $0c
+.GSIntroHoOhLugia:
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 IF DEF(_GOLD)
@@ -815,16 +845,15 @@ ELIF DEF(_SILVER)
 	ld d, 8
 ENDC
 	call .Sprites_Sine
-	ld hl, $07
+
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
 	ret
 
 .Function8d897:
 	push bc
-	ld a, $38
-	ld hl, $4000
-	rst $08
+	farcall ret_e0000
 	pop bc
 	ld hl, wHallOfFamePokemonListMon1DVs
 	ld a, [hl]
@@ -840,15 +869,13 @@ ENDC
 	ret
 
 .Data_8d8b4
-	db $17
-	db $18
-	db $17
-	db $19
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_4
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_5
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_4
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_6
 
 .Function8d8b8:
-	ld a, $38
-	ld hl, $4000
-	rst $08
+	farcall ret_e0000
 	ret
 
 .Function8d8bf:
@@ -860,9 +887,9 @@ ENDC
 	dw .Function8d8d9
 
 .Function8d8c7:
-	call .Call_023_58e1
+	call .Function8d8e1
 	ld a, [$c717]
-	ld hl, $04
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	add [hl]
 	ld [hl], a
@@ -876,8 +903,8 @@ ENDC
 	dec [hl]
 	ret
 
-.Call_023_58e1:
-	ld hl, $0c
+.Function8d8e1:
+	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
@@ -888,12 +915,12 @@ ENDC
 	ld hl, .Data_8d8f9
 	add hl, de
 	ld a, [hl]
-	ld hl, $07
+	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
 	ret
 
-.Data_8d8f9: ; 8d8f9
+.Data_8d8f9:
 	db $04
 	db $07
 	db $09
@@ -913,7 +940,8 @@ ENDC
 
 .Function8d909:
 	ld a, [$c717]
-	ld hl, $04
+
+	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	add [hl]
 	ld [hl], a
@@ -923,11 +951,11 @@ ENDC
 	ld [$c717], a
 	ret
 
-.NamingScreenCursor:
+.NamingScreenCursor
 	callfar NamingScreen_AnimateCursor
 	ret
 
-.MailCursor:
+.MailCursor
 	callfar ComposeMail_AnimateCursor
 	ret
 
@@ -935,22 +963,22 @@ ENDC
 	callfar GFPresents_UpdateLogoPal
 	ret
 
-.GSIntroStar:
+.GSIntroStar
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr z, .asm_5968
+	jr z, .asm_8d968
 	dec [hl]
 	dec [hl]
 	ld d, a
 	and $1f
-	jr nz, .asm_5943
+	jr nz, .asm_8d943
 
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	dec [hl]
-.asm_5943
+.asm_8d943
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld a, [hl]
@@ -979,18 +1007,18 @@ ENDC
 	ld [hl], a
 	ret
 
-.asm_5968
+.asm_8d968
 	ld a, 1
 	ld [wce64], a
 	call DeinitializeSprite
 	ret
 
-.GSIntroSparkle:
+.GSIntroSparkle
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hli]
 	or [hl]
-	jr z, .asm_59cc
+	jr z, .asm_8d9cc
 
 	ld hl, SPRITEANIMSTRUCT_0F
 	add hl, bc
@@ -1058,7 +1086,7 @@ ENDC
 	ld [hl], a
 	ret
 
-.asm_59cc
+.asm_8d9cc
 	call DeinitializeSprite
 	ret
 
@@ -1073,7 +1101,7 @@ ENDC
 	cp 2
 	ret nz
 	ld [hl], 3
-	ld a, $21
+	ld a, SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2
 	call _ReinitSpriteAnimFrame
 	ret
 
@@ -1110,20 +1138,16 @@ ENDC
 	ld [hl], a
 	ret
 
-.UnusedCursor:
-	ld hl, $4908
-	ld a, $38
-	rst $08
+.UnusedCursor
+	callfar ret_e0908
 	ret
 
-.PokegearArrow:
+.PokegearArrow
 	callfar AnimatePokegearModeIndicatorArrow
 	ret
 
-.DummyGameCursor:
-	ld hl, $69ae
-	ld a, $38
-	rst $08
+.DummyGameCursor
+	callfar DummyGame_InterpretJoypad_AnimateCursor
 	ret
 
 .TradePokeBall
@@ -1139,7 +1163,7 @@ ENDC
 	dw .TradePokeBall_five
 
 .TradePokeBall_zero
-	ld a, $26
+	ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WOBBLE
 	call _ReinitSpriteAnimFrame
 
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
@@ -1156,11 +1180,11 @@ ENDC
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr z, .asm_5a5d
+	jr z, .asm_8da5d
 	dec [hl]
 	ret
 
-.asm_5a5d
+.asm_8da5d
 	call .IncrementJumptableIndex
 
 	ld hl, SPRITEANIMSTRUCT_0C
@@ -1172,7 +1196,7 @@ ENDC
 	add hl, bc
 	ld a, [hl]
 	cp $30
-	jr c, .asm_5a7b
+	jr c, .asm_8da7b
 	dec [hl]
 	ld d, $28
 	call .Sprites_Sine
@@ -1182,7 +1206,7 @@ ENDC
 	ld [hl], a
 	ret
 
-.asm_5a7b
+.asm_8da7b
 	ld de, SFX_GOT_SAFARI_BALLS
 	call PlaySFX
 	jr .TradePokeBall_five
@@ -1206,7 +1230,7 @@ ENDC
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr z, .asm_5aca
+	jr z, .asm_8daca
 	ld d, a
 
 	ld hl, SPRITEANIMSTRUCT_0C
@@ -1238,7 +1262,7 @@ ENDC
 	call PlaySFX
 	ret
 
-.asm_5aca
+.asm_8daca
 	xor a
 
 	ld hl, SPRITEANIMSTRUCT_YOFFSET
@@ -1251,7 +1275,7 @@ ENDC
 	call DeinitializeSprite
 	ret
 
-.TradeTubeBulge:
+.TradeTubeBulge
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1268,7 +1292,7 @@ ENDC
 	call DeinitializeSprite
 	ret
 
-.TrademonInTube:
+.TrademonInTube
 	callfar TradeAnim_AnimateTrademonInTube
 	ret
 
@@ -1313,7 +1337,7 @@ ENDC
 	callfar AnimateTuningKnob
 	ret
 
-.CutLeaves:
+.CutLeaves
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld e, [hl]
@@ -1437,10 +1461,10 @@ ENDC
 	ld a, [hl]
 	ld d, a
 	and a
-	jr z, .asm_5bce
+	jr z, .asm_8dbce
 	sub 2
 	ld [hl], a
-.asm_5bce
+.asm_8dbce
 	ld hl, SPRITEANIMSTRUCT_0E
 	add hl, bc
 	ld a, [hl]
diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm
index ef352606..824ceac4 100755
--- a/engine/gfx/sprites.asm
+++ b/engine/gfx/sprites.asm
@@ -415,9 +415,9 @@ GetSpriteAnimFrame:
 	inc [hl]
 	call .GetPointer ; load pointer from SpriteAnimFrameData
 	ld a, [hli]
-	cp $fe
+	cp dorestart_command
 	jr z, .restart
-	cp $ff
+	cp endanim_command
 	jr z, .repeat_last
 
 	push af
diff --git a/main.asm b/main.asm
index ece4cd9b..4a90c13c 100644
--- a/main.asm
+++ b/main.asm
@@ -332,7 +332,9 @@ INCBIN "gfx/font/font_inversed.1bpp"
 
 SECTION "bank38", ROMX
 
+ret_e0000:
 	ret
+; unused
 	ret
 _Diploma::
 	dr $e0002, $e0009
@@ -341,7 +343,9 @@ PlaceDiplomaOnScreen::
 PrintDiplomaPage2::
 	dr $e00ae, $e081b
 RotateUnownFrontpic::
-	dr $e081b, $e0909
+	dr $e081b, $e0908
+ret_e0908::
+	ret
 _CardFlip::
 	dr $e0909, $e199d
 
@@ -349,7 +353,9 @@ _UnownPuzzle::
 	dr $e199d, $e2668
 
 _DummyGame::
-	dr $e2668, $e2b9e
+	dr $e2668, $e29ae
+DummyGame_InterpretJoypad_AnimateCursor::
+	dr $e29ae, $e2b9e
 _DepositPKMN::
 	dr $e2b9e, $e2d71
 _WithdrawPKMN::
diff --git a/wram.asm b/wram.asm
index cb3ed62d..ea8e950e 100644
--- a/wram.asm
+++ b/wram.asm
@@ -419,6 +419,10 @@ wOverworldMapBlocks:: ds 1300 ; c700
 wOverworldMapBlocksEnd::
 
 NEXTU ; c700
+; decompress buffer in wram
+wDecompressScratch:: ds 40 tiles
+
+NEXTU ; c700
 ; GB Printer screen RAM
 wGameboyPrinterRAM::
 wGameboyPrinterScreen:: ds SCREEN_HEIGHT * SCREEN_WIDTH ; c700