dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TrainerTower_Lobby/scripts.inc
+33 -33
View File
@@ -4,7 +4,7 @@
.set LOCALID_COOLTRAINER_F, 4
.set LOCALID_BALDING_MAN, 5
TrainerTower_Lobby_MapScripts:: @ 8164839
TrainerTower_Lobby_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_Lobby_OnTransition
@@ -12,7 +12,7 @@ TrainerTower_Lobby_MapScripts:: @ 8164839
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_Lobby_OnFrame
.byte 0
TrainerTower_Lobby_OnResume:: @ 8164853
TrainerTower_Lobby_OnResume::
setvar VAR_TEMP_2, 0
ttower_resumetimer
ttower_shouldexit
@@ -22,10 +22,10 @@ TrainerTower_Lobby_OnResume:: @ 8164853
setvar VAR_TEMP_0, 0
setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
TrainerTower_Lobby_OnResumeEnd:: @ 8164886
TrainerTower_Lobby_OnResumeEnd::
end
TrainerTower_Lobby_OnReturnToField:: @ 8164887
TrainerTower_Lobby_OnReturnToField::
addobject LOCALID_NURSE
addobject LOCALID_MART_CLERK
addobject LOCALID_RECEPTIONIST
@@ -33,26 +33,26 @@ TrainerTower_Lobby_OnReturnToField:: @ 8164887
addobject LOCALID_BALDING_MAN
end
TrainerTower_Lobby_OnLoad:: @ 8164897
TrainerTower_Lobby_OnLoad::
compare VAR_TEMP_D, 17
call_if_eq TrainerTower_Lobby_OpenCounterBarrier
end
TrainerTower_Lobby_OpenCounterBarrier:: @ 81648A3
TrainerTower_Lobby_OpenCounterBarrier::
setmetatile 17, 10, METATILE_TrainerTower_Floor_ShadeBottomLeft, 0
return
TrainerTower_Lobby_OnTransition:: @ 81648AD
TrainerTower_Lobby_OnTransition::
setworldmapflag FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY
getplayerxy VAR_TEMP_D, VAR_RESULT
end
TrainerTower_Lobby_OnFrame:: @ 81648B6
TrainerTower_Lobby_OnFrame::
map_script_2 VAR_TEMP_0, 0, TrainerTower_Lobby_EventScript_Enter
map_script_2 VAR_TEMP_D, 17, TrainerTower_Lobby_EventScript_ExitElevator
.2byte 0
TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8
TrainerTower_Lobby_EventScript_ExitElevator::
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator
waitmovement 0
@@ -64,12 +64,12 @@ TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8
releaseall
end
TrainerTower_Lobby_Movement_ExitElevator:: @ 81648EA
TrainerTower_Lobby_Movement_ExitElevator::
walk_down
walk_down
step_end
TrainerTower_Lobby_EventScript_Enter:: @ 81648ED
TrainerTower_Lobby_EventScript_Enter::
setvar VAR_TEMP_0, 1
ttower_getchallengestatus
switch VAR_RESULT
@@ -77,7 +77,7 @@ TrainerTower_Lobby_EventScript_Enter:: @ 81648ED
case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_164938
case CHALLENGE_STATUS_NORMAL, TrainerTower_Lobby_EventScript_EnterEnd
TrainerTower_Lobby_EventScript_LostChallenge:: @ 8164920
TrainerTower_Lobby_EventScript_LostChallenge::
lock
faceplayer
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
@@ -86,29 +86,29 @@ TrainerTower_Lobby_EventScript_LostChallenge:: @ 8164920
goto TrainerTower_Lobby_EventScript_ExitChallenge
@ Presumably E-Reader related
TrainerTower_Lobby_EventScript_164938:: @ 8164938
TrainerTower_Lobby_EventScript_164938::
lock
faceplayer
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
textcolor 1
msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch
TrainerTower_Lobby_EventScript_ExitChallenge:: @ 816494B
TrainerTower_Lobby_EventScript_ExitChallenge::
closemessage
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
waitmovement 0
setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
release
TrainerTower_Lobby_EventScript_EnterEnd:: @ 816495C
TrainerTower_Lobby_EventScript_EnterEnd::
end
TrainerTower_Lobby_EventScript_Nurse:: @ 816495D
TrainerTower_Lobby_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
TrainerTower_Lobby_EventScript_Receptionist:: @ 8164966
TrainerTower_Lobby_EventScript_Receptionist::
lock
faceplayer
ttower_getbeatchallenge
@@ -117,13 +117,13 @@ TrainerTower_Lobby_EventScript_Receptionist:: @ 8164966
msgbox TrainerTower_Lobby_Text_GiveItYourBest
goto TrainerTower_Lobby_EventScript_ReceptionistEnd
TrainerTower_Lobby_EventScript_ThanksForCompeting:: @ 8164988
TrainerTower_Lobby_EventScript_ThanksForCompeting::
msgbox TrainerTower_Lobby_Text_ThanksForCompeting
TrainerTower_Lobby_EventScript_ReceptionistEnd:: @ 8164990
TrainerTower_Lobby_EventScript_ReceptionistEnd::
release
end
TrainerTower_Lobby_EventScript_MartClerk:: @ 8164992
TrainerTower_Lobby_EventScript_MartClerk::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -135,7 +135,7 @@ TrainerTower_Lobby_EventScript_MartClerk:: @ 8164992
end
.align 2
TrainerTower_Lobby_Mart_Items:: @ 81649B8
TrainerTower_Lobby_Mart_Items::
.2byte ITEM_ULTRA_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_FULL_RESTORE
@@ -149,7 +149,7 @@ TrainerTower_Lobby_Mart_Items:: @ 81649B8
release
end
TrainerTower_Lobby_EventScript_EntryTrigger:: @ 81649CE
TrainerTower_Lobby_EventScript_EntryTrigger::
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
textcolor 1
@@ -160,9 +160,9 @@ TrainerTower_Lobby_EventScript_EntryTrigger:: @ 81649CE
msgbox TrainerTower_Lobby_Text_TrainersUpToFloorNum
goto TrainerTower_Lobby_EventScript_AskEnterChallenge
TrainerTower_Lobby_EventScript_AllFloorsUsed:: @ 8164A00
TrainerTower_Lobby_EventScript_AllFloorsUsed::
msgbox TrainerTower_Lobby_Text_TrainersUpEighthFloor
TrainerTower_Lobby_EventScript_AskEnterChallenge:: @ 8164A08
TrainerTower_Lobby_EventScript_AskEnterChallenge::
message TrainerTower_Lobby_Text_LikeToChallengeTrainers
waitmessage
multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE
@@ -173,12 +173,12 @@ TrainerTower_Lobby_EventScript_AskEnterChallenge:: @ 8164A08
case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge
end
TrainerTower_Lobby_EventScript_ChallengeInfo:: @ 8164A45
TrainerTower_Lobby_EventScript_ChallengeInfo::
msgbox TrainerTower_Lobby_Text_ExplainTrainerTower
goto TrainerTower_Lobby_EventScript_AskEnterChallenge
end
TrainerTower_Lobby_EventScript_ChooseChallenge:: @ 8164A53
TrainerTower_Lobby_EventScript_ChooseChallenge::
multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE
switch VAR_RESULT
case 0, TrainerTower_Lobby_EventScript_BeginChallenge
@@ -189,7 +189,7 @@ TrainerTower_Lobby_EventScript_ChooseChallenge:: @ 8164A53
case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge
end
TrainerTower_Lobby_EventScript_BeginChallenge:: @ 8164AA0
TrainerTower_Lobby_EventScript_BeginChallenge::
copyvar VAR_0x8005, VAR_RESULT
setvar VAR_MAP_SCENE_TRAINER_TOWER, 1
special HealPlayerParty
@@ -198,7 +198,7 @@ TrainerTower_Lobby_EventScript_BeginChallenge:: @ 8164AA0
releaseall
end
TrainerTower_Lobby_EventScript_DeclineChallenge:: @ 8164ABF
TrainerTower_Lobby_EventScript_DeclineChallenge::
msgbox TrainerTower_Lobby_Text_PleaseVisitUsAgain
closemessage
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
@@ -206,15 +206,15 @@ TrainerTower_Lobby_EventScript_DeclineChallenge:: @ 8164ABF
releaseall
end
TrainerTower_Lobby_Movement_FaceReceptionist:: @ 8164AD4
TrainerTower_Lobby_Movement_FaceReceptionist::
face_right
step_end
TrainerTower_Lobby_Movement_WalkDown:: @ 8164AD6
TrainerTower_Lobby_Movement_WalkDown::
walk_down
step_end
TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8
TrainerTower_Lobby_EventScript_ShowRecords::
lockall
fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 1
@@ -223,10 +223,10 @@ TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8
releaseall
end
TrainerTower_Lobby_EventScript_CooltrainerF:: @ 8164AE6
TrainerTower_Lobby_EventScript_CooltrainerF::
msgbox TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers, MSGBOX_NPC
end
TrainerTower_Lobby_EventScript_BaldingMan:: @ 8164AEF
TrainerTower_Lobby_EventScript_BaldingMan::
msgbox TrainerTower_Lobby_Text_StairsTougherThanAnyBattle, MSGBOX_NPC
end
data/maps/TrainerTower_Lobby/text.inc
+21 -21
View File
@@ -1,52 +1,52 @@
@ All Trainer Tower text (Lobby and Roof) is interleaved here
TrainerTower_Lobby_Text_WelcomeToTrainerTower:: @ 817C794
TrainerTower_Lobby_Text_WelcomeToTrainerTower::
.string "Hello!\p"
.string "Welcome to TRAINER TOWER where\n"
.string "TRAINERS gather from all over!$"
TrainerTower_Lobby_Text_TrainersUpToFloorNum:: @ 817C7D9
TrainerTower_Lobby_Text_TrainersUpToFloorNum::
.string "TRAINERS from all over the world\n"
.string "gather here to battle.\p"
.string "Let me see…\p"
.string "Right now, there are TRAINERS only\n"
.string "up to Floor {STR_VAR_1}.$"
TrainerTower_Lobby_Text_TrainersUpEighthFloor:: @ 817C850
TrainerTower_Lobby_Text_TrainersUpEighthFloor::
.string "TRAINERS are awaiting your\n"
.string "challenge up to the eighth floor.$"
TrainerTower_Lobby_Text_LikeToChallengeTrainers:: @ 817C88D
TrainerTower_Lobby_Text_LikeToChallengeTrainers::
.string "Would you like to challenge the\n"
.string "waiting TRAINERS?$"
TrainerTower_Lobby_Text_StartClockGetSetGo:: @ 817C8BF
TrainerTower_Lobby_Text_StartClockGetSetGo::
.string "Okay, I'll get the clock started,\n"
.string "so give it everything you have.\p"
.string "On your marks…\p"
.string "Get set…\p"
.string "Go!$"
TrainerTower_Lobby_Text_PleaseVisitUsAgain:: @ 817C91D
TrainerTower_Lobby_Text_PleaseVisitUsAgain::
.string "Please do visit us again!$"
TrainerTower_Lobby_Text_TooBadComeBackTryAgain:: @ 817C937
TrainerTower_Lobby_Text_TooBadComeBackTryAgain::
.string "That was too bad.\p"
.string "I think you put in a tremendous\n"
.string "effort in your battling.\p"
.string "Please come back and try again!$"
TrainerTower_Lobby_Text_GiveItYourBest:: @ 817C9A2
TrainerTower_Lobby_Text_GiveItYourBest::
.string "I hope you give it your best.$"
TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch:: @ 817C9C0
TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch::
.string "When the TRAINERS switch places,\n"
.string "the movement can be hectic.\p"
.string "To avoid the stampede, we moved\n"
.string "the reception counter here.\p"
.string "I'm sorry for the inconvenience.$"
TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: @ 817CA5A
TrainerTower_Roof_Text_ImOwnerBattledPerfectly::
.string "Hello…\p"
.string "I am the owner of this TOWER…\p"
.string "How the sky soars above this\n"
@@ -56,10 +56,10 @@ TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: @ 817CA5A
.string "The way you battled…\n"
.string "It, too, was perfection…$"
TrainerTower_Roof_Text_ThisIsForYou:: @ 817CB09
TrainerTower_Roof_Text_ThisIsForYou::
.string "This is for you…$"
TrainerTower_Roof_Text_DoneItInRecordTime:: @ 817CB1A
TrainerTower_Roof_Text_DoneItInRecordTime::
.string "Oh!\n"
.string "Stupendous!\p"
.string "It's marvelous how you've come up\n"
@@ -69,28 +69,28 @@ TrainerTower_Roof_Text_DoneItInRecordTime:: @ 817CB1A
.string "I'll have your record posted at\n"
.string "the reception counter.$"
TrainerTower_Roof_Text_TookSweetTimeGettingHere:: @ 817CBC0
TrainerTower_Roof_Text_TookSweetTimeGettingHere::
.string "You seem to have taken your sweet\n"
.string "time getting here…$"
TrainerTower_Roof_Text_IdLikeToSeeBetterTime:: @ 817CBF5
TrainerTower_Roof_Text_IdLikeToSeeBetterTime::
.string "What I would like to see is a\n"
.string "better time out of you…\p"
.string "I'm counting on you.\p"
.string "Until then, farewell…$"
TrainerTower_Text_XMinYZSec:: @ 817CC56
TrainerTower_Text_XMinYZSec::
.string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
TrainerTower_Lobby_Text_HereAreTheResults:: @ 817CC69
TrainerTower_Lobby_Text_HereAreTheResults::
.string "せいせきひょうです$"
TrainerTower_Lobby_Text_NeedTwoMonsForDouble:: @ 817CC73
TrainerTower_Lobby_Text_NeedTwoMonsForDouble::
.string "This is a two-on-two battle.\p"
.string "You may not battle unless you have\n"
.string "at least two POKéMON.$"
TrainerTower_Lobby_Text_ExplainTrainerTower:: @ 817CCC9
TrainerTower_Lobby_Text_ExplainTrainerTower::
.string "Here at TRAINER TOWER, there is an\n"
.string "event called TIME ATTACK.\p"
.string "You will be timed on how quickly\n"
@@ -103,16 +103,16 @@ TrainerTower_Lobby_Text_ExplainTrainerTower:: @ 817CCC9
.string "You will not earn any EXP. Points\n"
.string "or money by beating TRAINERS here.$"
TrainerTower_Lobby_Text_ThanksForCompeting:: @ 817CE1F
TrainerTower_Lobby_Text_ThanksForCompeting::
.string "Thank you for competing!$"
TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers:: @ 817CE38
TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers::
.string "I'm here to see how good I am.\p"
.string "I wonder what kinds of TRAINERS\n"
.string "are waiting for me?\p"
.string "It's nerve-racking!$"
TrainerTower_Lobby_Text_StairsTougherThanAnyBattle:: @ 817CE9F
TrainerTower_Lobby_Text_StairsTougherThanAnyBattle::
.string "Gasp, gasp…\n"
.string "Gasp…\p"
.string "Never mind battling! These stairs…\n"