Identify a few more labels and data

2 files changed, 21 insertions, 18 deletions

diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm
index 146cf5d8..012514a9 100644
--- a/engine/debug/color_picker.asm
+++ b/engine/debug/color_picker.asm
@@ -227,7 +227,7 @@ DebugColorMain:
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	cp 4
-	jr nc, .asm_fd49e
+	jr nc, .no_start_select
 	ld hl, hJoyLast
 	ld a, [hl]
 	and SELECT
@@ -236,7 +236,7 @@ DebugColorMain:
 	and START
 	jr nz, .PreviousMon
 
-.asm_fd49e
+.no_start_select
 	jumptable Jumptable_fd4e2, wJumptableIndex
 
 .NextMon:
@@ -982,14 +982,14 @@ DebugColor_PlaceCursor:
 	jr nz, .clearsprites
 	ld a, [wce64]
 	and a
-	jr z, .asm_fd996
+	jr z, .place_cursor
 	dec a
 	hlcoord 1, 11
 	ld bc, 2 * SCREEN_WIDTH
 	call AddNTimes
 	ld [hl], "▶"
 
-.asm_fd996
+.place_cursor
 	ld a, [wce65]
 	and a
 	jr z, .lightcolor
@@ -1402,14 +1402,14 @@ DebugColor_PlaceCursor2:
 	ld [hl], a
 	ld a, [wce65]
 	and a
-	jr z, .asm_fdde1
+	jr z, .place_cursor
 	dec a
 	hlcoord 0, 4
 	ld bc, 2 * SCREEN_WIDTH
 	call AddNTimes
 	ld [hl], "▶"
 
-.asm_fdde1
+.place_cursor
 	ld a, [wce66]
 	hlcoord 0, 2
 	ld bc, 5
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 49f40940..a15ada46 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -164,7 +164,7 @@ IntroScene2:
 
 IntroScene3:
 ; rise towards the surface
-	call Functione4e90
+	call IntroScene3Jumper
 	call Functione4e67
 	ret nc
 ; next scene if carry flag is set
@@ -271,7 +271,7 @@ Functione4e67:
 	scf
 	ret
 
-Functione4e90:
+IntroScene3Jumper:
 	jumptable .dw, wIntroFrameCounter1
 
 .dw
@@ -785,7 +785,7 @@ IntroScene10:
 	ld [hli], a
 	call EnableLCD
 	ld a, 0
-	call Functione5422
+	call DrawIntroCharizardGraphic
 
 	ld a, $80
 	ldh [hSCY], a
@@ -864,7 +864,7 @@ IntroScene12:
 	db %01101010, %10100101, %11100100, %00000000
 
 IntroScene13:
-; Charizard mouth closed
+; Charizard mouth open
 	ld hl, wIntroFrameCounter1
 	ld a, [hl]
 	and a
@@ -876,13 +876,13 @@ IntroScene13:
 	ld hl, wIntroJumptableIndex
 	inc [hl]
 	ld a, 1
-	call Functione5422
+	call DrawIntroCharizardGraphic
 	ld a, 4
 	ld [wIntroFrameCounter1], a
 	ret
 
 IntroScene14:
-; Charizard mouth open
+; Charizard breathing fire
 	ld hl, wIntroFrameCounter1
 	ld a, [hl]
 	and a
@@ -894,7 +894,7 @@ IntroScene14:
 	ld hl, wIntroJumptableIndex
 	inc [hl]
 	ld a, 2
-	call Functione5422
+	call DrawIntroCharizardGraphic
 	ld a, 64
 	ld [wIntroFrameCounter1], a
 	xor a
@@ -1061,10 +1061,10 @@ Functione5412:
 	farcall Intro_LoadMonPalette
 	ret
 
-Functione5422:
+DrawIntroCharizardGraphic:
 	push af
 	hlcoord 0, 6
-	ld c, $a0
+	ld c, SCREEN_WIDTH * 8
 	xor a
 .loop1
 	ld [hli], a
@@ -1074,7 +1074,7 @@ Functione5422:
 	pop af
 	ld e, a
 	ld d, 0
-	ld hl, .data_e5464
+	ld hl, .charizard_data
 rept 5
 	add hl, de
 endr
@@ -1114,12 +1114,15 @@ endr
 	ldh [hBGMapMode], a
 	ret
 
-.data_e5464
-; vtile offset, width, height, x, y
+.charizard_data
+; db vtile offset, width, height; dwcoord x, y
+; mouth closed
 	db $00, 8, 8
 	dwcoord 10, 6
+; mouth open
 	db $40, 9, 8
 	dwcoord 9, 6
+; breathing fire
 	db $88, 9, 8
 	dwcoord 8, 6