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/VermilionCity_Gym/scripts.inc
+40 -40
View File
@@ -3,17 +3,17 @@
.equ SWITCH2_ID, VAR_0x8005
.equ TRASH_CAN_ID, VAR_0x8008
VermilionCity_Gym_MapScripts:: @ 816B69E
VermilionCity_Gym_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, VermilionCity_Gym_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_Gym_OnTransition
.byte 0
VermilionCity_Gym_OnLoad:: @ 816B6A9
VermilionCity_Gym_OnLoad::
call_if_set FOUND_FIRST_SWITCH, VermilionCity_Gym_EventScript_SetOneBeamOff
call_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_SetBeamsOff
end
VermilionCity_Gym_EventScript_SetOneBeamOff:: @ 816B6BC
VermilionCity_Gym_EventScript_SetOneBeamOff::
setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_HalfOn, 1
setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_HalfOn, 1
setmetatile 5, 6, METATILE_VermilionGym_Beam_MidTop_HalfOn, 1
@@ -26,7 +26,7 @@ VermilionCity_Gym_EventScript_SetOneBeamOff:: @ 816B6BC
setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn, 1
return
VermilionCity_Gym_EventScript_SetBeamsOff:: @ 816B717
VermilionCity_Gym_EventScript_SetBeamsOff::
setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Off, 1
setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_Off, 0
setmetatile 5, 6, METATILE_VermilionGym_Floor, 0
@@ -39,108 +39,108 @@ VermilionCity_Gym_EventScript_SetBeamsOff:: @ 816B717
setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_Off, 1
return
VermilionCity_Gym_OnTransition:: @ 816B772
VermilionCity_Gym_OnTransition::
call VermilionCity_Gym_EventScript_InitTrashCans
end
VermilionCity_Gym_EventScript_InitTrashCans:: @ 816B778
VermilionCity_Gym_EventScript_InitTrashCans::
goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_Return
special SetVermilionTrashCans
copyvar VAR_TEMP_0, SWITCH1_ID
copyvar VAR_TEMP_1, SWITCH2_ID
return
VermilionCity_Gym_EventScript_TrashCan1:: @ 816B78F
VermilionCity_Gym_EventScript_TrashCan1::
lockall
setvar TRASH_CAN_ID, 1
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan2:: @ 816B79B
VermilionCity_Gym_EventScript_TrashCan2::
lockall
setvar TRASH_CAN_ID, 2
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan3:: @ 816B7A7
VermilionCity_Gym_EventScript_TrashCan3::
lockall
setvar TRASH_CAN_ID, 3
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan4:: @ 816B7B3
VermilionCity_Gym_EventScript_TrashCan4::
lockall
setvar TRASH_CAN_ID, 4
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan5:: @ 816B7BF
VermilionCity_Gym_EventScript_TrashCan5::
lockall
setvar TRASH_CAN_ID, 5
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan6:: @ 816B7CB
VermilionCity_Gym_EventScript_TrashCan6::
lockall
setvar TRASH_CAN_ID, 6
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan7:: @ 816B7D7
VermilionCity_Gym_EventScript_TrashCan7::
lockall
setvar TRASH_CAN_ID, 7
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan8:: @ 816B7E3
VermilionCity_Gym_EventScript_TrashCan8::
lockall
setvar TRASH_CAN_ID, 8
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan9:: @ 816B7EF
VermilionCity_Gym_EventScript_TrashCan9::
lockall
setvar TRASH_CAN_ID, 9
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan10:: @ 816B7FB
VermilionCity_Gym_EventScript_TrashCan10::
lockall
setvar TRASH_CAN_ID, 10
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan11:: @ 816B807
VermilionCity_Gym_EventScript_TrashCan11::
lockall
setvar TRASH_CAN_ID, 11
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan12:: @ 816B813
VermilionCity_Gym_EventScript_TrashCan12::
lockall
setvar TRASH_CAN_ID, 12
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan13:: @ 816B81F
VermilionCity_Gym_EventScript_TrashCan13::
lockall
setvar TRASH_CAN_ID, 13
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan14:: @ 816B82B
VermilionCity_Gym_EventScript_TrashCan14::
lockall
setvar TRASH_CAN_ID, 14
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan15:: @ 816B837
VermilionCity_Gym_EventScript_TrashCan15::
lockall
setvar TRASH_CAN_ID, 15
goto VermilionCity_Gym_EventScript_TrashCan
end
VermilionCity_Gym_EventScript_TrashCan:: @ 816B843
VermilionCity_Gym_EventScript_TrashCan::
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
copyvar SWITCH1_ID, VAR_TEMP_0
@@ -153,7 +153,7 @@ VermilionCity_Gym_EventScript_TrashCan:: @ 816B843
releaseall
end
VermilionCity_Gym_EventScript_FoundSwitchOne:: @ 816B885
VermilionCity_Gym_EventScript_FoundSwitchOne::
msgbox VermilionCity_Gym_Text_SwitchUnderTrashFirstLockOpened
playse SE_PIN
waitse
@@ -163,7 +163,7 @@ VermilionCity_Gym_EventScript_FoundSwitchOne:: @ 816B885
releaseall
end
VermilionCity_Gym_EventScript_TrySwitchTwo:: @ 816B89E
VermilionCity_Gym_EventScript_TrySwitchTwo::
compare SWITCH2_ID, TRASH_CAN_ID
goto_if_eq VermilionCity_Gym_EventScript_FoundSwitchTwo
msgbox VermilionCity_Gym_Text_OnlyTrashLocksWereReset
@@ -176,7 +176,7 @@ VermilionCity_Gym_EventScript_TrySwitchTwo:: @ 816B89E
releaseall
end
VermilionCity_Gym_EventScript_FoundSwitchTwo:: @ 816B8CB
VermilionCity_Gym_EventScript_FoundSwitchTwo::
msgbox VermilionCity_Gym_Text_SecondLockOpened
closemessage
call VermilionCity_Gym_EventScript_SetBeamsOff
@@ -187,12 +187,12 @@ VermilionCity_Gym_EventScript_FoundSwitchTwo:: @ 816B8CB
releaseall
end
VermilionCity_Gym_EventScript_LocksAlreadyOpen:: @ 816B8E5
VermilionCity_Gym_EventScript_LocksAlreadyOpen::
msgbox VermilionCity_Gym_Text_NopeOnlyTrashHere
releaseall
end
VermilionCity_Gym_EventScript_SetBeamsOn:: @ 816B8EF
VermilionCity_Gym_EventScript_SetBeamsOn::
setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_On, 1
setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_On, 1
setmetatile 5, 6, METATILE_VermilionGym_Beam_MidTop, 1
@@ -205,7 +205,7 @@ VermilionCity_Gym_EventScript_SetBeamsOn:: @ 816B8EF
setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_On, 1
return
VermilionCity_Gym_EventScript_LtSurge:: @ 816B94A
VermilionCity_Gym_EventScript_LtSurge::
famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_LT_SURGE, VermilionCity_Gym_Text_LtSurgeIntro, VermilionCity_Gym_Text_LtSurgeDefeat, VermilionCity_Gym_EventScript_DefeatedLtSurge, NO_MUSIC
goto_if_unset FLAG_GOT_TM34_FROM_SURGE, VermilionCity_Gym_EventScript_GiveTM34
@@ -213,7 +213,7 @@ VermilionCity_Gym_EventScript_LtSurge:: @ 816B94A
release
end
VermilionCity_Gym_EventScript_DefeatedLtSurge:: @ 816B97C
VermilionCity_Gym_EventScript_DefeatedLtSurge::
famechecker FAMECHECKER_LTSURGE, 1
call_if_unset FLAG_GOT_HM05, VermilionCity_Gym_EventScript_ShowOaksAide
clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL
@@ -223,11 +223,11 @@ VermilionCity_Gym_EventScript_DefeatedLtSurge:: @ 816B97C
goto VermilionCity_Gym_EventScript_GiveTM34
end
VermilionCity_Gym_EventScript_ShowOaksAide:: @ 816B9AB
VermilionCity_Gym_EventScript_ShowOaksAide::
clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE
return
VermilionCity_Gym_EventScript_GiveTM34:: @ 816B9AF
VermilionCity_Gym_EventScript_GiveTM34::
msgbox VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis
checkitemspace ITEM_TM34, 1
compare VAR_RESULT, FALSE
@@ -238,34 +238,34 @@ VermilionCity_Gym_EventScript_GiveTM34:: @ 816B9AF
release
end
VermilionCity_Gym_EventScript_NoRoomForTM34:: @ 816B9F0
VermilionCity_Gym_EventScript_NoRoomForTM34::
msgbox VermilionCity_Gym_Text_MakeRoomInYourBag
release
end
VermilionCity_Gym_EventScript_Dwayne:: @ 816B9FA
VermilionCity_Gym_EventScript_Dwayne::
trainerbattle_single TRAINER_SAILOR_DWAYNE, VermilionCity_Gym_Text_DwayneIntro, VermilionCity_Gym_Text_DwayneDefeat
famechecker FAMECHECKER_LTSURGE, 4
msgbox VermilionCity_Gym_Text_DwaynePostBattle, MSGBOX_AUTOCLOSE
end
VermilionCity_Gym_EventScript_Baily:: @ 816BA1E
VermilionCity_Gym_EventScript_Baily::
trainerbattle_single TRAINER_ENGINEER_BAILY, VermilionCity_Gym_Text_BailyIntro, VermilionCity_Gym_Text_BailyDefeat
msgbox VermilionCity_Gym_Text_BailyPostBattle, MSGBOX_AUTOCLOSE
end
VermilionCity_Gym_EventScript_Tucker:: @ 816BA35
VermilionCity_Gym_EventScript_Tucker::
trainerbattle_single TRAINER_GENTLEMAN_TUCKER, VermilionCity_Gym_Text_TuckerIntro, VermilionCity_Gym_Text_TuckerDefeat, VermilionCity_Gym_EventScript_DefeatedTucker
famechecker FAMECHECKER_LTSURGE, 3
msgbox VermilionCity_Gym_Text_TuckerPostBattle, MSGBOX_AUTOCLOSE
end
VermilionCity_Gym_EventScript_DefeatedTucker:: @ 816BA5D
VermilionCity_Gym_EventScript_DefeatedTucker::
famechecker FAMECHECKER_LTSURGE, 2
release
end
VermilionCity_Gym_EventScript_GymGuy:: @ 816BA6C
VermilionCity_Gym_EventScript_GymGuy::
lock
faceplayer
goto_if_set FLAG_DEFEATED_LT_SURGE, VermilionCity_Gym_EventScript_GymGuyPostVictory
@@ -273,19 +273,19 @@ VermilionCity_Gym_EventScript_GymGuy:: @ 816BA6C
release
end
VermilionCity_Gym_EventScript_GymGuyPostVictory:: @ 816BA81
VermilionCity_Gym_EventScript_GymGuyPostVictory::
msgbox VermilionCity_Gym_Text_GymGuyPostVictory
release
end
VermilionCity_Gym_EventScript_GymStatue:: @ 816BA8B
VermilionCity_Gym_EventScript_GymStatue::
lockall
goto_if_set FLAG_BADGE03_GET, VermilionCity_Gym_EventScript_GymStatuePostVictory
msgbox VermilionCity_Gym_Text_GymStatue
releaseall
end
VermilionCity_Gym_EventScript_GymStatuePostVictory:: @ 816BA9F
VermilionCity_Gym_EventScript_GymStatuePostVictory::
msgbox VermilionCity_Gym_Text_GymStatuePlayerWon
releaseall
end
data/maps/VermilionCity_Gym/text.inc
+25 -25
View File
@@ -1,4 +1,4 @@
VermilionCity_Gym_Text_LtSurgeIntro:: @ 8194BA4
VermilionCity_Gym_Text_LtSurgeIntro::
.string "Hey, kid! What do you think you're\n"
.string "doing here?\p"
.string "You won't live long in combat!\n"
@@ -9,13 +9,13 @@ VermilionCity_Gym_Text_LtSurgeIntro:: @ 8194BA4
.string "paralysis!\p"
.string "The same as I'll do to you!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$"
VermilionCity_Gym_Text_LtSurgePostBattle:: @ 8194C8E
VermilionCity_Gym_Text_LtSurgePostBattle::
.string "A little word of advice, kid!\p"
.string "Electricity is sure powerful!\p"
.string "But, it's useless against GROUND-\n"
.string "type POKéMON!$"
VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis:: @ 8194CFA
VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis::
.string "The THUNDERBADGE cranks up your\n"
.string "POKéMON's SPEED!\p"
.string "It also lets your POKéMON FLY\n"
@@ -23,58 +23,58 @@ VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis:: @ 8194CFA
.string "You're special, kid!\n"
.string "Take this!$"
VermilionCity_Gym_Text_ReceivedTM34FromLtSurge:: @ 8194D87
VermilionCity_Gym_Text_ReceivedTM34FromLtSurge::
.string "{PLAYER} received TM34\n"
.string "from LT. SURGE.$"
VermilionCity_Gym_Text_ExplainTM34:: @ 8194DA8
VermilionCity_Gym_Text_ExplainTM34::
.string "TM34 contains SHOCK WAVE!\p"
.string "Teach it to an ELECTRIC POKéMON!$"
VermilionCity_Gym_Text_MakeRoomInYourBag:: @ 8194DE3
VermilionCity_Gym_Text_MakeRoomInYourBag::
.string "Yo, kid, make room in your BAG!$"
VermilionCity_Gym_Text_LtSurgeDefeat:: @ 8194E03
VermilionCity_Gym_Text_LtSurgeDefeat::
.string "Now that's a shocker!\p"
.string "You're the real deal, kid!\p"
.string "Fine, then, take the THUNDERBADGE!$"
VermilionCity_Gym_Text_TuckerIntro:: @ 8194E57
VermilionCity_Gym_Text_TuckerIntro::
.string "When I was in the Army, LT. SURGE\n"
.string "was my strict CO.\p"
.string "He was a hard taskmaster.$"
VermilionCity_Gym_Text_TuckerDefeat:: @ 8194EA5
VermilionCity_Gym_Text_TuckerDefeat::
.string "Stop!\n"
.string "You're very good!$"
VermilionCity_Gym_Text_TuckerPostBattle:: @ 8194EBD
VermilionCity_Gym_Text_TuckerPostBattle::
.string "It's not easy opening that door.\p"
.string "LT. SURGE was always famous for\n"
.string "his cautious nature in the Army.$"
VermilionCity_Gym_Text_BailyIntro:: @ 8194F1F
VermilionCity_Gym_Text_BailyIntro::
.string "I'm a lightweight, but I'm good\n"
.string "with electricity!\p"
.string "That's why I joined this GYM.$"
VermilionCity_Gym_Text_BailyDefeat:: @ 8194F6F
VermilionCity_Gym_Text_BailyDefeat::
.string "Fried!$"
VermilionCity_Gym_Text_BailyPostBattle:: @ 8194F76
VermilionCity_Gym_Text_BailyPostBattle::
.string "Okay, I'll talk!\p"
.string "LT. SURGE said he hid door\n"
.string "switches inside something.$"
VermilionCity_Gym_Text_DwayneIntro:: @ 8194FBD
VermilionCity_Gym_Text_DwayneIntro::
.string "This is no place for kids!\n"
.string "Not even if you're good!$"
VermilionCity_Gym_Text_DwayneDefeat:: @ 8194FF1
VermilionCity_Gym_Text_DwayneDefeat::
.string "Wow!\n"
.string "Surprised me!$"
VermilionCity_Gym_Text_DwaynePostBattle:: @ 8195004
VermilionCity_Gym_Text_DwaynePostBattle::
.string "LT. SURGE installed the traps in\n"
.string "the GYM himself.\p"
.string "He set up double locks everywhere.\n"
@@ -82,7 +82,7 @@ VermilionCity_Gym_Text_DwaynePostBattle:: @ 8195004
.string "When you open the first lock, the\n"
.string "second lock is right next to it.$"
VermilionCity_Gym_Text_GymGuyAdvice:: @ 81950B4
VermilionCity_Gym_Text_GymGuyAdvice::
.string "Yo!\n"
.string "Champ in the making!\p"
.string "LT. SURGE has a nickname.\p"
@@ -97,42 +97,42 @@ VermilionCity_Gym_Text_GymGuyAdvice:: @ 81950B4
.string "He's locked himself in, so it won't\n"
.string "be easy getting to him.$"
VermilionCity_Gym_Text_GymGuyPostVictory:: @ 81951EC
VermilionCity_Gym_Text_GymGuyPostVictory::
.string "Whew!\n"
.string "That match was electric!$"
VermilionCity_Gym_Text_GymStatue:: @ 819520B
VermilionCity_Gym_Text_GymStatue::
.string "VERMILION POKéMON GYM\n"
.string "LEADER: LT. SURGE\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
VermilionCity_Gym_Text_GymStatuePlayerWon:: @ 8195248
VermilionCity_Gym_Text_GymStatuePlayerWon::
.string "VERMILION POKéMON GYM\n"
.string "LEADER: LT. SURGE\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}, {PLAYER}$"
VermilionCity_Gym_Text_NopeOnlyTrashHere:: @ 8195289
VermilionCity_Gym_Text_NopeOnlyTrashHere::
.string "Nope!\n"
.string "There's only trash here.$"
VermilionCity_Gym_Text_SwitchUnderTrashFirstLockOpened:: @ 81952A8
VermilionCity_Gym_Text_SwitchUnderTrashFirstLockOpened::
.string "Hey! There's a switch under the\n"
.string "trash! Turn it on!\p"
.string "The first electric lock opened!$"
VermilionCity_Gym_Text_AnotherSwitchInTrash:: @ 81952FB
VermilionCity_Gym_Text_AnotherSwitchInTrash::
.string "ガサゴソ‥！\n"
.string "おっと！　ゴミばこの　そこに\l"
.string "また　スイッチが　あった！\l"
.string "おして　みよう！　‥　ポチッとな$"
VermilionCity_Gym_Text_SecondLockOpened:: @ 8195330
VermilionCity_Gym_Text_SecondLockOpened::
.string "The second electric lock opened!\n"
.string "The motorized door opened!$"
VermilionCity_Gym_Text_OnlyTrashLocksWereReset:: @ 819536C
VermilionCity_Gym_Text_OnlyTrashLocksWereReset::
.string "Nope!\n"
.string "There's only trash here.\p"
.string "Hey!\n"