Fill in sprite animation index constants, other minor cleanups.

7 files changed, 66 insertions, 39 deletions

diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm
index 1df8c368..79d1155c 100644
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -20,27 +20,54 @@ SPRITEANIMSTRUCT_LENGTH EQU const_value
 NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
 
 ; SpriteAnimSeqData indexes (see data/sprite_anims/sequences.asm)
-SPRITE_ANIM_INDEX_PARTY_MON EQU $00
-SPRITE_ANIM_INDEX_GS_TITLE_TRAIL EQU $0f
-SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR EQU $14
-SPRITE_ANIM_INDEX_GAMEFREAK_LOGO EQU $15
-SPRITE_ANIM_INDEX_GS_INTRO_STAR EQU $16
-SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE EQU $17
-SPRITE_ANIM_INDEX_SLOTS_GOLEM EQU $18
-SPRITE_ANIM_INDEX_SLOTS_CHANSEY EQU $19
-SPRITE_ANIM_INDEX_SLOTS_EGG EQU $1a
-SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR EQU $1b
-SPRITE_ANIM_INDEX_RED_WALK EQU $1c
-SPRITE_ANIM_INDEX_POKEGEAR_ARROW EQU $1f
-SPRITE_ANIM_INDEX_TRADE_POKE_BALL EQU $20
-SPRITE_ANIM_INDEX_TRADE_POOF EQU $21
-SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE EQU $22
-SPRITE_ANIM_INDEX_TRADEMON_ICON EQU $23
-SPRITE_ANIM_INDEX_TRADEMON_BUBBLE EQU $24
-SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB EQU $26
-SPRITE_ANIM_INDEX_EGG_CRACK EQU $2b
-SPRITE_ANIM_INDEX_GS_INTRO_HO_OH EQU $2c
-SPRITE_ANIM_INDEX_EGG_HATCH EQU $2e
+	const_def
+	const SPRITE_ANIM_INDEX_PARTY_MON               ; 00
+	const SPRITE_ANIM_INDEX_01                      ; 01
+	const SPRITE_ANIM_INDEX_02                      ; 02
+	const SPRITE_ANIM_INDEX_03                      ; 03
+	const SPRITE_ANIM_INDEX_04                      ; 04
+	const SPRITE_ANIM_INDEX_05                      ; 05
+	const SPRITE_ANIM_INDEX_06                      ; 06
+	const SPRITE_ANIM_INDEX_07                      ; 07
+	const SPRITE_ANIM_INDEX_08                      ; 08
+	const SPRITE_ANIM_INDEX_09                      ; 09
+	const SPRITE_ANIM_INDEX_0A                      ; 0a
+	const SPRITE_ANIM_INDEX_0B                      ; 0b
+	const SPRITE_ANIM_INDEX_0C                      ; 0c
+	const SPRITE_ANIM_INDEX_0D                      ; 0d
+	const SPRITE_ANIM_INDEX_0E                      ; 0e
+	const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL          ; 0f
+	const SPRITE_ANIM_INDEX_UNUSED_10               ; 10
+	const SPRITE_ANIM_INDEX_UNUSED_11               ; 11
+	const SPRITE_ANIM_INDEX_UNUSED_12               ; 12
+	const SPRITE_ANIM_INDEX_UNUSED_13               ; 13
+	const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR    ; 14
+	const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO          ; 15
+	const SPRITE_ANIM_INDEX_GS_INTRO_STAR           ; 16
+	const SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE        ; 17
+	const SPRITE_ANIM_INDEX_SLOTS_GOLEM             ; 18
+	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY           ; 19
+	const SPRITE_ANIM_INDEX_SLOTS_EGG               ; 1a
+	const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR     ; 1b
+	const SPRITE_ANIM_INDEX_RED_WALK                ; 1c
+	const SPRITE_ANIM_INDEX_UNUSED_CURSOR           ; 1d
+	const SPRITE_ANIM_INDEX_DUMMY_GAME              ; 1e
+	const SPRITE_ANIM_INDEX_POKEGEAR_ARROW          ; 1f
+	const SPRITE_ANIM_INDEX_TRADE_POKE_BALL         ; 20
+	const SPRITE_ANIM_INDEX_TRADE_POOF              ; 21
+	const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE        ; 22
+	const SPRITE_ANIM_INDEX_TRADEMON_ICON           ; 23
+	const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE         ; 24
+	const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ; 25
+	const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB       ; 26
+	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED        ; 27
+	const SPRITE_ANIM_INDEX_LEAF                    ; 28
+	const SPRITE_ANIM_INDEX_CUT_TREE                ; 29
+	const SPRITE_ANIM_INDEX_FLY_LEAF                ; 2a
+	const SPRITE_ANIM_INDEX_EGG_CRACK               ; 2b
+	const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH          ; 2c
+	const SPRITE_ANIM_INDEX_HEADBUTT                ; 2d
+	const SPRITE_ANIM_INDEX_EGG_HATCH               ; 2e
 
 ; DoAnimFrame.Jumptable indexes (see engine/gfx/sprite_anims.asm)
 SPRITE_ANIM_SEQ_NULL EQU $00
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 7659c42d..7e7750a9 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -484,7 +484,7 @@ ret_96e71:
 
 GiveItemScript:
 	callasm ret_96e71
-	writetext ReceivedItemText
+	writetext .ReceivedItemText
 	iffalse .Full
 	waitsfx
 	specialsound
@@ -497,7 +497,7 @@ GiveItemScript:
 	pocketisfull
 	end
 
-ReceivedItemText:
+.ReceivedItemText:
 	text_far _ReceivedItemText
 	text_end
 
diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm
index cd7ad782..5c6d68b0 100755
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -836,7 +836,7 @@ EvolutionAnimation:
 .GenerateBallOfLight:
 	push de
 	depixel 9, 11
-	ld a, $25
+	ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
diff --git a/layout.link b/layout.link
index d9a33677..7487d0b1 100644
--- a/layout.link
+++ b/layout.link
@@ -120,7 +120,7 @@ ROMX $2b
 ROMX $2e
 	"Pics 14"
 	org $6300
-	"bank2e_2"
+	"bank2E_2"
 ROMX $30
 	"Sprites 1"
 ROMX $31
@@ -153,7 +153,7 @@ ROMX $3c
 ROMX $3d
 	"Songs 4"
 ROMX $3e
-	"bank3e"
+	"bank3E"
 ROMX $3f
 	"bank3F"
 ROMX $40
diff --git a/main.asm b/main.asm
index 66eca040..05346139 100644
--- a/main.asm
+++ b/main.asm
@@ -194,7 +194,6 @@ INCLUDE "engine/pokemon/mail.asm"
 
 SECTION "bank14", ROMX
 
-
 INCLUDE "engine/pokemon/party_menu.asm"
 INCLUDE "engine/events/fishing_gfx.asm"
 INCLUDE "engine/events/poisonstep.asm"
@@ -373,7 +372,7 @@ GSIntroTilemap::
 ENDC
 
 
-SECTION "bank2e_2", ROMX
+SECTION "bank2E_2", ROMX
 
 INCLUDE "engine/events/checkforhiddenitems.asm"
 INCLUDE "engine/events/treemons.asm"
@@ -500,7 +499,7 @@ GoldSilverIntro::
 ENDC
 
 
-SECTION "bank3e", ROMX
+SECTION "bank3E", ROMX
 
 _LoadStandardFont::
 	dr $f8000, $f800c
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 52efbaab..e29a9f8a 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -119,8 +119,8 @@ MomScript:
 	closetext
 	end
 
-TVScript:
-	jumptext TVText
+TVMovieScript:
+	jumptext TVMovieText
 
 StoveScript:
 	jumptext StoveText
@@ -276,7 +276,7 @@ FridgeText:
 	line "tasty LEMONADE!"
 	done
 
-TVText:
+TVMovieText:
 	text "There's a movie on"
 	line "TV: Stars dot the"
 
@@ -301,7 +301,7 @@ PlayersHouse1F_MapEvents:
 	bg_event  0,  1, BGEVENT_READ, StoveScript
 	bg_event  1,  1, BGEVENT_READ, SinkScript
 	bg_event  2,  1, BGEVENT_READ, FridgeScript
-	bg_event  4,  1, BGEVENT_READ, TVScript
+	bg_event  4,  1, BGEVENT_READ, TVMovieScript
 
 	db 4 ; object events
 	object_event  7,  3, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_1
diff --git a/sram.asm b/sram.asm
index 529d088b..0e0f2f5a 100755
--- a/sram.asm
+++ b/sram.asm
@@ -1,14 +1,15 @@
 SECTION "Scratch", SRAM
 
-UNION ; a000
-sScratchTilemap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
-sScratchAttrmap:: ds $200
-
-NEXTU ; a000
 sScratch::
+
+UNION ; a000
 sDecompressScratch:: ds $188
 sDecompressBuffer:: ds 7 * 7 tiles ; a188
-ENDU
+
+NEXTU ; a000
+sScratchTilemap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
+sScratchAttrmap:: ds $200 ; a200
+ENDU ; a498
 
 
 SECTION "SRAM Bank 0", SRAM