diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm index afccd1be98..e709a39ee8 100644 --- a/data/maps/objects/AgathasRoom.asm +++ b/data/maps/objects/AgathasRoom.asm @@ -10,6 +10,6 @@ AgathasRoom_Object: def_bg_events def_object_events - object_event 5, 2, SPRITE_AGATHA, STAY, DOWN, 1, OPP_AGATHA, 1 + object_event 5, 2, SPRITE_AGATHA, STAY, DOWN, TEXT_AGATHASROOM_AGATHA, OPP_AGATHA, 1 def_warps_to AGATHAS_ROOM diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index 1fa8f6e6f8..360f441f6a 100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -8,8 +8,8 @@ BikeShop_Object: def_bg_events def_object_events - object_event 6, 2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, 1 ; person - object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, 2 ; person - object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, 3 ; person + object_event 6, 2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, TEXT_BIKESHOP_CLERK ; person + object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, TEXT_BIKESHOP_MIDDLE_AGED_WOMAN ; person + object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, TEXT_BIKESHOP_YOUNGSTER ; person def_warps_to BIKE_SHOP diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index fa5efd8fdd..68bfba6f73 100644 --- a/data/maps/objects/ChampionsRoom.asm +++ b/data/maps/objects/ChampionsRoom.asm @@ -10,7 +10,7 @@ ChampionsRoom_Object: def_bg_events def_object_events - object_event 4, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person - object_event 3, 7, SPRITE_OAK, STAY, UP, 2 ; person + object_event 4, 2, SPRITE_BLUE, STAY, DOWN, TEXT_CHAMPIONSROOM_GARY_INTRO_AND_AFTER_BATTLE ; person + object_event 3, 7, SPRITE_OAK, STAY, UP, TEXT_CHAMPIONSROOM_OAK_SAYS_PLAYERS_NAME ; person def_warps_to CHAMPIONS_ROOM diff --git a/macros/const.asm b/macros/const.asm index 7c7f859185..e0a84404b0 100644 --- a/macros/const.asm +++ b/macros/const.asm @@ -39,6 +39,11 @@ MACRO const_next endc ENDM +MACRO dw_const + dw \1 + const \2 +ENDM + MACRO rb_skip IF _NARG == 1 rsset _RS + \1 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 5c1a8ad569..740b6d9c61 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -208,3 +208,13 @@ MACRO connection db _y, _x dw wOverworldMap + _win ENDM + +MACRO def_script_pointers +\1_ScriptPointers: + const_def +ENDM + +MACRO def_text_pointers +\1_TextPointers: + const_def 1 +ENDM diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm index abe22a4f63..5f48d88c5b 100644 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm @@ -26,18 +26,18 @@ AgathaShowOrHideExitBlock: predef_jump ReplaceTileBlock ResetAgathaScript: - xor a + xor a ; SCRIPT_AGATHASROOM_DEFAULT ld [wAgathasRoomCurScript], a ret -AgathasRoom_ScriptPointers: - dw AgathaScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw AgathaScript2 - dw AgathaScript3 - dw AgathaScript4 + def_script_pointers AgathasRoom + dw_const AgathasRoomDefaultScript, SCRIPT_AGATHASROOM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_AGATHASROOM_AGATHA_START_BATTLE + dw_const AgathasRoomAgathaEndBattleScript, SCRIPT_AGATHASROOM_AGATHA_END_BATTLE + dw_const AgathasRoomPlayerIsMovingScript, SCRIPT_AGATHASROOM_PLAYER_IS_MOVING + dw_const AgathasRoomStubScript, SCRIPT_AGATHASROOM_STUB -AgathaScript4: +AgathasRoomStubScript: ; stub ret AgathaScriptWalkIntoRoom: @@ -53,12 +53,12 @@ AgathaScriptWalkIntoRoom: ld a, $6 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_AGATHASROOM_PLAYER_IS_MOVING ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret -AgathaScript0: +AgathasRoomDefaultScript: ld hl, AgathaEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -73,15 +73,15 @@ AgathaScript0: CheckAndSetEvent EVENT_AUTOWALKED_INTO_AGATHAS_ROOM jr z, AgathaScriptWalkIntoRoom .stopPlayerFromLeaving - ld a, $2 + ld a, TEXT_AGATHASROOM_DONT_RUN_AWAY ldh [hSpriteIndexOrTextID], a - call DisplayTextID ; "Don't run away!" + call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_AGATHASROOM_PLAYER_IS_MOVING ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -93,7 +93,7 @@ AgathaEntranceCoords: dbmapcoord 5, 11 db -1 ; end -AgathaScript3: +AgathasRoomPlayerIsMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -104,21 +104,21 @@ AgathaScript3: ld [wCurMapScript], a ret -AgathaScript2: +AgathasRoomAgathaEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] cp $ff jp z, ResetAgathaScript - ld a, $1 + ld a, TEXT_AGATHASROOM_AGATHA ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $1 + ld a, SCRIPT_CHAMPIONSROOM_PLAYER_ENTERS ld [wChampionsRoomCurScript], a ret -AgathasRoom_TextPointers: - dw AgathaText1 - dw AgathaDontRunAwayText + def_text_pointers AgathasRoom + dw_const AgathasRoomAgathaTextScript, TEXT_AGATHASROOM_AGATHA + dw_const AgathasRoomDontRunAwayText, TEXT_AGATHASROOM_DONT_RUN_AWAY AgathasRoomTrainerHeaders: def_trainers @@ -126,7 +126,7 @@ AgathasRoomTrainerHeader0: trainer EVENT_BEAT_AGATHAS_ROOM_TRAINER_0, 0, AgathaBeforeBattleText, AgathaEndBattleText, AgathaAfterBattleText db -1 ; end -AgathaText1: +AgathasRoomAgathaTextScript: text_asm ld hl, AgathasRoomTrainerHeader0 call TalkToTrainer @@ -144,6 +144,6 @@ AgathaAfterBattleText: text_far _AgathaAfterBattleText text_end -AgathaDontRunAwayText: +AgathasRoomDontRunAwayText: text_far _AgathaDontRunAwayText text_end diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm index f5f0539ed2..cfadf7c854 100644 --- a/scripts/BikeShop.asm +++ b/scripts/BikeShop.asm @@ -1,23 +1,23 @@ BikeShop_Script: jp EnableAutoTextBoxDrawing -BikeShop_TextPointers: - dw BikeShopText1 - dw BikeShopText2 - dw BikeShopText3 + def_text_pointers BikeShop + dw_const BikeShopClerkTextScript, TEXT_BIKESHOP_CLERK + dw_const BikeShopMiddleAgedWomanTextScript, TEXT_BIKESHOP_MIDDLE_AGED_WOMAN + dw_const BikeShopYoungsterTextScript, TEXT_BIKESHOP_YOUNGSTER -BikeShopText1: +BikeShopClerkTextScript: text_asm CheckEvent EVENT_GOT_BICYCLE jr z, .asm_260d4 - ld hl, BikeShopText_1d82f + ld hl, BikeShopClerkHowDoYouLikeYourBicycleText call PrintText jp .Done .asm_260d4 ld b, BIKE_VOUCHER call IsItemInBag jr z, .asm_41190 - ld hl, BikeShopText_1d81f + ld hl, BikeShopClerkOhThatsAVoucherText call PrintText lb bc, BICYCLE, 1 call GiveItem @@ -26,15 +26,15 @@ BikeShopText1: ldh [hItemToRemoveID], a farcall RemoveItemByID SetEvent EVENT_GOT_BICYCLE - ld hl, BikeShopText_1d824 + ld hl, BikeShopExchangedVoucherText call PrintText jr .Done .BagFull - ld hl, BikeShopText_1d834 + ld hl, BikeShopBagFullText call PrintText jr .Done .asm_41190 - ld hl, BikeShopText_1d810 + ld hl, BikeShopClerkWelcomeText call PrintText xor a ld [wCurrentMenuItem], a @@ -60,7 +60,7 @@ BikeShopText1: hlcoord 8, 3 ld de, BikeShopMenuPrice call PlaceString - ld hl, BikeShopText_1d815 + ld hl, BikeShopClerkDoYouLikeItText call PrintText call HandleMenuInput bit BIT_B_BUTTON, a @@ -85,24 +85,24 @@ BikeShopMenuText: BikeShopMenuPrice: db "¥1000000@" -BikeShopText_1d810: - text_far _BikeShopText_1d810 +BikeShopClerkWelcomeText: + text_far _BikeShopClerkWelcomeText text_end -BikeShopText_1d815: - text_far _BikeShopText_1d815 +BikeShopClerkDoYouLikeItText: + text_far _BikeShopClerkDoYouLikeItText text_end BikeShopCantAffordText: text_far _BikeShopCantAffordText text_end -BikeShopText_1d81f: - text_far _BikeShopText_1d81f +BikeShopClerkOhThatsAVoucherText: + text_far _BikeShopClerkOhThatsAVoucherText text_end -BikeShopText_1d824: - text_far _BikeShopText_1d824 +BikeShopExchangedVoucherText: + text_far _BikeShopExchangedVoucherText sound_get_key_item text_end @@ -110,38 +110,38 @@ BikeShopComeAgainText: text_far _BikeShopComeAgainText text_end -BikeShopText_1d82f: - text_far _BikeShopText_1d82f +BikeShopClerkHowDoYouLikeYourBicycleText: + text_far _BikeShopClerkHowDoYouLikeYourBicycleText text_end -BikeShopText_1d834: - text_far _BikeShopText_1d834 +BikeShopBagFullText: + text_far _BikeShopBagFullText text_end -BikeShopText2: +BikeShopMiddleAgedWomanTextScript: text_asm - ld hl, BikeShopText_1d843 + ld hl, BikeShopMiddleAgedWomanText call PrintText jp TextScriptEnd -BikeShopText_1d843: - text_far _BikeShopText_1d843 +BikeShopMiddleAgedWomanText: + text_far _BikeShopMiddleAgedWomanText text_end -BikeShopText3: +BikeShopYoungsterTextScript: text_asm CheckEvent EVENT_GOT_BICYCLE - ld hl, BikeShopText_1d861 + ld hl, BikeShopYoungsterCoolBikeText jr nz, .asm_34d2d - ld hl, BikeShopText_1d85c + ld hl, BikeShopYoungsterTheseBikesAreExpensiveText .asm_34d2d call PrintText jp TextScriptEnd -BikeShopText_1d85c: - text_far _BikeShopText_1d85c +BikeShopYoungsterTheseBikesAreExpensiveText: + text_far _BikeShopYoungsterTheseBikesAreExpensiveText text_end -BikeShopText_1d861: - text_far _BikeShopText_1d861 +BikeShopYoungsterCoolBikeText: + text_far _BikeShopYoungsterCoolBikeText text_end diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index 11f99ee154..c5a809be58 100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -5,28 +5,28 @@ ChampionsRoom_Script: jp CallFunctionInTable ResetGaryScript: - xor a + 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 ChampionsRoom + dw_const ChampionsRoomDefaultScript, SCRIPT_CHAMPIONSROOM_DEFAULT + dw_const ChampionsRoomPlayerEntersScript, SCRIPT_CHAMPIONSROOM_PLAYER_ENTERS + dw_const ChampionsRoomGaryReadyToBattleScript, SCRIPT_CHAMPIONSROOM_GARY_READY_TO_BATTLE + dw_const ChampionsRoomGaryDefeatedScript, SCRIPT_CHAMPIONSROOM_GARY_DEFEATED + dw_const ChampionsRoomOakArrivesScript, SCRIPT_CHAMPIONSROOM_OAK_ARRIVES + dw_const ChampionsRoomOakCongratulatesPlayerScript, SCRIPT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER + dw_const ChampionsRoomOakDisappointedWithGaryScript, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_GARY + 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: +ChampionsRoomPlayerEntersScript: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd @@ -35,7 +35,7 @@ GaryScript1: dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $2 + ld a, SCRIPT_CHAMPIONSROOM_GARY_READY_TO_BATTLE ld [wChampionsRoomCurScript], a ret @@ -45,7 +45,7 @@ GaryEntrance_RLEMovement: db D_UP, 3 db -1 ; end -GaryScript2: +ChampionsRoomGaryReadyToBattleScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -54,7 +54,7 @@ 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_GARY_INTRO_AND_AFTER_BATTLE ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 @@ -85,11 +85,11 @@ GaryScript2: xor a ldh [hJoyHeld], a - ld a, $3 + ld a, SCRIPT_CHAMPIONSROOM_GARY_DEFEATED ld [wChampionsRoomCurScript], a ret -GaryScript3: +ChampionsRoomGaryDefeatedScript: ld a, [wIsInBattle] cp $ff jp z, ResetGaryScript @@ -97,19 +97,19 @@ GaryScript3: SetEvent EVENT_BEAT_CHAMPION_RIVAL ld a, $f0 ld [wJoyIgnore], a - ld a, $1 + ld a, TEXT_CHAMPIONSROOM_GARY_INTRO_AND_AFTER_BATTLE ldh [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $1 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_SAYS_PLAYERS_NAME ldh [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $2 @@ -122,7 +122,7 @@ GaryScript4: 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 @@ -134,7 +134,7 @@ OakEntranceAfterVictoryMovement: db NPC_MOVEMENT_UP db -1 ; end -GaryScript5: +ChampionsRoomOakCongratulatesPlayerScript: ld a, [wd730] bit 0, a ret nz @@ -150,60 +150,60 @@ GaryScript5: 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 + ld a, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_GARY ld [wChampionsRoomCurScript], a ret -GaryScript6: +ChampionsRoomOakDisappointedWithGaryScript: ld a, $2 ldh [hSpriteIndex], a ld a, SPRITE_FACING_RIGHT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $4 + ld a, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_GARY ldh [hSpriteIndexOrTextID], a call GaryScript_760c8 - ld a, $7 + ld a, SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME ld [wChampionsRoomCurScript], a ret -GaryScript7: +ChampionsRoomOakComeWithMeScript: ld a, $2 ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $5 + ld a, TEXT_CHAMPIONSROOM_COME_WITH_ME ldh [hSpriteIndexOrTextID], a call GaryScript_760c8 - ld de, OakExitGaryRoomMovement + ld de, OakExitChampionsRoomMovement ld a, $2 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: +ChampionsRoomPlayerFollowsOakScript: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd @@ -212,7 +212,7 @@ GaryScript9: dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $a + ld a, SCRIPT_CHAMPIONSROOM_CLEANUP_SCRIPT ld [wChampionsRoomCurScript], a ret @@ -221,13 +221,13 @@ WalkToHallOfFame_RLEMovment: 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 @@ -239,19 +239,19 @@ GaryScript_760c8: ld [wJoyIgnore], a ret -ChampionsRoom_TextPointers: - dw GaryText1 - dw GaryText2 - dw GaryText3 - dw GaryText4 - dw GaryText5 + def_text_pointers ChampionsRoom + dw_const ChampionsRoomGaryIntroAndAfterBattleTextScript, TEXT_CHAMPIONSROOM_GARY_INTRO_AND_AFTER_BATTLE + dw_const ChampionsRoomOakSaysPlayersNameText, TEXT_CHAMPIONSROOM_OAK_SAYS_PLAYERS_NAME + dw_const ChampionsRoomOakCongratulatesPlayerTextScript, TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER + dw_const ChampionsRoomOakDisappointedWithGaryText, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_GARY + dw_const ChampionsRoomOakComeWithMeText, TEXT_CHAMPIONSROOM_COME_WITH_ME -GaryText1: +ChampionsRoomGaryIntroAndAfterBattleTextScript: text_asm CheckEvent EVENT_BEAT_CHAMPION_RIVAL ld hl, GaryChampionIntroText jr z, .printText - ld hl, GaryText_76103 + ld hl, GaryAfterBattleText .printText call PrintText jp TextScriptEnd @@ -268,31 +268,31 @@ GaryVictoryText: text_far _GaryVictoryText text_end -GaryText_76103: - text_far _GaryText_76103 +GaryAfterBattleText: + text_far _GaryAfterBattleText text_end -GaryText2: - text_far _GaryText2 +ChampionsRoomOakSaysPlayersNameText: + text_far _ChampionsRoomOakSaysPlayersNameText text_end -GaryText3: +ChampionsRoomOakCongratulatesPlayerTextScript: text_asm ld a, [wPlayerStarter] ld [wd11e], a call GetMonName - ld hl, GaryText_76120 + ld hl, ChampionsRoomOakCongratulatesPlayerText call PrintText jp TextScriptEnd -GaryText_76120: - text_far _GaryText_76120 +ChampionsRoomOakCongratulatesPlayerText: + text_far _ChampionsRoomOakCongratulatesPlayerText text_end -GaryText4: - text_far _GaryText_76125 +ChampionsRoomOakDisappointedWithGaryText: + text_far _ChampionsRoomOakDisappointedWithGaryText text_end -GaryText5: - text_far _GaryText_7612a +ChampionsRoomOakComeWithMeText: + text_far _ChampionsRoomOakComeWithMeText text_end diff --git a/text/BikeShop.asm b/text/BikeShop.asm index 5d71133c37..fcfc7b0321 100644 --- a/text/BikeShop.asm +++ b/text/BikeShop.asm @@ -1,4 +1,4 @@ -_BikeShopText_1d810:: +_BikeShopClerkWelcomeText:: text "Hi! Welcome to" line "our BIKE SHOP." @@ -6,7 +6,7 @@ _BikeShopText_1d810:: line "the BIKE for you!" prompt -_BikeShopText_1d815:: +_BikeShopClerkDoYouLikeItText:: text "It's a cool BIKE!" line "Do you want it?" done @@ -16,7 +16,7 @@ _BikeShopCantAffordText:: line "afford it!" prompt -_BikeShopText_1d81f:: +_BikeShopClerkOhThatsAVoucherText:: text "Oh, that's..." para "A BIKE VOUCHER!" @@ -24,7 +24,7 @@ _BikeShopText_1d81f:: para "OK! Here you go!" prompt -_BikeShopText_1d824:: +_BikeShopExchangedVoucherText:: text " exchanged" line "the BIKE VOUCHER" cont "for a BICYCLE.@" @@ -35,7 +35,7 @@ _BikeShopComeAgainText:: line "some time!" done -_BikeShopText_1d82f:: +_BikeShopClerkHowDoYouLikeYourBicycleText:: text "How do you like" line "your new BICYCLE?" @@ -44,12 +44,12 @@ _BikeShopText_1d82f:: cont "and in caves!" done -_BikeShopText_1d834:: +_BikeShopBagFullText:: text "You better make" line "room for this!" done -_BikeShopText_1d843:: +_BikeShopMiddleAgedWomanText:: text "A plain city BIKE" line "is good enough" cont "for me!" @@ -59,13 +59,13 @@ _BikeShopText_1d843:: cont "on an MTB!" done -_BikeShopText_1d85c:: +_BikeShopYoungsterTheseBikesAreExpensiveText:: text "These BIKEs are" line "cool, but they're" cont "way expensive!" done -_BikeShopText_1d861:: +_BikeShopYoungsterCoolBikeText:: text "Wow. Your BIKE is" line "really cool!" done diff --git a/text/ChampionsRoom.asm b/text/ChampionsRoom.asm index 575b7da469..9b25e72fa5 100644 --- a/text/ChampionsRoom.asm +++ b/text/ChampionsRoom.asm @@ -65,7 +65,7 @@ _GaryVictoryText:: line "Hahaha!" prompt -_GaryText_76103:: +_GaryAfterBattleText:: text "Why?" line "Why did I lose?" @@ -81,11 +81,11 @@ _GaryText_76103:: line "like to admit it." done -_GaryText2:: +_ChampionsRoomOakSaysPlayersNameText:: text "OAK: !" done -_GaryText_76120:: +_ChampionsRoomOakCongratulatesPlayerText:: text "OAK: So, you won!" line "Congratulations!" cont "You're the new" @@ -103,7 +103,7 @@ _GaryText_76120:: line "come of age!" done -_GaryText_76125:: +_ChampionsRoomOakDisappointedWithGaryText:: text "OAK: ! I'm" line "disappointed!" @@ -129,7 +129,7 @@ _GaryText_76125:: cont "a champ again!" done -_GaryText_7612a:: +_ChampionsRoomOakComeWithMeText:: text "OAK: !" para "You understand"