Merge pull request #9 from PikalaxALT/master

Disassemble banks 3A, 3F, and all outdoor maps

1 files changed, 502 insertions, 578 deletions

diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index aff39cbc..43464d77 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -7,7 +7,8 @@ OaksLabScript: ; 1cb0e (7:4b0e)
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, OaksLabScriptPointers
 	ld a, [W_OAKSLABCURSCRIPT]
-	jp CallFunctionInTable
+	call JumpTable
+	ret
 
 OaksLabScriptPointers: ; 1cb28 (7:4b28)
 	dw OaksLabScript0
@@ -29,6 +30,10 @@ OaksLabScriptPointers: ; 1cb28 (7:4b28)
 	dw OaksLabScript16
 	dw OaksLabScript17
 	dw OaksLabScript18
+	dw OaksLabScript19
+	dw OaksLabScript20
+	dw OaksLabScript21
+	dw OaksLabScript22
 
 OaksLabScript0: ; 1cb4e (7:4b4e)
 	CheckEvent EVENT_OAK_APPEARED_IN_PALLET
@@ -47,7 +52,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e)
 	ret
 
 OaksLabScript1: ; 1cb6e (7:4b6e)
-	ld a, $8
+	ld a, $6
 	ld [H_SPRITEINDEX], a
 	ld de, OakEntryMovement
 	call MoveSprite
@@ -90,7 +95,7 @@ OaksLabScript3: ; 1cba2 (7:4ba2)
 	xor a
 	ld [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, $5
+	ld a, $3
 	ld [H_SPRITEINDEX], a
 	xor a
 	ld [hSpriteFacingDirection], a
@@ -104,7 +109,7 @@ PlayerEntryMovementRLE: ; 1cbcf (7:4bcf)
 	db D_UP,$8
 	db $ff
 
-OaksLabScript4: ; 1cbd2 (7:4bd2)
+OaksLabScript4: ; 1cbd2 (7:445f)
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -115,7 +120,6 @@ OaksLabScript4: ; 1cbd2 (7:4bd2)
 	ld a, SPRITE_FACING_UP
 	ld [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	call UpdateSprites
 	ld hl, wFlags_D733
 	res 1, [hl]
 	call PlayDefaultMusic
@@ -125,24 +129,29 @@ OaksLabScript4: ; 1cbd2 (7:4bd2)
 	ret
 
 OaksLabScript5: ; 1cbfd (7:4bfd)
+	ld hl, wd74b
+	set 1, [hl]
 	ld a, $fc
 	ld [wJoyIgnore], a
-	ld a, $11
+	ld a, $d
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call Delay3
-	ld a, $12
+	ld a, $e
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call Delay3
-	ld a, $13
+	ld a, $2
+	ld [wSpriteStateData1 + 1 * $10 + 1], a
+	ld a, SPRITE_FACING_UP
+	ld [wSpriteStateData1 + 1 * $10 + 9], a
+	ld a, $f
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call Delay3
-	ld a, $14
+	ld a, $10
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON
 	xor a
 	ld [wJoyIgnore], a
 
@@ -154,7 +163,7 @@ OaksLabScript6: ; 1cc36 (7:4c36)
 	ld a, [wYCoord]
 	cp $6
 	ret nz
-	ld a, $5
+	ld a, $3
 	ld [H_SPRITEINDEX], a
 	xor a ; SPRITE_FACING_DOWN
 	ld [hSpriteFacingDirection], a
@@ -165,7 +174,7 @@ OaksLabScript6: ; 1cc36 (7:4c36)
 	ld [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
 	call UpdateSprites
-	ld a, $c
+	ld a, $a
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $1
@@ -191,176 +200,130 @@ OaksLabScript7: ; 1cc72 (7:4c72)
 	ret
 
 OaksLabScript8: ; 1cc80 (7:4c80)
-	ld a, [W_PLAYERSTARTER]
-	cp STARTER1
-	jr z, .Charmander
-	cp STARTER2
-	jr z, .Squirtle
-	jr .Bulbasaur
-.Charmander
-	ld de, .MiddleBallMovement1
-	ld a, [wYCoord]
-	cp $4 ; is the player standing below the table?
-	jr z, .asm_1ccf3
-	ld de, .MiddleBallMovement2
-	jr .asm_1ccf3
-
-.MiddleBallMovement1
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_UP
-	db $FF
-
-.MiddleBallMovement2
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_RIGHT
-	db $FF
-
-.Squirtle
-	ld de, .RightBallMovement1
-	ld a, [wYCoord]
-	cp $4 ; is the player standing below the table?
-	jr z, .asm_1ccf3
-	ld de, .RightBallMovement2
-	jr .asm_1ccf3
-
-.RightBallMovement1
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_UP
-	db $FF
-
-.RightBallMovement2
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_RIGHT
-	db NPC_MOVEMENT_RIGHT
-	db $FF
-
-.Bulbasaur
-	ld de, .LeftBallMovement1
-	ld a, [wXCoord]
-	cp $9 ; is the player standing to the right of the table?
-	jr nz, .asm_1ccf3
-	push hl
 	ld a, $1
-	ld [H_SPRITEINDEX], a
-	ld a, $4
-	ld [H_SPRITEDATAOFFSET], a
-	call GetPointerWithinSpriteStateData1
-	push hl
-	ld [hl], $4c
-	inc hl
-	inc hl
-	ld [hl], $0
-	pop hl
-	inc h
-	ld [hl], $8
-	inc hl
-	ld [hl], $9
-	ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that
-	pop hl
-	jr .asm_1ccf3
-
-.LeftBallMovement1
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_RIGHT ; not yet terminated!
-.LeftBallMovement2
-	db NPC_MOVEMENT_RIGHT
-	db $FF
-
-.asm_1ccf3
-	ld a, $1
-	ld [H_SPRITEINDEX], a
+	ld [hSpriteIndexOrTextID], a
+	ld de, .SonyPushesPlayerAwayFromEeveeBall
 	call MoveSprite
-
 	ld a, $9
 	ld [W_OAKSLABCURSCRIPT], a
 	ret
 
+.SonyPushesPlayerAwayFromEeveeBall
+	db $00
+	db $07
+	db $07
+	db $07
+	db $FF
+
 OaksLabScript9: ; 1cd00 (7:4d00)
 	ld a, [wd730]
 	bit 0, a
-	ret nz
-	ld a, $fc
-	ld [wJoyIgnore], a
+	jr nz, .asm_1c564
+	ld a, HS_STARTER_BALL_1
+	ld [wMissableObjectIndex], a
+	predef HideObject
 	ld a, $1
 	ld [H_SPRITEINDEX], a
 	ld a, SPRITE_FACING_UP
 	ld [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, $d
-	ld [hSpriteIndexOrTextID], a
-	call DisplayTextID
-	ld a, [wRivalStarterBallSpriteIndex]
-	cp $2
-	jr nz, .asm_1cd28
-	ld a, HS_STARTER_BALL_1
-	jr .asm_1cd32
-.asm_1cd28
-	cp $3
-	jr nz, .asm_1cd30
-	ld a, HS_STARTER_BALL_2
-	jr .asm_1cd32
-.asm_1cd30
-	ld a, HS_STARTER_BALL_3
-.asm_1cd32
-	ld [wMissableObjectIndex], a
-	predef HideObject
-	call Delay3
-	ld a, [wRivalStarterTemp]
+	ld a, 1
 	ld [W_RIVALSTARTER], a
-	ld [wcf91], a
+	ld a, EEVEE
 	ld [wd11e], a
 	call GetMonName
+	ld a, $FF ^ (A_BUTTON | B_BUTTON)
+	ld [wJoyIgnore], a
+	ld a, $11
+	ld [hSpriteIndexOrTextID], a
+	call DisplayTextID
+
+	ld a, $a
+	ld [W_OAKSLABCURSCRIPT], a
+	ret
+
+.asm_1c564
+	ld a, [wYCoord]
+	cp $4
+	ret nz
+	ld a, [wNPCNumScriptedSteps]
+	cp 1
+	ret nz
+	ld a, PLAYER_DIR_LEFT
+	ld [wPlayerMovingDirection], a
+	ld a, $2
+	ld [wSimulatedJoypadStatesIndex], a
+	ld a, D_RIGHT
+	ld [wSimulatedJoypadStatesEnd], a
+	ld [wSimulatedJoypadStatesEnd + 1], a
+	call StartSimulatingJoypadStates
+	ret
+
+OaksLabScript10: ; 1cd6d (7:4d6d)
+	ld a, [wYCoord]
+	cp $4
+	jr z, .asm_1c599
 	ld a, $1
-	ld [H_SPRITEINDEX], a
-	ld a, SPRITE_FACING_UP
-	ld [hSpriteFacingDirection], a
-	call SetSpriteFacingDirectionAndDelay
-	ld a, $e
+	ld [wSimulatedJoypadStatesIndex], a
+	ld a, D_LEFT
+	ld [wSimulatedJoypadStatesEnd], a
+	jr .asm_1c5a6
+
+.asm_1c599
+	ld hl, wSimulatedJoypadStatesEnd
+	ld de, OaksLabRLE_PlayerWalksToOak
+	call DecodeRLEList
+	dec a
+	ld [wSimulatedJoypadStatesIndex], a
+.asm_1c5a6
+	call StartSimulatingJoypadStates
+	ld a, $b
+	ld [W_OAKSLABCURSCRIPT], a
+	ret
+
+OaksLabRLE_PlayerWalksToOak:
+	db D_UP, 2
+	db D_LEFT, 3
+	db D_DOWN, 1
+	db D_LEFT, 1
+	db $FF
+
+OaksLabScript11:
+	ld a, [wSimulatedJoypadStatesIndex]
+	and a
+	ret nz
+	ld a, $12
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	SetEvent EVENT_GOT_STARTER
 	xor a
 	ld [wJoyIgnore], a
 
-	ld a, $a
+	ld a, $c
 	ld [W_OAKSLABCURSCRIPT], a
 	ret
 
-OaksLabScript10: ; 1cd6d (7:4d6d)
+OaksLabScript12:
 	ld a, [wYCoord]
 	cp $6
 	ret nz
+	ld a, PLAYER_DIR_UP
+	ld [wPlayerMovingDirection], a
 	ld a, $1
-	ld [H_SPRITEINDEX], a
-	xor a ; SPRITE_FACING_DOWN
+	ld [hSpriteIndexOrTextID], a
+	xor a
 	ld [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, PLAYER_DIR_UP
-	ld [wPlayerMovingDirection], a
 	ld c, BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
-	ld a, $f
+	ld a, $b
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $1
 	ld [hNPCPlayerRelativePosPerspective], a
 	ld a, $1
 	swap a
-	ld [hNPCSpriteOffset], a
+	ld [hNPCPlayerYDistance], a
 	predef CalcPositionOfPlayerRelativeToNPC
 	ld a, [hNPCPlayerYDistance]
 	dec a
@@ -368,40 +331,25 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
 	predef FindPathToPlayer
 	ld de, wNPCMovementDirections2
 	ld a, $1
-	ld [H_SPRITEINDEX], a
+	ld [hSpriteIndexOrTextID], a
 	call MoveSprite
-
-	ld a, $b
+	ld a, $d
 	ld [W_OAKSLABCURSCRIPT], a
 	ret
 
-OaksLabScript11: ; 1cdb9 (7:4db9)
+OaksLabScript13:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-
-	; define which team rival uses, and fight it
+	ld a, $1
+	ld [wSpriteIndex], a
+	call GetSpritePosition1
 	ld a, OPP_SONY1
 	ld [wCurOpponent], a
-	ld a, [W_RIVALSTARTER]
-	cp STARTER2
-	jr nz, .NotSquirtle
 	ld a, $1
-	jr .done
-.NotSquirtle
-	cp STARTER3
-	jr nz, .Charmander
-	ld a, $2
-	jr .done
-.Charmander
-	ld a, $3
-.done
 	ld [wTrainerNo], a
-	ld a, $1
-	ld [wSpriteIndex], a
-	call GetSpritePosition1
-	ld hl, OaksLabText_1d3be
-	ld de, OaksLabText_1d3c3
+	ld hl, OaksLabRivalDefeatedText
+	ld de, OaksLabRivalBeatYouText
 	call SaveEndBattleTextPointers
 	ld hl, wd72d
 	set 6, [hl]
@@ -410,12 +358,28 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
 	ld [wJoyIgnore], a
 	ld a, PLAYER_DIR_UP
 	ld [wPlayerMovingDirection], a
-	ld a, $c
+	ld a, $e
 	ld [W_OAKSLABCURSCRIPT], a
 	ret
 
-OaksLabScript12: ; 1ce03 (7:4e03)
-	ld a, $f0
+OaksLabScript14:
+	ld a, $ff
+	ld [wJoyIgnore], a
+
+	; If you beat your rival here, his Eevee will evolve into
+	; Jolteon if you beat him on Route 22, or Flareon if you
+	; skip or lose that battle.
+	; Otherwise, it will evolve into Vaporeon.
+	ld a, [wBattleResult]
+	and a
+	ld b, $3
+	jr nz, .asm_1c660
+	ld b, $2
+.asm_1c660
+	ld a, b
+	ld [W_RIVALSTARTER], a
+
+	ld a, $ff ^ (A_BUTTON | B_BUTTON)
 	ld [wJoyIgnore], a
 	ld a, PLAYER_DIR_UP
 	ld [wPlayerMovingDirection], a
@@ -423,101 +387,124 @@ OaksLabScript12: ; 1ce03 (7:4e03)
 	ld a, $1
 	ld [wSpriteIndex], a
 	call SetSpritePosition1
-	ld a, $1
-	ld [H_SPRITEINDEX], a
-	xor a ; SPRITE_FACING_DOWN
-	ld [hSpriteFacingDirection], a
-	call SetSpriteFacingDirectionAndDelay
+	ld a, $2
+	ld [wSpriteStateData1 + 1 * $10 + 1], a
+	xor a
+	ld [wSpriteStateData1 + 1 * $10 + 9], a
 	predef HealParty
-	SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB
-
-	ld a, $d
+	ld hl, wd74b
+	set 3, [hl]
+	ld a, $f
 	ld [W_OAKSLABCURSCRIPT], a
 	ret
 
-OaksLabScript13: ; 1ce32 (7:4e32)
+OaksLabScript15:
 	ld c, 20
 	call DelayFrames
-	ld a, $10
+	ld a, $c
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	callba Music_RivalAlternateStart
 	ld a, $1
-	ld [H_SPRITEINDEX], a
-	ld de, .RivalExitMovement
+	ld [hSpriteIndexOrTextID], a
+	ld de, .OaksLabMovement_RivalWalksOut1
 	call MoveSprite
 	ld a, [wXCoord]
 	cp $4
-	; move left or right depending on where the player is standing
-	jr nz, .moveLeft
+	jr nz, .asm_1c6bb
 	ld a, NPC_MOVEMENT_RIGHT
-	jr .next
-.moveLeft
+	jr .asm_1c6bd
+
+.asm_1c6bb
 	ld a, NPC_MOVEMENT_LEFT
-.next
+.asm_1c6bd
 	ld [wNPCMovementDirections], a
-
-	ld a, $e
+	ld a, $10
 	ld [W_OAKSLABCURSCRIPT], a
 	ret
 
-.RivalExitMovement
-	db $E0 ; change sprite facing direction
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_DOWN
-	db $FF
+.OaksLabMovement_RivalWalksOut1
+	db $e0
+	db $00
+	db $04
+	db $04
+	db $04
+	db $04
+	db $04
+	db $ff
 
-OaksLabScript14: ; 1ce6d (7:4e6d)
+OaksLabScript16:
 	ld a, [wd730]
 	bit 0, a
-	jr nz, .asm_1ce8c
+	jr nz, .asm_1c6ed
+	ld a, $ff ^ (A_BUTTON | B_BUTTON)
+	ld [wJoyIgnore], a
 	ld a, HS_OAKS_LAB_RIVAL
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	xor a
-	ld [wJoyIgnore], a
-	call PlayDefaultMusic ; reset to map music
-	ld a, $12
+	call PlayDefaultMusic
+	ld a, $11
 	ld [W_OAKSLABCURSCRIPT], a
-	jr .done
-; make the player keep facing the rival as he walks away
-.asm_1ce8c
+	ret
+
+.asm_1c6ed
 	ld a, [wNPCNumScriptedSteps]
-	cp $5
-	jr nz, .asm_1cea8
+	cp 5
+	jr nz, .asm_1c703
 	ld a, [wXCoord]
-	cp $4
-	jr nz, .asm_1cea1
+	cp 4
+	jr nz, .asm_1c6ff
 	ld a, SPRITE_FACING_RIGHT
-	ld [wSpriteStateData1 + 9], a
-	jr .done
-.asm_1cea1
+	jr .asm_1c707
+
+.asm_1c6ff
 	ld a, SPRITE_FACING_LEFT
-	ld [wSpriteStateData1 + 9], a
-	jr .done
-.asm_1cea8
-	cp $4
+	jr .asm_1c707
+
+.asm_1c703
+	cp 4
 	ret nz
-	xor a ; ld a, SPRITE_FACING_DOWN
+	xor a
+.asm_1c707
+	ld [wSpriteStateData1 + 9], a
+	ret
+
+OaksLabScript17:
+; Pikachu comes out
+	ld a, SPRITE_FACING_UP
 	ld [wSpriteStateData1 + 9], a
-.done
+	ld a, $2
+	ld [wd431], a
+	callba Func_fc4fa
+	call Func_1525
+	ld a, $1a
+	ld [hSpriteIndexOrTextID], a
+	call DisplayTextID
+	ld a, $12
+	ld [W_OAKSLABCURSCRIPT], a
+	ret
+
+OaksLabScript18:
+	ld a, $1b
+	ld [hSpriteIndexOrTextID], a
+	call DisplayTextID
+	xor a
+	ld [wJoyIgnore], a
+	ld a, $16
+	ld [W_OAKSLABCURSCRIPT], a
 	ret
 
-OaksLabScript15: ; 1ceb0 (7:4eb0)
+OaksLabScript19:
 	xor a
 	ld [hJoyHeld], a
 	call EnableAutoTextBoxDrawing
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 	callba Music_RivalAlternateStart
-	ld a, $15
+	ld a, $13
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	call OaksLabScript_1d02b
+	callab Func_f1be0
+	call OaksLabScript_1c8b9
 	ld a, HS_OAKS_LAB_RIVAL
 	ld [wMissableObjectIndex], a
 	predef ShowObject
@@ -530,50 +517,50 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
 	call FillMemory
 	ld [hl], $ff
 	ld a, $1
-	ld [H_SPRITEINDEX], a
+	ld [hSpriteIndexOrTextID], a
 	ld de, wNPCMovementDirections2
 	call MoveSprite
-
-	ld a, $10
+	ld a, $14
 	ld [W_OAKSLABCURSCRIPT], a
 	ret
 
-OaksLabScript_1cefd: ; 1cefd (7:4efd)
+OaksLabScript_1c78e:
 	ld a, $1
-	ld [H_SPRITEINDEX], a
+	ld [hSpriteIndexOrTextID], a
 	ld a, SPRITE_FACING_UP
 	ld [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, $8
-	ld [H_SPRITEINDEX], a
-	xor a ; SPRITE_FACING_DOWN
+	ld a, $6
+	ld [hSpriteIndexOrTextID], a
+	xor a
 	ld [hSpriteFacingDirection], a
-	jp SetSpriteFacingDirectionAndDelay
+	call SetSpriteFacingDirectionAndDelay
+	ret
 
-OaksLabScript16: ; 1cf12 (7:4f12)
+OaksLabScript20:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
 	call EnableAutoTextBoxDrawing
 	call PlayDefaultMusic
-	ld a, $fc
+	ld a, $ff ^ (A_BUTTON | B_BUTTON)
 	ld [wJoyIgnore], a
-	call OaksLabScript_1cefd
-	ld a, $16
+	call OaksLabScript_1c78e
+	ld a, $14
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call DelayFrame
-	call OaksLabScript_1cefd
-	ld a, $17
+	call OaksLabScript_1c78e
+	ld a, $15
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call DelayFrame
-	call OaksLabScript_1cefd
-	ld a, $18
+	call OaksLabScript_1c78e
+	ld a, $16
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call DelayFrame
-	ld a, $19
+	ld a, $17
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call Delay3
@@ -583,20 +570,22 @@ OaksLabScript16: ; 1cf12 (7:4f12)
 	ld a, HS_POKEDEX_2
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	call OaksLabScript_1cefd
-	ld a, $1a
+	call OaksLabScript_1c78e
+	ld a, $18
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $1
-	ld [H_SPRITEINDEX], a
+	ld [hSpriteIndexOrTextID], a
 	ld a, SPRITE_FACING_RIGHT
 	ld [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
 	call Delay3
-	ld a, $1b
+	ld a, $19
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_GOT_POKEDEX
+	ld a, $1
+	ld [W_VIRIDIANCITYCURSCRIPT], a
 	SetEvent EVENT_OAK_GOT_PARCEL
 	ld a, HS_LYING_OLD_MAN
 	ld [wMissableObjectIndex], a
@@ -608,23 +597,20 @@ OaksLabScript16: ; 1cf12 (7:4f12)
 	ld b, 0
 	ld c, a
 	ld hl, wNPCMovementDirections2
-	xor a ; NPC_MOVEMENT_DOWN
+	xor a
 	call FillMemory
 	ld [hl], $ff
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 	callba Music_RivalAlternateStart
 	ld a, $1
-	ld [H_SPRITEINDEX], a
-	ld de, wNPCMovementDirections2
+	ld [hSpriteIndexOrTextID], a
+	ld de, wNPCMovementDirections2 
 	call MoveSprite
-
-	ld a, $11
+	ld a, $15
 	ld [W_OAKSLABCURSCRIPT], a
 	ret
 
-OaksLabScript17: ; 1cfd4 (7:4fd4)
+OaksLabScript21:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -638,71 +624,73 @@ OaksLabScript17: ; 1cfd4 (7:4fd4)
 	ld a, HS_ROUTE_22_RIVAL_1
 	ld [wMissableObjectIndex], a
 	predef ShowObject
-	ld a, $5
-	ld [W_PALLETTOWNCURSCRIPT], a
 	xor a
 	ld [wJoyIgnore], a
-
-	ld a, $12
+	ld a, $16
 	ld [W_OAKSLABCURSCRIPT], a
 	ret
 
-OaksLabScript18: ; 1d009 (7:5009)
+OaksLabScript22:
 	ret
 
-OaksLabScript_RemoveParcel: ; 1d00a (7:500a)
+OaksLabScript_1c897:
 	ld hl, wBagItems
-	ld bc, $0000
-.loop
+	ld bc, 0
+.asm_1c89d
 	ld a, [hli]
 	cp $ff
 	ret z
 	cp OAKS_PARCEL
-	jr z, .foundParcel
+	jr z, .asm_1c8a9
 	inc hl
 	inc c
-	jr .loop
-.foundParcel
+	jr .asm_1c89d
+
+.asm_1c8a9
 	ld hl, wNumBagItems
 	ld a, c
 	ld [wWhichPokemon], a
-	ld a, $1
+	ld a, 1
 	ld [wItemQuantity], a
-	jp RemoveItemFromInventory
+	call RemoveItemFromInventory
+	ret
 
-OaksLabScript_1d02b: ; 1d02b (7:502b)
+OaksLabScript_1c8b9:
 	ld a, $7c
 	ld [$ffeb], a
 	ld a, $8
 	ld [$ffee], a
 	ld a, [wYCoord]
-	cp $3
-	jr nz, .asm_1d045
+	cp 3
+	jr nz, .asm_1c8d3
 	ld a, $4
 	ld [wNPCMovementDirections2Index], a
 	ld a, $30
 	ld b, $b
-	jr .asm_1d068
-.asm_1d045
+	jr .asm_1c8f6
+
+.asm_1c8d3
 	cp $1
-	jr nz, .asm_1d054
+	jr nz, .asm_1c8e2
 	ld a, $2
 	ld [wNPCMovementDirections2Index], a
 	ld a, $30
 	ld b, $9
-	jr .asm_1d068
-.asm_1d054
+	jr .asm_1c8f6
+
+.asm_1c8e2
 	ld a, $3
 	ld [wNPCMovementDirections2Index], a
 	ld b, $a
 	ld a, [wXCoord]
 	cp $4
-	jr nz, .asm_1d066
+	jr nz, .asm_1c8f4
 	ld a, $40
-	jr .asm_1d068
-.asm_1d066
+	jr .asm_1c8f6
+
+.asm_1c8f4
 	ld a, $20
-.asm_1d068
+.asm_1c8f6
 	ld [$ffec], a
 	ld a, b
 	ld [$ffed], a
@@ -711,12 +699,12 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
 	call SetSpritePosition1
 	ret
 
-OaksLabScript_1d076: ; 1d076 (7:5076)
-	ld hl, OaksLabTextPointers + $36 ; starts at OaksLabText28
+OaksLabScript_1d076:
+	ld hl, OaksLabTextPointers2
 	ld a, l
 	ld [wMapTextPtr], a
 	ld a, h
-	ld [wMapTextPtr+1], a
+	ld [wMapTextPtr + 1], a
 	ret
 
 OaksLabTextPointers: ; 1d082 (7:5082)
@@ -747,492 +735,428 @@ OaksLabTextPointers: ; 1d082 (7:5082)
 	dw OaksLabText25
 	dw OaksLabText26
 	dw OaksLabText27
-	dw OaksLabText28
-	dw OaksLabText29
-	dw OaksLabText30
-	dw OaksLabText31
-	dw OaksLabText32
-	dw OaksLabText33
-	dw OaksLabText34
-	dw OaksLabText35
-	dw OaksLabText36
-	dw OaksLabText37
-	dw OaksLabText38
-
-OaksLabText28: ; 1d0ce (7:50ce)
-OaksLabText1: ; 1d0ce (7:50ce)
+
+OaksLabTextPointers2:
+	dw OaksLabText1
+	dw OaksLabText2
+	dw OaksLabText3
+	dw OaksLabText4
+	dw OaksLabText5
+	dw OaksLabText6
+	dw OaksLabText7
+	dw OaksLabText8
+	dw OaksLabText9
+
+OaksLabText1:
 	TX_ASM
 	CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2
-	jr nz, .asm_1d0de
-	ld hl, OaksLabGaryText1
+	jr nz, .asm_1c968
+	ld hl, OaksLabText_1c97d
 	call PrintText
-	jr .asm_1d0f0
-.asm_1d0de
-	bit 2, a
-	jr nz, .asm_1d0ea
-	ld hl, OaksLabText40
+	jr .asm_1c97a
+
+.asm_1c968
+	CheckEventReuseA EVENT_GOT_STARTER
+	jr nz, .asm_1c974
+	ld hl, OaksLabText_1c982
 	call PrintText
-	jr .asm_1d0f0
-.asm_1d0ea
-	ld hl, OaksLabText41
+	jr .asm_1c97a
+
+.asm_1c974
+	ld hl, OaksLabText_1c987
 	call PrintText
-.asm_1d0f0
+.asm_1c97a
 	jp TextScriptEnd
 
-OaksLabGaryText1: ; 1d0f3 (7:50f3)
+OaksLabText_1c97d:
 	TX_FAR _OaksLabGaryText1
 	db "@"
 
-OaksLabText40: ; 1d0f8 (7:50f8)
+OaksLabText_1c982:
 	TX_FAR _OaksLabText40
 	db "@"
 
-OaksLabText41: ; 1d0fd (7:50fd)
+OaksLabText_1c987:
 	TX_FAR _OaksLabText41
 	db "@"
 
-OaksLabText29: ; 1d102 (7:5102)
-OaksLabText2: ; 1d102 (7:5102)
-	TX_ASM
-	ld a, STARTER2
-	ld [wRivalStarterTemp], a
-	ld a, $3
-	ld [wRivalStarterBallSpriteIndex], a
-	ld a, STARTER1
-	ld b, $2
-	jr OaksLabScript_1d133
-
-OaksLabText30: ; 1d113 (7:5113)
-OaksLabText3: ; 1d113 (7:5113)
+OaksLabText2:
 	TX_ASM
-	ld a, STARTER3
-	ld [wRivalStarterTemp], a
-	ld a, $4
-	ld [wRivalStarterBallSpriteIndex], a
-	ld a, STARTER2
-	ld b, $3
-	jr OaksLabScript_1d133
-
-OaksLabText31: ; 1d124 (7:5124)
-OaksLabText4: ; 1d124 (7:5124)
-	TX_ASM
-	ld a, STARTER1
-	ld [wRivalStarterTemp], a
-	ld a, $2
-	ld [wRivalStarterBallSpriteIndex], a
-	ld a, STARTER3
-	ld b, $4
-
-OaksLabScript_1d133: ; 1d133 (7:5133)
-	ld [wcf91], a
-	ld [wd11e], a
-	ld a, b
-	ld [wSpriteIndex], a
-	CheckEvent EVENT_GOT_STARTER
-	jp nz, OaksLabScript_1d22d
-	CheckEventReuseA EVENT_OAK_ASKED_TO_CHOOSE_MON
-	jr nz, OaksLabScript_1d157
-	ld hl, OaksLabText39
+	ld a, $1
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
+	CheckEvent EVENT_OAK_ASKED_TO_CHOOSE_MON
+	jr nz, OaksLabScript_1c9ac
+	ld a, $0
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
+	ld hl, OaksLabText_1c9a7
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText39: ; 1d152 (7:5152)
+OaksLabText_1c9a7:
 	TX_FAR _OaksLabText39
 	db "@"
 
-OaksLabScript_1d157: ; 1d157 (7:5157)
-	ld a, $5
-	ld [H_SPRITEINDEX], a
-	ld a, $9
-	ld [H_SPRITEDATAOFFSET], a
-	call GetPointerWithinSpriteStateData1
-	ld [hl], SPRITE_FACING_DOWN
+OaksLabScript_1c9ac:
 	ld a, $1
-	ld [H_SPRITEINDEX], a
-	ld a, $9
-	ld [H_SPRITEDATAOFFSET], a
-	call GetPointerWithinSpriteStateData1
-	ld [hl], SPRITE_FACING_RIGHT
-	ld hl, wd730
-	set 6, [hl]
-	predef StarterDex
-	ld hl, wd730
-	res 6, [hl]
-	call ReloadMapData
-	ld c, 10
-	call DelayFrames
-	ld a, [wSpriteIndex]
-	cp $2
-	jr z, OaksLabLookAtCharmander
-	cp $3
-	jr z, OaksLabLookAtSquirtle
-	jr OaksLabLookAtBulbasaur
-
-OaksLabLookAtCharmander: ; 1d195 (7:5195)
-	ld hl, OaksLabCharmanderText
-	jr OaksLabMonChoiceMenu
-OaksLabCharmanderText: ; 1d19a (7:519a)
-	TX_FAR _OaksLabCharmanderText
-	db "@"
-
-OaksLabLookAtSquirtle: ; 1d19f (7:519f)
-	ld hl, OaksLabSquirtleText
-	jr OaksLabMonChoiceMenu
-OaksLabSquirtleText: ; 1d1a4 (7:51a4)
-	TX_FAR _OaksLabSquirtleText
-	db "@"
-
-OaksLabLookAtBulbasaur: ; 1d1a9 (7:51a9)
-	ld hl, OaksLabBulbasaurText
-	jr OaksLabMonChoiceMenu
-OaksLabBulbasaurText: ; 1d1ae (7:51ae)
-	TX_FAR _OaksLabBulbasaurText
-	db "@"
-
-OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
-	call PrintText
-	ld a, $1
-	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	call YesNoChoice ; yes/no menu
-	ld a, [wCurrentMenuItem]
-	and a
-	jr nz, OaksLabMonChoiceEnd
-	ld a, [wcf91]
-	ld [W_PLAYERSTARTER], a
-	ld [wd11e], a
-	call GetMonName
-	ld a, [wSpriteIndex]
-	cp $2
-	jr nz, .asm_1d1db
-	ld a, HS_STARTER_BALL_1
-	jr .asm_1d1e5
-.asm_1d1db
-	cp $3
-	jr nz, .asm_1d1e3
-	ld a, HS_STARTER_BALL_2
-	jr .asm_1d1e5
-.asm_1d1e3
-	ld a, HS_STARTER_BALL_3
-.asm_1d1e5
-	ld [wMissableObjectIndex], a
-	predef HideObject
-	ld a, $1
-	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, OaksLabMonEnergeticText
-	call PrintText
-	ld hl, OaksLabReceivedMonText
-	call PrintText
-	xor a ; PLAYER_PARTY_DATA
-	ld [wMonDataLocation], a
-	ld a, 5
-	ld [wCurEnemyLVL], a
-	ld a, [wcf91]
-	ld [wd11e], a
-	call AddPartyMon
-	ld hl, wd72e
-	set 3, [hl]
-	ld a, $fc
-	ld [wJoyIgnore], a
+	ld [wEmotionBubbleSpriteIndex], a
+	xor a
+	ld [wWhichEmotionBubble], a
+	predef EmotionBubble
 	ld a, $8
 	ld [W_OAKSLABCURSCRIPT], a
-OaksLabMonChoiceEnd: ; 1d21f (7:521f)
 	jp TextScriptEnd
 
-OaksLabMonEnergeticText: ; 1d222 (7:5222)
-	TX_FAR _OaksLabMonEnergeticText
-	db "@"
-
-OaksLabReceivedMonText: ; 1d227 (7:5227)
-	TX_FAR _OaksLabReceivedMonText
-	db $11, "@"
-
-OaksLabScript_1d22d: ; 1d22d (7:522d)
-	ld a, $5
-	ld [H_SPRITEINDEX], a
-	ld a, $9
-	ld [H_SPRITEDATAOFFSET], a
-	call GetPointerWithinSpriteStateData1
-	ld [hl], $0
-	ld hl, OaksLabLastMonText
-	call PrintText
-	jp TextScriptEnd
-
-OaksLabLastMonText: ; 1d243 (7:5243)
-	TX_FAR _OaksLabLastMonText
-	db "@"
-
-OaksLabText32: ; 1d248 (7:5248)
-OaksLabText5: ; 1d248 (7:5248)
+OaksLabText3:
 	TX_ASM
 	CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS
-	jr nz, .asm_1d266
+	jr nz, .asm_1c9d9
 	ld hl, wPokedexOwned
 	ld b, wPokedexOwnedEnd - wPokedexOwned
 	call CountSetBits
 	ld a, [wNumSetBits]
 	cp 2
-	jr c, .asm_1d279
-	CheckEvent EVENT_GOT_POKEDEX
-	jr z, .asm_1d279
-.asm_1d266
-	ld hl, OaksLabText_1d31d
+	jr c, .asm_1c9ec
+.asm_1c9d9
+	ld hl, OaksLabText_1ca9f
 	call PrintText
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	predef DisplayDexRating
-	jp .asm_1d2ed
-.asm_1d279
-	ld b,POKE_BALL
+	jp .asm_1ca6f
+
+.asm_1c9ec
+	ld b, POKE_BALL
 	call IsItemInBag
-	jr nz, .asm_1d2e7
+	jr nz, .asm_1ca69
+	ld hl, wPokedexOwned
+	ld b, wPokedexOwnedEnd - wPokedexOwned
+	call CountSetBits
+	ld a, [wNumSetBits]
+	cp 2
+	jr nc, .asm_1ca69
 	CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
-	jr nz, .asm_1d2d0
+	jr nz, .asm_1ca52
 	CheckEvent EVENT_GOT_POKEDEX
-	jr nz, .asm_1d2c8
+	jr nz, .asm_1ca4a
 	CheckEventReuseA EVENT_BATTLED_RIVAL_IN_OAKS_LAB
-	jr nz, .asm_1d2a9
+	jr nz, .asm_1ca2b
 	ld a, [wd72e]
 	bit 3, a
-	jr nz, .asm_1d2a1
-	ld hl, OaksLabText_1d2f0
+	jr nz, .asm_1ca23
+	ld hl, OaksLabText_1ca72
 	call PrintText
-	jr .asm_1d2ed
-.asm_1d2a1
-	ld hl, OaksLabText_1d2f5
+	jr .asm_1ca6f
+
+.asm_1ca23
+	ld hl, OaksLabText_1ca77
 	call PrintText
-	jr .asm_1d2ed
-.asm_1d2a9
+	jr .asm_1ca6f
+
+.asm_1ca2b
 	ld b, OAKS_PARCEL
 	call IsItemInBag
-	jr nz, .asm_1d2b8
-	ld hl, OaksLabText_1d2fa
+	jr nz, .asm_1ca3a
+	ld hl, OaksLabText_1ca7c
 	call PrintText
-	jr .asm_1d2ed
-.asm_1d2b8
-	ld hl, OaksLabDeliverParcelText
+	jr .asm_1ca6f
+
+.asm_1ca3a
+	ld hl, OaksLabText_1ca81
 	call PrintText
-	call OaksLabScript_RemoveParcel
-	ld a, $f
+	call OaksLabScript_1c897
+	ld a, $13
 	ld [W_OAKSLABCURSCRIPT], a
-	jr .asm_1d2ed
-.asm_1d2c8
-	ld hl, OaksLabAroundWorldText
+	jr .asm_1ca6f
+
+.asm_1ca4a
+	ld hl, OaksLabText_1ca8b
 	call PrintText
-	jr .asm_1d2ed
-.asm_1d2d0
+	jr .asm_1ca6f
+
+.asm_1ca52
 	CheckAndSetEvent EVENT_GOT_POKEBALLS_FROM_OAK
-	jr nz, .asm_1d2e7
+	jr nz, .asm_1ca69
 	lb bc, POKE_BALL, 5
 	call GiveItem
-	ld hl, OaksLabGivePokeballsText
+	ld hl, OaksLabText_1ca90
 	call PrintText
-	jr .asm_1d2ed
-.asm_1d2e7
-	ld hl, OaksLabPleaseVisitText
+	jr .asm_1ca6f
+
+.asm_1ca69
+	ld hl, OaksLabText_1ca9a
 	call PrintText
-.asm_1d2ed
+.asm_1ca6f
 	jp TextScriptEnd
-
-OaksLabText_1d2f0: ; 1d2f0 (7:52f0)
-	TX_FAR _OaksLabText_1d2f0
+	
+OaksLabText_1ca72:
+	TX_FAR _OaksLabPikachuText
 	db "@"
 
-OaksLabText_1d2f5: ; 1d2f5 (7:52f5)
+OaksLabText_1ca77:
 	TX_FAR _OaksLabText_1d2f5
 	db "@"
 
-OaksLabText_1d2fa: ; 1d2fa (7:52fa)
+OaksLabText_1ca7c:
 	TX_FAR _OaksLabText_1d2fa
 	db "@"
 
-OaksLabDeliverParcelText: ; 1d2ff (7:52ff)
+OaksLabText_1ca81:
 	TX_FAR _OaksLabDeliverParcelText1
-	db $11
+	TX_SFX_KEY_ITEM
 	TX_FAR _OaksLabDeliverParcelText2
 	db "@"
 
-OaksLabAroundWorldText: ; 1d309 (7:5309)
+OaksLabText_1ca8b:
 	TX_FAR _OaksLabAroundWorldText
 	db "@"
 
-OaksLabGivePokeballsText: ; 1d30e (7:530e)
+OaksLabText_1ca90:
 	TX_FAR _OaksLabGivePokeballsText1
-	db $11
+	TX_SFX_KEY_ITEM
 	TX_FAR _OaksLabGivePokeballsText2
 	db "@"
 
-OaksLabPleaseVisitText: ; 1d318 (7:5318)
+OaksLabText_1ca9a:
 	TX_FAR _OaksLabPleaseVisitText
 	db "@"
 
-OaksLabText_1d31d: ; 1d31d (7:531d)
+OaksLabText_1ca9f:
 	TX_FAR _OaksLabText_1d31d
 	db "@"
 
-OaksLabText34: ; 1d322 (7:5322)
-OaksLabText33: ; 1d322 (7:5322)
-OaksLabText7: ; 1d322 (7:5322)
-OaksLabText6: ; 1d322 (7:5322)
+OaksLabText4:
+OaksLabText5:
 	TX_ASM
-	ld hl, OaksLabText_1d32c
+	ld hl, OaksLabText_1caae
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText_1d32c: ; 1d32c (7:532c)
+OaksLabText_1caae:
 	TX_FAR _OaksLabText_1d32c
 	db "@"
 
-OaksLabText35: ; 1d331 (7:5331)
-OaksLabText8: ; 1d331 (7:5331)
+OaksLabText6:
 	TX_FAR _OaksLabText8
 	db "@"
 
-OaksLabText36: ; 1d336 (7:5336)
-OaksLabText9: ; 1d336 (7:5336)
+OaksLabText7:
 	TX_ASM
-	ld hl, OaksLabText_1d340
+	ld hl, OaksLabText_1cac2
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText_1d340: ; 1d340 (7:5340)
+OaksLabText_1cac2:
 	TX_FAR _OaksLabText_1d340
 	db "@"
 
-OaksLabText17: ; 1d345 (7:5345)
+OaksLabText13:
 	TX_ASM
-	ld hl, OaksLabRivalWaitingText
+	ld hl, OaksLabText_1cad1
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalWaitingText: ; 1d34f (7:534f)
+OaksLabText_1cad1:
 	TX_FAR _OaksLabRivalWaitingText
 	db "@"
 
-OaksLabText18: ; 1d354 (7:5354)
+OaksLabText14:
 	TX_ASM
-	ld hl, OaksLabChooseMonText
+	ld hl, OaksLabText_1cae0
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabChooseMonText: ; 1d35e (7:535e)
+OaksLabText_1cae0:
 	TX_FAR _OaksLabChooseMonText
 	db "@"
 
-OaksLabText19: ; 1d363 (7:5363)
+OaksLabText15:
 	TX_ASM
-	ld hl, OaksLabRivalInterjectionText
+	ld hl, OaksLabText_1caef
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalInterjectionText: ; 1d36d (7:536d)
+OaksLabText_1caef:
 	TX_FAR _OaksLabRivalInterjectionText
 	db "@"
 
-OaksLabText20: ; 1d372 (7:5372)
+OaksLabText16:
 	TX_ASM
-	ld hl, OaksLabBePatientText
+	ld hl, OaksLabText_1cafe
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabBePatientText: ; 1d37c (7:537c)
+OaksLabText_1cafe:
 	TX_FAR _OaksLabBePatientText
 	db "@"
 
-OaksLabText12: ; 1d381 (7:5381)
+OaksLabText17:
 	TX_ASM
-	ld hl, OaksLabLeavingText
+	ld hl, OaksLabText_1cb25
+	call PrintText
+	ld hl, OaksLabText_1cb2a
+	call PrintText
+	ld hl, OaksLabText_1cb30
+	call PrintText
+	ld hl, OaksLabText_1cb35
+	call PrintText
+	ld hl, OaksLabText_1cb3a
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabLeavingText: ; 1d38b (7:538b)
-	TX_FAR _OaksLabLeavingText
+OaksLabText_1cb25:
+	TX_FAR _OaksLabRivalTakesText1
+	db "@"
+
+OaksLabText_1cb2a:
+	TX_FAR _OaksLabRivalTakesText2
+	TX_SFX_KEY_ITEM
 	db "@"
 
-OaksLabText13: ; 1d390 (7:5390)
+OaksLabText_1cb30:
+	TX_FAR _OaksLabRivalTakesText3
+	db "@"
+
+OaksLabText_1cb35:
+	TX_FAR _OaksLabRivalTakesText4
+	db "@"
+
+OaksLabText_1cb3a:
+	TX_FAR _OaksLabRivalTakesText5
+	db "@"
+
+OaksLabText18:
 	TX_ASM
-	ld hl, OaksLabRivalPickingMonText
+	ld a, PIKACHU
+	ld [W_PLAYERSTARTER], a
+	ld [wd11e], a
+	call GetMonName
+	ld a, $1
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
+	ld hl, OaksLabText_1cb85
+	call PrintText
+	ld hl, OaksLabText_1cb8a
 	call PrintText
+	xor a
+	ld [wMonDataLocation], a
+	ld a, 5
+	ld [wCurEnemyLVL], a
+	ld a, PIKACHU
+	ld [wd11e], a
+	ld [wcf91], a
+	call AddPartyMon
+	ld a, 163
+	ld [wPartyMon1CatchRate], a
+	call Func_152d
+	SetEvent EVENT_GOT_STARTER
+	ld hl, wd72e
+	set 3, [hl]
 	jp TextScriptEnd
 
-OaksLabRivalPickingMonText: ; 1d39a (7:539a)
-	TX_FAR _OaksLabRivalPickingMonText
+OaksLabText_1cb85:
+	TX_FAR _OaksLabOakGivesText
+	db "@"
+
+OaksLabText_1cb8a:
+	TX_FAR _OaksLabReceivedText
+	TX_SFX_KEY_ITEM
 	db "@"
 
-OaksLabText14: ; 1d39f (7:539f)
+OaksLabText10:
 	TX_ASM
-	ld hl, OaksLabRivalReceivedMonText
+	ld hl, OaksLabText_1cb9a
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalReceivedMonText: ; 1d3a9 (7:53a9)
-	TX_FAR _OaksLabRivalReceivedMonText
-	db $11, "@"
+OaksLabText_1cb9a:
+	TX_FAR _OaksLabLeavingText
+	db "@"
 
-OaksLabText15: ; 1d3af (7:53af)
+OaksLabText11:
 	TX_ASM
-	ld hl, OaksLabRivalChallengeText
+	ld hl, OaksLabText_1cba9
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalChallengeText: ; 1d3b9 (7:53b9)
+OaksLabText_1cba9:
 	TX_FAR _OaksLabRivalChallengeText
 	db "@"
 
-OaksLabText_1d3be: ; 1d3be (7:53be)
+OaksLabRivalDefeatedText:
 	TX_FAR _OaksLabText_1d3be
 	db "@"
 
-OaksLabText_1d3c3: ; 1d3c3 (7:53c3)
+OaksLabRivalBeatYouText:
 	TX_FAR _OaksLabText_1d3c3
 	db "@"
 
-OaksLabText16: ; 1d3c8 (7:53c8)
+OaksLabText12:
 	TX_ASM
-	ld hl, OaksLabRivalToughenUpText
+	ld hl, OaksLabText_1cbc2
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabRivalToughenUpText: ; 1d3d2 (7:53d2)
+OaksLabText_1cbc2:
 	TX_FAR _OaksLabRivalToughenUpText
 	db "@"
 
-OaksLabText21: ; 1d3d7 (7:53d7)
+OaksLabText26:
+	TX_ASM
+	ldpikacry e, PikachuCry2
+	callab PlayPikachuSoundClip
+	ld hl, OaksLabText_1cbdb
+	call PrintText
+	jp TextScriptEnd
+
+OaksLabText_1cbdb:
+	TX_FAR _OaksLabPikachuDislikesPokeballsText1
+	db "@"
+
+OaksLabText27:
+	TX_ASM
+	ld hl, OaksLabText_1cbea
+	call PrintText
+	jp TextScriptEnd
+
+OaksLabText_1cbea:
+	TX_FAR _OaksLabPikachuDislikesPokeballsText2
+	db "@"
+
+OaksLabText19:
 	TX_FAR _OaksLabText21
 	db "@"
 
-OaksLabText22: ; 1d3dc (7:53dc)
+OaksLabText20:
 	TX_FAR _OaksLabText22
 	db "@"
 
-OaksLabText23: ; 1d3e1 (7:53e1)
+OaksLabText21:
 	TX_FAR _OaksLabText23
 	db "@"
 
-OaksLabText24: ; 1d3e6 (7:53e6)
+OaksLabText22:
 	TX_FAR _OaksLabText24
 	db "@"
 
-OaksLabText25: ; 1d3eb (7:53eb)
+OaksLabText23:
 	TX_FAR _OaksLabText25
-	db $11, "@"
+	TX_SFX_KEY_ITEM
+	db "@"
 
-OaksLabText26: ; 1d3f1 (7:53f1)
+OaksLabText24:
 	TX_FAR _OaksLabText26
 	db "@"
 
-OaksLabText27: ; 1d3f6 (7:53f6)
+OaksLabText25:
 	TX_FAR _OaksLabText27
 	db "@"
 
-OaksLabText38: ; 1d3fb (7:53fb)
-OaksLabText37: ; 1d3fb (7:53fb)
-OaksLabText11: ; 1d3fb (7:53fb)
-OaksLabText10: ; 1d3fb (7:53fb)
+OaksLabText8:
+OaksLabText9:
 	TX_ASM
-	ld hl, OaksLabText_1d405
+	ld hl, OaksLabText_1c31d
 	call PrintText
 	jp TextScriptEnd
 
-OaksLabText_1d405: ; 1d405 (7:5405)
+OaksLabText_1c31d:
 	TX_FAR _OaksLabText_1d405
 	db "@"