Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 196 insertions, 198 deletions

diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm
index 491ecae3..2b2dea4e 100644
--- a/scripts/MtMoonB2F.asm
+++ b/scripts/MtMoonB2F.asm
@@ -7,18 +7,18 @@ MtMoonB2F_Script:
 	ld [wMtMoonB2FCurScript], a
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	ret z
-	ld hl, CoordsData_49d37
+	ld hl, MtMoonB2FFossilAreaCoords
 	call ArePlayerCoordsInArray
-	jr nc, .asm_49d31
+	jr nc, .enable_battles
 	ld hl, wd72e
 	set 4, [hl]
 	ret
-.asm_49d31
+.enable_battles
 	ld hl, wd72e
 	res 4, [hl]
 	ret
 
-CoordsData_49d37:
+MtMoonB2FFossilAreaCoords:
 	dbmapcoord 11,  5
 	dbmapcoord 12,  5
 	dbmapcoord 13,  5
@@ -37,53 +37,54 @@ CoordsData_49d37:
 	dbmapcoord 14,  8
 	db -1 ; end
 
-MtMoon3Script_49cd7:
+MtMoonB2FResetScripts:
 	CheckAndResetEvent EVENT_57E
-	call nz, MtMoon3Script_49cec
+	call nz, MtMoonB2FScript_HideJessieJames
 	xor a
 	ld [wJoyIgnore], a
-MtMoon3Script_49ce5:
+MtMoonB2FSetScript:
 	ld [wMtMoonB2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-MtMoon3Script_49cec:
+MtMoonB2FScript_HideJessieJames:
 	ld a, HS_MT_MOON_B2F_JESSIE
-	call MtMoon3Script_49f93
+	call MtMoonB2FScript_HideObject
 	ld a, HS_MT_MOON_B2F_JAMES
-	call MtMoon3Script_49f93
+	call MtMoonB2FScript_HideObject
 	ret
 
 MtMoonB2F_ScriptPointers:
-	dw MtMoon3Script0
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
-	dw MtMoon3Script3
-	dw MtMoon3Script4
-	dw MtMoon3Script5
-	dw MtMoon3Script6
-	dw MtMoon3Script7
-	dw MtMoon3Script8
-	dw MtMoon3Script9
-	dw MtMoon3Script10
-	dw MtMoon3Script11
-	dw MtMoon3Script12
-	dw MtMoon3Script13
-	dw MtMoon3Script14
-	dw MtMoon3Script15
+	def_script_pointers
+	dw_const MtMoonB2FDefaultScript,                   SCRIPT_MTMOONB2F_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle,    SCRIPT_MTMOONB2F_START_BATTLE
+	dw_const EndTrainerBattle,                         SCRIPT_MTMOONB2F_END_BATTLE
+	dw_const MtMoonB2FDefeatedSuperNerdScript,         SCRIPT_MTMOONB2F_DEFEATED_SUPER_NERD
+	dw_const MtMoonB2FMoveSuperNerdScript,             SCRIPT_MTMOONB2F_MOVE_SUPER_NERD
+	dw_const MtMoonB2FSuperNerdTakesOtherFossilScript, SCRIPT_MTMOONB2F_SUPER_NERD_TAKES_OTHER_FOSSIL
+	dw_const MtMoonB2FScript6,                         SCRIPT_MTMOONB2F_SCRIPT6
+	dw_const MtMoonB2FScript7,                         SCRIPT_MTMOONB2F_SCRIPT7
+	dw_const MtMoonB2FScript8,                         SCRIPT_MTMOONB2F_SCRIPT8
+	dw_const MtMoonB2FScript9,                         SCRIPT_MTMOONB2F_SCRIPT9
+	dw_const MtMoonB2FScript10,                        SCRIPT_MTMOONB2F_SCRIPT10
+	dw_const MtMoonB2FScript11,                        SCRIPT_MTMOONB2F_SCRIPT11
+	dw_const MtMoonB2FScript12,                        SCRIPT_MTMOONB2F_SCRIPT12
+	dw_const MtMoonB2FScript13,                        SCRIPT_MTMOONB2F_SCRIPT13
+	dw_const MtMoonB2FScript14,                        SCRIPT_MTMOONB2F_SCRIPT14
+	dw_const MtMoonB2FScript15,                        SCRIPT_MTMOONB2F_SCRIPT15
 
-MtMoon3Script0:
+MtMoonB2FDefaultScript:
 IF DEF(_DEBUG)
 	call DebugPressedOrHeldB
 	ret nz
 ENDC
 	CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL
-	call z, MtMoon3Script_49d28
+	call z, MtMoonB2FScript_49d28
 	CheckEvent EVENT_BEAT_MT_MOON_3_TRAINER_0
-	call z, MtMoon3Script_49e15
+	call z, MtMoonB2FScript_49e15
 	ret
 
-MtMoon3Script_49d28:
+MtMoonB2FScript_49d28:
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	jp nz, .asm_49d4b
 	ld a, [wYCoord]
@@ -94,7 +95,7 @@ MtMoon3Script_49d28:
 	jp nz, .asm_49d4b
 	xor a
 	ldh [hJoyHeld], a
-	ld a, $1
+	ld a, TEXT_MTMOONB2F_SUPER_NERD
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ret
@@ -104,21 +105,21 @@ MtMoon3Script_49d28:
 	jp z, CheckFightingMapTrainers
 	ret
 
-MtMoon3Script3:
+MtMoonB2FDefeatedSuperNerdScript:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, MtMoon3Script_49cd7
+	jp z, MtMoonB2FResetScripts
 	call UpdateSprites
 	call Delay3
 	SetEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	xor a
 	ld [wJoyIgnore], a
-	ld a, $0
-	call MtMoon3Script_49ce5
+	ld a, SCRIPT_MTMOONB2F_DEFAULT
+	call MtMoonB2FSetScript
 	ret
 
-MtMoon3Script4:
-	ld a, $1
+MtMoonB2FMoveSuperNerdScript:
+	ld a, MTMOONB2F_SUPER_NERD
 	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
 	ld hl, CoordsData_49dc7
@@ -138,7 +139,7 @@ MtMoon3Script4:
 .asm_49d9b
 	ld b, SPRITE_FACING_LEFT
 	ld hl, PikachuMovementData_49dd8
-	call MtMoon3Script_4a325
+	call MtMoonB2FScript_ApplyPikachuMovementData
 .asm_49da3
 	ld de, MovementData_49ddd
 	jr .asm_49db3
@@ -146,15 +147,15 @@ MtMoon3Script4:
 .asm_49da8
 	ld b, SPRITE_FACING_RIGHT
 	ld hl, PikachuMovementData_49dca
-	call MtMoon3Script_4a325
+	call MtMoonB2FScript_ApplyPikachuMovementData
 .asm_49db0
 	ld de, MovementData_49ddc
 .asm_49db3
-	ld a, $1
+	ld a, MTMOONB2F_SUPER_NERD
 	ldh [hSpriteIndex], a
 	call MoveSprite
-	ld a, $5
-	call MtMoon3Script_49ce5
+	ld a, SCRIPT_MTMOONB2F_SUPER_NERD_TAKES_OTHER_FOSSIL
+	call MtMoonB2FSetScript
 	ret
 
 CoordsData_49dc0:
@@ -195,15 +196,15 @@ MovementData_49ddd:
 	db NPC_MOVEMENT_UP
 	db -1 ; end
 
-MtMoon3Script5:
+MtMoonB2FSuperNerdTakesOtherFossilScript:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-	ld a, $f0
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, $b
+	ld a, TEXT_MTMOONB2F_SUPER_NERD_THEN_THIS_IS_MINE
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	CheckEvent EVENT_GOT_HELIX_FOSSIL
@@ -217,11 +218,11 @@ MtMoon3Script5:
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
-	ld a, $0
-	call MtMoon3Script_49ce5
+	ld a, SCRIPT_MTMOONB2F_DEFAULT
+	call MtMoonB2FSetScript
 	ret
 
-MtMoon3Script_49e15:
+MtMoonB2FScript_49e15:
 	ld a, [wXCoord]
 	cp $3
 	ret nz
@@ -237,12 +238,12 @@ MtMoon3Script_49e15:
 	ld a, ~(A_BUTTON | B_BUTTON)
 	ld [wJoyIgnore], a
 	ld a, HS_MT_MOON_B2F_JESSIE
-	call MtMoon3Script_49f84
+	call MtMoonB2FScript_ShowObject
 	ld a, HS_MT_MOON_B2F_JAMES
-	call MtMoon3Script_49f84
+	call MtMoonB2FScript_ShowObject
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, $c
+	ld a, TEXT_MTMOONB2F_TEXT12
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	xor a
@@ -252,10 +253,10 @@ MtMoon3Script_49e15:
 	ld a, D_UP
 	ld [wSimulatedJoypadStatesEnd], a
 	call StartSimulatingJoypadStates
-	ld a, $ff
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $6
-	call MtMoon3Script_49ce5
+	ld a, SCRIPT_MTMOONB2F_SCRIPT6
+	call MtMoonB2FSetScript
 	ret
 
 MovementData_f9e65:
@@ -268,52 +269,52 @@ MovementData_f9e66:
 	db $06
 	db $FF
 
-MtMoon3Script6:
-	ld a, $ff
+MtMoonB2FScript6:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3
-	ld a, $2
+	ld a, MTMOONB2F_JESSIE
 	ldh [hSpriteIndex], a
 	ld de, MovementData_f9e65
 	call MoveSprite
-	ld a, $ff
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $7
-	call MtMoon3Script_49ce5
+	ld a, SCRIPT_MTMOONB2F_SCRIPT7
+	call MtMoonB2FSetScript
 	ret
 
-MtMoon3Script7:
-	ld a, $ff
+MtMoonB2FScript7:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-MtMoon3Script8:
+MtMoonB2FScript8:
 	ld a, $2
 	ld [wSprite02StateData1MovementStatus], a
 	ld a, SPRITE_FACING_DOWN
 	ld [wSprite02StateData1FacingDirection], a
-MtMoon3Script9:
-	ld a, $6
+MtMoonB2FScript9:
+	ld a, MTMOONB2F_JAMES
 	ldh [hSpriteIndex], a
 	ld de, MovementData_f9e66
 	call MoveSprite
-	ld a, $ff
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $a
-	call MtMoon3Script_49ce5
+	ld a, SCRIPT_MTMOONB2F_SCRIPT10
+	call MtMoonB2FSetScript
 	ret
 
-MtMoon3Script10:
-	ld a, $ff
+MtMoonB2FScript10:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-MtMoon3Script11:
+MtMoonB2FScript11:
 	ld a, $2
 	ld [wSprite06StateData1MovementStatus], a
 	ld a, SPRITE_FACING_LEFT
@@ -321,15 +322,15 @@ MtMoon3Script11:
 	call Delay3
 	ld a, ~(A_BUTTON | B_BUTTON)
 	ld [wJoyIgnore], a
-	ld a, $d
+	ld a, TEXT_MTMOONB2F_TEXT13
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
-MtMoon3Script12:
+MtMoonB2FScript12:
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, MtMoon3JessieJamesEndBattleText
-	ld de, MtMoon3JessieJamesEndBattleText
+	ld hl, MtMoonB2FJessieJamesEndBattleText
+	ld de, MtMoonB2FJessieJamesEndBattleText
 	call SaveEndBattleTextPointers
 	ld a, OPP_ROCKET
 	ld [wCurOpponent], a
@@ -339,16 +340,16 @@ MtMoon3Script12:
 	ldh [hJoyHeld], a
 	ld [wJoyIgnore], a
 	SetEvent EVENT_57E
-	ld a, $d
-	call MtMoon3Script_49ce5
+	ld a, SCRIPT_MTMOONB2F_SCRIPT13
+	call MtMoonB2FSetScript
 	ret
 
-MtMoon3Script13:
-	ld a, $ff
+MtMoonB2FScript13:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, MtMoon3Script_49cd7
+	jp z, MtMoonB2FResetScripts
 	ld a, $2
 	ld [wSprite02StateData1MovementStatus], a
 	ld [wSprite06StateData1MovementStatus], a
@@ -359,7 +360,7 @@ MtMoon3Script13:
 	ld [wJoyIgnore], a
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, $e
+	ld a, TEXT_MTMOONB2F_TEXT14
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	xor a
@@ -368,81 +369,81 @@ MtMoon3Script13:
 	ld c, BANK(Music_MeetJessieJames)
 	ld a, MUSIC_MEET_JESSIE_JAMES
 	call PlayMusic
-	ld a, $ff
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $e
-	call MtMoon3Script_49ce5
+	ld a, SCRIPT_MTMOONB2F_SCRIPT14
+	call MtMoonB2FSetScript
 	ret
 
-MtMoon3Script14:
-	ld a, $ff
+MtMoonB2FScript14:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
 	ld a, HS_MT_MOON_B2F_JESSIE
-	call MtMoon3Script_49f93
+	call MtMoonB2FScript_HideObject
 	ld a, HS_MT_MOON_B2F_JAMES
-	call MtMoon3Script_49f93
+	call MtMoonB2FScript_HideObject
 	call UpdateSprites
 	call Delay3
 	call GBFadeInFromBlack
-	ld a, $f
-	call MtMoon3Script_49ce5
+	ld a, SCRIPT_MTMOONB2F_SCRIPT15
+	call MtMoonB2FSetScript
 	ret
 
-MtMoon3Script15:
+MtMoonB2FScript15:
 	call PlayDefaultMusic
 	xor a
 	ldh [hJoyHeld], a
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_MT_MOON_3_TRAINER_0
 	ResetEventReuseHL EVENT_57E
-	ld a, $0
-	call MtMoon3Script_49ce5
+	ld a, SCRIPT_MTMOONB2F_DEFAULT
+	call MtMoonB2FSetScript
 	ret
 
-MtMoon3Script_49f84:
+MtMoonB2FScript_ShowObject:
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	call UpdateSprites
 	call Delay3
 	ret
 
-MtMoon3Script_49f93:
+MtMoonB2FScript_HideObject:
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	ret
 
 MtMoonB2F_TextPointers:
-	dw MtMoon3Text1
-	dw MtMoon3Text2
-	dw MtMoon3Text3
-	dw MtMoon3Text4
-	dw MtMoon3Text5
-	dw MtMoon3Text6
-	dw MtMoon3Text7
-	dw MtMoon3Text8
-	dw PickUpItemText
-	dw PickUpItemText
-	dw MtMoon3Text11
-	dw MtMoon3Text12
-	dw MtMoon3Text13
-	dw MtMoon3Text14
+	def_text_pointers
+	dw_const MtMoonB2FSuperNerdText,                TEXT_MTMOONB2F_SUPER_NERD
+	dw_const MtMoonB2FJessieJamesText,              TEXT_MTMOONB2F_JESSIE
+	dw_const MtMoonB2FRocket1Text,                  TEXT_MTMOONB2F_ROCKET1
+	dw_const MtMoonB2FRocket2Text,                  TEXT_MTMOONB2F_ROCKET2
+	dw_const MtMoonB2FRocket3Text,                  TEXT_MTMOONB2F_ROCKET3
+	dw_const MtMoonB2FJessieJamesText,              TEXT_MTMOONB2F_JAMES
+	dw_const MtMoonB2FDomeFossilText,               TEXT_MTMOONB2F_DOME_FOSSIL
+	dw_const MtMoonB2FHelixFossilText,              TEXT_MTMOONB2F_HELIX_FOSSIL
+	dw_const PickUpItemText,                        TEXT_MTMOONB2F_HP_UP
+	dw_const PickUpItemText,                        TEXT_MTMOONB2F_TM_MEGA_PUNCH
+	dw_const MtMoonB2FSuperNerdThenThisIsMineText,  TEXT_MTMOONB2F_SUPER_NERD_THEN_THIS_IS_MINE
+	dw_const MtMoonB2FText12,                       TEXT_MTMOONB2F_TEXT12
+	dw_const MtMoonB2FText13,                       TEXT_MTMOONB2F_TEXT13
+	dw_const MtMoonB2FText14,                       TEXT_MTMOONB2F_TEXT14
 
 MtMoon3TrainerHeaders:
 	def_trainers 3
 MtMoon3TrainerHeader0:
-	trainer EVENT_BEAT_MT_MOON_3_TRAINER_1, 4, MtMoon3BattleText3, MtMoon3EndBattleText3, MtMoon3AfterBattleText3
+	trainer EVENT_BEAT_MT_MOON_3_TRAINER_1, 4, MtMoonB2FRocket2BattleText, MtMoonB2FRocket2EndBattleText, MtMoonB2FRocket2AfterBattleText
 MtMoon3TrainerHeader1:
-	trainer EVENT_BEAT_MT_MOON_3_TRAINER_2, 4, MtMoon3BattleText4, MtMoon3EndBattleText4, MtMoon3AfterBattleText4
+	trainer EVENT_BEAT_MT_MOON_3_TRAINER_2, 4, MtMoonB2FRocket3BattleText, MtMoonB2FRocket3EndBattleText, MtMoonB2FRocket3AfterBattleText
 MtMoon3TrainerHeader2:
-	trainer EVENT_BEAT_MT_MOON_3_TRAINER_3, 4, MtMoon3BattleText5, MtMoon3EndBattleText5, MtMoon3AfterBattleText5
+	trainer EVENT_BEAT_MT_MOON_3_TRAINER_3, 4, MtMoonB2FRocket4BattleText, MtMoonB2FRocket4EndBattleText, MtMoonB2FRocket4AfterBattleText
 	db -1 ; end
 
-MtMoon3Text2:
-MtMoon3Text6:
+MtMoonB2FJessieJamesText:
 	text_end
 
-MtMoon3Text12:
+MtMoonB2FText12:
 	text_far _MtMoonJessieJamesText1
 	text_asm
 	ld c, 10
@@ -458,200 +459,197 @@ MtMoon3Text12:
 	call DelayFrames
 	jp TextScriptEnd
 
-MtMoon3Text13:
+MtMoonB2FText13:
 	text_far _MtMoonJessieJamesText2
 	text_end
 
-MtMoon3JessieJamesEndBattleText:
+MtMoonB2FJessieJamesEndBattleText:
 	text_far _MtMoonJessieJamesText3
 	text_end
 
-MtMoon3Text14:
+MtMoonB2FText14:
 	text_far _MtMoonJessieJamesText4
 	text_asm
 	ld c, 64
 	call DelayFrames
 	jp TextScriptEnd
 
-MtMoon3Text1:
+MtMoonB2FSuperNerdText:
 	text_asm
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
-	jr z, .asm_4a02f
+	jr z, .beat_super_nerd
 	; CheckEitherEventSetReuseA EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL
 	and (1 << (EVENT_GOT_DOME_FOSSIL % 8)) | (1 << (EVENT_GOT_HELIX_FOSSIL % 8))
-	jr nz, .asm_4a057
-	ld hl, MtMoon3Text_4a116
+	jr nz, .got_a_fossil
+	ld hl, MtMoonB2fSuperNerdEachTakeOneText
 	call PrintText
-	jr .asm_4a05d
-
-.asm_4a02f
-	ld hl, MtMoon3Text_4a10c
+	jr .done
+.beat_super_nerd
+	ld hl, MtMoonB2FSuperNerdTheyreBothMineText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, MtMoon3SuperNerdEndBattleText
-	ld de, MtMoon3SuperNerdEndBattleText
+	ld hl, MtMoonB2FSuperNerdOkIllShareText
+	ld de, MtMoonB2FSuperNerdOkIllShareText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
-	ld a, $3
-	call MtMoon3Script_49ce5
-	jr .asm_4a05d
-
-.asm_4a057
-	ld hl, MtMoon3Text_4a11b
+	ld a, SCRIPT_MTMOONB2F_DEFEATED_SUPER_NERD
+	call MtMoonB2FSetScript
+	jr .done
+.got_a_fossil
+	ld hl, MtMoonB2FSuperNerdTheresAPokemonLabText
 	call PrintText
-.asm_4a05d
+.done
 	jp TextScriptEnd
 
-MtMoon3Text3:
+MtMoonB2FRocket1Text:
 	text_asm
 	ld hl, MtMoon3TrainerHeader0
-	jr MtMoon3TalkToTrainer
+	jr MtMoonB2FTalkToTrainer
 
-MtMoon3Text4:
+MtMoonB2FRocket2Text:
 	text_asm
 	ld hl, MtMoon3TrainerHeader1
-	jr MtMoon3TalkToTrainer
-
+	jr MtMoonB2FTalkToTrainer
 
-MtMoon3Text5:
+MtMoonB2FRocket3Text:
 	text_asm
 	ld hl, MtMoon3TrainerHeader2
-MtMoon3TalkToTrainer:
+MtMoonB2FTalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
 
-MtMoon3Text7:
+MtMoonB2FDomeFossilText:
 	text_asm
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, MtMoon3Text_4a0ae
+	ld hl, .YouWantText
 	call PrintText
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, .asm_4a0ab
+	jr nz, .done
 	lb bc, DOME_FOSSIL, 1
 	call GiveItem
-	jp nc, MtMoon3Script_4a0fd
-	call MtMoon3Script_4a0f0
+	jp nc, MtMoonB2FYouHaveNoRoomText
+	call MtMoonB2FReceivedFossilText
 	ld a, HS_MT_MOON_B2F_FOSSIL_1
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_DOME_FOSSIL
-	ld a, $4
-	call MtMoon3Script_49ce5
-.asm_4a0ab
+	ld a, SCRIPT_MTMOONB2F_MOVE_SUPER_NERD
+	call MtMoonB2FSetScript
+.done
 	jp TextScriptEnd
 
-MtMoon3Text_4a0ae:
-	text_far _MtMoon3Text_49f24
+.YouWantText:
+	text_far _MtMoonB2FDomeFossilYouWantText
 	text_end
 
-MtMoon3Text8:
+MtMoonB2FHelixFossilText:
 	text_asm
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, MtMoon3Text_4a0eb
+	ld hl, .YouWantText
 	call PrintText
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, .asm_4a0e8
+	jr nz, .done
 	lb bc, HELIX_FOSSIL, 1
 	call GiveItem
-	jp nc, MtMoon3Script_4a0fd
-	call MtMoon3Script_4a0f0
+	jp nc, MtMoonB2FYouHaveNoRoomText
+	call MtMoonB2FReceivedFossilText
 	ld a, HS_MT_MOON_B2F_FOSSIL_2
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_HELIX_FOSSIL
-	ld a, $4
-	call MtMoon3Script_49ce5
-.asm_4a0e8
+	ld a, SCRIPT_MTMOONB2F_MOVE_SUPER_NERD
+	call MtMoonB2FSetScript
+.done
 	jp TextScriptEnd
 
-MtMoon3Text_4a0eb:
-	text_far _MtMoon3Text_49f64
+.YouWantText:
+	text_far _MtMoonB2FHelixFossilYouWantText
 	text_end
 
-MtMoon3Script_4a0f0:
-	ld hl, MtMoon3Text_4a0f6
+MtMoonB2FReceivedFossilText:
+	ld hl, .Text
 	jp PrintText
 
-MtMoon3Text_4a0f6:
-	text_far _MtMoon3Text_49f6f
+.Text:
+	text_far _MtMoonB2FReceivedFossilText
 	sound_get_key_item
 	text_waitbutton
 	text_end
 
-MtMoon3Script_4a0fd:
-	ld hl, MtMoon3Text_4a106
+MtMoonB2FYouHaveNoRoomText:
+	ld hl, .Text
 	call PrintText
 	jp TextScriptEnd
 
-MtMoon3Text_4a106:
-	text_far _MtMoon3Text_49f7f
+.Text:
+	text_far _MtMoonB2FYouHaveNoRoomText
 	text_waitbutton
 	text_end
 
-MtMoon3Text_4a10c:
-	text_far _MtMoon3Text_49f85
+MtMoonB2FSuperNerdTheyreBothMineText:
+	text_far _MtMoonB2FSuperNerdTheyreBothMineText
 	text_end
 
-MtMoon3SuperNerdEndBattleText:
-	text_far _MtMoon3Text_49f8a
+MtMoonB2FSuperNerdOkIllShareText:
+	text_far _MtMoonB2FSuperNerdOkIllShareText
 	text_end
 
-MtMoon3Text_4a116:
-	text_far _MtMoon3Text_49f8f
+MtMoonB2fSuperNerdEachTakeOneText:
+	text_far _MtMoonB2fSuperNerdEachTakeOneText
 	text_end
 
-MtMoon3Text_4a11b:
-	text_far _MtMoon3Text_49f94
+MtMoonB2FSuperNerdTheresAPokemonLabText:
+	text_far _MtMoonB2FSuperNerdTheresAPokemonLabText
 	text_end
 
-MtMoon3Text11:
-	text_far _MtMoon3Text_49f99
+MtMoonB2FSuperNerdThenThisIsMineText:
+	text_far _MtMoonB2FSuperNerdThenThisIsMineText
 	sound_get_key_item
 	text_end
 
-MtMoon3BattleText3:
-	text_far _MtMoon3BattleText3
+MtMoonB2FRocket2BattleText:
+	text_far _MtMoonB2FRocket2BattleText
 	text_end
 
-MtMoon3EndBattleText3:
-	text_far _MtMoon3EndBattleText3
+MtMoonB2FRocket2EndBattleText:
+	text_far _MtMoonB2FRocket2EndBattleText
 	text_end
 
-MtMoon3AfterBattleText3:
-	text_far _MtMoon3AfterBattleText3
+MtMoonB2FRocket2AfterBattleText:
+	text_far _MtMoonB2FRocket2AfterBattleText
 	text_end
 
-MtMoon3BattleText4:
-	text_far _MtMoon3BattleText4
+MtMoonB2FRocket3BattleText:
+	text_far _MtMoonB2FRocket3BattleText
 	text_end
 
-MtMoon3EndBattleText4:
-	text_far _MtMoon3EndBattleText4
+MtMoonB2FRocket3EndBattleText:
+	text_far _MtMoonB2FRocket3EndBattleText
 	text_end
 
-MtMoon3AfterBattleText4:
-	text_far _MtMoon3AfterBattleText4
+MtMoonB2FRocket3AfterBattleText:
+	text_far _MtMoonB2FRocket3AfterBattleText
 	text_end
 
-MtMoon3BattleText5:
-	text_far _MtMoon3BattleText5
+MtMoonB2FRocket4BattleText:
+	text_far _MtMoonB2FRocket4BattleText
 	text_end
 
-MtMoon3EndBattleText5:
-	text_far _MtMoon3EndBattleText5
+MtMoonB2FRocket4EndBattleText:
+	text_far _MtMoonB2FRocket4EndBattleText
 	text_end
 
-MtMoon3AfterBattleText5:
-	text_far _MtMoon3AfterBattleText5
+MtMoonB2FRocket4AfterBattleText:
+	text_far _MtMoonB2FRocket4AfterBattleText
 	text_end