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

1 files changed, 96 insertions, 94 deletions

diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm
index d500e1d2..918e9468 100644
--- a/scripts/ChampionsRoom.asm
+++ b/scripts/ChampionsRoom.asm
@@ -5,48 +5,49 @@ ChampionsRoom_Script:
 	call CallFunctionInTable
 	ret
 
-ResetGaryScript:
-	xor a
+ResetRivalScript:
+	xor a ; SCENE_CHAMPIONSROOM_DEFAULT
 	ld [wJoyIgnore], a
 	ld [wChampionsRoomCurScript], a
 	ret
 
 ChampionsRoom_ScriptPointers:
-	dw GaryScript0
-	dw GaryScript1
-	dw GaryScript2
-	dw GaryScript3
-	dw GaryScript4
-	dw GaryScript5
-	dw GaryScript6
-	dw GaryScript7
-	dw GaryScript8
-	dw GaryScript9
-	dw GaryScript10
+	def_script_pointers
+	dw_const ChampionsRoomDefaultScript,                  SCRIPT_CHAMPIONSROOM_DEFAULT
+	dw_const ChampionsRoomPlayerEntersScript,             SCRIPT_CHAMPIONSROOM_PLAYER_ENTERS
+	dw_const ChampionsRoomRivalReadyToBattleScript,       SCRIPT_CHAMPIONSROOM_RIVAL_READY_TO_BATTLE
+	dw_const ChampionsRoomRivalDefeatedScript,            SCRIPT_CHAMPIONSROOM_RIVAL_DEFEATED
+	dw_const ChampionsRoomOakArrivesScript,               SCRIPT_CHAMPIONSROOM_OAK_ARRIVES
+	dw_const ChampionsRoomOakCongratulatesPlayerScript,   SCRIPT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER
+	dw_const ChampionsRoomOakDisappointedWithRivalScript, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL
+	dw_const ChampionsRoomOakComeWithMeScript,            SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME
+	dw_const ChampionsRoomOakExitsScript,                 SCRIPT_CHAMPIONSROOM_OAK_EXITS
+	dw_const ChampionsRoomPlayerFollowsOakScript,         SCRIPT_CHAMPIONSROOM_PLAYER_FOLLOWS_OAK
+	dw_const ChampionsRoomCleanupScript,                  SCRIPT_CHAMPIONSROOM_CLEANUP_SCRIPT
 
-GaryScript0:
+ChampionsRoomDefaultScript:
 	ret
 
-GaryScript1:
-	ld a, $ff
+ChampionsRoomPlayerEntersScript:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld hl, wSimulatedJoypadStatesEnd
-	ld de, GaryEntrance_RLEMovement
+	ld de, RivalEntrance_RLEMovement
 	call DecodeRLEList
 	dec a
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
-	ld a, $2
+	ld a, SCRIPT_CHAMPIONSROOM_RIVAL_READY_TO_BATTLE
 	ld [wChampionsRoomCurScript], a
 	ret
 
-GaryEntrance_RLEMovement:
+RivalEntrance_RLEMovement:
 	db D_UP, 1
 	db D_RIGHT, 1
 	db D_UP, 3
 	db -1 ; end
 
-GaryScript2:
+ChampionsRoomRivalReadyToBattleScript:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -55,15 +56,15 @@ GaryScript2:
 	ld [wJoyIgnore], a
 	ld hl, wOptions
 	res 7, [hl]  ; Turn on battle animations to make the battle feel more epic.
-	ld a, $1
+	ld a, TEXT_CHAMPIONSROOM_RIVAL
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call Delay3
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, GaryDefeatedText
-	ld de, GaryVictoryText
+	ld hl, RivalDefeatedText
+	ld de, RivalVictoryText
 	call SaveEndBattleTextPointers
 	ld a, OPP_RIVAL3
 	ld [wCurOpponent], a
@@ -75,44 +76,44 @@ GaryScript2:
 
 	xor a
 	ldh [hJoyHeld], a
-	ld a, $3
+	ld a, SCRIPT_CHAMPIONSROOM_RIVAL_DEFEATED
 	ld [wChampionsRoomCurScript], a
 	ret
 
-GaryScript3:
+ChampionsRoomRivalDefeatedScript:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, ResetGaryScript
+	jp z, ResetRivalScript
 	call UpdateSprites
 	SetEvent EVENT_BEAT_CHAMPION_RIVAL
-	ld a, $f0
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $1
+	ld a, TEXT_CHAMPIONSROOM_RIVAL
 	ldh [hSpriteIndexOrTextID], a
-	call GaryScript_760c8
-	ld a, $1
+	call ChampionsRoom_DisplayTextID_AllowABSelectStart
+	ld a, CHAMPIONSROOM_RIVAL
 	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
-	ld a, $4
+	ld a, SCRIPT_CHAMPIONSROOM_OAK_ARRIVES
 	ld [wChampionsRoomCurScript], a
 	ret
 
-GaryScript4:
+ChampionsRoomOakArrivesScript:
 	farcall Music_Cities1AlternateTempo
-	ld a, $2
+	ld a, TEXT_CHAMPIONSROOM_OAK
 	ldh [hSpriteIndexOrTextID], a
-	call GaryScript_760c8
-	ld a, $2
+	call ChampionsRoom_DisplayTextID_AllowABSelectStart
+	ld a, CHAMPIONSROOM_OAK
 	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
 	ld de, OakEntranceAfterVictoryMovement
-	ld a, $2
+	ld a, CHAMPIONSROOM_OAK
 	ldh [hSpriteIndex], a
 	call MoveSprite
 	ld a, HS_CHAMPIONS_ROOM_OAK
 	ld [wMissableObjectIndex], a
 	predef ShowObject
-	ld a, $5
+	ld a, SCRIPT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER
 	ld [wChampionsRoomCurScript], a
 	ret
 
@@ -124,165 +125,166 @@ OakEntranceAfterVictoryMovement:
 	db NPC_MOVEMENT_UP
 	db -1 ; end
 
-GaryScript5:
+ChampionsRoomOakCongratulatesPlayerScript:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
 	ld a, PLAYER_DIR_LEFT
 	ld [wPlayerMovingDirection], a
-	ld a, $1
+	ld a, CHAMPIONSROOM_RIVAL
 	ldh [hSpriteIndex], a
 	ld a, SPRITE_FACING_LEFT
 	ldh [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, $2
+	ld a, CHAMPIONSROOM_OAK
 	ldh [hSpriteIndex], a
 	xor a ; SPRITE_FACING_DOWN
 	ldh [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, $3
+	ld a, TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER
 	ldh [hSpriteIndexOrTextID], a
-	call GaryScript_760c8
-	ld a, $6
+	call ChampionsRoom_DisplayTextID_AllowABSelectStart
+	ld a, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL
 	ld [wChampionsRoomCurScript], a
 	ret
 
-GaryScript6:
-	ld a, $2
+ChampionsRoomOakDisappointedWithRivalScript:
+	ld a, CHAMPIONSROOM_OAK
 	ldh [hSpriteIndex], a
 	ld a, SPRITE_FACING_RIGHT
 	ldh [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, $4
+	ld a, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL
 	ldh [hSpriteIndexOrTextID], a
-	call GaryScript_760c8
-	ld a, $7
+	call ChampionsRoom_DisplayTextID_AllowABSelectStart
+	ld a, SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME
 	ld [wChampionsRoomCurScript], a
 	ret
 
-GaryScript7:
-	ld a, $2
+ChampionsRoomOakComeWithMeScript:
+	ld a, CHAMPIONSROOM_OAK
 	ldh [hSpriteIndex], a
 	xor a ; SPRITE_FACING_DOWN
 	ldh [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, $5
+	ld a, TEXT_CHAMPIONSROOM_OAK_COME_WITH_ME
 	ldh [hSpriteIndexOrTextID], a
-	call GaryScript_760c8
-	ld de, OakExitGaryRoomMovement
-	ld a, $2
+	call ChampionsRoom_DisplayTextID_AllowABSelectStart
+	ld de, OakExitChampionsRoomMovement
+	ld a, CHAMPIONSROOM_OAK
 	ldh [hSpriteIndex], a
 	call MoveSprite
-	ld a, $8
+	ld a, SCRIPT_CHAMPIONSROOM_OAK_EXITS
 	ld [wChampionsRoomCurScript], a
 	ret
 
-OakExitGaryRoomMovement:
+OakExitChampionsRoomMovement:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db -1 ; end
 
-GaryScript8:
+ChampionsRoomOakExitsScript:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
 	ld a, HS_CHAMPIONS_ROOM_OAK
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	ld a, $9
+	ld a, SCRIPT_CHAMPIONSROOM_PLAYER_FOLLOWS_OAK
 	ld [wChampionsRoomCurScript], a
 	ret
 
-GaryScript9:
-	ld a, $ff
+ChampionsRoomPlayerFollowsOakScript:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld hl, wSimulatedJoypadStatesEnd
-	ld de, WalkToHallOfFame_RLEMovment
+	ld de, WalkToHallOfFame_RLEMovement
 	call DecodeRLEList
 	dec a
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
-	ld a, $a
+	ld a, SCRIPT_CHAMPIONSROOM_CLEANUP_SCRIPT
 	ld [wChampionsRoomCurScript], a
 	ret
 
-WalkToHallOfFame_RLEMovment:
+WalkToHallOfFame_RLEMovement:
 	db D_UP, 4
 	db D_LEFT, 1
 	db -1 ; end
 
-GaryScript10:
+ChampionsRoomCleanupScript:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	xor a
 	ld [wJoyIgnore], a
-	ld a, $0
+	ld a, SCRIPT_CHAMPIONSROOM_DEFAULT
 	ld [wChampionsRoomCurScript], a
 	ret
 
-GaryScript_760c8:
-	ld a, $f0
+ChampionsRoom_DisplayTextID_AllowABSelectStart:
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	call DisplayTextID
-	ld a, $ff
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ret
 
 ChampionsRoom_TextPointers:
-	dw GaryText1
-	dw GaryText2
-	dw GaryText3
-	dw GaryText4
-	dw GaryText5
+	def_text_pointers
+	dw_const ChampionsRoomRivalText,                    TEXT_CHAMPIONSROOM_RIVAL
+	dw_const ChampionsRoomOakText,                      TEXT_CHAMPIONSROOM_OAK
+	dw_const ChampionsRoomOakCongratulatesPlayerText,   TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER
+	dw_const ChampionsRoomOakDisappointedWithRivalText, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL
+	dw_const ChampionsRoomOakComeWithMeText,            TEXT_CHAMPIONSROOM_OAK_COME_WITH_ME
 
-GaryText1:
+ChampionsRoomRivalText:
 	text_asm
 	CheckEvent EVENT_BEAT_CHAMPION_RIVAL
-	ld hl, GaryChampionIntroText
+	ld hl, .IntroText
 	jr z, .printText
-	ld hl, GaryText_76103
+	ld hl, ChampionsRoomRivalAfterBattleText
 .printText
 	call PrintText
 	jp TextScriptEnd
 
-GaryChampionIntroText:
-	text_far _GaryChampionIntroText
+.IntroText:
+	text_far _ChampionsRoomRivalIntroText
 	text_end
 
-GaryDefeatedText:
-	text_far _GaryDefeatedText
+RivalDefeatedText:
+	text_far _RivalDefeatedText
 	text_end
 
-GaryVictoryText:
-	text_far _GaryVictoryText
+RivalVictoryText:
+	text_far _RivalVictoryText
 	text_end
 
-GaryText_76103:
-	text_far _GaryText_76103
+ChampionsRoomRivalAfterBattleText:
+	text_far _ChampionsRoomRivalAfterBattleText
 	text_end
 
-GaryText2:
-	text_far _GaryText2
+ChampionsRoomOakText:
+	text_far _ChampionsRoomOakText
 	text_end
 
-GaryText3:
+ChampionsRoomOakCongratulatesPlayerText:
 	text_asm
 	ld a, [wPlayerStarter]
 	ld [wd11e], a
 	call GetMonName
-	ld hl, GaryText_76120
+	ld hl, .Text
 	call PrintText
 	jp TextScriptEnd
 
-GaryText_76120:
-	text_far _GaryText_76120
+.Text:
+	text_far _ChampionsRoomOakCongratulatesPlayerText
 	text_end
 
-GaryText4:
-	text_far _GaryText_76125
+ChampionsRoomOakDisappointedWithRivalText:
+	text_far _ChampionsRoomOakDisappointedWithRivalText
 	text_end
 
-GaryText5:
-	text_far _GaryText_7612a
+ChampionsRoomOakComeWithMeText:
+	text_far _ChampionsRoomOakComeWithMeText
 	text_end