Crystal Intro

engine/breeding/egg.asm

@@ -731,14 +731,14 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
 	ld a, 2
 	ld [hSCX], a
 	ld a, -2
-	ld [wc3c0], a
+	ld [wGlobalAnimXOffset], a
 	call EggHatch_DoAnimFrame
 	ld c, 2
 	call DelayFrames
 	ld a, -2
 	ld [hSCX], a
 	ld a, 2
-	ld [wc3c0], a
+	ld [wGlobalAnimXOffset], a
 	call EggHatch_DoAnimFrame
 	ld c, 2
 	call DelayFrames
@@ -754,7 +754,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
 	call PlaySFX
 	xor a
 	ld [hSCX], a
-	ld [wc3c0], a
+	ld [wGlobalAnimXOffset], a
 	call ClearSprites
 	call Function173b3
 	hlcoord 6, 3

engine/intro_menu.asm

@@ -7,7 +7,7 @@ _MainMenu: ; 5ae8
 	ld [wMapMusic], a
 	call PlayMusic
 	callba MainMenu
-	jp Function6219
+	jp StartTitleScreen
 ; 5b04
 
 ; unreferenced
@@ -1003,19 +1003,19 @@ Intro_PlacePlayerSprite: ; 61cd
 
 .sprites ; 61fe
 	db 4
-	db $4c, $48, 0
-	db $4c, $50, 1
-	db $54, $48, 2
-	db $54, $50, 3
+	db  9 * 8 + 4,  9 * 8, 0
+	db  9 * 8 + 4, 10 * 8, 1
+	db 10 * 8 + 4,  9 * 8, 2
+	db 10 * 8 + 4, 10 * 8, 3
 ; 620b
 
 
 Function620b: ; 620b
 	callab Functione4579
-	jr c, Function6219
+	jr c, StartTitleScreen
 	callba CrystalIntro
 
-Function6219: ; 6219
+StartTitleScreen: ; 6219
 	ld a, [rSVBK]
 	push af
 	ld a, $5

engine/namingscreen.asm

@@ -898,9 +898,9 @@ Function11c51: ; 11c51
 	ld [hl], $7e
 	xor a
 	ld [hSCY], a
-	ld [wc3bf], a
+	ld [wGlobalAnimYOffset], a
 	ld [hSCX], a
-	ld [wc3c0], a
+	ld [wGlobalAnimXOffset], a
 	ld [wJumptableIndex], a
 	ld [wcf64], a
 	ld [hBGMapMode], a

engine/options_menu.asm

@@ -47,7 +47,7 @@ _OptionsMenu: ; e41d0
 	jr c, .ExitOptions
 
 .dpad
-	call Functione455c
+	call Options_UpdateCursorPosition
 	ld c, 3
 	call DelayFrames
 	jr .joypad_loop
@@ -563,3 +563,20 @@ OptionsControl: ; e452a
 	scf
 	ret
 ; e455c
+
+Options_UpdateCursorPosition: ; e455c
+	hlcoord 1, 1
+	ld de, SCREEN_WIDTH
+	ld c, $10
+.loop
+	ld [hl], " "
+	add hl, de
+	dec c
+	jr nz, .loop
+	hlcoord 1, 2
+	ld bc, 2 * SCREEN_WIDTH
+	ld a, [wJumptableIndex]
+	call AddNTimes
+	ld [hl], "▶"
+	ret
+; e4579

engine/sprites.asm

@@ -259,13 +259,13 @@ Function8d04c: ; 8d04c
 	ld c, a ; number of objects
 .loop
 	; first byte: y (px)
-	; [de] = [wCurrAnimYCoord] + [wCurrAnimYOffset] + [wc3bf] + Function8d0be([hl])
+	; [de] = [wCurrAnimYCoord] + [wCurrAnimYOffset] + [wGlobalAnimYOffset] + Function8d0be([hl])
 	ld a, [wCurrAnimYCoord]
 	ld b, a
 	ld a, [wCurrAnimYOffset]
 	add b
 	ld b, a
-	ld a, [wc3bf]
+	ld a, [wGlobalAnimYOffset]
 	add b
 	ld b, a
 	call Function8d0be
@@ -274,13 +274,13 @@ Function8d04c: ; 8d04c
 	inc hl
 	inc de
 	; second byte: x (px)
-	; [de] = [wCurrAnimXCoord] + [wCurrAnimXOffset] + [wc3c0] + Function8d0ce([hl])
+	; [de] = [wCurrAnimXCoord] + [wCurrAnimXOffset] + [wGlobalAnimXOffset] + Function8d0ce([hl])
 	ld a, [wCurrAnimXCoord]
 	ld b, a
 	ld a, [wCurrAnimXOffset]
 	add b
 	ld b, a
-	ld a, [wc3c0]
+	ld a, [wGlobalAnimXOffset]
 	add b
 	ld b, a
 	call Function8d0ce
@@ -411,15 +411,15 @@ LookUpInwSpriteAnimDict: ; 8d109
 ; 8d120
 
 Function8d120:: ; 8d120
-	ld hl, $1
+	ld hl, SPRITEANIMSTRUCT_01
 	add hl, bc
 	ld [hl], a
-	ld hl, $8
+	ld hl, SPRITEANIMSTRUCT_DURATION
 	add hl, bc
-	ld [hl], $0
-	ld hl, $a
+	ld [hl], 0
+	ld hl, SPRITEANIMSTRUCT_FRAME
 	add hl, bc
-	ld [hl], $ff
+	ld [hl], -1
 	ret
 ; 8d132
 
@@ -593,7 +593,7 @@ Unknown_8d1c4: ; 8d1c4
 	db $35, SPRITE_ANIM_SEQ_1D, $00 ; 26
 	db $37, SPRITE_ANIM_SEQ_1E, $00 ; 27
 	db $38, SPRITE_ANIM_SEQ_1E, $00 ; 28
-	db $39, SPRITE_ANIM_SEQ_20, $00 ; 29
+	db $39, SPRITE_ANIM_SEQ_20, $00 ; 29 intro unown
 	db $3f, SPRITE_ANIM_SEQ_21, $00 ; 2a
 	db $3e, SPRITE_ANIM_SEQ_22, $00 ; 2b
 	db $40, SPRITE_ANIM_SEQ_00, $00 ; 2c