Merge branch 'master' of github.com:pret/pokecrystal

author: surskitty <surskitty@gmail.com> 2017-12-11 17:37:34 -0500
committer: surskitty <surskitty@gmail.com> 2017-12-11 17:37:34 -0500
commit: 98128cd4d8457948e7136a16e08bacff0bc3529d (patch)
tree: 171c67509afba62571266bd6bebbfdb829d2a876 /engine
parent: 069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff)
parent: 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff)
57 files changed, 583 insertions, 550 deletions
diff --git a/engine/battle_start.asm b/engine/battle_start.asm
index 627519daa..9097e74ed 100644
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
@@ -141,7 +141,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf
 ; 8c2f4
 
 TrainerBattlePokeballTiles: ; 8c2f4
-INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
+INCBIN "gfx/ow_fx/trainer_battle_pokeball_tiles.2bpp"
 
 
 FlashyTransitionToBattle: ; 8c314
diff --git a/engine/billspc.asm b/engine/billspc.asm
index 4d8bf1c48..9595bffc6 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -1783,7 +1783,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6)
 	call CopyNicknameToTemp
 	ld hl, PartyMonOT
 	call CopyOTNameToTemp
-	ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
+	ld hl, PartyMon1
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
@@ -2280,8 +2280,8 @@ BillsPC_InitGFX: ; e33e8 (38:73e8)
 	ret
 ; e3419 (38:7419)
 
-PCSelectLZ: INCBIN "gfx/pc.2bpp.lz"
-PCMailGFX:  INCBIN "gfx/pc_mail.2bpp"
+PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz"
+PCMailGFX:  INCBIN "gfx/pc/pc_mail.2bpp"
 ; e34dd
 
 PCString_ChooseaPKMN: db "Choose a <PK><MN>.@"
diff --git a/engine/billspctop.asm b/engine/billspctop.asm
index 115c90385..eda83c28e 100755
--- a/engine/billspctop.asm
+++ b/engine/billspctop.asm
@@ -245,10 +245,10 @@ ClearPCItemScreen: ; e58b
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	ld a, " "
 	call ByteFill
-	hlcoord 0,0
+	hlcoord 0, 0
 	lb bc, 10, 18
 	call TextBox
-	hlcoord 0,12
+	hlcoord 0, 12
 	lb bc, 4, 18
 	call TextBox
 	call WaitBGMap2
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm
index 326faaa6c..5051083b2 100755
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -234,7 +234,7 @@ HatchEggs: ; 16f70 (5:6f70)
 	callba SetEggMonCaughtData
 	callba TrainerRankings_EggsHatched
 	ld a, [CurPartyMon]
-	ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
+	ld hl, PartyMon1Species
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hl]
@@ -263,7 +263,7 @@ HatchEggs: ; 16f70 (5:6f70)
 	ld [wd26b], a
 	call GetBaseData
 	ld a, [CurPartyMon]
-	ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
+	ld hl, PartyMon1
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	push hl
@@ -309,7 +309,7 @@ HatchEggs: ; 16f70 (5:6f70)
 	ld a, [PlayerID + 1]
 	ld [hl], a
 	ld a, [CurPartyMon]
-	ld hl, PartyMonOT ; wddff (aliases: PartyMonOT)
+	ld hl, PartyMonOT
 	ld bc, NAME_LENGTH
 	call AddNTimes
 	ld d, h
@@ -803,7 +803,7 @@ EggHatch_CrackShell: ; 1736d (5:736d)
 	add 9 * 8 + 4
 	ld d, a
 	ld e, 11 * 8
-	ld a, SPRITE_ANIM_INDEX_19
+	ld a, SPRITE_ANIM_INDEX_EGG_CRACK
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -813,7 +813,7 @@ EggHatch_CrackShell: ; 1736d (5:736d)
 ; 17393 (5:7393)
 
 EggHatchGFX: ; 17393
-INCBIN "gfx/unknown/017393.2bpp"
+INCBIN "gfx/evo/egg_hatch.2bpp"
 ; 173b3
 
 Hatch_InitShellFragments: ; 173b3 (5:73b3)
@@ -833,7 +833,7 @@ Hatch_InitShellFragments: ; 173b3 (5:73b3)
 	push hl
 	push bc
 
-	ld a, SPRITE_ANIM_INDEX_1C
+	ld a, SPRITE_ANIM_INDEX_EGG_HATCH
 	call _InitSpriteAnimStruct
 
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
diff --git a/engine/card_flip.asm b/engine/card_flip.asm
index cdf2be010..063d5324f 100755
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -499,12 +499,12 @@ CardFlip_DisplayCardFaceUp: ; e03ec
 
 .Deck: ; e0459
 	; level, pic anchor (3x3)
-	db "1",$4e, "1",$57, "1",$69, "1",$60
-	db "2",$4e, "2",$57, "2",$69, "2",$60
-	db "3",$4e, "3",$57, "3",$69, "3",$60
-	db "4",$4e, "4",$57, "4",$69, "4",$60
-	db "5",$4e, "5",$57, "5",$69, "5",$60
-	db "6",$4e, "6",$57, "6",$69, "6",$60
+	db "1", $4e, "1", $57, "1", $69, "1", $60
+	db "2", $4e, "2", $57, "2", $69, "2", $60
+	db "3", $4e, "3", $57, "3", $69, "3", $60
+	db "4", $4e, "4", $57, "4", $69, "4", $60
+	db "5", $4e, "5", $57, "5", $69, "5", $60
+	db "6", $4e, "6", $57, "6", $69, "6", $60
 ; e0489
 
 CardFlip_UpdateCoinBalanceDisplay: ; e0489
@@ -1712,19 +1712,19 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37)
 ; e0cdb
 
 CardFlipLZ03: ; e0cdb
-INCBIN "gfx/unknown/0e0cdb.2bpp.lz"
+INCBIN "gfx/card_flip/card_flip_3.2bpp.lz"
 
 CardFlipOffButtonGFX: ; e0cf6
-INCBIN "gfx/unknown/0e0cf6.2bpp"
+INCBIN "gfx/card_flip/off.2bpp"
 
 CardFlipOnButtonGFX: ; e0d06
-INCBIN "gfx/unknown/0e0d06.2bpp"
+INCBIN "gfx/card_flip/on.2bpp"
 
 CardFlipLZ01: ; e0d16
-INCBIN "gfx/unknown/0e0d16.2bpp.lz"
+INCBIN "gfx/card_flip/card_flip_1.2bpp.lz"
 
 CardFlipLZ02: ; e0ea8
-INCBIN "gfx/unknown/0e0ea8.2bpp.lz"
+INCBIN "gfx/card_flip/card_flip_2.2bpp.lz"
 
 CardFlipTilemap: ; e110c
 	db $ef, $15, $27, $2a, $2a, $06, $27, $2a, $2a, $06, $27
diff --git a/engine/clock_reset.asm b/engine/clock_reset.asm
index 4e6f588e9..7b1d84302 100755
--- a/engine/clock_reset.asm
+++ b/engine/clock_reset.asm
@@ -66,7 +66,7 @@ RestartClock: ; 20021 (8:4021)
 .SetClock: ; 20051 (8:4051)
 	ld a, 1
 	ld [Buffer1], a ; which digit
-	ld [Buffer2], a ; wd1eb (aliases: MovementType)
+	ld [Buffer2], a
 	ld a, 8
 	ld [Buffer3], a
 	call UpdateTime
@@ -151,7 +151,7 @@ RestartClock: ; 20021 (8:4021)
 	ret
 
 .pressed_up
-	ld a, [Buffer1] ; wd1ea (aliases: MagikarpLength)
+	ld a, [Buffer1]
 	call ResetClock_GetWraparoundTime
 	ld a, [de]
 	inc a
@@ -163,7 +163,7 @@ RestartClock: ; 20021 (8:4021)
 	jr .done_scroll
 
 .pressed_down
-	ld a, [Buffer1] ; wd1ea (aliases: MagikarpLength)
+	ld a, [Buffer1]
 	call ResetClock_GetWraparoundTime
 	ld a, [de]
 	dec a
@@ -176,14 +176,14 @@ RestartClock: ; 20021 (8:4021)
 	jr .done_scroll
 
 .pressed_left
-	ld hl, Buffer1 ; wd1ea (aliases: MagikarpLength)
+	ld hl, Buffer1
 	dec [hl]
 	jr nz, .done_scroll
 	ld [hl], $3
 	jr .done_scroll
 
 .pressed_right
-	ld hl, Buffer1 ; wd1ea (aliases: MagikarpLength)
+	ld hl, Buffer1
 	inc [hl]
 	ld a, [hl]
 	cp $4
@@ -209,14 +209,14 @@ RestartClock: ; 20021 (8:4021)
 	ld c, a
 	decoord 11, 8
 	callba PrintHoursMins
-	ld a, [Buffer2] ; wd1eb (aliases: MovementType)
+	ld a, [Buffer2]
 	lb de, " ", " "
 	call .PlaceChars
-	ld a, [Buffer1] ; wd1ea (aliases: MagikarpLength)
+	ld a, [Buffer1]
 	lb de, "▲", "▼"
 	call .PlaceChars
-	ld a, [Buffer1] ; wd1ea (aliases: MagikarpLength)
-	ld [Buffer2], a ; wd1eb (aliases: MovementType)
+	ld a, [Buffer1]
+	ld [Buffer2], a
 	ret
 ; 20160 (8:4160)
 
diff --git a/engine/credits.asm b/engine/credits.asm
index 1888ef27d..f8cce7a15 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -196,7 +196,7 @@ Credits:: ; 109847
 	xor a
 	ld [hBGMapMode], a
 	ld [CreditsPos], a
-	ld [wcd21], a
+	ld [CreditsUnusedCD21], a
 	ld [CreditsTimer], a
 
 .execution_loop
@@ -491,7 +491,7 @@ ParseCredits: ; 1099aa
 	ld a, MUSIC_POST_CREDITS % $100
 	ld [MusicFadeID], a
 	ld a, MUSIC_POST_CREDITS / $100
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 	ret
 
 .get
@@ -1303,9 +1303,9 @@ CreditsStrings:
 
 .Copyright:
 	;    (C) 1  9  9  5 - 2  0  0  1     N  i  n  t  e  n  d  o
-	db   $60,$61,$62,$63,$64,$65,$66, $67, $68, $69, $6a, $6b, $6c
-	;    (C) 1  9  9  5 - 2  0  0  1    C  r  e  a  t  u  r  e  s      i  n  c .
-	next $60,$61,$62,$63,$64,$65,$66, $6d, $6e, $6f, $70, $71, $72,  $7a, $7b, $7c
-	;    (C) 1  9  9  5 - 2  0  0  1  G   A   M   E   F   R   E   A   K     i  n  c .
-	next $60,$61,$62,$63,$64,$65,$66, $73, $74, $75, $76, $77, $78, $79,  $7a, $7b, $7c
+	db   $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,$6a,$6b,$6c
+	;    (C) 1  9  9  5 - 2  0  0  1    C  r  e  a  t  u  r  e  s     i  n  c .
+	next $60,$61,$62,$63,$64,$65,$66,$6d,$6e,$6f,$70,$71,$72,  $7a,$7b,$7c
+	;    (C) 1  9  9  5 - 2  0  0  1  G  A  M  E  F  R  E  A  K     i  n  c .
+	next $60,$61,$62,$63,$64,$65,$66,$73,$74,$75,$76,$77,$78,$79,  $7a,$7b,$7c
 	db "@"
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm
index fbb2dbc97..d0a0b7281 100755
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -183,7 +183,7 @@ PlaceGameFreakPresents_2: ; e46ba
 .place_presents
 	ld [hl], 0
 	ld hl, .presents
-	decoord 7,11
+	decoord 7, 11
 	ld bc, .end - .presents
 	call CopyBytes
 	call PlaceGameFreakPresents_AdvanceIndex
@@ -773,7 +773,7 @@ IntroScene7: ; e4b3f (39:4b3f)
 	call Intro_ResetLYOverrides
 	callba ClearSpriteAnims
 	depixel 13, 27, 4, 0
-	ld a, SPRITE_ANIM_INDEX_26
+	ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
 	call _InitSpriteAnimStruct
 	ld a, $f0
 	ld [wGlobalAnimXOffset], a
@@ -866,7 +866,7 @@ IntroScene10: ; e4c4f (39:4c4f)
 
 .pichu
 	depixel 21, 16, 1, 0
-	ld a, SPRITE_ANIM_INDEX_27
+	ld a, SPRITE_ANIM_INDEX_INTRO_PICHU
 	call _InitSpriteAnimStruct
 	ld de, SFX_INTRO_PICHU
 	call PlaySFX
@@ -874,7 +874,7 @@ IntroScene10: ; e4c4f (39:4c4f)
 
 .wooper
 	depixel 22, 6
-	ld a, SPRITE_ANIM_INDEX_28
+	ld a, SPRITE_ANIM_INDEX_INTRO_WOOPER
 	call _InitSpriteAnimStruct
 	ld de, SFX_INTRO_PICHU
 	call PlaySFX
@@ -1054,7 +1054,7 @@ IntroScene13: ; e4d6d (39:4d6d)
 	ld [hWY], a
 	callba ClearSpriteAnims
 	depixel 13, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_26
+	ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
 	call _InitSpriteAnimStruct
 	ld de, MUSIC_CRYSTAL_OPENING
 	call PlayMusic
@@ -1165,10 +1165,10 @@ IntroScene15: ; e4e40 (39:4e40)
 	callba ClearSpriteAnims
 	call Intro_SetCGBPalUpdate
 	depixel 8, 5
-	ld a, SPRITE_ANIM_INDEX_2A
+	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN_F
 	call _InitSpriteAnimStruct
 	depixel 12, 0
-	ld a, SPRITE_ANIM_INDEX_2B
+	ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
 	call _InitSpriteAnimStruct
 	xor a
 	ld [wIntroSceneFrameCounter], a
@@ -1317,7 +1317,7 @@ IntroScene19: ; e4f7e (39:4f7e)
 	ld [hl], $7f
 	call Intro_SetCGBPalUpdate
 	depixel 12, 0
-	ld a, SPRITE_ANIM_INDEX_2B
+	ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
 	call _InitSpriteAnimStruct
 	xor a
 	ld [wIntroSceneFrameCounter], a
@@ -1617,7 +1617,7 @@ Intro_Scene24_ApplyPaletteFade: ; e5172 (39:5172)
 
 CrystalIntro_InitUnownAnim: ; e51dc (39:51dc)
 	push de
-	ld a, SPRITE_ANIM_INDEX_29
+	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
@@ -1627,7 +1627,7 @@ CrystalIntro_InitUnownAnim: ; e51dc (39:51dc)
 	pop de
 
 	push de
-	ld a, SPRITE_ANIM_INDEX_29
+	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
@@ -1637,7 +1637,7 @@ CrystalIntro_InitUnownAnim: ; e51dc (39:51dc)
 	pop de
 
 	push de
-	ld a, SPRITE_ANIM_INDEX_29
+	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
@@ -1646,7 +1646,7 @@ CrystalIntro_InitUnownAnim: ; e51dc (39:51dc)
 	call ReinitSpriteAnimFrame
 	pop de
 
-	ld a, SPRITE_ANIM_INDEX_29
+	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
diff --git a/engine/decorations.asm b/engine/decorations.asm
index 4bd99c0a5..ad82a2080 100755
--- a/engine/decorations.asm
+++ b/engine/decorations.asm
@@ -908,16 +908,16 @@ DecoAction_putawayornament: ; 26dc9
 
 DecoAction_FinishUp_Ornament: ; 26dd6
 	call QueryWhichSide
-	ld a, [wd1ec]
+	ld a, [wSelectedDecoration]
 	ld [hl], a
-	ld a, [wd1ed]
+	ld a, [wOtherDecoration]
 	ld [de], a
 	xor a
 	ret
 ; 26de3
 
 DecoAction_SetItUp_Ornament: ; 26de3
-	ld a, [wd1ec]
+	ld a, [wSelectedDecoration]
 	and a
 	jr z, .nothingthere
 	ld b, a
@@ -931,7 +931,7 @@ DecoAction_SetItUp_Ornament: ; 26de3
 	ld hl, StringBuffer4
 	call GetDecorationName
 	ld a, [MenuSelection]
-	ld [wd1ec], a
+	ld [wSelectedDecoration], a
 	call .getwhichside
 	ld hl, DecoText_PutAwayAndSetUp
 	call MenuTextBoxBackup
@@ -940,7 +940,7 @@ DecoAction_SetItUp_Ornament: ; 26de3
 
 .nothingthere
 	ld a, [MenuSelection]
-	ld [wd1ec], a
+	ld [wSelectedDecoration], a
 	call .getwhichside
 	ld a, [MenuSelection]
 	ld hl, StringBuffer3
@@ -960,11 +960,11 @@ DecoAction_SetItUp_Ornament: ; 26de3
 .getwhichside ; 26e33
 	ld a, [MenuSelection]
 	ld b, a
-	ld a, [wd1ed]
+	ld a, [wOtherDecoration]
 	cp b
 	ret nz
 	xor a
-	ld [wd1ed], a
+	ld [wOtherDecoration], a
 	ret
 ; 26e41
 
@@ -975,7 +975,7 @@ UnknownText_0x26e41: ; 0x26e41
 ; 0x26e46
 
 DecoAction_PutItAway_Ornament: ; 26e46
-	ld a, [wd1ec]
+	ld a, [wSelectedDecoration]
 	and a
 	jr z, .nothingthere
 	ld hl, StringBuffer3
@@ -983,7 +983,7 @@ DecoAction_PutItAway_Ornament: ; 26e46
 	ld a, $1
 	ld [Buffer5], a
 	xor a
-	ld [wd1ec], a
+	ld [wSelectedDecoration], a
 	ld hl, DecoText_PutAwayTheDeco
 	call MenuTextBoxBackup
 	xor a
@@ -1015,9 +1015,9 @@ DecoAction_AskWhichSide: ; 26e70
 	ld [Buffer2], a
 	call QueryWhichSide
 	ld a, [hl]
-	ld [wd1ec], a
+	ld [wSelectedDecoration], a
 	ld a, [de]
-	ld [wd1ed], a
+	ld [wOtherDecoration], a
 	xor a
 	ret
 
diff --git a/engine/diploma.asm b/engine/diploma.asm
index c446ff86b..582d0cd1c 100644
--- a/engine/diploma.asm
+++ b/engine/diploma.asm
@@ -85,10 +85,10 @@ PrintDiplomaPage2: ; 1dd7ae
 ; 1dd805
 
 DiplomaGFX: ; 1dd805
-INCBIN "gfx/unknown/1dd805.2bpp.lz"
+INCBIN "gfx/diploma/diploma.2bpp.lz"
 
 DiplomaPage1Tilemap: ; 1ddc4b
-INCBIN "gfx/unknown/1ddc4b.tilemap"
+INCBIN "gfx/diploma/page1.tilemap"
 
 DiplomaPage2Tilemap: ; 1dddb3
-INCBIN "gfx/unknown/1dddb3.tilemap"
+INCBIN "gfx/diploma/page2.tilemap"
diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm
index e5ef9b4cf..3ff1888dc 100755
--- a/engine/dummy_game.asm
+++ b/engine/dummy_game.asm
@@ -109,7 +109,7 @@ endr
 
 .spawn_object
 	depixel 6, 3, 4, 4
-	ld a, SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
+	ld a, SPRITE_ANIM_INDEX_DUMMY_GAME
 	call _InitSpriteAnimStruct
 	ld a, 5
 	ld [wDummyGameNumberTriesRemaining], a
@@ -609,4 +609,4 @@ DummyGame_InterpretJoypad_AnimateCursor: ; e21a1 (38:61a1)
 ; e2221 (38:6221)
 
 LZ_e2221: ; e2221
-INCBIN "gfx/unknown/0e2221.2bpp.lz"
+INCBIN "gfx/dummy_game/dummy_game.2bpp.lz"
diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm
index 2b441bab4..3bca8dd87 100644
--- a/engine/engine_flags.asm
+++ b/engine/engine_flags.asm
@@ -208,7 +208,7 @@ ENDM
 	engine_flag WeeklyFlags, 6 ; move tutor
 	engine_flag WeeklyFlags, 7 ; buenas password
 
-	engine_flag SwarmFlags, 0 ; $60
+	engine_flag SwarmFlags, 0 ; buenas password 2
 	engine_flag SwarmFlags, 1 ; goldenrod dept store sale is on
 
 	engine_flag GameTimerPause, 7 ; $62
diff --git a/engine/events_2.asm b/engine/events_2.asm
index 42e3ed8e4..285b3e05b 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -627,7 +627,7 @@ CmdQueue_StoneTable: ; 97f42
 	ld hl, OBJECT_MOVEMENTTYPE
 	add hl, de
 	ld a, [hl]
-	cp STEP_TYPE_SKYFALL_TOP
+	cp SPRITEMOVEDATA_STRENGTH_BOULDER
 	jr nz, .next
 
 	ld hl, OBJECT_NEXT_TILE
diff --git a/engine/events_3.asm b/engine/events_3.asm
index b6aaea3b7..cff4eefb9 100755
--- a/engine/events_3.asm
+++ b/engine/events_3.asm
@@ -850,9 +850,9 @@ LoadFishingGFX: ; b84b3
 ; b84f2
 
 FishingGFX: ; b84f2
-INCBIN "gfx/overworld/chris_fish.2bpp"
+INCBIN "gfx/ow_fx/chris_fish.2bpp"
 ; b8582
 
 KrisFishingGFX: ; b8582
-INCBIN "gfx/overworld/kris_fish.2bpp"
+INCBIN "gfx/ow_fx/kris_fish.2bpp"
 ; b8612
diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm
index 2f1c4c522..173a31bf2 100755
--- a/engine/evolution_animation.asm
+++ b/engine/evolution_animation.asm
@@ -316,7 +316,7 @@ EvolutionAnimation: ; 4e5e1
 .GenerateBallOfLight: ; 4e7e8
 	push de
 	depixel 9, 11
-	ld a, SPRITE_ANIM_INDEX_13
+	ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
diff --git a/engine/facings.asm b/engine/facings.asm
index ee9efec3f..4d2a55364 100644
--- a/engine/facings.asm
+++ b/engine/facings.asm
@@ -1,4 +1,5 @@
 Facings: ; 4049
+; entries correspond to FACING_* constants
 	dw FacingStepDown0
 	dw FacingStepDown1
 	dw FacingStepDown2
@@ -31,7 +32,8 @@ Facings: ; 4049
 	dw FacingBoulderDust2
 	dw FacingGrass1
 	dw FacingGrass2
-FacingsEnd: dw 0
+FacingsEnd:
+	dw 0
 
 NUM_FACINGS EQU (FacingsEnd - Facings) / 2
 
@@ -41,12 +43,6 @@ NUM_FACINGS EQU (FacingsEnd - Facings) / 2
 ; Format:
 ;	db y, x, attributes, tile index
 
-; Attributes:
-X_FLIP    EQU 1 << OAM_X_FLIP
-Y_FLIP    EQU 1 << OAM_Y_FLIP
-BEHIND_BG EQU 1 << OAM_PRIORITY
-
-
 FacingStepDown0:
 FacingStepDown2:
 FacingWeirdTree0:
diff --git a/engine/healmachineanim.asm b/engine/healmachineanim.asm
index 5162b3830..bea580dcd 100755
--- a/engine/healmachineanim.asm
+++ b/engine/healmachineanim.asm
@@ -137,7 +137,7 @@ HealMachineAnim: ; 12324
 ; 123fc
 
 .HealMachineGFX: ; 123fc
-INCBIN "gfx/unknown/0123fc.2bpp"
+INCBIN "gfx/ow_fx/heal_machine.2bpp"
 ; 1241c
 
 .HOF_OAM: ; 1241c
diff --git a/engine/init_gender.asm b/engine/init_gender.asm
index ff5babdf9..3ae856029 100755
--- a/engine/init_gender.asm
+++ b/engine/init_gender.asm
@@ -68,9 +68,9 @@ InitGenderScreen: ; 48e14 (12:4e14)
 	ld a, $10
 	ld [MusicFade], a
 	ld a, MUSIC_NONE
-	ld [MusicFadeIDLo], a
+	ld [MusicFadeID], a
 	ld a, $0
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 	ld c, 8
 	call DelayFrames
 	call ClearBGPalettes
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index 8e3c90204..6dcda93f3 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -111,8 +111,8 @@ _ResetWRAM: ; 5bae
 	xor a
 	call ByteFill
 
-	ld hl, wd000
-	ld bc, wGameData - wd000
+	ld hl, wRAM1Start
+	ld bc, wGameData - wRAM1Start
 	xor a
 	call ByteFill
 
@@ -375,9 +375,9 @@ Continue: ; 5d65
 	ld a, $8
 	ld [MusicFade], a
 	ld a, MUSIC_NONE % $100
-	ld [MusicFadeIDLo], a
+	ld [MusicFadeID], a
 	ld a, MUSIC_NONE / $100
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 	call ClearBGPalettes
 	call Continue_MobileAdapterMenu
 	call CloseWindow
@@ -429,9 +429,9 @@ Continue_MobileAdapterMenu: ; 5df0
 	ld a, 5
 	ld [MusicFade], a
 	ld a, MUSIC_MOBILE_ADAPTER_MENU % $100
-	ld [MusicFadeIDLo], a
+	ld [MusicFadeID], a
 	ld a, MUSIC_MOBILE_ADAPTER_MENU / $100
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 	ld c, 20
 	call DelayFrames
 	ld c, $1
@@ -440,9 +440,9 @@ Continue_MobileAdapterMenu: ; 5df0
 	ld a, 8
 	ld [MusicFade], a
 	ld a, MUSIC_NONE % $100
-	ld [MusicFadeIDLo], a
+	ld [MusicFadeID], a
 	ld a, MUSIC_NONE / $100
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 	ld c, 35
 	call DelayFrames
 	ret
@@ -859,9 +859,9 @@ ShrinkPlayer: ; 610f
 	ld [MusicFade], a
 	ld de, MUSIC_NONE
 	ld a, e
-	ld [MusicFadeIDLo], a
+	ld [MusicFadeID], a
 	ld a, d
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 
 	ld de, SFX_ESCAPE_ROPE
 	call PlaySFX
@@ -1051,7 +1051,7 @@ StartTitleScreen: ; 6219
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call UpdateTimePals
-	ld a, [wcf64]
+	ld a, [wIntroSceneFrameCounter]
 	cp $5
 	jr c, .ok
 	xor a
@@ -1191,7 +1191,7 @@ TitleScreenTimer: ; 62f6
 	inc [hl]
 
 ; Start a timer
-	ld hl, wcf65
+	ld hl, wTitleScreenTimer
 	ld de, 73 * 60 + 36
 	ld [hl], e
 	inc hl
@@ -1202,7 +1202,7 @@ TitleScreenTimer: ; 62f6
 TitleScreenMain: ; 6304
 
 ; Run the timer down.
-	ld hl, wcf65
+	ld hl, wTitleScreenTimer
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
@@ -1268,7 +1268,7 @@ TitleScreenMain: ; 6304
 	ld a, 1
 
 .done
-	ld [wcf64], a
+	ld [wIntroSceneFrameCounter], a
 
 ; Return to the intro sequence.
 	ld hl, wJumptableIndex
@@ -1282,18 +1282,18 @@ TitleScreenMain: ; 6304
 
 ; Fade out the title screen music
 	xor a
-	ld [MusicFadeIDLo], a
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID], a
+	ld [MusicFadeID + 1], a
 	ld hl, MusicFade
 	ld [hl], 8 ; 1 second
 
-	ld hl, wcf65
+	ld hl, wTitleScreenTimer
 	inc [hl]
 	ret
 
 .clock_reset
 	ld a, 4
-	ld [wcf64], a
+	ld [wIntroSceneFrameCounter], a
 
 ; Return to the intro sequence.
 	ld hl, wJumptableIndex
@@ -1305,7 +1305,7 @@ TitleScreenEnd: ; 6375
 
 ; Wait until the music is done fading.
 
-	ld hl, wcf65
+	ld hl, wTitleScreenTimer
 	inc [hl]
 
 	ld a, [MusicFade]
@@ -1313,7 +1313,7 @@ TitleScreenEnd: ; 6375
 	ret nz
 
 	ld a, 2
-	ld [wcf64], a
+	ld [wIntroSceneFrameCounter], a
 
 ; Back to the intro.
 	ld hl, wJumptableIndex
@@ -1332,8 +1332,8 @@ ResetClock: ; 6392
 ; 639b
 
 Function639b: ; unreferenced
-	; If bit 0 or 1 of [wcf65] is set, we don't need to be here.
-	ld a, [wcf65]
+	; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here.
+	ld a, [wTitleScreenTimer]
 	and $3
 	ret nz
 	ld bc, SpriteAnim10
@@ -1345,8 +1345,8 @@ Function639b: ; unreferenced
 	add hl, hl
 	ld de, Data63ca
 	add hl, de
-	; If bit 2 of [wcf65] is set, get the second dw; else, get the first dw
-	ld a, [wcf65]
+	; If bit 2 of [wTitleScreenTimer] is set, get the second dw; else, get the first dw
+	ld a, [wTitleScreenTimer]
 	and %00000100
 	srl a
 	srl a
diff --git a/engine/items.asm b/engine/items.asm
index 81c080dda..0124489e5 100755
--- a/engine/items.asm
+++ b/engine/items.asm
@@ -331,7 +331,7 @@ ReceiveKeyItem: ; d35a
 	ret
 
 TossKeyItem: ; d374
-	ld a, [wd107]
+	ld a, [CurItemQuantity]
 	ld e, a
 	ld d, 0
 	ld hl, NumKeyItems
diff --git a/engine/link.asm b/engine/link.asm
index f5bc24da9..ab3d38968 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -390,7 +390,7 @@ Gen2ToGen2LinkComms: ; 28177
 	ld [de], a
 
 .skip_mail
-	ld hl, wLinkData
+	ld hl, wLinkPlayerName
 	ld de, OTPlayerName
 	ld bc, NAME_LENGTH
 	call CopyBytes
@@ -1143,7 +1143,7 @@ TimeCapsule_ReplaceTeruSama: ; 28771
 	db ITEM_BE, BERRY
 	db ITEM_C3, BERRY
 	db ITEM_DC, BERRY
-	db HM_08,   BERRY
+	db ITEM_FA, BERRY
 	db -1,      BERRY
 	db  0
 ; 2879e
diff --git a/engine/link_trade.asm b/engine/link_trade.asm
index 96401f188..3983dfd1d 100755
--- a/engine/link_trade.asm
+++ b/engine/link_trade.asm
@@ -1,5 +1,5 @@
 LinkCommsBorderGFX:
-INCBIN "gfx/unknown/16cfc1.2bpp"
+INCBIN "gfx/trade/border_tiles.2bpp"
 ; 16d421
 
 __LoadTradeScreenBorder: ; 16d421
@@ -35,13 +35,13 @@ Function16d43b: ; 16d43b
 ; 16d465
 
 Tilemap_16d465:
-INCBIN "gfx/unknown/16d465.tilemap"
+INCBIN "gfx/trade/border_mobile_fullscreen.tilemap"
 
 Tilemap_16d5cd:
-INCBIN "gfx/unknown/16d5cd.tilemap"
+INCBIN "gfx/trade/border_cable_top.tilemap"
 
 Tilemap_16d5f5:
-INCBIN "gfx/unknown/16d5f5.tilemap"
+INCBIN "gfx/trade/border_cable_bottom.tilemap"
 
 _LinkTextbox: ; 16d61d
 	ld h, d
diff --git a/engine/map_object_action.asm b/engine/map_object_action.asm
index a7ab87200..2a13f924e 100755
--- a/engine/map_object_action.asm
+++ b/engine/map_object_action.asm
@@ -1,36 +1,22 @@
-	ld hl, OBJECT_ACTION
-	add hl, bc
-	ld a, [hl]
-	ld l, a
-	ld h, 0
-	add hl, hl
-	add hl, hl
-	add hl, de
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	call _hl_
-	ret
-; 445f
-
-Pointers445f: ; 445f
-	dw SetFacingStanding,              SetFacingStanding ; 00
-	dw SetFacingStandAction,           SetFacingCurrent ; 01 standing?
-	dw SetFacingStepAction,            SetFacingCurrent ; 02 walking?
-	dw SetFacingBumpAction,            SetFacingCurrent ; 03 bumping?
-	dw SetFacingCounterclockwiseSpin,  SetFacingCurrent ; 04
-	dw SetFacingCounterclockwiseSpin2, SetFacingStanding ; 05
-	dw SetFacingFish,                  SetFacingFish ; 06
-	dw SetFacingShadow,                SetFacingStanding ; 07
-	dw SetFacingEmote,                 SetFacingEmote ; 08
-	dw SetFacingBigDollSym,            SetFacingBigDollSym ; 09
-	dw SetFacingBounce,                SetFacingFreezeBounce ; 0a
-	dw SetFacingWeirdTree,             SetFacingCurrent ; 0b
-	dw SetFacingBigDollAsym,           SetFacingBigDollAsym ; 0c
-	dw SetFacingBigDoll,               SetFacingBigDoll ; 0d
-	dw SetFacingBoulderDust,           SetFacingStanding ; 0e
-	dw SetFacingGrassShake,            SetFacingStanding ; 0f
-	dw SetFacingSkyfall,               SetFacingCurrent ; 10
+PersonActionPairPointers: ; 445f
+; entries correspond to PERSON_ACTION_* constants
+	dw SetFacingStanding,              SetFacingStanding
+	dw SetFacingStandAction,           SetFacingCurrent
+	dw SetFacingStepAction,            SetFacingCurrent
+	dw SetFacingBumpAction,            SetFacingCurrent
+	dw SetFacingCounterclockwiseSpin,  SetFacingCurrent
+	dw SetFacingCounterclockwiseSpin2, SetFacingStanding
+	dw SetFacingFish,                  SetFacingFish
+	dw SetFacingShadow,                SetFacingStanding
+	dw SetFacingEmote,                 SetFacingEmote
+	dw SetFacingBigDollSym,            SetFacingBigDollSym
+	dw SetFacingBounce,                SetFacingFreezeBounce
+	dw SetFacingWeirdTree,             SetFacingCurrent
+	dw SetFacingBigDollAsym,           SetFacingBigDollAsym
+	dw SetFacingBigDoll,               SetFacingBigDoll
+	dw SetFacingBoulderDust,           SetFacingStanding
+	dw SetFacingGrassShake,            SetFacingStanding
+	dw SetFacingSkyfall,               SetFacingCurrent
 ; 44a3
 
 SetFacingStanding: ; 44a3
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index d5fa84642..83147c168 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -155,8 +155,8 @@ Function437b: ; 437b
 	jr nz, SetFacingStanding
 	bit 5, [hl]
 	jr nz, asm_4448
-	ld de, Pointers445f ; use first column
-	jr asm_444d
+	ld de, PersonActionPairPointers ; use first column
+	jr _HandleObjectAction
 ; 4440
 
 Function4440: ; 4440
@@ -164,13 +164,28 @@ Function4440: ; 4440
 	add hl, bc
 	bit INVISIBLE, [hl]
 	jr nz, SetFacingStanding
-asm_4448 ; use second column
-	ld de, Pointers445f + 2
-	jr asm_444d
+asm_4448
+	ld de, PersonActionPairPointers + 2 ; use second column
+	jr _HandleObjectAction
 ; 444d
 
-asm_444d
+_HandleObjectAction
 ; call [4 * ObjectStructs[ObjInd, OBJECT_ACTION] + de]
+	ld hl, OBJECT_ACTION
+	add hl, bc
+	ld a, [hl]
+	ld l, a
+	ld h, 0
+	add hl, hl
+	add hl, hl
+	add hl, de
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	call _hl_
+	ret
+; 445f
+
 INCLUDE "engine/map_object_action.asm"
 
 CopyNextCoordsTileToStandingCoordsTile: ; 4600
@@ -535,6 +550,7 @@ MapObjectMovementPattern: ; 47dd
 	ret
 
 .Pointers: ; 47e9
+; entries correspond to SPRITEMOVEFN_* constants
 	dw .Null_00 ; 00
 	dw .RandomWalkY ; 01
 	dw .RandomWalkX ; 02
@@ -1085,7 +1101,7 @@ SetRandomStepDuration: ; 4b2d
 ; 4b45
 
 StepTypesJumptable: ; 4b45
-; These pointers use OBJECT_STEP_TYPE.  See constants/sprite_constants.asm
+; entries correspond to STEP_TYPE_* constants
 	dw ObjectMovementReset ; 00
 	dw MapObjectMovementPattern ; unused
 	dw NPCStep ; 02 npc walk
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index dc013ffdd..5de4f30da 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -414,9 +414,9 @@ RetainOldPalettes: ; 1556d
 
 RotatePalettesRightMapAndMusic: ; 15574
 	ld e, 0
-	ld a, [MusicFadeIDLo]
+	ld a, [MusicFadeID]
 	ld d, 0
-	ld a, [MusicFadeIDHi]
+	ld a, [MusicFadeID + 1]
 	ld a, $4
 	ld [MusicFade], a
 	call RotateThreePalettesRight
diff --git a/engine/mart.asm b/engine/mart.asm
index 7002902cc..6bcec4c55 100755
--- a/engine/mart.asm
+++ b/engine/mart.asm
@@ -370,9 +370,9 @@ BuyMenu: ; 15c62
 	call FadeToMenu
 	callba BlankScreen
 	xor a
-	ld [wd045 + 1], a
+	ld [wMenuScrollPositionBackup], a
 	ld a, 1
-	ld [wd045], a
+	ld [wMenuCursorBufferBackup], a
 .loop
 	call BuyMenuLoop ; menu loop
 	jr nc, .loop
@@ -471,15 +471,15 @@ BuyMenuLoop: ; 15cef
 	call UpdateSprites
 	ld hl, MenuDataHeader_Buy
 	call CopyMenuDataHeader
-	ld a, [wd045]
+	ld a, [wMenuCursorBufferBackup]
 	ld [wMenuCursorBuffer], a
-	ld a, [wd045 + 1]
+	ld a, [wMenuScrollPositionBackup]
 	ld [wMenuScrollPosition], a
 	call ScrollingMenu
 	ld a, [wMenuScrollPosition]
-	ld [wd045 + 1], a
+	ld [wMenuScrollPositionBackup], a
 	ld a, [wMenuCursorY]
-	ld [wd045], a
+	ld [wMenuCursorBufferBackup], a
 	call SpeechTextBox
 	ld a, [wMenuJoypad]
 	cp B_BUTTON
diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm
index d66ea6fac..9c6fb1870 100755
--- a/engine/mon_icons.asm
+++ b/engine/mon_icons.asm
@@ -178,7 +178,7 @@ InitPartyMenuIcon: ; 8e908 (23:6908)
 ; x coord
 	ld e, $10
 ; type is partymon icon
-	ld a, SPRITE_ANIM_INDEX_00
+	ld a, SPRITE_ANIM_INDEX_PARTY_MON
 	call InitSpriteAnimStruct
 	pop af
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
@@ -215,7 +215,9 @@ SetPartyMonIconAnimSpeed: ; 8e936 (23:6936)
 ; 8e95e (23:695e)
 
 .speeds ; 8e95e
-	db $00, $40, $80
+	db $00 ; HP_GREEN
+	db $40 ; HP_YELLOW
+	db $80 ; HP_RED
 ; 8e961
 
 NamingScreen_InitAnimatedMonIcon: ; 8e961 (23:6961)
@@ -225,7 +227,7 @@ NamingScreen_InitAnimatedMonIcon: ; 8e961 (23:6961)
 	xor a
 	call GetIconGFX
 	depixel 4, 4, 4, 0
-	ld a, SPRITE_ANIM_INDEX_00
+	ld a, SPRITE_ANIM_INDEX_PARTY_MON
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
@@ -238,9 +240,9 @@ MoveList_InitAnimatedMonIcon: ; 8e97d (23:697d)
 	ld [CurIcon], a
 	xor a
 	call GetIconGFX
-	ld d, 3 * 8 + 2
+	ld d, 3 * 8 + 2 ; depixel 3, 4, 2, 4
 	ld e, 4 * 8 + 4
-	ld a, SPRITE_ANIM_INDEX_00
+	ld a, SPRITE_ANIM_INDEX_PARTY_MON
 	call InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
@@ -376,7 +378,7 @@ FreezeMonIcons: ; 8ea4a
 	jr .ok
 
 .loadwithtwo
-	ld a, SPRITE_ANIM_SEQ_02
+	ld a, SPRITE_ANIM_SEQ_PARTY_MON_SWITCH
 
 .ok
 	push hl
@@ -407,7 +409,7 @@ UnfreezeMonIcons: ; 8ea71
 	ld b, h
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_01
+	ld [hl], SPRITE_ANIM_SEQ_PARTY_MON
 	pop hl
 .next
 	ld bc, $10
@@ -428,11 +430,11 @@ HoldSwitchmonIcon: ; 8ea8c
 	jr z, .next
 	cp d
 	jr z, .is_switchmon
-	ld a, SPRITE_ANIM_SEQ_03
+	ld a, SPRITE_ANIM_SEQ_PARTY_MON_SELECTED
 	jr .join_back
 
 .is_switchmon
-	ld a, SPRITE_ANIM_SEQ_02
+	ld a, SPRITE_ANIM_SEQ_PARTY_MON_SWITCH
 .join_back
 	push hl
 	ld c, l
diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm
index a6dcf0eb7..fbeffe3ed 100755
--- a/engine/mon_menu.asm
+++ b/engine/mon_menu.asm
@@ -9,8 +9,7 @@ MonMenuOptionStrings: ; 24caf
 ; 24cd9
 
 MonMenuOptions: ; 24cd9
-
-; Moves
+; moves
 	db MONMENU_FIELD_MOVE, MONMENU_CUT,        CUT
 	db MONMENU_FIELD_MOVE, MONMENU_FLY,        FLY
 	db MONMENU_FIELD_MOVE, MONMENU_SURF,       SURF
@@ -25,8 +24,7 @@ MonMenuOptions: ; 24cd9
 	db MONMENU_FIELD_MOVE, MONMENU_ROCKSMASH,  ROCK_SMASH
 	db MONMENU_FIELD_MOVE, MONMENU_MILKDRINK,  MILK_DRINK
 	db MONMENU_FIELD_MOVE, MONMENU_SWEETSCENT, SWEET_SCENT
-
-; Options
+; options
 	db MONMENU_MENUOPTION, MONMENU_STATS,      1 ; STATS
 	db MONMENU_MENUOPTION, MONMENU_SWITCH,     2 ; SWITCH
 	db MONMENU_MENUOPTION, MONMENU_ITEM,       3 ; ITEM
@@ -34,7 +32,6 @@ MonMenuOptions: ; 24cd9
 	db MONMENU_MENUOPTION, MONMENU_MOVE,       5 ; MOVE
 	db MONMENU_MENUOPTION, MONMENU_MAIL,       6 ; MAIL
 	db MONMENU_MENUOPTION, MONMENU_ERROR,      7 ; ERROR!
-
 	db -1
 ; 24d19
 
@@ -216,7 +213,7 @@ GetMonSubmenuItems: ; 24dd4
 
 .skip2
 	ld a, [Buffer1]
-	cp NUM_MON_SUBMENU_ITEMS
+	cp NUM_MONMENU_ITEMS
 	jr z, .ok2
 	ld a, MONMENU_CANCEL
 	call AddMonMenuItem
@@ -261,7 +258,7 @@ ResetMonSubmenu: ; 24e68
 	xor a
 	ld [Buffer1], a
 	ld hl, Buffer2
-	ld bc, NUM_MON_SUBMENU_ITEMS + 1
+	ld bc, NUM_MONMENU_ITEMS + 1
 	call ByteFill
 	ret
 ; 24e76
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index e07237d68..21b6994ac 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -1543,7 +1543,7 @@ CalcPkmnStatC: ; e17b
 	call Divide
 	ld a, c
 	cp STAT_HP
-	ld a, 5
+	ld a, STAT_MIN_NORMAL
 	jr nz, .not_hp
 	ld a, [CurPartyLevel]
 	ld b, a
@@ -1556,7 +1556,7 @@ CalcPkmnStatC: ; e17b
 	ld [hMultiplicand + 1], a
 
 .no_overflow_3
-	ld a, 10
+	ld a, STAT_MIN_HP
 
 .not_hp
 	ld b, a
diff --git a/engine/mysterygift.asm b/engine/mysterygift.asm
index f2d29b08a..ae40d0992 100755
--- a/engine/mysterygift.asm
+++ b/engine/mysterygift.asm
@@ -815,7 +815,7 @@ Function104e93: ; 104e93 (41:4e93)
 	ld c, rRP % $100
 	ld d, $3d
 	call Function104dd1
-	ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
+	ld hl, hPrintNum2
 	ld a, $5a
 	ld [hli], a
 	ld [hl], b
@@ -830,7 +830,7 @@ Function104e93: ; 104e93 (41:4e93)
 	ld a, [hPrintNum6]
 	ld [hPrintNum3], a
 	push hl
-	ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
+	ld hl, hPrintNum2
 	ld b, $2
 	call Function104ed6
 	ld hl, hMGStatusFlags
@@ -934,7 +934,7 @@ Function104f57: ; 104f57 (41:4f57)
 	ld [hPrintNum6], a
 	push bc
 	push hl
-	ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
+	ld hl, hPrintNum2
 	ld b, $2
 	call Function104faf
 	ld a, [hPrintNum3]
@@ -954,11 +954,11 @@ Function104f57: ; 104f57 (41:4f57)
 	ld e, a
 	push hl
 	push de
-	ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
+	ld hl, hPrintNum2
 	ld b, $2
 	call Function104faf
 	pop de
-	ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
+	ld hl, hPrintNum2
 	ld a, [hli]
 	xor d
 	ld b, a
diff --git a/engine/mysterygift2.asm b/engine/mysterygift2.asm
index 4048ea533..0b8948c5b 100755
--- a/engine/mysterygift2.asm
+++ b/engine/mysterygift2.asm
@@ -9,7 +9,7 @@ PrepMysteryGiftDataToSend: ; 2c642 (b:4642)
 	ld a, [hli]
 	ld [de], a
 	ld b, a
-	inc de
+	inc de ; wc802
 	ld a, [hl]
 	ld [de], a
 	ld c, a
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index 4a7ca301a..d4f11cb8c 100755
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -419,7 +419,7 @@ NamingScreenJoypadLoop: ; 11915
 	jr nz, .got_cursor_position
 	ld d, 8 * 8
 .got_cursor_position
-	ld a, SPRITE_ANIM_INDEX_02
+	ld a, SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
 	call _InitSpriteAnimStruct
 	ld a, c
 	ld [wNamingScreenCursorObjectPointer], a
@@ -946,11 +946,11 @@ LoadNamingScreenGFX: ; 11c51
 ; 11cb7
 
 NamingScreenGFX_Border: ; 11cb7
-INCBIN "gfx/unknown/011cb7.2bpp"
+INCBIN "gfx/namingscreen/border.2bpp"
 ; 11cc7
 
 NamingScreenGFX_Cursor: ; 11cc7
-INCBIN "gfx/unknown/011cc7.2bpp"
+INCBIN "gfx/namingscreen/cursor.2bpp"
 ; 11ce7
 
 NameInputLower:
@@ -985,16 +985,16 @@ BoxNameInputUpper:
 
 ; 11e5d
 
-GFX_11e5d: ; ????
-INCBIN "gfx/unknown/011e5d.1bpp"
+NamingScreenGFX_End: ; unused
+INCBIN "gfx/namingscreen/end.1bpp"
 ; 11e6d
 
 NamingScreenGFX_MiddleLine:
-INCBIN "gfx/unknown/011e65.1bpp"
+INCBIN "gfx/namingscreen/middle_line.1bpp"
 ; 11e6d
 
 NamingScreenGFX_UnderLine: ; 11e6d
-INCBIN "gfx/unknown/011e6d.1bpp"
+INCBIN "gfx/namingscreen/underline.1bpp"
 ; 11e75
 
 _ComposeMailMessage: ; 11e75 (mail?)
@@ -1039,7 +1039,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
 
 	; init mail icon
 	depixel 3, 2
-	ld a, SPRITE_ANIM_INDEX_00
+	ld a, SPRITE_ANIM_INDEX_PARTY_MON
 	call _InitSpriteAnimStruct
 
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
@@ -1174,7 +1174,7 @@ INCBIN "gfx/icon/mail2.2bpp"
 
 .init_blinking_cursor ; 1201b (4:601b)
 	depixel 9, 2
-	ld a, SPRITE_ANIM_INDEX_09
+	ld a, SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
 	call _InitSpriteAnimStruct
 	ld a, c
 	ld [wNamingScreenCursorObjectPointer], a
diff --git a/engine/overworld.asm b/engine/overworld.asm
index 4d22e55b6..5bbd70a85 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -181,7 +181,7 @@ MapCallbackSprites_LoadUsedSpritesGFX: ; 14209
 	callba LoadEmote
 	call GetMapPermission
 	call CheckOutdoorMap
-	ld c, EMOTE_0B
+	ld c, EMOTE_GRASS_RUSTLE
 	jr z, .outdoor
 	ld c, EMOTE_BOULDER_DUST
 .outdoor
@@ -723,10 +723,8 @@ emote_header: MACRO
 ENDM
 
 EmotesPointers: ; 144d
-; dw source address
-; db length, bank
-; dw dest address
-
+; entries correspond to EMOTE_* constants
+; graphics address, length, starting tile
 	emote_header ShockEmote,     4, $78
 	emote_header QuestionEmote,  4, $78
 	emote_header HappyEmote,     4, $78
@@ -736,9 +734,9 @@ EmotesPointers: ; 144d
 	emote_header SleepEmote,     4, $78
 	emote_header FishEmote,      4, $78
 	emote_header JumpShadowGFX,  1, $7c
-	emote_header FishingRodGFX2, 2, $7c
+	emote_header FishingRodGFX,  2, $7c
 	emote_header BoulderDustGFX, 2, $7e
-	emote_header FishingRodGFX4, 1, $7e
+	emote_header GrassRustleGFX, 1, $7e
 ; 14495
 
 
diff --git a/engine/pack.asm b/engine/pack.asm
index dad9a799d..e10b70e12 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1716,6 +1716,6 @@ TextJump_YouCantUseItInABattle: ; 0x10b11
 ; 0x10b16
 
 PackMenuGFX:
-INCBIN "gfx/misc/pack_menu.2bpp"
+INCBIN "gfx/pack/pack_menu.2bpp"
 PackGFX:
-INCBIN "gfx/misc/pack.2bpp"
+INCBIN "gfx/pack/pack.2bpp"
diff --git a/engine/phone.asm b/engine/phone.asm
index f5f39218d..6366ea579 100644
--- a/engine/phone.asm
+++ b/engine/phone.asm
@@ -203,7 +203,7 @@ ChooseRandomCaller: ; 900bf (24:40bf)
 GetAvailableCallers: ; 900de (24:40de)
 	callba CheckTime
 	ld a, c
-	ld [EngineBuffer1], a ; wd03e (aliases: MenuItemsList, CurFruitTree, CurInput)
+	ld [EngineBuffer1], a
 	ld hl, EngineBuffer3
 	ld bc, 11
 	xor a
@@ -219,7 +219,7 @@ GetAvailableCallers: ; 900de (24:40de)
 	ld hl, PhoneContacts + PHONE_CONTACT_SCRIPT2_TIME
 	ld bc, PHONE_TABLE_WIDTH
 	call AddNTimes
-	ld a, [EngineBuffer1] ; wd03e (aliases: MenuItemsList, CurFruitTree, CurInput)
+	ld a, [EngineBuffer1]
 	and [hl]
 	jr z, .not_good_for_call
 	ld bc, PHONE_CONTACT_MAP_GROUP - PHONE_CONTACT_SCRIPT2_TIME
@@ -381,11 +381,11 @@ Function90199: ; 90199 (24:4199)
 
 .DoPhoneCall:
 	ld a, b
-	ld [wd002], a
+	ld [PhoneScriptBank], a
 	ld a, l
-	ld [wd003], a
+	ld [PhoneCaller], a
 	ld a, h
-	ld [wd004], a
+	ld [PhoneCaller + 1], a
 	ld b, BANK(UnknownScript_0x90205)
 	ld de, UnknownScript_0x90205
 	call ExecuteCallbackScript
@@ -495,9 +495,9 @@ PhoneCall:: ; 9029a
 	ld a, b
 	ld [PhoneScriptBank], a
 	ld a, e
-	ld [PhoneCallerLo], a
+	ld [PhoneCaller], a
 	ld a, d
-	ld [PhoneCallerHi], a
+	ld [PhoneCaller + 1], a
 	call Phone_FirstOfTwoRings
 	call Phone_FirstOfTwoRings
 	callba TrainerRankings_PhoneCalls
@@ -518,14 +518,14 @@ Phone_FirstOfTwoRings: ; 902b3
 Phone_CallerTextboxWithName2: ; 902c9
 	call Phone_CallerTextbox
 	hlcoord 1, 2
-	ld [hl], $62
+	ld [hl], "<PHONE>"
 	inc hl
 	inc hl
 	ld a, [PhoneScriptBank]
 	ld b, a
-	ld a, [PhoneCallerLo]
+	ld a, [PhoneCaller]
 	ld e, a
-	ld a, [PhoneCallerHi]
+	ld a, [PhoneCaller + 1]
 	ld d, a
 	call FarPlaceString
 	ret
@@ -618,7 +618,7 @@ Function90363: ; 90363 (24:4363)
 	push bc
 	call Phone_CallerTextbox
 	hlcoord 1, 1
-	ld [hl], $62
+	ld [hl], "<PHONE>"
 	inc hl
 	inc hl
 	ld d, h
@@ -769,7 +769,7 @@ phone: MACRO
 	db  \6
 	dba \7 ; script 2
 ENDM
-
+; entries correspond to PHONE_* constants
 	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
 	phone TRAINER_NONE, PHONECONTACT_MOM,      KRISS_HOUSE_1F,            7, MomPhoneScript,      0, UnusedPhoneScript
 	phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB,                  0, UnusedPhoneScript,   0, UnusedPhoneScript
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 569bdbb0b..282b9ca91 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -117,7 +117,7 @@ Pokedex_CheckUnlockedUnownMode: ; 400a2
 	ret
 
 Pokedex_InitCursorPosition: ; 400b4
-	ld hl, wPokedexDataStart
+	ld hl, wPokedexOrder
 	ld a, [wLastDexEntry]
 	and a
 	jr z, .done
@@ -512,7 +512,7 @@ Pokedex_InitOptionScreen: ; 4039d (10:439d)
 	call ClearSprites
 	call Pokedex_DrawOptionScreenBG
 	call Pokedex_InitArrowCursor
-	ld a, [wCurrentDexMode]
+	ld a, [wCurrentDexMode] ; Index of the topmost visible item in a scrolling menu ???
 	ld [wDexArrowCursorPosIndex], a
 	call Pokedex_DisplayModeDescription
 	call WaitBGMap
@@ -1479,11 +1479,11 @@ Pokedex_PrintListing: ; 40b0f (10:4b0f)
 	ld a, " "
 	call Pokedex_FillBox
 
-; Load de with wPokedexDataStart + [wDexListingScrollOffset]
+; Load de with wPokedexOrder + [wDexListingScrollOffset]
 	ld a, [wDexListingScrollOffset]
 	ld e, a
 	ld d, $0
-	ld hl, wPokedexDataStart
+	ld hl, wPokedexOrder
 	add hl, de
 	ld e, l
 	ld d, h
@@ -1583,7 +1583,7 @@ Pokedex_GetSelectedMon: ; 40bb1
 	add [hl]
 	ld e, a
 	ld d, $0
-	ld hl, wPokedexDataStart
+	ld hl, wPokedexOrder
 	add hl, de
 	ld a, [hl]
 	ld [wd265], a
@@ -1614,8 +1614,8 @@ Pokedex_CheckSeen: ; 40bd0
 
 
 Pokedex_OrderMonsByMode: ; 40bdc
-	ld hl, wPokedexDataStart
-	ld bc, wPokedexMetadata - wPokedexDataStart
+	ld hl, wPokedexOrder
+	ld bc, wPokedexOrderEnd - wPokedexOrder
 	xor a
 	call ByteFill
 	ld a, [wCurrentDexMode]
@@ -1632,7 +1632,7 @@ Pokedex_OrderMonsByMode: ; 40bdc
 
 .NewMode: ; 40bf6 (10:4bf6)
 	ld de, NewPokedexOrder
-	ld hl, wPokedexDataStart
+	ld hl, wPokedexOrder
 	ld c, NUM_POKEMON
 .loopnew
 	ld a, [de]
@@ -1644,7 +1644,7 @@ Pokedex_OrderMonsByMode: ; 40bdc
 	ret
 
 .OldMode: ; 40c08 (10:4c08)
-	ld hl, wPokedexDataStart
+	ld hl, wPokedexOrder
 	ld a, $1
 	ld c, NUM_POKEMON
 .loopold
@@ -1656,7 +1656,7 @@ Pokedex_OrderMonsByMode: ; 40bdc
 	ret
 
 .FindLastSeen: ; 40c18 (10:4c18)
-	ld hl, wPokedexDataStart + NUM_POKEMON - 1
+	ld hl, wPokedexOrder + NUM_POKEMON - 1
 	ld d, NUM_POKEMON
 	ld e, d
 .loopfindend
@@ -1675,7 +1675,7 @@ Pokedex_OrderMonsByMode: ; 40bdc
 Pokedex_ABCMode: ; 40c30
 	xor a
 	ld [wDexListingEnd], a
-	ld hl, wPokedexDataStart
+	ld hl, wPokedexOrder
 	ld de, AlphabeticalPokedexOrder
 	ld c, NUM_POKEMON
 .loop1abc
@@ -1915,8 +1915,8 @@ Pokedex_SearchForMons: ; 41086
 	add hl, de
 	ld a, [hl]
 	ld [wDexConvertedMonType], a
-	ld hl, wPokedexDataStart
-	ld de, wPokedexDataStart
+	ld hl, wPokedexOrder
+	ld de, wPokedexOrder
 	ld c, NUM_POKEMON
 	xor a
 	ld [wDexSearchResultCount], a
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index 8e5697f75..901053c9f 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -136,7 +136,7 @@ Pokegear_LoadGFX: ; 90c4e
 ; 90cb2
 
 FastShipGFX: ; 90cb2
-INCBIN "gfx/misc/fast_ship.2bpp"
+INCBIN "gfx/pokegear/fast_ship.2bpp"
 ; 90d32
 
 InitPokegearModeIndicatorArrow: ; 90d32 (24:4d32)
@@ -751,7 +751,7 @@ TownMap_GetKantoLandmarkLimits: ; 910e8
 PokegearRadio_Init: ; 910f9 (24:50f9)
 	call InitPokegearTilemap
 	depixel 4, 10, 4, 4
-	ld a, SPRITE_ANIM_INDEX_14
+	ld a, SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -1407,7 +1407,7 @@ PokegearText_DeleteStoredNumber: ; 0x914d8
 ; 0x914dd
 
 PokegearSpritesGFX: ; 914dd
-INCBIN "gfx/misc/pokegear_sprites.2bpp.lz"
+INCBIN "gfx/pokegear/pokegear_sprites.2bpp.lz"
 ; 9150d
 
 RadioTilemapRLE: ; 9150d
@@ -1619,8 +1619,8 @@ RadioChannels:
 
 LoadStation_OaksPokemonTalk: ; 91753 (24:5753)
 	xor a ; OAKS_POKEMON_TALK
-	ld [wd002], a
-	ld [wd005], a
+	ld [wCurrentRadioLine], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1629,9 +1629,9 @@ LoadStation_OaksPokemonTalk: ; 91753 (24:5753)
 
 LoadStation_PokedexShow: ; 91766 (24:5766)
 	ld a, POKEDEX_SHOW
-	ld [wd002], a
+	ld [wCurrentRadioLine], a
 	xor a
-	ld [wd005], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1640,9 +1640,9 @@ LoadStation_PokedexShow: ; 91766 (24:5766)
 
 LoadStation_PokemonMusic: ; 9177b (24:577b)
 	ld a, POKEMON_MUSIC
-	ld [wd002], a
+	ld [wCurrentRadioLine], a
 	xor a
-	ld [wd005], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1651,9 +1651,9 @@ LoadStation_PokemonMusic: ; 9177b (24:577b)
 
 LoadStation_LuckyChannel: ; 91790 (24:5790)
 	ld a, LUCKY_CHANNEL
-	ld [wd002], a
+	ld [wCurrentRadioLine], a
 	xor a
-	ld [wd005], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1662,9 +1662,9 @@ LoadStation_LuckyChannel: ; 91790 (24:5790)
 
 LoadStation_BuenasPassword: ; 917a5 (24:57a5)
 	ld a, BUENAS_PASSWORD
-	ld [wd002], a
+	ld [wCurrentRadioLine], a
 	xor a
-	ld [wd005], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1682,9 +1682,9 @@ NotBuenasPasswordName: db "@"
 
 LoadStation_UnownRadio: ; 917d5 (24:57d5)
 	ld a, UNOWN_RADIO
-	ld [wd002], a
+	ld [wCurrentRadioLine], a
 	xor a
-	ld [wd005], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1693,9 +1693,9 @@ LoadStation_UnownRadio: ; 917d5 (24:57d5)
 
 LoadStation_PlacesAndPeople: ; 917ea (24:57ea)
 	ld a, PLACES_AND_PEOPLE
-	ld [wd002], a
+	ld [wCurrentRadioLine], a
 	xor a
-	ld [wd005], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1704,9 +1704,9 @@ LoadStation_PlacesAndPeople: ; 917ea (24:57ea)
 
 LoadStation_LetsAllSing: ; 917ff (24:57ff)
 	ld a, LETS_ALL_SING
-	ld [wd002], a
+	ld [wCurrentRadioLine], a
 	xor a
-	ld [wd005], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1717,9 +1717,9 @@ LoadStation_LetsAllSing: ; 917ff (24:57ff)
 
 LoadStation_RocketRadio: ; 91814
 	ld a, ROCKET_RADIO
-	ld [wd002], a
+	ld [wCurrentRadioLine], a
 	xor a
-	ld [wd005], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1730,9 +1730,9 @@ LoadStation_RocketRadio: ; 91814
 
 LoadStation_PokeFluteRadio: ; 91829 (24:5829)
 	ld a, POKE_FLUTE_RADIO
-	ld [wd002], a
+	ld [wCurrentRadioLine], a
 	xor a
-	ld [wd005], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1741,9 +1741,9 @@ LoadStation_PokeFluteRadio: ; 91829 (24:5829)
 
 LoadStation_EvolutionRadio: ; 9183e (24:583e)
 	ld a, EVOLUTION_RADIO
-	ld [wd002], a
+	ld [wCurrentRadioLine], a
 	xor a
-	ld [wd005], a
+	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
@@ -1855,20 +1855,20 @@ _TownMap: ; 9191c
 	ld a, $e3
 	ld [rLCDC], a
 	call TownMap_GetCurrentLandmark
-	ld [wd002], a
-	ld [wd003], a
+	ld [wTownMapPlayerIconLandmark], a
+	ld [wTownMapCursorLandmark], a
 	xor a
 	ld [hBGMapMode], a
 	call .InitTilemap
 	call WaitBGMap2
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	call PokegearMap_InitPlayerIcon
-	ld a, [wd003]
+	ld a, [wTownMapCursorLandmark]
 	call PokegearMap_InitCursor
 	ld a, c
-	ld [wd004], a
+	ld [wTownMapCursorObjectPointer], a
 	ld a, b
-	ld [wd005], a
+	ld [wTownMapCursorObjectPointer + 1], a
 	ld b, SCGB_POKEGEAR_PALS
 	call GetSGBLayout
 	call SetPalettes
@@ -1880,7 +1880,7 @@ _TownMap: ; 9191c
 	call DelayFrame
 
 .dmg
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	cp KANTO_LANDMARK
 	jr nc, .kanto
 	ld d, KANTO_LANDMARK - 1
@@ -1925,7 +1925,7 @@ _TownMap: ; 9191c
 	jr .loop
 
 .pressed_up
-	ld hl, wd003
+	ld hl, wTownMapCursorLandmark
 	ld a, [hl]
 	cp d
 	jr c, .okay
@@ -1938,7 +1938,7 @@ _TownMap: ; 9191c
 	jr .next
 
 .pressed_down
-	ld hl, wd003
+	ld hl, wTownMapCursorLandmark
 	ld a, [hl]
 	cp e
 	jr nz, .okay2
@@ -1951,20 +1951,20 @@ _TownMap: ; 9191c
 
 .next
 	push de
-	ld a, [wd003]
+	ld a, [wTownMapCursorLandmark]
 	call PokegearMap_UpdateLandmarkName
-	ld a, [wd004]
+	ld a, [wTownMapCursorObjectPointer]
 	ld c, a
-	ld a, [wd005]
+	ld a, [wTownMapCursorObjectPointer + 1]
 	ld b, a
-	ld a, [wd003]
+	ld a, [wTownMapCursorLandmark]
 	call PokegearMap_UpdateCursorPosition
 	pop de
 	jr .loop2
 ; 91a04
 
 .InitTilemap: ; 91a04
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	cp KANTO_LANDMARK
 	jr nc, .kanto2
 	ld e, $0
@@ -1992,7 +1992,7 @@ _TownMap: ; 9191c
 	call ByteFill
 	hlcoord 19, 2
 	ld [hl], $17
-	ld a, [wd003]
+	ld a, [wTownMapCursorLandmark]
 	call PokegearMap_UpdateLandmarkName
 	callba TownMapPals
 	ret
@@ -2147,7 +2147,7 @@ _FlyMap: ; 91af3
 	jr .exit
 
 .pressedA
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	ld l, a
 	ld h, 0
 	add hl, hl
@@ -2155,7 +2155,7 @@ _FlyMap: ; 91af3
 	add hl, de
 	ld a, [hl]
 .exit
-	ld [wd002], a
+	ld [wTownMapPlayerIconLandmark], a
 	pop af
 	ld [hInMenu], a
 	call ClearBGPalettes
@@ -2165,7 +2165,7 @@ _FlyMap: ; 91af3
 	ld [hBGMapAddress], a
 	ld a, VBGMap0 / $100
 	ld [hBGMapAddress + 1], a
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	ld e, a
 	ret
 
@@ -2186,7 +2186,7 @@ FlyMapScroll: ; 91b73
 	ret
 
 .ScrollNext:
-	ld hl, wd002
+	ld hl, wTownMapPlayerIconLandmark
 	ld a, [hl]
 	cp d
 	jr nz, .NotAtEndYet
@@ -2200,7 +2200,7 @@ FlyMapScroll: ; 91b73
 	jr .Finally
 
 .ScrollPrev:
-	ld hl, wd002
+	ld hl, wTownMapPlayerIconLandmark
 	ld a, [hl]
 	cp e
 	jr nz, .NotAtStartYet
@@ -2269,7 +2269,7 @@ TownMapBubble: ; 91bb5
 
 .Name:
 ; We need the map location of the default flypoint
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	ld l, a
 	ld h, 0
 	add hl, hl ; two bytes per flypoint
@@ -2285,7 +2285,7 @@ TownMapBubble: ; 91bb5
 ; 91c17
 
 GetMapCursorCoordinates: ; 91c17
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	ld l, a
 	ld h, $0
 	add hl, hl
@@ -2293,9 +2293,9 @@ GetMapCursorCoordinates: ; 91c17
 	add hl, de
 	ld e, [hl]
 	callba GetLandmarkCoords
-	ld a, [wd003]
+	ld a, [wTownMapCursorCoordinates]
 	ld c, a
-	ld a, [wd004]
+	ld a, [wTownMapCursorCoordinates + 1]
 	ld b, a
 	ld hl, $4
 	add hl, bc
@@ -2389,8 +2389,7 @@ FlyMap: ; 91c90
 	ld c, a
 	call GetWorldMapLocation
 ; If we're not in a valid location, i.e. Pokecenter floor 2F,
-
-; the backup map information is used
+; the backup map information is used.
 	cp SPECIAL_MAP
 	jr nz, .CheckRegion
 	ld a, [BackupMapGroup]
@@ -2399,7 +2398,7 @@ FlyMap: ; 91c90
 	ld c, a
 	call GetWorldMapLocation
 .CheckRegion:
-; The first 46 locations are part of Johto. The rest are in Kanto
+; The first 46 locations are part of Johto. The rest are in Kanto.
 	cp KANTO_LANDMARK
 	jr nc, .KantoFlyMap
 .JohtoFlyMap:
@@ -2407,10 +2406,10 @@ FlyMap: ; 91c90
 	push af
 ; Start from New Bark Town
 	ld a, FLY_NEW_BARK
-	ld [wd002], a
+	ld [wTownMapPlayerIconLandmark], a
 ; Flypoints begin at New Bark Town...
 	ld [StartFlypoint], a
-; ..and end at Silver Cave
+; ..and end at Silver Cave.
 	ld a, FLY_MT_SILVER
 	ld [EndFlypoint], a
 ; Fill out the map
@@ -2422,17 +2421,13 @@ FlyMap: ; 91c90
 
 .KantoFlyMap:
 ; The event that there are no flypoints enabled in a map is not
-
 ; accounted for. As a result, if you attempt to select a flypoint
 ; when there are none enabled, the game will crash. Additionally,
-
 ; the flypoint selection has a default starting point that
-; can be flown to even if none are enabled
-
+; can be flown to even if none are enabled.
 ; To prevent both of these things from happening when the player
 ; enters Kanto, fly access is restricted until Indigo Plateau is
-
-; visited and its flypoint enabled
+; visited and its flypoint enabled.
 	push af
 	ld c, SPAWN_INDIGO
 	call HasVisitedSpawn
@@ -2447,9 +2442,8 @@ FlyMap: ; 91c90
 	ld a, FLY_INDIGO
 	ld [EndFlypoint], a
 ; Because Indigo Plateau is the first flypoint the player
-
-; visits, it's made the default flypoint
-	ld [wd002], a
+; visits, it's made the default flypoint.
+	ld [wTownMapPlayerIconLandmark], a
 ; Fill out the map
 	call FillKantoMap
 	call .MapHud
@@ -2462,7 +2456,7 @@ FlyMap: ; 91c90
 
 ; Start from New Bark Town
 	ld a, FLY_NEW_BARK
-	ld [wd002], a
+	ld [wTownMapPlayerIconLandmark], a
 ; Flypoints begin at New Bark Town...
 	ld [StartFlypoint], a
 ; ..and end at Silver Cave
@@ -2477,21 +2471,21 @@ FlyMap: ; 91c90
 	call TownMapBGUpdate
 	call TownMapMon
 	ld a, c
-	ld [wd003], a
+	ld [wTownMapCursorCoordinates], a
 	ld a, b
-	ld [wd004], a
+	ld [wTownMapCursorCoordinates + 1], a
 	ret
 
 ; 91d11
 
 _Area: ; 91d11
 ; e: Current landmark
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	push af
-	ld a, [wd003]
+	ld a, [wTownMapCursorLandmark]
 	push af
 	ld a, e
-	ld [wd002], a
+	ld [wTownMapPlayerIconLandmark], a
 	call ClearSprites
 	xor a
 	ld [hBGMapMode], a
@@ -2545,9 +2539,9 @@ _Area: ; 91d11
 .a_b
 	call ClearSprites
 	pop af
-	ld [wd003], a
+	ld [wTownMapCursorLandmark], a
 	pop af
-	ld [wd002], a
+	ld [wTownMapPlayerIconLandmark], a
 	ret
 
 ; 91d9b
@@ -2636,7 +2630,7 @@ _Area: ; 91d11
 ; 91e1e
 
 .GetAndPlaceNest: ; 91e1e
-	ld [wd003], a
+	ld [wTownMapCursorLandmark], a
 	ld e, a
 	callba FindNest ; load nest landmarks into TileMap[0,0]
 	decoord 0, 0
@@ -2678,7 +2672,7 @@ _Area: ; 91d11
 .HideNestsShowPlayer: ; 91e5a
 	call .CheckPlayerLocation
 	ret c
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	ld e, a
 	callba GetLandmarkCoords
 	ld c, e
@@ -2731,22 +2725,21 @@ _Area: ; 91d11
 
 .CheckPlayerLocation: ; 91ea9
 ; Don't show the player's sprite if you're
-
 ; not in the same region as what's currently
 ; on the screen.
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
 	jr c, .johto
 .kanto
-	ld a, [wd003]
+	ld a, [wTownMapCursorLandmark]
 	and a
 	jr z, .clear
 	jr .ok
 
 .johto
-	ld a, [wd003]
+	ld a, [wTownMapCursorLandmark]
 	and a
 	jr nz, .clear
 .ok
@@ -2764,7 +2757,7 @@ _Area: ; 91d11
 ; 91ed0
 
 .GetPlayerOrFastShipIcon: ; 91ed0
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .FastShip
 	callba GetPlayerIcon
@@ -2910,7 +2903,7 @@ TownMapMon: ; 91f7b
 	callba GetSpeciesIcon
 ; Animation/palette
 	depixel 0, 0
-	ld a, SPRITE_ANIM_INDEX_00
+	ld a, SPRITE_ANIM_INDEX_PARTY_MON
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -2977,11 +2970,11 @@ LoadTownMapGFX: ; 91ff2
 ; 91fff
 
 JohtoMap: ; 91fff
-INCBIN "gfx/misc/johto.bin"
+INCBIN "gfx/pokegear/johto.bin"
 ; 92168
 
 KantoMap: ; 92168
-INCBIN "gfx/misc/kanto.bin"
+INCBIN "gfx/pokegear/kanto.bin"
 ; 922d1
 
 PokedexNestIconGFX: ; 922d1
@@ -2991,7 +2984,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 
 ; XXX
 	xor a
-	ld [wd002], a
+	ld [wTownMapPlayerIconLandmark], a
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -3019,9 +3012,9 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 	call TownMapBGUpdate
 	call TownMapMon
 	ld a, c
-	ld [wd003], a
+	ld [wTownMapCursorCoordinates], a
 	ld a, b
-	ld [wd004], a
+	ld [wTownMapCursorCoordinates + 1], a
 	ld b, SCGB_POKEGEAR_PALS
 	call GetSGBLayout
 	call SetPalettes
@@ -3045,7 +3038,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 	jr .finished_a_b
 
 .pressedA
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	ld l, a
 	ld h, 0
 	add hl, hl
@@ -3053,7 +3046,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 	add hl, de
 	ld a, [hl]
 .finished_a_b
-	ld [wd002], a
+	ld [wTownMapPlayerIconLandmark], a
 	pop af
 	ld [hInMenu], a
 	call ClearBGPalettes
@@ -3063,7 +3056,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 	ld [hBGMapAddress], a
 	ld a, VBGMap0 / $100
 	ld [hBGMapAddress + 1], a
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	ld e, a
 	ret
 
@@ -3080,7 +3073,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 	ret
 
 .down_right
-	ld hl, wd002
+	ld hl, wTownMapPlayerIconLandmark
 	ld a, [hl]
 	cp FLY_INDIGO
 	jr c, .okay_dr
@@ -3090,7 +3083,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 	jr .continue
 
 .up_left
-	ld hl, wd002
+	ld hl, wTownMapPlayerIconLandmark
 	ld a, [hl]
 	and a
 	jr nz, .okay_ul
@@ -3098,7 +3091,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 .okay_ul
 	dec [hl]
 .continue
-	ld a, [wd002]
+	ld a, [wTownMapPlayerIconLandmark]
 	cp KANTO_FLYPOINT
 	jr c, .johto
 	call FillKantoMap
diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm
index 37ed2990b..6909a38b2 100755
--- a/engine/printer/serial.asm
+++ b/engine/printer/serial.asm
@@ -292,13 +292,13 @@ Printer_WaitHandshake: ; 841c3 (21:41c3)
 
 Printer_CopyPacket: ; 841e2 (21:41e2)
 	ld a, [hli]
-	ld [wca82], a
+	ld [wPrinterData], a
 	ld a, [hli]
-	ld [wca83], a
+	ld [wPrinterData + 1], a
 	ld a, [hli]
-	ld [wca84], a
+	ld [wPrinterData + 2], a
 	ld a, [hli]
-	ld [wca85], a
+	ld [wPrinterData + 3], a
 	ld a, [hli]
 	ld [wPrinterChecksum], a
 	ld a, [hl]
@@ -307,7 +307,7 @@ Printer_CopyPacket: ; 841e2 (21:41e2)
 
 Printer_ResetData: ; 841fb (21:41fb)
 	xor a
-	ld hl, wca82
+	ld hl, wPrinterData
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@@ -326,7 +326,7 @@ Printer_ResetData: ; 841fb (21:41fb)
 Printer_ComputeChecksum: ; 84219 (21:4219)
 	ld hl, 0
 	ld bc, 4
-	ld de, wca82
+	ld de, wPrinterData
 	call .ComputeChecksum
 	ld a, [wPrinterSendByteCounter]
 	ld c, a
@@ -476,10 +476,10 @@ _PrinterReceive:: ; 842db
 	dw Printer_DoNothing ; 00
 
 	dw Printer_Send0x33 ; 01
-	dw Printer_Sendwca82 ; 02
-	dw Printer_Sendwca83 ; 03
-	dw Printer_Sendwca84 ; 04
-	dw Printer_Sendwca85 ; 05
+	dw Printer_SendPrinterData1 ; 02
+	dw Printer_SendPrinterData2 ; 03
+	dw Printer_SendPrinterData3 ; 04
+	dw Printer_SendPrinterData4 ; 05
 	dw Printer_SendNextByte ; 06
 	dw Printer_SendwPrinterChecksumLo ; 07
 	dw Printer_SendwPrinterChecksumHi ; 08
@@ -524,26 +524,26 @@ Printer_Send0x33: ; 84330 (21:4330)
 	call Printer_NextInstruction
 	ret
 
-Printer_Sendwca82: ; 84339 (21:4339)
-	ld a, [wca82]
+Printer_SendPrinterData1: ; 84339 (21:4339)
+	ld a, [wPrinterData]
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_Sendwca83: ; 84343 (21:4343)
-	ld a, [wca83]
+Printer_SendPrinterData2: ; 84343 (21:4343)
+	ld a, [wPrinterData + 1]
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_Sendwca84: ; 8434d (21:434d)
-	ld a, [wca84]
+Printer_SendPrinterData3: ; 8434d (21:434d)
+	ld a, [wPrinterData + 2]
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_Sendwca85: ; 84357 (21:4357)
-	ld a, [wca85]
+Printer_SendPrinterData4: ; 84357 (21:4357)
+	ld a, [wPrinterData + 3]
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
diff --git a/engine/printnum.asm b/engine/printnum.asm
index 4ef7721c8..7b814a042 100755
--- a/engine/printnum.asm
+++ b/engine/printnum.asm
@@ -275,7 +275,7 @@ _PrintNum:: ; c4c7
 	dec e
 	ret nz
 	inc hl
-	ld [hl], "·"
+	ld [hl], "<DOT>"
 	ret
 
 .PrintLeadingZero: ; c644
diff --git a/engine/radio.asm b/engine/radio.asm
index 99408af48..8760956b2 100644
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -234,7 +234,7 @@ OaksPkmnTalk4:
 	jr z, .done
 .next
 	dec hl
-	ld de, WILDMON_GRASS_STRUCTURE_LENGTH
+	ld de, GRASS_WILDDATA_LENGTH
 	add hl, de
 	jr .loop
 
@@ -249,12 +249,12 @@ endr
 	cp 3
 	jr z, .loop2
 
-	ld bc, 2 * NUM_WILDMONS_PER_AREA_TIME_OF_DAY
+	ld bc, 2 * NUM_GRASSMON
 	call AddNTimes
 .loop3
 	; Choose one of the middle three Pokemon.
 	call Random
-	and NUM_WILDMONS_PER_AREA_TIME_OF_DAY
+	and NUM_GRASSMON
 	cp 2
 	jr c, .loop3
 	cp 5
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 42976ad65..df22995b5 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -979,7 +979,7 @@ Script_cry:
 	ret
 
 GetScriptPerson:
-	and a
+	and a ; PLAYER?
 	ret z
 	cp LAST_TALKED
 	ret z
@@ -1355,19 +1355,19 @@ Script_earthquake:
 ;     param (DecimalParam)
 
 	ld hl, EarthquakeMovement
-	ld de, wd002
+	ld de, wEarthquakeMovementDataBuffer
 	ld bc, EarthquakeMovementEnd - EarthquakeMovement
 	call CopyBytes
 	call GetScriptByte
-	ld [wd003], a
-	and (1 << 6) - 1
-	ld [wd005], a
+	ld [wEarthquakeMovementDataBuffer + 1], a
+	and %00111111
+	ld [wEarthquakeMovementDataBuffer + 3], a
 	ld b, BANK(.script)
 	ld de, .script
 	jp ScriptCall
 
 .script
-	applymovement PLAYER, wd002
+	applymovement PLAYER, wEarthquakeMovementDataBuffer
 	end
 
 EarthquakeMovement:
@@ -2170,7 +2170,7 @@ Script_givepokeitem:
 	ld b, a
 	push bc
 	inc hl
-	ld bc, MAIL_MAX_LENGTH
+	ld bc, MAIL_MSG_LENGTH
 	ld de, wd002
 	ld a, [ScriptBank]
 	call FarCopyBytes
@@ -2668,7 +2668,7 @@ Script_warp:
 	call GetScriptByte
 	ld [YCoord], a
 	ld a, -1
-	ld [wd001], a
+	ld [DefaultSpawnpoint], a
 	ld a, MAPSETUP_WARP
 	ld [hMapEntryMethod], a
 	ld a, 1
@@ -2681,7 +2681,7 @@ Script_warp:
 	call GetScriptByte
 	call GetScriptByte
 	ld a, -1
-	ld [wd001], a
+	ld [DefaultSpawnpoint], a
 	ld a, MAPSETUP_BADWARP
 	ld [hMapEntryMethod], a
 	ld a, 1
@@ -2955,9 +2955,9 @@ ExitScriptSubroutine:
 	ld e, [hl]
 	ld d, $0
 	ld hl, wScriptStack
-	add hl,de
-	add hl,de
-	add hl,de
+	add hl, de
+	add hl, de
+	add hl, de
 	ld a, [hli]
 	ld b, a
 	and " "
diff --git a/engine/selectmenu.asm b/engine/selectmenu.asm
index 838438a4c..5d3b5ff0a 100755
--- a/engine/selectmenu.asm
+++ b/engine/selectmenu.asm
@@ -94,7 +94,7 @@ CheckRegisteredItem: ; 13345
 	dec a
 	cp [hl]
 	jr nc, .NotEnoughItems
-	ld [wd107], a
+	ld [CurItemQuantity], a
 	and a
 	ret
 
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index 93be28d9a..e23b760cd 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -1067,7 +1067,7 @@ ReelAction_InitGolem: ; 92d20
 	push bc
 	push af
 	depixel 12, 13
-	ld a, SPRITE_ANIM_INDEX_SLOT_GOLEM
+	ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_0E
 	add hl, bc
@@ -2211,17 +2211,17 @@ Reel3Tilemap: ; 9334b
 ; 9335d
 
 SlotsTilemap: ; 9335d
-INCBIN "gfx/slots.tilemap"
+INCBIN "gfx/slots/slots.tilemap"
 ; 9344d
 
 Slots1LZ: ; 9344d
-INCBIN "gfx/slots_1.2bpp.lz"
+INCBIN "gfx/slots/slots_1.2bpp.lz"
 ; 935cd
 
 Slots2LZ: ; 935cd
-INCBIN "gfx/slots_2.2bpp.lz"
+INCBIN "gfx/slots/slots_2.2bpp.lz"
 ; 9382d
 
 Slots3LZ: ; 9382d
-INCBIN "gfx/slots_3.2bpp.lz"
+INCBIN "gfx/slots/slots_3.2bpp.lz"
 ; 93a3d
diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm
index e8f1177f2..8dda255a1 100644
--- a/engine/spawn_points.asm
+++ b/engine/spawn_points.asm
@@ -42,17 +42,16 @@ ENDM
 
 
 LoadSpawnPoint: ; 1531f
-	; loads the spawn point in wd001
+	; loads the spawn point in DefaultSpawnpoint
 	push hl
 	push de
-	ld a, [wd001]
+	ld a, [DefaultSpawnpoint]
 	cp SPAWN_N_A
 	jr z, .spawn_n_a
 	ld l, a
 	ld h, 0
-rept 2 ; multiply hl by 4
-	add hl,hl
-endr
+	add hl, hl
+	add hl, hl
 	ld de, SpawnPoints
 	add hl, de
 	ld a, [hli]
diff --git a/engine/specials.asm b/engine/specials.asm
index 2548cf076..e88112286 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -2,9 +2,9 @@
 Special:: ; c01b
 ; Run script special de.
 	ld hl, SpecialsPointers
-	add hl,de
-	add hl,de
-	add hl,de
+	add hl, de
+	add hl, de
+	add hl, de
 	ld b, [hl]
 	inc hl
 	ld a, [hli]
@@ -618,9 +618,9 @@ SpecialGameboyCheck: ; c478
 
 Special_FadeOutMusic: ; c48f
 	ld a, MUSIC_NONE % $100
-	ld [MusicFadeIDLo], a
+	ld [MusicFadeID], a
 	ld a, MUSIC_NONE / $100
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 	ld a, $2
 	ld [MusicFade], a
 	ret
diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm
index ed7fe20ad..e6681c8ac 100755
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -13,54 +13,54 @@ DoAnimFrame: ; 8d24b
 ; 8d25b
 
 .Jumptable: ; 8d25b (23:525b)
-
-	dw .Null        ; null
-	dw .one         ; bouncing mon icon
-	dw .two         ; bouncing mon icon, selected
-	dw .three       ; bouncing mon icon, menu open
-	dw .four
+; entries correspond to SPRITE_ANIM_SEQ_* constants
+	dw .Null
+	dw .PartyMon
+	dw .PartyMonSwitch
+	dw .PartyMonSelected
+	dw .sprite_anim_seq_04
 	dw .namingscreencursor
-	dw .GameFreakLogo         ; Game Freak logo
-	dw .seven
-	dw .eight
-	dw .SlotsGolem        ; Something to do with slots
-	dw .SlotsChansey         ; Something to do with slots
-	dw .SlotsChanseyEgg      ; Something to do with slots
-	dw .mailcompositioncursor      ; blinking cursor
-	dw .thirteen
-	dw .fourteen
-	dw .fifteen
-	dw .sixteen
-	dw .seventeen
-	dw .eighteen
-	dw .EggShell    ; finish egg hatching animation
-	dw .RadioTuningKnob      ; radio tuning knob
-	dw .twentyone   ; cut grass leaves
-	dw .FlyFrom   ; flying sprite
-	dw .FlyLeaf ; flying leaves
-	dw .FlyTo  ; fly to
-	dw .twentyfive
-	dw .twentysix
-	dw .twentyseven
-	dw .twentyeight
-	dw .twentynine  ; intro suicune
-	dw .thirty      ; intro pichu wooper
-	dw .thirtyone   ; celebi
-	dw .thirtytwo   ; intro unown
-	dw .thirtythree ; intro unown F with suicune leaping up
-	dw .thirtyfour  ; intro suicune facing away from us
+	dw .GameFreakLogo
+	dw .GSIntroStar
+	dw .GSIntroSparkle
+	dw .SlotsGolem
+	dw .SlotsChansey
+	dw .SlotsChanseyEgg
+	dw .MailCursor
+	dw .sprite_anim_seq_0D
+	dw .sprite_anim_seq_0E
+	dw .sprite_anim_seq_0F
+	dw .TradePokeBall
+	dw .TradeTubeBulge
+	dw .TrademonInTube
+	dw .RevealNewMon
+	dw .RadioTuningKnob
+	dw .CutLeaves
+	dw .FlyFrom
+	dw .FlyLeaf
+	dw .FlyTo
+	dw .sprite_anim_seq_19
+	dw .sprite_anim_seq_1A
+	dw .sprite_anim_seq_1B
+	dw .sprite_anim_seq_1C
+	dw .IntroSuicune 
+	dw .IntroPichuWooper
+	dw .Celebi
+	dw .IntroUnown
+	dw .IntroUnownF
+	dw .IntroSuicuneAway
 
 
 .Null: ; 8d2a1 (23:52a1)
 	ret
 
-.one ; 8d2a2 (23:52a2)
+.PartyMon ; 8d2a2 (23:52a2)
 	ld a, [wMenuCursorY]
 
 	ld hl, SPRITEANIMSTRUCT_INDEX
 	add hl, bc
 	cp [hl]
-	jr z, .two
+	jr z, .PartyMonSwitch
 
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -71,7 +71,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], $0
 	ret
 
-.two ; 8d2b9 (23:52b9)
+.PartyMonSwitch ; 8d2b9 (23:52b9)
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld [hl], 8 * 3
@@ -113,7 +113,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.three ; 8d2ea (23:52ea)
+.PartyMonSelected ; 8d2ea (23:52ea)
 	ld a, [wMenuCursorY]
 
 	ld hl, SPRITEANIMSTRUCT_INDEX
@@ -132,7 +132,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], 8 * 3
 	ret
 
-.four ; 8d302 (23:5302)
+.sprite_anim_seq_04 ; 8d302 (23:5302)
 	call .AnonymousJumptable
 	jp hl
 ; 8d306 (23:5306)
@@ -203,7 +203,7 @@ DoAnimFrame: ; 8d24b
 	ret
 ; 8d35a
 
-.twentyfive ; 8d35a (23:535a)
+.sprite_anim_seq_19 ; 8d35a (23:535a)
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -221,7 +221,7 @@ DoAnimFrame: ; 8d24b
 	callab NamingScreen_AnimateCursor
 	ret
 
-.mailcompositioncursor ; 8d373 (23:5373)
+.MailCursor ; 8d373 (23:5373)
 	callab ComposeMail_AnimateCursor
 	ret
 
@@ -229,7 +229,7 @@ DoAnimFrame: ; 8d24b
 	callab GameFreakLogoJumper
 	ret
 
-.seven ; 8d381 (23:5381)
+.GSIntroStar ; 8d381 (23:5381)
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -279,7 +279,7 @@ DoAnimFrame: ; 8d24b
 	call DeinitializeSprite
 	ret
 
-.eight ; 8d3c3 (23:53c3)
+.GSIntroSparkle ; 8d3c3 (23:53c3)
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hli]
@@ -404,33 +404,33 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.thirteen ; 8d46e (23:546e)
+.sprite_anim_seq_0D ; 8d46e (23:546e)
 	callab ret_e00ed
 	ret
 
-.fifteen ; 8d475 (23:5475)
+.sprite_anim_seq_0F ; 8d475 (23:5475)
 	callab AnimatePokegearModeIndicatorArrow
 	ret
 
-.fourteen ; 8d47c (23:547c)
+.sprite_anim_seq_0E ; 8d47c (23:547c)
 	callab DummyGame_InterpretJoypad_AnimateCursor
 	ret
 
-.sixteen ; 8d483 (23:5483)
+.TradePokeBall ; 8d483 (23:5483)
 	call .AnonymousJumptable
 	jp hl
 ; 8d487 (23:5487)
 
 ; Anonymous dw (see .AnonymousJumptable)
-	dw .sixteen_zero
-	dw .sixteen_one
-	dw .sixteen_two
-	dw .sixteen_three
-	dw .sixteen_four
-	dw .sixteen_five
+	dw .TradePokeBall_zero
+	dw .TradePokeBall_one
+	dw .TradePokeBall_two
+	dw .TradePokeBall_three
+	dw .TradePokeBall_four
+	dw .TradePokeBall_five
 ; 8d493
 
-.sixteen_zero ; 8d493
+.TradePokeBall_zero ; 8d493
 	ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0
 	call _ReinitSpriteAnimFrame
 
@@ -444,7 +444,7 @@ DoAnimFrame: ; 8d24b
 	ret
 ; 8d4a5
 
-.sixteen_two ; 8d4a5
+.TradePokeBall_two ; 8d4a5
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -460,7 +460,7 @@ DoAnimFrame: ; 8d24b
 	add hl, bc
 	ld [hl], $40
 
-.sixteen_three ; 8d4b8
+.TradePokeBall_three ; 8d4b8
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -478,10 +478,10 @@ DoAnimFrame: ; 8d24b
 .asm_8d4cd
 	ld de, SFX_GOT_SAFARI_BALLS
 	call PlaySFX
-	jr .sixteen_five
+	jr .TradePokeBall_five
 ; 8d4d5
 
-.sixteen_one ; 8d4d5
+.TradePokeBall_one ; 8d4d5
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], $4
@@ -496,7 +496,7 @@ DoAnimFrame: ; 8d24b
 	ret
 ; 8d4e8
 
-.sixteen_four ; 8d4e8
+.TradePokeBall_four ; 8d4e8
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
@@ -542,12 +542,12 @@ DoAnimFrame: ; 8d24b
 	call .IncrementJumptableIndex
 	ret
 
-.sixteen_five ; 8d526
+.TradePokeBall_five ; 8d526
 	call DeinitializeSprite
 	ret
 ; 8d52a
 
-.seventeen ; 8d52a (23:552a)
+.TradeTubeBulge ; 8d52a (23:552a)
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -565,11 +565,11 @@ DoAnimFrame: ; 8d24b
 	call DeinitializeSprite
 	ret
 
-.eighteen ; 8d543 (23:5543)
+.TrademonInTube ; 8d543 (23:5543)
 	callab TradeAnim_AnimateTrademonInTube
 	ret
 
-.EggShell: ; 8d54a (23:554a)
+.RevealNewMon: ; 8d54a (23:554a)
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -610,7 +610,7 @@ DoAnimFrame: ; 8d24b
 	callab AnimateTuningKnob
 	ret
 
-.twentyone ; 8d57f (23:557f)
+.CutLeaves ; 8d57f (23:557f)
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld e, [hl]
@@ -749,15 +749,15 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.twentyseven ; 8d630 (23:5630)
+.sprite_anim_seq_1B ; 8d630 (23:5630)
 	callba Function108bc7
 	ret
 
-.twentyeight ; 8d637 (23:5637)
+.sprite_anim_seq_1C ; 8d637 (23:5637)
 	callba Function108be0
 	ret
 
-.twentynine ; 8d63e (23:563e)
+.IntroSuicune ; 8d63e (23:563e)
 	ld a, [wcf65]
 	and a
 	jr nz, .asm_8d645
@@ -784,7 +784,7 @@ DoAnimFrame: ; 8d24b
 	call _ReinitSpriteAnimFrame
 	ret
 
-.thirty ; 8d666 (23:5666)
+.IntroPichuWooper ; 8d666 (23:5666)
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -803,7 +803,7 @@ DoAnimFrame: ; 8d24b
 .asm_8d67f
 	ret
 
-.thirtytwo ; 8d680 (23:5680)
+.IntroUnown ; 8d680 (23:5680)
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld d, [hl]
@@ -830,7 +830,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.thirtythree ; 8d6a2 (23:56a2)
+.IntroUnownF ; 8d6a2 (23:56a2)
 	ld a, [wcf64]
 	cp $40
 	ret nz
@@ -838,7 +838,7 @@ DoAnimFrame: ; 8d24b
 	call _ReinitSpriteAnimFrame
 	ret
 
-.thirtyfour ; 8d6ae (23:56ae)
+.IntroSuicuneAway ; 8d6ae (23:56ae)
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -846,11 +846,11 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.twentysix ; 8d6b7 (23:56b7)
+.sprite_anim_seq_1A ; 8d6b7 (23:56b7)
 	callba AnimateEZChatCursor
 	ret
 
-.thirtyone ; 8d6be (23:56be)
+.Celebi ; 8d6be (23:56be)
 	callba UpdateCelebiPosition
 	ret
 
diff --git a/engine/sprites.asm b/engine/sprites.asm
index b358275eb..ad36dfbc9 100755
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -551,51 +551,97 @@ BrokenGetStdGraphics: ; 8d1ac
 ; 8d1c4
 
 SpriteAnimSeqData: ; 8d1c4
+; entries correspond to SPRITE_ANIM_INDEX_* constants
 	; frameset sequence, tile
-	db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_01, $00 ; 00
-	db SPRITE_ANIM_FRAMESET_07, SPRITE_ANIM_SEQ_04, $00 ; 01
-	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_05, $05 ; 02
-	db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO, SPRITE_ANIM_SEQ_GAMEFREAK_LOGO, $00 ; 03
-	db SPRITE_ANIM_FRAMESET_0B, SPRITE_ANIM_SEQ_07, $06 ; 04 gs intro star
-	db SPRITE_ANIM_FRAMESET_0C, SPRITE_ANIM_SEQ_08, $06 ; 05 gs intro sparkle
-	db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM, SPRITE_ANIM_SEQ_SLOT_GOLEM, $07 ; 06 slots golem
-	db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY, SPRITE_ANIM_SEQ_SLOTS_CHANSEY, $07 ; 07 slots chansey
-	db SPRITE_ANIM_FRAMESET_SLOTS_EGG, SPRITE_ANIM_SEQ_SLOTS_EGG, $07 ; 08 slots egg
-	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_0C, $05 ; 09
-	db SPRITE_ANIM_FRAMESET_WALK_CYCLE, SPRITE_ANIM_SEQ_NULL, $00 ; 0a walk cycle
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0D, $08 ; 0b
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0E, $08 ; 0c
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0F, $08 ; 0d
-	db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL, SPRITE_ANIM_SEQ_10, $00 ; 0e
-	db SPRITE_ANIM_FRAMESET_TRADE_POOF, SPRITE_ANIM_SEQ_NULL, $00 ; 0f
-	db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE, SPRITE_ANIM_SEQ_11, $00 ; 10
-	db SPRITE_ANIM_FRAMESET_TRADEMON_ICON, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 ; 11
-	db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 ; 12
-	db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT, SPRITE_ANIM_SEQ_13, $00 ; 13
-	db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB, SPRITE_ANIM_SEQ_14, $00 ; 14 radio tuning knob
-	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED, SPRITE_ANIM_SEQ_NULL, $00 ; 15 chris on magnet train
-	db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_15, $00 ; 16 leaves when cutting down a tree
-	db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00 ; 17
-	db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 ; 18 flying leaves
-	db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 ; 19
-	db SPRITE_ANIM_FRAMESET_24, SPRITE_ANIM_SEQ_19, $00 ; 1a
-	db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 ; 1b headbutt
-	db SPRITE_ANIM_FRAMESET_EGG_HATCH, SPRITE_ANIM_SEQ_13, $00 ; 1c
-	db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00 ; 1d
-	db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, $00 ; 1e kris on map
-	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, $00 ; 1f kris on magnet train
-	db SPRITE_ANIM_FRAMESET_2F, SPRITE_ANIM_SEQ_NULL, $00 ; 20
-	db SPRITE_ANIM_FRAMESET_30, SPRITE_ANIM_SEQ_NULL, $00 ; 21
-	db SPRITE_ANIM_FRAMESET_31, SPRITE_ANIM_SEQ_NULL, $00 ; 22
-	db SPRITE_ANIM_FRAMESET_32, SPRITE_ANIM_SEQ_1B, $00 ; 23
-	db SPRITE_ANIM_FRAMESET_33, SPRITE_ANIM_SEQ_1C, $00 ; 24
-	db SPRITE_ANIM_FRAMESET_34, SPRITE_ANIM_SEQ_NULL, $00 ; 25
-	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_1D, $00 ; 26
-	db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_SEQ_1E, $00 ; 27
-	db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_SEQ_1E, $00 ; 28
-	db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_SEQ_20, $00 ; 29 intro unown
-	db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_21, $00 ; 2a
-	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_22, $00 ; 2b
+; SPRITE_ANIM_INDEX_PARTY_MON
+	db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, $00
+; SPRITE_ANIM_INDEX_01
+	db SPRITE_ANIM_FRAMESET_07, SPRITE_ANIM_SEQ_04, $00
+; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
+	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR, $05
+; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
+	db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO, SPRITE_ANIM_SEQ_GAMEFREAK_LOGO, $00
+; SPRITE_ANIM_INDEX_GS_INTRO_STAR
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_STAR, SPRITE_ANIM_SEQ_GS_INTRO_STAR, $06
+; SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE, SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE, $06
+; SPRITE_ANIM_INDEX_SLOTS_GOLEM
+	db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM, SPRITE_ANIM_SEQ_SLOTS_GOLEM, $07
+; SPRITE_ANIM_INDEX_SLOTS_CHANSEY
+	db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY, SPRITE_ANIM_SEQ_SLOTS_CHANSEY, $07
+; SPRITE_ANIM_INDEX_SLOTS_EGG
+	db SPRITE_ANIM_FRAMESET_SLOTS_EGG, SPRITE_ANIM_SEQ_SLOTS_EGG, $07
+; SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
+	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_MAIL_CURSOR, $05
+; SPRITE_ANIM_INDEX_RED_WALK
+	db SPRITE_ANIM_FRAMESET_RED_WALK, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_0B
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0D, $08
+; SPRITE_ANIM_INDEX_DUMMY_GAME
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0E, $08
+; SPRITE_ANIM_INDEX_0D
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0F, $08
+; SPRITE_ANIM_INDEX_TRADE_POKE_BALL
+	db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL, SPRITE_ANIM_SEQ_TRADE_POKE_BALL, $00
+; SPRITE_ANIM_INDEX_TRADE_POOF
+	db SPRITE_ANIM_FRAMESET_TRADE_POOF, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
+	db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE, SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE, $00
+; SPRITE_ANIM_INDEX_TRADEMON_ICON
+	db SPRITE_ANIM_FRAMESET_TRADEMON_ICON, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00
+; SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
+	db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00
+; SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
+	db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00
+; SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
+	db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB, SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB, $00
+; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
+	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_LEAF
+	db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_CUT_LEAVES, $00
+; SPRITE_ANIM_INDEX_CUT_TREE
+	db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_FLY_LEAF
+	db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00
+; SPRITE_ANIM_INDEX_EGG_CRACK
+	db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_1A
+	db SPRITE_ANIM_FRAMESET_24, SPRITE_ANIM_SEQ_19, $00
+; SPRITE_ANIM_INDEX_HEADBUTT
+	db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_EGG_HATCH
+	db SPRITE_ANIM_FRAMESET_EGG_HATCH, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00
+; SPRITE_ANIM_INDEX_1D
+	db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00
+; SPRITE_ANIM_INDEX_BLUE_WALK
+	db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
+	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_20
+	db SPRITE_ANIM_FRAMESET_2F, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_21
+	db SPRITE_ANIM_FRAMESET_30, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_22
+	db SPRITE_ANIM_FRAMESET_31, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_23
+	db SPRITE_ANIM_FRAMESET_32, SPRITE_ANIM_SEQ_1B, $00
+; SPRITE_ANIM_INDEX_24
+	db SPRITE_ANIM_FRAMESET_33, SPRITE_ANIM_SEQ_1C, $00
+; SPRITE_ANIM_INDEX_25
+	db SPRITE_ANIM_FRAMESET_34, SPRITE_ANIM_SEQ_NULL, $00
+; SPRITE_ANIM_INDEX_INTRO_SUICUNE
+	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_INTRO_SUICUNE, $00
+; SPRITE_ANIM_INDEX_INTRO_PICHU
+	db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00
+; SPRITE_ANIM_INDEX_INTRO_WOOPER
+	db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00
+; SPRITE_ANIM_INDEX_INTRO_UNOWN
+	db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_SEQ_INTRO_UNOWN, $00
+; SPRITE_ANIM_INDEX_INTRO_UNOWN_F
+	db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_INTRO_UNOWN_F, $00
+; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
+	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, $00
+; SPRITE_ANIM_INDEX_CELEBI
 	db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, $00 ; 2c
 ; 8d24b
 
diff --git a/engine/startmenu.asm b/engine/startmenu.asm
index 32999cacb..871da86be 100755
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -16,7 +16,7 @@ StartMenu:: ; 125cd
 
 	call LoadMenuDataHeader
 	call .SetUpMenuItems
-	ld a, [wd0d2]
+	ld a, [wBattleMenuCursorBuffer]
 	ld [wMenuCursorBuffer], a
 	call .DrawMenuAccount_
 	call DrawVariableLengthMenuBox
@@ -32,7 +32,7 @@ StartMenu:: ; 125cd
 	call UpdateSprites
 	call UpdateTimePals
 	call .SetUpMenuItems
-	ld a, [wd0d2]
+	ld a, [wBattleMenuCursorBuffer]
 	ld [wMenuCursorBuffer], a
 
 .Select:
@@ -40,7 +40,7 @@ StartMenu:: ; 125cd
 	jr c, .Exit
 	call .DrawMenuAccount
 	ld a, [wMenuCursorBuffer]
-	ld [wd0d2], a
+	ld [wBattleMenuCursorBuffer], a
 	call PlayClickSFX
 	call PlaceHollowCursor
 	call .OpenMenu
@@ -614,7 +614,7 @@ TossItemFromPC: ; 129f4
 	pop af
 	jr c, .quit
 	pop hl
-	ld a, [wd107]
+	ld a, [CurItemQuantity]
 	call TossItem
 	call PartyMonItemName
 	ld hl, .TossedThisMany
diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm
index 6a59019f0..14a0c1d47 100755
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -3,7 +3,7 @@ BattleStatsScreenInit: ; 4dc7b (13:5c7b)
 	cp LINK_MOBILE
 	jr nz, StatsScreenInit
 
-	ld a, [wBattleMode] ; wd22d (aliases: EnemyMonEnd)
+	ld a, [wBattleMode]
 	and a
 	jr z, StatsScreenInit
 	jr _MobileStatsScreenInit
@@ -377,7 +377,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
 	call .PlaceHPBar
 	xor a
 	ld [hBGMapMode], a
-	ld a, [CurBaseData] ; wd236 (aliases: BaseDexNo)
+	ld a, [CurBaseData]
 	ld [wd265], a
 	ld [CurSpecies], a
 	hlcoord 8, 0
@@ -401,7 +401,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
 	hlcoord 9, 4
 	ld a, "/"
 	ld [hli], a
-	ld a, [CurBaseData] ; wd236 (aliases: BaseDexNo)
+	ld a, [CurBaseData]
 	ld [wd265], a
 	call GetPokemonName
 	call PlaceString
@@ -420,7 +420,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
 	ld d, a
 	ld e, [hl]
 	callba ComputeHPBarPixels
-	ld hl, wcda1
+	ld hl, wCurHPPal
 	call SetHPPal
 	ld b, SCGB_STATS_SCREEN_HP_PALS
 	call GetSGBLayout
@@ -453,7 +453,7 @@ Function4df7f: ; 4df7f
 	ld bc, SCREEN_WIDTH
 	ld d, SCREEN_HEIGHT
 .loop
-	ld a, $31
+	ld a, "|"
 	ld [hl], a
 	add hl, bc
 	dec d
@@ -487,7 +487,7 @@ StatsScreen_PlaceShinyIcon: ; 4dfa6 (13:5fa6)
 	ret
 
 StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
-	ld a, [BaseDexNo] ; wd236 (aliases: BaseDexNo)
+	ld a, [BaseDexNo]
 	ld [wd265], a
 	ld [CurSpecies], a
 	xor a
@@ -583,7 +583,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	hlcoord 9, 8
 	ld de, SCREEN_WIDTH
 	ld b, 10
-	ld a, $31
+	ld a, "|"
 .vertical_divider
 	ld [hl], a
 	add hl, de
@@ -601,7 +601,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	call .CalcExpToNextLevel
 	hlcoord 13, 13
 	lb bc, 3, 7
-	ld de, Buffer1 ; wd1ea (aliases: MagikarpLength)
+	ld de, Buffer1
 	call PrintNum
 	ld de, .LevelUpStr
 	hlcoord 10, 12
@@ -649,14 +649,14 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	ld a, [hQuotient + 1]
 	sbc [hl]
 	dec hl
-	ld [Buffer2], a ; wd1eb (aliases: MovementType)
+	ld [Buffer2], a
 	ld a, [hQuotient]
 	sbc [hl]
-	ld [Buffer1], a ; wd1ea (aliases: MagikarpLength)
+	ld [Buffer1], a
 	ret
 
 .AlreadyAtMaxLevel:
-	ld hl, Buffer1 ; wd1ea (aliases: MagikarpLength)
+	ld hl, Buffer1
 	xor a
 	ld [hli], a
 	ld [hli], a
@@ -743,7 +743,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	hlcoord 10, 8
 	ld de, SCREEN_WIDTH
 	ld b, 10
-	ld a, $31
+	ld a, "|"
 .BluePageVerticalDivider:
 	ld [hl], a
 	add hl, de
@@ -891,7 +891,7 @@ StatsScreen_GetAnimationParam: ; 4e2ad (13:62ad)
 
 .PartyMon: ; 4e2bf (13:62bf)
 	ld a, [CurPartyMon]
-	ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
+	ld hl, PartyMon1
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld b, h
@@ -918,7 +918,7 @@ StatsScreen_GetAnimationParam: ; 4e2ad (13:62ad)
 	ret
 
 .Tempmon: ; 4e2ed (13:62ed)
-	ld bc, TempMonSpecies ; wd10e (aliases: TempMon)
+	ld bc, TempMonSpecies
 	jr .CheckEggFaintedFrzSlp ; utterly pointless
 
 .CheckEggFaintedFrzSlp: ; 4e2f2 (13:62f2)
@@ -973,7 +973,7 @@ Unknown_4e32a: ; 4e32a
 EggStatsScreen: ; 4e33a
 	xor a
 	ld [hBGMapMode], a
-	ld hl, wcda1
+	ld hl, wCurHPPal
 	call SetHPPal
 	ld b, SCGB_STATS_SCREEN_HP_PALS
 	call GetSGBLayout
diff --git a/engine/timeset.asm b/engine/timeset.asm
index d560ae817..ca5d9b85a 100755
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -10,9 +10,9 @@ InitClock: ; 90672 (24:4672)
 	ld a, $10
 	ld [MusicFade], a
 	ld a, MUSIC_NONE % $100
-	ld [MusicFadeIDLo], a
+	ld [MusicFadeID], a
 	ld a, MUSIC_NONE / $100
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 	ld c, 8
 	call DelayFrames
 	call RotateFourPalettesLeft
@@ -23,17 +23,17 @@ InitClock: ; 90672 (24:4672)
 	xor a
 	ld [hBGMapMode], a
 	call LoadStandardFont
-	ld de, GFX_908fb
+	ld de, TimeSetBackgroundGFX
 	ld hl, VTiles2 tile $00
-	lb bc, BANK(GFX_908fb), 1
+	lb bc, BANK(TimeSetBackgroundGFX), 1
 	call Request1bpp
-	ld de, GFX_90903
+	ld de, TimeSetUpArrowGFX
 	ld hl, VTiles2 tile $01
-	lb bc, BANK(GFX_90903), 1
+	lb bc, BANK(TimeSetUpArrowGFX), 1
 	call Request1bpp
-	ld de, GFX_9090b
+	ld de, TimeSetDownArrowGFX
 	ld hl, VTiles2 tile $02
-	lb bc, BANK(GFX_9090b), 1
+	lb bc, BANK(TimeSetDownArrowGFX), 1
 	call Request1bpp
 	call .ClearScreen
 	call WaitBGMap
@@ -396,12 +396,12 @@ OakText_ResponseToSetTime: ; 0x908b8
 	db "@"
 ; 0x908fb
 
-GFX_908fb: ; 908fb
-INCBIN "gfx/unknown/0908fb.1bpp"
-GFX_90903: ; 90903
-INCBIN "gfx/unknown/090903.1bpp"
-GFX_9090b: ; 9090b
-INCBIN "gfx/unknown/09090b.1bpp"
+TimeSetBackgroundGFX: ; 908fb
+INCBIN "gfx/timeset/background.1bpp"
+TimeSetUpArrowGFX: ; 90903
+INCBIN "gfx/timeset/up_arrow.1bpp"
+TimeSetDownArrowGFX: ; 9090b
+INCBIN "gfx/timeset/down_arrow.1bpp"
 ; 90913
 
 Special_SetDayOfWeek: ; 90913
@@ -409,13 +409,13 @@ Special_SetDayOfWeek: ; 90913
 	push af
 	ld a, $1
 	ld [hInMenu], a
-	ld de, GFX_90903
+	ld de, TimeSetUpArrowGFX
 	ld hl, VTiles1 tile $6f
-	lb bc, BANK(GFX_90903), 1
+	lb bc, BANK(TimeSetUpArrowGFX), 1
 	call Request1bpp
-	ld de, GFX_9090b
+	ld de, TimeSetDownArrowGFX
 	ld hl, VTiles1 tile $75
-	lb bc, BANK(GFX_9090b), 1
+	lb bc, BANK(TimeSetDownArrowGFX), 1
 	call Request1bpp
 	xor a
 	ld [wTempDayOfWeek], a
diff --git a/engine/title.asm b/engine/title.asm
index 36e2851d3..2073fdf58 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -10,10 +10,10 @@ _TitleScreen: ; 10ed67
 
 ; Reset timing variables
 	ld hl, wJumptableIndex
-	ld [hli], a ; cf63 ; Scene?
-	ld [hli], a ; cf64
-	ld [hli], a ; cf65 ; Timer lo
-	ld [hl], a  ; cf66 ; Timer hi
+	ld [hli], a ; wJumptableIndex
+	ld [hli], a ; wIntroSceneFrameCounter
+	ld [hli], a ; wTitleScreenTimer
+	ld [hl], a  ; wTitleScreenTimer + 1
 
 ; Turn LCD off
 	call DisableLCD
@@ -145,12 +145,12 @@ _TitleScreen: ; 10ed67
 ; Update palette colors
 	ld hl, TitleScreenPalettes
 	ld de, UnknBGPals
-	ld bc, 4 * 32
+	ld bc, 16 palettes
 	call CopyBytes
 
 	ld hl, TitleScreenPalettes
 	ld de, BGPals
-	ld bc, 4 * 32
+	ld bc, 16 palettes
 	call CopyBytes
 
 ; Restore WRAM bank
diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm
index fa351ba3d..31c1578c2 100755
--- a/engine/trade/animation.asm
+++ b/engine/trade/animation.asm
@@ -100,7 +100,7 @@ TradeAnimationPlayer2: ; 28f63
 	tradeanim_end
 
 RunTradeAnimScript: ; 28fa1
-	ld hl, wTradeAnimPointer
+	ld hl, wTradeAnimAddress
 	ld [hl], e
 	inc hl
 	ld [hl], d
@@ -294,7 +294,7 @@ TradeAnim_IncrementJumptableIndex: ; 2910f
 ; 29114
 
 TradeAnim_AdvanceScriptPointer: ; 29114
-	ld hl, wTradeAnimPointer
+	ld hl, wTradeAnimAddress
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
@@ -1110,7 +1110,7 @@ TrademonStats_PrintTrademonID: ; 29611
 
 TradeAnim_RockingBall: ; 2961b
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_0E
+	ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
 	call _InitSpriteAnimStruct
 	call TradeAnim_AdvanceScriptPointer
 	ld a, $20
@@ -1121,7 +1121,7 @@ TradeAnim_RockingBall: ; 2961b
 
 TradeAnim_DropBall: ; 2962c
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_0E
+	ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
@@ -1138,7 +1138,7 @@ TradeAnim_DropBall: ; 2962c
 
 TradeAnim_Poof: ; 29649
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_0F
+	ld a, SPRITE_ANIM_INDEX_TRADE_POOF
 	call _InitSpriteAnimStruct
 	call TradeAnim_AdvanceScriptPointer
 	ld a, $10
@@ -1153,7 +1153,7 @@ TradeAnim_BulgeThroughTube: ; 29660
 	ld a, %11100100 ; 3,2,1,0
 	call DmgToCgbObjPal0
 	depixel 5, 11
-	ld a, SPRITE_ANIM_INDEX_10
+	ld a, SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
 	call _InitSpriteAnimStruct
 	call TradeAnim_AdvanceScriptPointer
 	ld a, $40
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm
index 23defe919..499891fb0 100755
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -448,7 +448,7 @@ TrainerCard_Page1_PrintGameTime: ; 25415 (9:5415)
 	ret nz
 	hlcoord 15, 12
 	ld a, [hl]
-	xor %01010001 ; $7F <--> $2E
+	xor %01010001 ; $7F (space) <--> $2E (colon)
 	ld [hl], a
 	ret
 
@@ -606,11 +606,11 @@ TrainerCard_JohtoBadgesOAM: ; 254c9
 	db $1c | $80, $20, $24, $20 | $80
 ; 25523
 
-CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp"
+CardStatusGFX: INCBIN "gfx/trainer_card/card_status.2bpp"
 
-LeaderGFX:  INCBIN "gfx/misc/leaders.2bpp"
-LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp"
-BadgeGFX:   INCBIN "gfx/misc/badges.2bpp"
-BadgeGFX2:  INCBIN "gfx/misc/badges.2bpp"
+LeaderGFX:  INCBIN "gfx/trainer_card/leaders.2bpp"
+LeaderGFX2: INCBIN "gfx/trainer_card/leaders.2bpp"
+BadgeGFX:   INCBIN "gfx/trainer_card/badges.2bpp"
+BadgeGFX2:  INCBIN "gfx/trainer_card/badges.2bpp"
 
-CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp"
+CardRightCornerGFX: INCBIN "gfx/trainer_card/card_right_corner.2bpp"
diff --git a/engine/unowndex.asm b/engine/unowndex.asm
index d7fe63dc3..007dd9790 100755
--- a/engine/unowndex.asm
+++ b/engine/unowndex.asm
@@ -1,7 +1,7 @@
 UpdateUnownDex: ; fba18
 	ld a, [UnownLetter]
 	ld c, a
-	ld b, 26
+	ld b, NUM_UNOWN
 	ld hl, UnownDex
 .loop
 	ld a, [hli]
diff --git a/engine/variables.asm b/engine/variables.asm
index fde2583b7..edc12ac66 100755
--- a/engine/variables.asm
+++ b/engine/variables.asm
@@ -35,9 +35,9 @@ _GetVarAction:: ; 80648 (20:4648)
 ; 80671 (20:4671)
 
 .VarActionTable: ; 80671
-; $00: copy [de] to StringBuffer2
-; $40: return address in de
-; $80: call function
+; RETVAR_STRBUF2: copy [de] to StringBuffer2
+; RETVAR_ADDR_DE: return address in de
+; RETVAR_EXECUTE: call function
 	dwb StringBuffer2,                  RETVAR_STRBUF2
 	dwb PartyCount,                     RETVAR_STRBUF2
 	dwb .BattleResult,                  RETVAR_EXECUTE
diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm
index 180aada87..365e24ea6 100755
--- a/engine/warp_connection.asm
+++ b/engine/warp_connection.asm
@@ -184,7 +184,7 @@ LoadWarpData: ; 1046c6
 	ret z
 .not_mt_moon_or_tin_tower
 	ld a, [wPrevWarp]
-	ld [wDigWarp], a
+	ld [wDigWarpNumber], a
 	ld a, [wPrevMapGroup]
 	ld [wDigMapGroup], a
 	ld a, [wPrevMapNumber]
@@ -254,7 +254,7 @@ LoadMapTimeOfDay: ; 104750
 	pop af
 	ld [rVBK], a
 
-	ld a, $60
+	ld a, "<BLACK>"
 	ld bc, VBGMap1 - VBGMap0
 	hlbgcoord 0, 0
 	call ByteFill
diff --git a/engine/wildmons.asm b/engine/wildmons.asm
index 6208cfbce..bb668f2be 100755
--- a/engine/wildmons.asm
+++ b/engine/wildmons.asm
@@ -65,7 +65,7 @@ FindNest: ; 2a01f
 	inc hl
 	inc hl
 	inc hl
-	ld a, NUM_WILDMONS_PER_AREA_TIME_OF_DAY * 3
+	ld a, NUM_GRASSMON * 3
 	call .SearchMapForMon
 	jr nc, .next_grass
 	ld [de], a
@@ -73,7 +73,7 @@ FindNest: ; 2a01f
 
 .next_grass
 	pop hl
-	ld bc, WILDMON_GRASS_STRUCTURE_LENGTH
+	ld bc, GRASS_WILDDATA_LENGTH
 	add hl, bc
 	jr .FindGrass
 ; 2a06e
author	surskitty <surskitty@gmail.com>	2017-12-11 17:37:34 -0500
committer	surskitty <surskitty@gmail.com>	2017-12-11 17:37:34 -0500
commit	98128cd4d8457948e7136a16e08bacff0bc3529d (patch)
tree	171c67509afba62571266bd6bebbfdb829d2a876 /engine
parent	069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff)
parent	94c7def4883fbdbcd3987a067443a2069b8bb610 (diff)