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

19 files changed, 179 insertions, 132 deletions

diff --git a/engine/experience.asm b/engine/experience.asm
index e1037950..42917bf7 100755
--- a/engine/experience.asm
+++ b/engine/experience.asm
@@ -1,5 +1,5 @@
 ; calculates the level a mon should be based on its current exp
-CalcLevelFromExperience: ; 58f43 (16:4f43)
+CalcLevelFromExperience: ; 58d99 (16:4d99)
 	ld a, [wLoadedMonSpecies]
 	ld [wd0b5], a
 	call GetMonHeader
@@ -28,7 +28,7 @@ CalcLevelFromExperience: ; 58f43 (16:4f43)
 	ret
 
 ; calculates the amount of experience needed for level d
-CalcExperience: ; 58f6a (16:4f6a)
+CalcExperience: ; 58dc0 (16:4dc0)
 	ld a, [wMonHGrowthRate]
 	add a
 	add a
@@ -137,7 +137,7 @@ CalcExperience: ; 58f6a (16:4f6a)
 	ret
 
 ; calculates d*d
-CalcDSquared: ; 59010 (16:5010)
+CalcDSquared: ; 58e66 (16:4e66)
 	xor a
 	ld [H_MULTIPLICAND], a
 	ld [H_MULTIPLICAND + 1], a
@@ -151,7 +151,7 @@ CalcDSquared: ; 59010 (16:5010)
 ; resulting in
 ;  (a*n^3)/b + sign*c*n^2 + d*n - e
 ; where sign = -1 <=> S=1
-GrowthRateTable: ; 5901d (16:501d)
+GrowthRateTable: ; 58e73 (16:4e73)
 	db $11,$00,$00,$00 ; medium fast      n^3
 	db $34,$0A,$00,$1E ; (unused?)    3/4 n^3 + 10 n^2         - 30
 	db $34,$14,$00,$46 ; (unused?)    3/4 n^3 + 20 n^2         - 70
diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm
index 33ad1c9b..3108a836 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -1,20 +1,20 @@
-PrintNewBikeText: ; 1e94b (7:694b)
+PrintNewBikeText: ; 1e2e4 (7:62e4)
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump NewBicycleText
 
-NewBicycleText: ; 1e953 (7:6953)
+NewBicycleText: ; 1e2ec (7:62ec)
 	TX_FAR _NewBicycleText
 	db "@"
 
-DisplayOakLabLeftPoster: ; 1e958 (7:6958)
+DisplayOakLabLeftPoster: ; 1e2f1 (7:62f1)
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump PushStartText
 
-PushStartText: ; 1e960 (7:6960)
+PushStartText: ; 1e2f9 (7:62f9)
 	TX_FAR _PushStartText
 	db "@"
 
-DisplayOakLabRightPoster: ; 1e965 (7:6965)
+DisplayOakLabRightPoster: ; 1e2fe (7:62fe)
 	call EnableAutoTextBoxDrawing
 	ld hl, wPokedexOwned
 	ld b, wPokedexOwnedEnd - wPokedexOwned
@@ -22,20 +22,20 @@ DisplayOakLabRightPoster: ; 1e965 (7:6965)
 	ld a, [wNumSetBits]
 	cp 2
 	tx_pre_id SaveOptionText
-	jr c, .ownThreeOrMoreMon
+	jr c, .ownOneMon
 	tx_pre_id StrengthsAndWeaknessesText
-.ownThreeOrMoreMon
+.ownOneMon
 	jp PrintPredefTextID
 
-SaveOptionText: ; 1e97e (7:697e)
+SaveOptionText: ; 1e317 (7:6317)
 	TX_FAR _SaveOptionText
 	db "@"
 
-StrengthsAndWeaknessesText: ; 1e983 (7:6983)
+StrengthsAndWeaknessesText: ; 1e31c (7:631c)
 	TX_FAR _StrengthsAndWeaknessesText
 	db "@"
 
-SafariZoneCheck: ; 1e988 (7:6988)
+SafariZoneCheck: ; 1e321 (7:6321)
 	CheckEventHL EVENT_IN_SAFARI_ZONE ; if we are not in the Safari Zone,
 	jr z, SafariZoneGameStillGoing ; don't bother printing game over text
 	ld a, [wNumSafariBalls]
@@ -43,7 +43,7 @@ SafariZoneCheck: ; 1e988 (7:6988)
 	jr z, SafariZoneGameOver
 	jr SafariZoneGameStillGoing
 
-SafariZoneCheckSteps: ; 1e997 (7:6997)
+SafariZoneCheckSteps: ; 1e330 (7:6330)
 	ld a, [wSafariSteps]
 	ld b, a
 	ld a, [wSafariSteps + 1]
@@ -55,24 +55,23 @@ SafariZoneCheckSteps: ; 1e997 (7:6997)
 	ld [wSafariSteps], a
 	ld a, c
 	ld [wSafariSteps + 1], a
-SafariZoneGameStillGoing: ; 1e9ab (7:69ab)
+SafariZoneGameStillGoing: ; 1e344 (7:6344)
 	xor a
 	ld [wSafariZoneGameOver], a
 	ret
 
-SafariZoneGameOver: ; 1e9b0 (7:69b0)
+SafariZoneGameOver: ; 1e349 (7:6349)
 	call EnableAutoTextBoxDrawing
 	xor a
 	ld [wAudioFadeOutControl], a
-	dec a
-	call PlaySound
+	call StopAllMusic
 	ld c, BANK(SFX_Safari_Zone_PA)
 	ld a, SFX_SAFARI_ZONE_PA
 	call PlayMusic
-.asm_1e9c2
+.waitForMusicToPlay
 	ld a, [wChannelSoundIDs + CH4]
-	cp $b9
-	jr nz, .asm_1e9c2
+	cp SFX_SAFARI_ZONE_PA
+	jr nz, .waitForMusicToPlay
 	ld a, TEXT_SAFARI_GAME_OVER
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -83,49 +82,51 @@ SafariZoneGameOver: ; 1e9b0 (7:69b0)
 	ld a, $3
 	ld [wDestinationWarpID], a
 	ld a, $5
-	ld [W_SAFARIZONEENTRANCECURSCRIPT], a
+	ld [wSafariZoneEntranceCurScript], a
 	SetEvent EVENT_SAFARI_GAME_OVER
-	ld a, 1
+	ld a, $1
 	ld [wSafariZoneGameOver], a
 	ret
 
-PrintSafariGameOverText: ; 1e9ed (7:69ed)
+PrintSafariGameOverText: ; 1e385 (7:6385)
 	xor a
 	ld [wJoyIgnore], a
 	ld hl, SafariGameOverText
 	jp PrintText
 
-SafariGameOverText: ; 1e9f7 (7:69f7)
+SafariGameOverText: ; 1e38f (7:638f)
 	TX_ASM
 	ld a, [wNumSafariBalls]
 	and a
-	jr z, .asm_1ea04
+	jr z, .noMoreSafariBalls
 	ld hl, TimesUpText
 	call PrintText
-.asm_1ea04
+.noMoreSafariBalls
 	ld hl, GameOverText
 	call PrintText
 	jp TextScriptEnd
 
-TimesUpText: ; 1ea0d (7:6a0d)
+TimesUpText: ; 1e3a5 (7:63a5)
 	TX_FAR _TimesUpText
 	db "@"
 
-GameOverText: ; 1ea12 (7:6a12)
+GameOverText: ; 1e3aa (7:63aa)
 	TX_FAR _GameOverText
 	db "@"
 
-PrintCinnabarQuiz: ; 1ea17 (7:6a17)
+PrintCinnabarQuiz: ; 1e3af (7:63af)
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump CinnabarGymQuiz
 
-CinnabarGymQuiz: ; 1ea25 (7:6a25)
+CinnabarGymQuiz: ; 1e3be (7:63be)
 	TX_ASM
 	xor a
 	ld [wOpponentAfterWrongAnswer], a
+	ld hl, wd475
+	res 7, [hl]
 	ld a, [wHiddenObjectFunctionArgument]
 	push af
 	and $f
@@ -134,7 +135,12 @@ CinnabarGymQuiz: ; 1ea25 (7:6a25)
 	and $f0
 	swap a
 	ld [$ffdc], a
+	ld a, [hGymGateIndex]
 	ld hl, CinnabarGymQuizIntroText
+	cp $1
+	jr z, .onFirstQuestion
+	ld hl, CinnabarGymQuizShortIntroText
+.onFirstQuestion
 	call PrintText
 	ld a, [hGymGateIndex]
 	dec a
@@ -152,11 +158,19 @@ CinnabarGymQuiz: ; 1ea25 (7:6a25)
 	call CinnabarGymQuiz_1ea92
 	jp TextScriptEnd
 
-CinnabarGymQuizIntroText: ; 1ea5b (7:6a5b)
+CinnabarGymQuizDummyIntroText: ; 1e401 (7:6401)
+	TX_FAR _CinnabarGymQuizDummyIntroText
+	db "@"
+	
+CinnabarGymQuizIntroText: ; 1e406 (7:6406)
 	TX_FAR _CinnabarGymQuizIntroText
 	db "@"
 
-CinnabarQuizQuestions: ; 1ea60 (7:6a60)
+CinnabarGymQuizShortIntroText: ; 1e40b (7:640b)
+	TX_FAR _CinnabarGymQuizShortIntroText
+	db "@"
+	
+CinnabarQuizQuestions: ; 1e410 (7:6410)
 	dw CinnabarQuizQuestionsText1
 	dw CinnabarQuizQuestionsText2
 	dw CinnabarQuizQuestionsText3
@@ -164,35 +178,31 @@ CinnabarQuizQuestions: ; 1ea60 (7:6a60)
 	dw CinnabarQuizQuestionsText5
 	dw CinnabarQuizQuestionsText6
 
-CinnabarQuizQuestionsText1: ; 1ea6c (7:6a6c)
+CinnabarQuizQuestionsText1: ; 1e41c (7:641c)
 	TX_FAR _CinnabarQuizQuestionsText1
 	db "@"
 
-CinnabarQuizQuestionsText2: ; 1ea71 (7:6a71)
+CinnabarQuizQuestionsText2: ; 1e421 (7:6421)
 	TX_FAR _CinnabarQuizQuestionsText2
 	db "@"
 
-CinnabarQuizQuestionsText3: ; 1ea76 (7:6a76)
+CinnabarQuizQuestionsText3: ; 1e426 (7:6426)
 	TX_FAR _CinnabarQuizQuestionsText3
 	db "@"
 
-CinnabarQuizQuestionsText4: ; 1ea7b (7:6a7b)
+CinnabarQuizQuestionsText4: ; 1e42b (7:642b)
 	TX_FAR _CinnabarQuizQuestionsText4
 	db "@"
 
-CinnabarQuizQuestionsText5: ; 1ea80 (7:6a80)
+CinnabarQuizQuestionsText5: ; 1e430 (7:6430)
 	TX_FAR _CinnabarQuizQuestionsText5
 	db "@"
 
-CinnabarQuizQuestionsText6: ; 1ea85 (7:6a85)
+CinnabarQuizQuestionsText6: ; 1e435 (7:6435)
 	TX_FAR _CinnabarQuizQuestionsText6
 	db "@"
 
-CinnabarGymGateFlagAction: ; 1ea8a (7:6a8a)
-	EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
-	predef_jump FlagActionPredef
-
-CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92)
+CinnabarGymQuiz_1ea92: ; 1e43a (7:643a)
 	call YesNoChoice
 	ld a, [$ffdc]
 	ld c, a
@@ -231,9 +241,11 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92)
 	ld a, [hGymGateIndex]
 	add $2
 	ld [wOpponentAfterWrongAnswer], a
+	ld hl, wd475
+	set 7, [hl]
 	ret
 
-CinnabarGymQuizCorrectText: ; 1eae3 (7:6ae3)
+CinnabarGymQuizCorrectText: ; 1e490 (7:6490)
 	db $0b
 	TX_FAR _CinnabarGymQuizCorrectText
 	db $06
@@ -253,11 +265,15 @@ CinnabarGymQuizCorrectText: ; 1eae3 (7:6ae3)
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
-CinnabarGymQuizIncorrectText: ; 1eb05 (7:6b05)
+CinnabarGymQuizIncorrectText: ; 1e4b2 (7:64b2)
 	TX_FAR _CinnabarGymQuizIncorrectText
 	db "@"
 
-UpdateCinnabarGymGateTileBlocks_: ; 1eb0a (7:6b0a)
+CinnabarGymGateFlagAction: ; 1e4b7 (7:64b7)
+	EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
+	predef_jump FlagActionPredef
+
+UpdateCinnabarGymGateTileBlocks_: ; 1e4bf (7:64bf)
 ; Update the overworld map with open floor blocks or locked gate blocks
 ; depending on event flags.
 	ld a, 6
@@ -294,13 +310,14 @@ UpdateCinnabarGymGateTileBlocks_: ; 1eb0a (7:6b0a)
 .next
 	pop bc
 	ld [wNewTileBlockID], a
-	predef ReplaceTileBlock
+	call CinnabarGym_ReplaceTileBlock
 	ld hl, hGymGateIndex
 	dec [hl]
 	jr nz, .loop
+	callab RedrawMapView
 	ret
 
-CinnabarGymGateCoords: ; 1eb48 (7:6b48)
+CinnabarGymGateCoords: ; 1e503 (7:6503)
 	; format: x-coord, y-coord, direction, padding
 	; direction: $54 = horizontal gate, $5f = vertical gate
 	db $09,$03,$54,$00
@@ -310,29 +327,57 @@ CinnabarGymGateCoords: ; 1eb48 (7:6b48)
 	db $02,$06,$54,$00
 	db $02,$03,$54,$00
 
-PrintMagazinesText: ; 1eb60 (7:6b60)
+	
+CinnabarGym_ReplaceTileBlock: ; 1e51b (7:651b)
+; basically a copy of the first half of ReplaceTileBlock
+; before checking if it is necessary to redraw the map view
+	ld hl, wOverworldMap
+	ld a, [wCurMapWidth]
+	add $6
+	ld e, a
+	ld d, $0
+	add hl, de
+	add hl, de
+	add hl, de
+	ld e, $3
+	add hl, de
+	ld e, a
+	ld a, b
+	and a
+	jr z, .addX
+.addWidthYTimesLoop
+	add hl, de
+	dec b
+	jr nz, .addWidthYTimesLoop
+.addX
+	add hl, bc
+	ld a, [wNewTileBlockID]
+	ld [hl], a
+	ret
+
+PrintMagazinesText: ; 1e53b (7:653b)
 	call EnableAutoTextBoxDrawing
 	tx_pre MagazinesText
 	ret
 
-MagazinesText: ; 1eb69 (7:6b69)
+MagazinesText: ; 1e544 (7:6544)
 	TX_FAR _MagazinesText
 	db "@"
 
-BillsHousePC: ; 1eb6e (7:6b6e)
+BillsHousePC: ; 1e549 (7:6549)
 	call EnableAutoTextBoxDrawing
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
 	CheckEvent EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING
-	jr nz, .asm_1ebd2
+	jr nz, .displayBillsHousePokemonList
 	CheckEventReuseA EVENT_USED_CELL_SEPARATOR_ON_BILL
-	jr nz, .asm_1eb86
+	jr nz, .displayBillsHouseMonitorText
 	CheckEventReuseA EVENT_BILL_SAID_USE_CELL_SEPARATOR
-	jr nz, .asm_1eb8b
-.asm_1eb86
+	jr nz, .doCellSeparator
+.displayBillsHouseMonitorText
 	tx_pre_jump BillsHouseMonitorText
-.asm_1eb8b
+.doCellSeparator
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	tx_pre BillsHouseInitiatedText
@@ -359,23 +404,21 @@ BillsHousePC: ; 1eb6e (7:6b6e)
 	call PlayDefaultMusic
 	SetEvent EVENT_USED_CELL_SEPARATOR_ON_BILL
 	ret
-.asm_1ebd2
+.displayBillsHousePokemonList
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	tx_pre BillsHousePokemonList
 	ret
 
-BillsHouseMonitorText: ; 1ebdd (7:6bdd)
+BillsHouseMonitorText: ; 1e5b8 (7:65b8)
 	TX_FAR _BillsHouseMonitorText
 	db "@"
 
-BillsHouseInitiatedText: ; 1ebe2 (7:6be2)
+BillsHouseInitiatedText: ; 1e5bd (7:65b2)
 	TX_FAR _BillsHouseInitiatedText
 	db $06
 	TX_ASM
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 	ld c, 16
 	call DelayFrames
 	ld a, SFX_SWITCH
@@ -385,7 +428,7 @@ BillsHouseInitiatedText: ; 1ebe2 (7:6be2)
 	call DelayFrames
 	jp TextScriptEnd
 
-BillsHousePokemonList: ; 1ec05 (7:6c05)
+BillsHousePokemonList: ; 1e5dc (7:65dc)
 	TX_ASM
 	call SaveScreenTilesToBuffer1
 	ld hl, BillsHousePokemonListText1
@@ -406,8 +449,7 @@ BillsHousePokemonList: ; 1ec05 (7:6c05)
 	ld hl, wd730
 	set 6, [hl]
 	coord hl, 0, 0
-	ld b, $a
-	ld c, $9
+	lb bc, 10, 9
 	call TextBoxBorder
 	coord hl, 2, 2
 	ld de, BillsMonListText
@@ -439,28 +481,29 @@ BillsHousePokemonList: ; 1ec05 (7:6c05)
 	call LoadScreenTilesFromBuffer2
 	jp TextScriptEnd
 
-BillsHousePokemonListText1: ; 1ec7f (7:6c7f)
+BillsHousePokemonListText1: ; 1e654 (7:6654)
 	TX_FAR _BillsHousePokemonListText1
 	db "@"
 
-BillsMonListText: ; 1ec84 (7:6c84)
+BillsMonListText: ; 1e659 (7:6659)
 	db   "EEVEE"
 	next "FLAREON"
 	next "JOLTEON"
 	next "VAPOREON"
 	next "CANCEL@"
 
-BillsHousePokemonListText2: ; 1ecaa (7:6caa)
+BillsHousePokemonListText2: ; 1e67f (7:667f)
 	TX_FAR _BillsHousePokemonListText2
 	db "@"
 
-DisplayOakLabEmailText: ; 1ecaf (7:6caf)
+DisplayOakLabEmailText: ; 1e684 (7:6684)
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
 	ret nz
 	call EnableAutoTextBoxDrawing
-	tx_pre_jump OakLabEmailText
+	tx_pre OakLabEmailText
+	ret
 
-OakLabEmailText: ; 1ecbd (7:6cbd)
+OakLabEmailText: ; 1e693 (7:6693)
 	TX_FAR _OakLabEmailText
 	db "@"
diff --git a/engine/items/items.asm b/engine/items/items.asm
index e3e8eace..aa607911 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1502,7 +1502,7 @@ ItemUseEscapeRope: ; ddcf (3:5dcf)
 	res 7,[hl]
 	xor a
 	ld [wNumSafariBalls],a
-	ld [W_SAFARIZONEENTRANCECURSCRIPT],a
+	ld [wSafariZoneEntranceCurScript],a
 	inc a
 	ld [wEscapedFromBattle],a
 	ld [wActionResultOrTookBattleTurn],a ; item used
diff --git a/engine/menu/oaks_pc.asm b/engine/menu/oaks_pc.asm
index 7ff03c46..ce989bf1 100755
--- a/engine/menu/oaks_pc.asm
+++ b/engine/menu/oaks_pc.asm
@@ -1,4 +1,4 @@
-OpenOaksPC: ; 1e915 (7:6915)
+OpenOaksPC: ; 1e2ae (7:62ae)
 	call SaveScreenTilesToBuffer2
 	ld hl, AccessedOaksPCText
 	call PrintText
@@ -7,21 +7,21 @@ OpenOaksPC: ; 1e915 (7:6915)
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, .asm_1e932
+	jr nz, .closePC
 	predef DisplayDexRating
-.asm_1e932
+.closePC
 	ld hl, ClosedOaksPCText
 	call PrintText
 	jp LoadScreenTilesFromBuffer2
 
-GetDexRatedText: ; 1e93b (7:693b)
+GetDexRatedText: ; 1e2d4 (7:62d4)
 	TX_FAR _GetDexRatedText
 	db "@"
 
-ClosedOaksPCText: ; 1e940 (7:6940)
+ClosedOaksPCText: ; 1e2d9 (7:62d9)
 	TX_FAR _ClosedOaksPCText
 	db $0d,"@"
 
-AccessedOaksPCText: ; 1e946 (7:6946)
+AccessedOaksPCText: ; 1e2df (7:62df)
 	TX_FAR _AccessedOaksPCText
 	db "@"
diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm
index 8ec9772a..3f7b5f0f 100755
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -1,5 +1,5 @@
 ; returns whether the player is standing on a door tile in carry
-IsPlayerStandingOnDoorTile: ; 1a609 (6:6609)
+IsPlayerStandingOnDoorTile: ; 1a785 (6:6785)
 	push de
 	ld hl, DoorTileIDPointers
 	ld a, [wCurMapTileset]
@@ -42,22 +42,22 @@ DoorTileIDPointers: ; 1a7a8 (6:67a8)
 	dbw INTERIOR,    InteriorDoorTileIDs
 	db $ff
 
-OverworldDoorTileIDs: ; 1a654 (6:6654)
+OverworldDoorTileIDs: ; 1a7d3 (6:67d3)
 	db $1B,$58,$00
 
-ForestDoorTileIDs: ; 1a657 (6:6657)
+ForestDoorTileIDs: ; 1a7d6 (6:67d6)
 	db $3a,$00
 
-MartDoorTileIDs: ; 1a659 (6:6659)
+MartDoorTileIDs: ; 1a7d8 (6:67d8)
 	db $5e,$00
 
-HouseDoorTileIDs: ; 1a65b (6:665b)
+HouseDoorTileIDs: ; 1a7da (6:67da)
 	db $54,$00
 
-TilesetMuseumDoorTileIDs: ; 1a65d (6:665d)
+TilesetMuseumDoorTileIDs: ; 1a7dc (6:67dc)
 	db $3b,$00
 
-ShipDoorTileIDs: ; 1a65f (6:665f)
+ShipDoorTileIDs: ; 1a7de (6:67de)
 	db $1e,$00
 
 LobbyDoorTileIDs: ; 1a7e0 (6:67e0)
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index 58eb6a47..07abd44f 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -1,4 +1,4 @@
-PlayerStepOutFromDoor: ; 1a3e0 (6:63e0)
+PlayerStepOutFromDoor: ; 1a4ea (6:64ea)
 	ld hl, wd730
 	res 1, [hl]
 	call IsPlayerStandingOnDoorTile
@@ -258,7 +258,7 @@ RLEList_PewterGymPlayer: ; 1a6cb (6:66cb)
 	db D_LEFT, $0F
 	db $FF
 
-RLEList_PewterGymGuy: ; 1a6cd8(6:66d8)
+RLEList_PewterGymGuy: ; 1a6cd8 (6:66d8)
 	db NPC_MOVEMENT_DOWN, $02
 	db NPC_MOVEMENT_LEFT, $0F
 	db NPC_MOVEMENT_UP, $05
diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm
index 8ac456d2..d412d8ec 100755
--- a/engine/overworld/oaks_aide.asm
+++ b/engine/overworld/oaks_aide.asm
@@ -1,4 +1,4 @@
-OaksAideScript: ; 0x59035
+OaksAideScript: ; 58ecc (16:4ecc)
 	ld hl, OaksAideHiText
 	call PrintText
 	call YesNoChoice
@@ -45,27 +45,27 @@ OaksAideScript: ; 0x59035
 	ld [hOaksAideResult], a
 	ret
 
-OaksAideHiText: ; 59091 (16:5091)
+OaksAideHiText: ; 58f28 (16:4f28)
 	TX_FAR _OaksAideHiText
 	db "@"
 
-OaksAideUhOhText: ; 59096 (16:5096)
+OaksAideUhOhText: ; 58f2d (16:4f2d)
 	TX_FAR _OaksAideUhOhText
 	db "@"
 
-OaksAideComeBackText: ; 5909b (16:509b)
+OaksAideComeBackText: ; 58f32 (16:4f32)
 	TX_FAR _OaksAideComeBackText
 	db "@"
 
-OaksAideHereYouGoText: ; 590a0 (16:50a0)
+OaksAideHereYouGoText: ; 58f37 (16:4f37)
 	TX_FAR _OaksAideHereYouGoText
 	db "@"
 
-OaksAideGotItemText: ; 590a5 (16:50a5)
+OaksAideGotItemText: ; 58f3c (16:4f3c)
 	TX_FAR _OaksAideGotItemText
 	db $0b
 	db "@"
 
-OaksAideNoRoomText: ; 590ab (16:50ab)
+OaksAideNoRoomText: ; 58f41 (16:4f41)
 	TX_FAR _OaksAideNoRoomText
 	db "@"
diff --git a/engine/overworld/saffron_guards.asm b/engine/overworld/saffron_guards.asm
index c0d6a985..83d73d02 100755
--- a/engine/overworld/saffron_guards.asm
+++ b/engine/overworld/saffron_guards.asm
@@ -1,4 +1,4 @@
-RemoveGuardDrink: ; 5a59f (16:659f)
+RemoveGuardDrink: ; 5a53a (16:653a)
 	ld hl, GuardDrinksList
 .drinkLoop
 	ld a, [hli]
@@ -12,5 +12,5 @@ RemoveGuardDrink: ; 5a59f (16:659f)
 	jr z, .drinkLoop
 	jpba RemoveItemByID
 
-GuardDrinksList: ; 5a5b7 (16:65b7)
+GuardDrinksList: ; 5a552 (16:6552)
 	db FRESH_WATER, SODA_POP, LEMONADE, $00
diff --git a/engine/status_ailments.asm b/engine/status_ailments.asm
index 9bcfe9f0..b233defa 100755
--- a/engine/status_ailments.asm
+++ b/engine/status_ailments.asm
@@ -1,4 +1,4 @@
-PrintStatusAilment: ; 747de (1d:47de)
+PrintStatusAilment: ; 58e8b (16:4e8b)
 	ld a, [de]
 	bit PSN, a
 	jr nz, .psn
diff --git a/gfx/intro_nido_1.6x6.png b/gfx/intro_nido_1.6x6.png
deleted file mode 100644
index 4c7804a1..00000000
--- a/gfx/intro_nido_1.6x6.png
+++ /dev/null
diff --git a/gfx/intro_nido_2.6x6.png b/gfx/intro_nido_2.6x6.png
deleted file mode 100644
index a29a4814..00000000
--- a/gfx/intro_nido_2.6x6.png
+++ /dev/null
diff --git a/gfx/intro_nido_3.6x6.png b/gfx/intro_nido_3.6x6.png
deleted file mode 100644
index e920d55d..00000000
--- a/gfx/intro_nido_3.6x6.png
+++ /dev/null
diff --git a/gfx/ledge_hopping_shadow.png b/gfx/ledge_hopping_shadow.png
index 8e760056..ba3dab5b 100644
--- a/gfx/ledge_hopping_shadow.png
+++ b/gfx/ledge_hopping_shadow.png
diff --git a/home.asm b/home.asm
index c8f227ef..3d8db84f 100644
--- a/home.asm
+++ b/home.asm
@@ -1445,7 +1445,7 @@ DisplayPlayerBlackedOutText:: ; 2988 (0:2988)
 	ld [wSafariSteps+1],a
 	ld [wd790],a
 	ld [wcf0d],a
-	ld [W_SAFARIZONEENTRANCECURSCRIPT],a
+	ld [wSafariZoneEntranceCurScript],a
 .didnotblackoutinsafari
 	jp HoldTextDisplayOpen
 
@@ -4913,7 +4913,7 @@ PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9)
 INCLUDE "home/predef.asm"
 
 UpdateCinnabarGymGateTileBlocks:: ; 3ef0 (0:3ef0)
-	callba CinnabarGymQuiz_1e4bf
+	callba UpdateCinnabarGymGateTileBlocks_
 	ret ; again?
 	;jp Bankswitch
 
diff --git a/main.asm b/main.asm
index 08b0df82..3fc6f370 100755
--- a/main.asm
+++ b/main.asm
@@ -283,16 +283,10 @@ INCLUDE "engine/clear_save.asm"
 INCLUDE "engine/predefs7.asm"
 
 	dr $1c2c2,$1e2ae ; map scripts
-OpenOaksPC: ; 1e2ae (7:62ae)
-	dr $1e2ae,$1e321
-SafariZoneCheck: ; 1e321 (7:6e21)
-	dr $1e321,$1e330
-SafariZoneCheckSteps: ; 1e330 (7:6330)
-	dr $1e330,$1e385
-PrintSafariGameOverText: ; 1e385 (7:6385)
-	dr $1e385,$1e4bf
-CinnabarGymQuiz_1e4bf: ; 1e4bf (7:64bf)
-	dr $1e4bf,$20000
+
+INCLUDE "engine/menu/oaks_pc.asm"
+
+INCLUDE "engine/hidden_object_functions7.asm"
 
 SECTION "Pics 1", ROMX, BANK[PICS_1]
 
@@ -770,12 +764,16 @@ INCLUDE "engine/overworld/trainers.asm"
 SECTION "bank16",ROMX,BANK[$16]
 
 	dr $58000,$58d99
-CalcLevelFromExperience: ; 58d99 (16:4d99)
-	dr $58d99,$58dc0
-CalcExperience: ; 58dc0 (16:4dc0)
-	dr $58dc0,$58e8b
-PrintStatusAilment: ; 58e8b (16:4e8b)
-	dr $58e8b,$5a555
+
+INCLUDE "engine/experience.asm"
+
+INCLUDE "engine/status_ailments.asm"
+
+INCLUDE "engine/overworld/oaks_aide.asm"
+
+	dr $58f47,$5a53a
+	
+INCLUDE "engine/overworld/saffron_guards.asm"
 
 
 SECTION "bank17",ROMX,BANK[$17]
diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm
index ac51c2d5..da9a068e 100644
--- a/scripts/safarizoneentrance-yellow.asm
+++ b/scripts/safarizoneentrance-yellow.asm
@@ -67,7 +67,7 @@
 	SetEvent EVENT_IN_SAFARI_ZONE
 	ResetEventReuseHL EVENT_SAFARI_GAME_OVER
 	ld a,3
-	ld [W_SAFARIZONEENTRANCECURSCRIPT],a
+	ld [wSafariZoneEntranceCurScript],a
 	jr .done
 
 .PleaseComeAgain
@@ -78,7 +78,7 @@
 	ld c,1
 	call SafariZoneEntranceAutoWalk
 	ld a,4
-	ld [W_SAFARIZONEENTRANCECURSCRIPT],a
+	ld [wSafariZoneEntranceCurScript],a
 .done
 	ret
 
diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm
index a24b790f..2f8ff34b 100755
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/safarizoneentrance.asm
@@ -1,7 +1,7 @@
 SafariZoneEntranceScript: ; 751cd (1d:51cd)
 	call EnableAutoTextBoxDrawing
 	ld hl, SafariZoneEntranceScriptPointers
-	ld a, [W_SAFARIZONEENTRANCECURSCRIPT]
+	ld a, [wSafariZoneEntranceCurScript]
 	jp CallFunctionInTable
 
 SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
@@ -30,7 +30,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
 	cp $1
 	jr z, .asm_7520f
 	ld a, $2
-	ld [W_SAFARIZONEENTRANCECURSCRIPT], a
+	ld [wSafariZoneEntranceCurScript], a
 	ret
 .asm_7520f
 	ld a, D_RIGHT
@@ -39,7 +39,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, $1
-	ld [W_SAFARIZONEENTRANCECURSCRIPT], a
+	ld [wSafariZoneEntranceCurScript], a
 	ret
 
 .CoordsData_75221: ; 75221 (1d:5221)
@@ -68,7 +68,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $5
-	ld [W_SAFARIZONEENTRANCECURSCRIPT], a
+	ld [wSafariZoneEntranceCurScript], a
 	ret
 
 .SafariZoneEntranceScript5
@@ -89,7 +89,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
 	ld c, $3
 	call SafariZoneEntranceAutoWalk
 	ld a, $4
-	ld [W_SAFARIZONEENTRANCECURSCRIPT], a
+	ld [wSafariZoneEntranceCurScript], a
 	jr .asm_75286
 .asm_7527f
 	ld a, $5
@@ -104,7 +104,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [W_SAFARIZONEENTRANCECURSCRIPT], a
+	ld [wSafariZoneEntranceCurScript], a
 	ret
 
 .SafariZoneEntranceScript6
@@ -112,7 +112,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
 	ret nz
 	call Delay3
 	ld a, [wcf0d]
-	ld [W_SAFARIZONEENTRANCECURSCRIPT], a
+	ld [wSafariZoneEntranceCurScript], a
 	ret
 
 SafariZoneEntranceAutoWalk:
@@ -192,7 +192,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9)
 	SetEvent EVENT_IN_SAFARI_ZONE
 	ResetEventReuseHL EVENT_SAFARI_GAME_OVER
 	ld a,3
-	ld [W_SAFARIZONEENTRANCECURSCRIPT],a
+	ld [wSafariZoneEntranceCurScript],a
 	jr .done
 
 .PleaseComeAgain
@@ -203,7 +203,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9)
 	ld c,1
 	call SafariZoneEntranceAutoWalk
 	ld a,4
-	ld [W_SAFARIZONEENTRANCECURSCRIPT],a
+	ld [wSafariZoneEntranceCurScript],a
 .done
 	jp TextScriptEnd
 
@@ -251,7 +251,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9)
 	ld [wcf0d], a
 .asm_753b3
 	ld a, $6
-	ld [W_SAFARIZONEENTRANCECURSCRIPT], a
+	ld [wSafariZoneEntranceCurScript], a
 	jp TextScriptEnd
 
 .SafariZoneEntranceText_753bb
diff --git a/text.asm b/text.asm
index 47721ff4..d8e01bf9 100644
--- a/text.asm
+++ b/text.asm
@@ -559,7 +559,7 @@ _GameOverText::
 	line "GAME is over!"
 	done
 
-_CinnabarGymQuizIntroText::
+_CinnabarGymQuizDummyIntroText::
 	text "#MON Quiz!"
 
 	para "Get it right and"
@@ -578,6 +578,7 @@ _CinnabarGymQuizIntroText::
 	line "Here we go!"
 	prompt
 
+_CinnabarGymQuizIntroText::
 	text "#MON Quiz!"
 
 	para "Get it right and"
@@ -598,6 +599,7 @@ _CinnabarGymQuizIntroText::
 	db $51
 	done
 
+_CinnabarGymQuizShortIntroText::
 	text "#MON Quiz!"
 
 	line "Test your skill!"
diff --git a/wram.asm b/wram.asm
index 77c489f8..b8b0aa28 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2530,7 +2530,11 @@ wPikachuMood:: ds 1 ; d470
 wd472:: ds 1
 wd473:: ds 1
 	
-	ds 6
+	ds 1
+	
+wd475:: ds 1
+
+	ds 4
 
 wd47a:: ds 1
 
@@ -2752,7 +2756,7 @@ W_ROUTE19CURSCRIPT:: ; d61d
 	ds 1
 W_ROUTE21CURSCRIPT:: ; d61e
 	ds 1
-W_SAFARIZONEENTRANCECURSCRIPT:: ; d61f
+wSafariZoneEntranceCurScript:: ; d61f
 	ds 1
 W_ROCKTUNNEL2CURSCRIPT:: ; d620
 	ds 1