5 files changed, 52 insertions, 23 deletions
diff --git a/scripts/celadongamecorner2.asm b/scripts/celadongamecorner2.asm
new file mode 100755
index 00000000..f8d25905
--- /dev/null
+++ b/scripts/celadongamecorner2.asm
@@ -0,0 +1,12 @@
+Func_f1f23:
+	ld hl, PikachuMovementData_f1f2c
+	ld b, SPRITE_FACING_DOWN
+	call TryApplyPikachuMovementData
+	ret
+
+PikachuMovementData_f1f2c:
+	db $00
+	db $20
+	db $1e
+	db $35
+	db $3f
diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm
index 6df2bcd6..187f8579 100755
--- a/scripts/daycarem.asm
+++ b/scripts/daycarem.asm
@@ -221,8 +221,8 @@ DayCareMText1:
 	ld [wPikachuSpawnState], a
 
 	; GameFreak... TriHard
-	ld hl, Func_fc4fa
-	ld b, BANK(Func_fc4fa)
+	ld hl, SchedulePikachuSpawnForAfterText
+	ld b, BANK(SchedulePikachuSpawnForAfterText)
 	ld hl, Bankswitch
 
 	ldpikacry e, PikachuCry35
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index 5a6b9456..55b58b39 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -473,8 +473,8 @@ OaksLabScript17:
 	ld [wPlayerFacingDirection], a
 	ld a, $2
 	ld [wPikachuSpawnState], a
-	callba Func_fc4fa
-	call Func_1525
+	callba SchedulePikachuSpawnForAfterText
+	call EnablePikachuOverworldSpriteDrawing
 	ld a, $1a
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -1044,7 +1044,7 @@ OaksLabText18:
 	call AddPartyMon
 	ld a, 163
 	ld [wPartyMon1CatchRate], a
-	call Func_152d
+	call DisablePikachuOverworldSpriteDrawing
 	SetEvent EVENT_GOT_STARTER
 	ld hl, wd72e
 	set 3, [hl]
diff --git a/scripts/pokemontower2_2.asm b/scripts/pokemontower2_2.asm
new file mode 100755
index 00000000..42659da3
--- /dev/null
+++ b/scripts/pokemontower2_2.asm
@@ -0,0 +1,12 @@
+Func_f1e22:
+	ld hl, PikachuMovementData_f1e2b
+	ld b, SPRITE_FACING_RIGHT
+	call TryApplyPikachuMovementData
+	ret
+
+PikachuMovementData_f1e2b:
+	db $00
+	db $1d
+	db $1f
+	db $38
+	db $3f
diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm
index eb726831..90ffc34c 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -29,14 +29,15 @@ Gym3LeaderName:
 
 VermilionGymScript_5ca6d:
 	CheckEvent EVENT_2ND_LOCK_OPENED
-	jr nz, .asm_5ca78
+	jr nz, .opened_second_lock
 	ld a, $24
-	jr .asm_5ca7f
-.asm_5ca78
+	jr .load_door_tile
+
+.opened_second_lock
 	ld a, SFX_GO_INSIDE
 	call PlaySound
 	ld a, $5
-.asm_5ca7f
+.load_door_tile
 	ld [wNewTileBlockID], a
 	lb bc, 2, 2
 	predef_jump ReplaceTileBlock
@@ -73,12 +74,13 @@ VermilionGymScript_5caaa:
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_GOT_TM24
-	jr .asm_5cad3
+	jr .set_gym_flags
+
 .BagFull
 	ld a, $8
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-.asm_5cad3
+.set_gym_flags
 	ld hl, wObtainedBadges
 	set 2, [hl]
 	ld hl, wBeatGymFlags
@@ -132,17 +134,19 @@ VermilionGymTrainerHeader2:
 VermilionGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_LT_SURGE
-	jr z, .asm_5cb39
+	jr z, .engage_surge
 	CheckEventReuseA EVENT_GOT_TM24
-	jr nz, .asm_5cb31
+	jr nz, .after_win_text
 	call z, VermilionGymScript_5caaa
 	call DisableWaitingAfterTextDisplay
-	jr .asm_5cb6a
-.asm_5cb31
+	jr .text_script_end
+
+.after_win_text
 	ld hl, VermilionGymText_5cb72
 	call PrintText
-	jr .asm_5cb6a
-.asm_5cb39
+	jr .text_script_end
+
+.engage_surge
 	ld hl, VermilionGymText_5cb6d
 	call PrintText
 	ld hl, wd72d
@@ -162,7 +166,7 @@ VermilionGymText1:
 	ld a, $3
 	ld [wVermilionGymCurScript], a
 	ld [wCurMapScript], a
-.asm_5cb6a
+.text_script_end
 	jp TextScriptEnd
 
 VermilionGymText_5cb6d:
@@ -179,7 +183,7 @@ VermilionGymText6:
 
 VermilionGymText7:
 	TX_FAR _ReceivedTM24Text
-	db $11
+	TX_SFX_KEY_ITEM
 	TX_FAR _TM24ExplanationText
 	db "@"
 
@@ -249,14 +253,15 @@ VermilionGymText5:
 	TX_ASM
 	ld a, [wBeatGymFlags]
 	bit 2, a
-	jr nz, .asm_5cbeb
+	jr nz, .beat_surge
 	ld hl, VermilionGymText_5cbf4
 	call PrintText
-	jr .asm_5cbf1
-.asm_5cbeb
+	jr .text_script_end
+
+.beat_surge
 	ld hl, VermilionGymText_5cbf9
 	call PrintText
-.asm_5cbf1
+.text_script_end
 	jp TextScriptEnd
 
 VermilionGymText_5cbf4: