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

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2022-06-24 21:10:48 -04:00
parent d73f39ae40
commit 9cde4e0f74
802 changed files with 20272 additions and 20272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/ViridianCity/scripts.inc
+35 -35
View File
@@ -2,11 +2,11 @@
.set LOCALID_TUTORIAL_MAN, 4
.set LOCALID_WOMAN, 5
ViridianCity_MapScripts:: @ 81658D3
ViridianCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition
.byte 0
ViridianCity_OnTransition:: @ 81658D9
ViridianCity_OnTransition::
setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY
compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0
call_if_eq ViridianCity_EventScript_SetOldManBlockingRoad
@@ -18,23 +18,23 @@ ViridianCity_OnTransition:: @ 81658D9
call_if_eq ViridianCity_EventScript_TryUnlockGym
end
ViridianCity_EventScript_SetOldManNormal:: @ 8165909
ViridianCity_EventScript_SetOldManNormal::
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_1
return
ViridianCity_EventScript_SetOldManStandingByRoad:: @ 816590F
ViridianCity_EventScript_SetOldManStandingByRoad::
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_1
setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 8
setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_LOOK_AROUND
return
ViridianCity_EventScript_SetOldManBlockingRoad:: @ 8165920
ViridianCity_EventScript_SetOldManBlockingRoad::
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN
setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 11
setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_FACE_DOWN
return
ViridianCity_EventScript_TryUnlockGym:: @ 8165931
ViridianCity_EventScript_TryUnlockGym::
goto_if_unset FLAG_BADGE02_GET, EventScript_Return
goto_if_unset FLAG_BADGE03_GET, EventScript_Return
goto_if_unset FLAG_BADGE04_GET, EventScript_Return
@@ -44,7 +44,7 @@ ViridianCity_EventScript_TryUnlockGym:: @ 8165931
setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1
return
ViridianCity_EventScript_GymDoorLocked:: @ 816596D
ViridianCity_EventScript_GymDoorLocked::
lockall
textcolor 3
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
@@ -57,36 +57,36 @@ ViridianCity_EventScript_GymDoorLocked:: @ 816596D
releaseall
end
ViridianCity_Movement_JumpDownLedge:: @ 8165992
ViridianCity_Movement_JumpDownLedge::
jump_2_down
step_end
ViridianCity_EventScript_CitySign:: @ 8165994
ViridianCity_EventScript_CitySign::
msgbox ViridianCity_Text_CitySign, MSGBOX_SIGN
end
ViridianCity_EventScript_TrainerTips1:: @ 816599D
ViridianCity_EventScript_TrainerTips1::
msgbox ViridianCity_Text_CatchMonsForEasierBattles, MSGBOX_SIGN
end
ViridianCity_EventScript_TrainerTips2:: @ 81659A6
ViridianCity_EventScript_TrainerTips2::
msgbox ViridianCity_Text_MovesLimitedByPP, MSGBOX_SIGN
end
ViridianCity_EventScript_GymSign:: @ 81659AF
ViridianCity_EventScript_GymSign::
msgbox ViridianCity_Text_GymSign, MSGBOX_SIGN
end
ViridianCity_EventScript_GymDoor:: @ 81659B8
ViridianCity_EventScript_GymDoor::
msgbox ViridianCity_Text_GymDoorsAreLocked, MSGBOX_SIGN
end
ViridianCity_EventScript_Boy:: @ 81659C1
ViridianCity_EventScript_Boy::
msgbox ViridianCity_Text_CanCarryMonsAnywhere, MSGBOX_NPC
end
@ Other old man, not the tutorial old man
ViridianCity_EventScript_OldMan:: @ 81659CA
ViridianCity_EventScript_OldMan::
lock
faceplayer
compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1
@@ -98,12 +98,12 @@ ViridianCity_EventScript_OldMan:: @ 81659CA
release
end
ViridianCity_EventScript_OldManGymLeaderReturned:: @ 81659EC
ViridianCity_EventScript_OldManGymLeaderReturned::
msgbox ViridianCity_Text_ViridiansGymLeaderReturned
release
end
ViridianCity_EventScript_TutorialOldMan:: @ 81659F6
ViridianCity_EventScript_TutorialOldMan::
lock
faceplayer
goto_if_set FLAG_BADGE01_GET, ViridianCity_EventScript_AskIfTeachyTVHelpful
@@ -115,7 +115,7 @@ ViridianCity_EventScript_TutorialOldMan:: @ 81659F6
goto_if_eq ViridianCity_EventScript_TutorialNotReady
end
ViridianCity_EventScript_AskIfTeachyTVHelpful:: @ 8165A23
ViridianCity_EventScript_AskIfTeachyTVHelpful::
msgbox ViridianCity_Text_HowsTeachyTVHelping, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq ViridianCity_EventScript_TeachyTVNotHelpful
@@ -123,29 +123,29 @@ ViridianCity_EventScript_AskIfTeachyTVHelpful:: @ 8165A23
release
end
ViridianCity_EventScript_TeachyTVNotHelpful:: @ 8165A40
ViridianCity_EventScript_TeachyTVNotHelpful::
msgbox ViridianCity_Text_TooBusyForTeachyTV
release
end
ViridianCity_EventScript_TutorialCompleted:: @ 8165A4A
ViridianCity_EventScript_TutorialCompleted::
msgbox ViridianCity_Text_WeakenMonsFirstToCatch
release
end
ViridianCity_EventScript_TutorialStart:: @ 8165A54
ViridianCity_EventScript_TutorialStart::
call ViridianCity_EventScript_DoTutorialBattle
release
end
@ Unused
ViridianCity_EventScript_WatchToLearnBasics:: @ 8165A5B
ViridianCity_EventScript_WatchToLearnBasics::
msgbox ViridianCity_Text_WatchThatToLearnBasics
release
end
@ Unused. Starts battle after the post battle text, which is odd.
ViridianCity_EventScript_TutorialUnused:: @ 8165A65
ViridianCity_EventScript_TutorialUnused::
msgbox ViridianCity_Text_ThatWasEducationalTakeThis
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
@@ -154,13 +154,13 @@ ViridianCity_EventScript_TutorialUnused:: @ 8165A65
release
end
ViridianCity_EventScript_TutorialNotReady:: @ 8165A84
ViridianCity_EventScript_TutorialNotReady::
msgbox ViridianCity_Text_ThisIsPrivateProperty
closemessage
release
end
ViridianCity_EventScript_Youngster:: @ 8165A8F
ViridianCity_EventScript_Youngster::
lock
faceplayer
msgbox ViridianCity_Text_WantToKnowAboutCaterpillarMons, MSGBOX_YESNO
@@ -170,17 +170,17 @@ ViridianCity_EventScript_Youngster:: @ 8165A8F
goto_if_eq ViridianCity_EventScript_YoungsterDeclineExplanation
end
ViridianCity_EventScript_YoungsterExplainCaterpillars:: @ 8165AB0
ViridianCity_EventScript_YoungsterExplainCaterpillars::
msgbox ViridianCity_Text_ExplainCaterpieWeedle
release
end
ViridianCity_EventScript_YoungsterDeclineExplanation:: @ 8165ABA
ViridianCity_EventScript_YoungsterDeclineExplanation::
msgbox ViridianCity_Text_OhOkayThen
release
end
ViridianCity_EventScript_Woman:: @ 8165AC4
ViridianCity_EventScript_Woman::
lock
faceplayer
compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0
@@ -189,7 +189,7 @@ ViridianCity_EventScript_Woman:: @ 8165AC4
release
end
ViridianCity_EventScript_WomanRoadBlocked:: @ 8165ADB
ViridianCity_EventScript_WomanRoadBlocked::
msgbox ViridianCity_Text_GrandpaHasntHadCoffeeYet
closemessage
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
@@ -197,11 +197,11 @@ ViridianCity_EventScript_WomanRoadBlocked:: @ 8165ADB
release
end
ViridianCity_EventScript_DreamEaterTutor:: @ 8165AF0
ViridianCity_EventScript_DreamEaterTutor::
goto EventScript_DreamEaterTutor
end
ViridianCity_EventScript_RoadBlocked:: @ 8165AF6
ViridianCity_EventScript_RoadBlocked::
lockall
textcolor 0
msgbox ViridianCity_Text_ThisIsPrivateProperty
@@ -211,11 +211,11 @@ ViridianCity_EventScript_RoadBlocked:: @ 8165AF6
releaseall
end
ViridianCity_Movement_WalkDown:: @ 8165B0E
ViridianCity_Movement_WalkDown::
walk_down
step_end
ViridianCity_EventScript_TutorialTriggerLeft:: @ 8165B10
ViridianCity_EventScript_TutorialTriggerLeft::
lockall
textcolor 0
applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestLeft
@@ -226,7 +226,7 @@ ViridianCity_EventScript_TutorialTriggerLeft:: @ 8165B10
release
end
ViridianCity_EventScript_TutorialTriggerRight:: @ 8165B2E
ViridianCity_EventScript_TutorialTriggerRight::
lockall
textcolor 0
applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestRight
@@ -237,7 +237,7 @@ ViridianCity_EventScript_TutorialTriggerRight:: @ 8165B2E
release
end
ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C
ViridianCity_EventScript_DoTutorialBattle::
msgbox ViridianCity_Text_ShowYouHowToCatchMons
closemessage
goto_if_questlog EventScript_ReleaseEnd
data/maps/ViridianCity/text.inc
+21 -21
View File
@@ -1,47 +1,47 @@
ViridianCity_Text_CanCarryMonsAnywhere:: @ 817DABB
ViridianCity_Text_CanCarryMonsAnywhere::
.string "Those POKé BALLS at your waist!\n"
.string "You have POKéMON, don't you?\p"
.string "It's great that you can carry and\n"
.string "use POKéMON anytime, anywhere.$"
ViridianCity_Text_GymClosedWonderWhoLeaderIs:: @ 817DB39
ViridianCity_Text_GymClosedWonderWhoLeaderIs::
.string "This POKéMON GYM is always closed.\p"
.string "I wonder who the LEADER is?$"
ViridianCity_Text_ViridiansGymLeaderReturned:: @ 817DB78
ViridianCity_Text_ViridiansGymLeaderReturned::
.string "VIRIDIAN GYM's LEADER returned!$"
ViridianCity_Text_WantToKnowAboutCaterpillarMons:: @ 817DB98
ViridianCity_Text_WantToKnowAboutCaterpillarMons::
.string "You want to know about the two\n"
.string "kinds of caterpillar POKéMON?$"
ViridianCity_Text_OhOkayThen:: @ 817DBD5
ViridianCity_Text_OhOkayThen::
.string "Oh, okay then!$"
ViridianCity_Text_ExplainCaterpieWeedle:: @ 817DBE4
ViridianCity_Text_ExplainCaterpieWeedle::
.string "CATERPIE has no poison,\n"
.string "but WEEDLE does.\p"
.string "Watch that your POKéMON aren't\n"
.string "stabbed by WEEDLE's POISON STING.$"
ViridianCity_Text_GrandpaHasntHadCoffeeYet:: @ 817DC4E
ViridianCity_Text_GrandpaHasntHadCoffeeYet::
.string "Oh, Grandpa!\n"
.string "Don't be so mean!\p"
.string "I'm so sorry.\n"
.string "He hasn't had his coffee yet.$"
ViridianCity_Text_GoShoppingInPewterOccasionally:: @ 817DC99
ViridianCity_Text_GoShoppingInPewterOccasionally::
.string "I go shopping in PEWTER CITY\n"
.string "occasionally.\p"
.string "I have to take the winding trail in\n"
.string "VIRIDIAN FOREST when I go.$"
ViridianCity_Text_ThisIsPrivateProperty:: @ 817DD03
ViridianCity_Text_ThisIsPrivateProperty::
.string "I absolutely forbid you from\n"
.string "going through here!\p"
.string "This is private property!$"
ViridianCity_Text_ShowYouHowToCatchMons:: @ 817DD4E
ViridianCity_Text_ShowYouHowToCatchMons::
.string "Well, now, I've had my coffee, and\n"
.string "that's what I need to get going!\p"
.string "Hm?\n"
@@ -58,18 +58,18 @@ ViridianCity_Text_ShowYouHowToCatchMons:: @ 817DD4E
.string "I suppose I had better show you\n"
.string "then!$"
ViridianCity_Text_ThatWasEducationalTakeThis:: @ 817DE9B
ViridianCity_Text_ThatWasEducationalTakeThis::
.string "There! Now tell me, that was\n"
.string "educational, was it not?\p"
.string "And here, take this, too.$"
ViridianCity_Text_WatchThatToLearnBasics:: @ 817DEEB
ViridianCity_Text_WatchThatToLearnBasics::
.string "If there's something you don't\n"
.string "understand, watch that.\p"
.string "It will teach you about the basics\n"
.string "of being a POKéMON TRAINER.$"
ViridianCity_Text_WeakenMonsFirstToCatch:: @ 817DF61
ViridianCity_Text_WeakenMonsFirstToCatch::
.string "Well, now, I've had my coffee, and\n"
.string "that's what I need to get going!\p"
.string "But I made it too strong.\n"
@@ -79,7 +79,7 @@ ViridianCity_Text_WeakenMonsFirstToCatch:: @ 817DF61
.string "At first, focus on weakening the\n"
.string "POKéMON before trying to catch it.$"
ViridianCity_Text_HowsTeachyTVHelping:: @ 817E046
ViridianCity_Text_HowsTeachyTVHelping::
.string "Well, now, I've had my coffee, and\n"
.string "that's what I need to get going!\p"
.string "But I made it too strong.\n"
@@ -87,39 +87,39 @@ ViridianCity_Text_HowsTeachyTVHelping:: @ 817E046
.string "Incidentally, is my old TEACHY TV\n"
.string "helping you?$"
ViridianCity_Text_MyGrandsonOnTheShow:: @ 817E0EA
ViridianCity_Text_MyGrandsonOnTheShow::
.string "Wahaha!\n"
.string "It's my grandson on the show!\p"
.string "Since he's the one doing the\n"
.string "teaching, you're bound to learn.$"
ViridianCity_Text_TooBusyForTeachyTV:: @ 817E14E
ViridianCity_Text_TooBusyForTeachyTV::
.string "Hm… You're too busy to not even\n"
.string "have the time for TEACHY TV…\p"
.string "Time is money, and neither should\n"
.string "be ill spent…$"
ViridianCity_Text_CitySign:: @ 817E1BB
ViridianCity_Text_CitySign::
.string "VIRIDIAN CITY \n"
.string "The Eternally Green Paradise$"
ViridianCity_Text_CatchMonsForEasierBattles:: @ 817E1E7
ViridianCity_Text_CatchMonsForEasierBattles::
.string "TRAINER TIPS\p"
.string "Catch POKéMON and expand your\n"
.string "collection.\p"
.string "The more you have, the easier it\n"
.string "is to battle.$"
ViridianCity_Text_MovesLimitedByPP:: @ 817E24D
ViridianCity_Text_MovesLimitedByPP::
.string "TRAINER TIPS\p"
.string "The battle moves of POKéMON are\n"
.string "limited by their POWER POINTS, PP.\p"
.string "To replenish PP, rest your tired\n"
.string "POKéMON at a POKéMON CENTER.$"
ViridianCity_Text_GymSign:: @ 817E2DB
ViridianCity_Text_GymSign::
.string "VIRIDIAN CITY POKéMON GYM$"
ViridianCity_Text_GymDoorsAreLocked:: @ 817E2F5
ViridianCity_Text_GymDoorsAreLocked::
.string "VIRIDIAN GYM's doors are locked…$"