dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2021-07-20 15:18:31 -04:00
parent bea170e8e9
commit 06351bf63c
576 changed files with 17798 additions and 17798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/MauvilleCity_Gym/scripts.inc
+65 -65
View File
@@ -1,8 +1,8 @@
MauvilleCity_Gym_MapScripts:: @ 820DD6E
MauvilleCity_Gym_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_OnLoad
.byte 0
MauvilleCity_Gym_OnLoad: @ 820DD74
MauvilleCity_Gym_OnLoad:
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_DeactivatePuzzle
switch VAR_MAUVILLE_GYM_STATE
case 0, MauvilleCity_Gym_EventScript_UpdateBarriers
@@ -12,11 +12,11 @@ MauvilleCity_Gym_OnLoad: @ 820DD74
case 4, MauvilleCity_Gym_EventScript_Switch4Pressed
end
MauvilleCity_Gym_EventScript_UpdateBarriers:: @ 820DDBA
MauvilleCity_Gym_EventScript_UpdateBarriers::
goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetAltBarriers
end
MauvilleCity_Gym_EventScript_SetAltBarriers:: @ 820DDC4
MauvilleCity_Gym_EventScript_SetAltBarriers::
setmetatile 3, 11, METATILE_MauvilleGym_RedBeamV1_On, 1
setmetatile 3, 12, METATILE_MauvilleGym_RedBeamV2_On, 1
setmetatile 3, 13, METATILE_MauvilleGym_PoleTop_On, 1
@@ -45,35 +45,35 @@ MauvilleCity_Gym_EventScript_SetAltBarriers:: @ 820DDC4
setmetatile 5, 7, METATILE_MauvilleGym_GreenBeamH4_Off, 0
end
MauvilleCity_Gym_EventScript_Switch1Pressed:: @ 820DEAF
MauvilleCity_Gym_EventScript_Switch1Pressed::
setvar VAR_0x8004, 0
special MauvilleGymPressSwitch
goto MauvilleCity_Gym_EventScript_UpdateBarriers
end
MauvilleCity_Gym_EventScript_Switch2Pressed:: @ 820DEBD
MauvilleCity_Gym_EventScript_Switch2Pressed::
setvar VAR_0x8004, 1
special MauvilleGymPressSwitch
goto MauvilleCity_Gym_EventScript_UpdateBarriers
end
MauvilleCity_Gym_EventScript_Switch3Pressed:: @ 820DECB
MauvilleCity_Gym_EventScript_Switch3Pressed::
setvar VAR_0x8004, 2
special MauvilleGymPressSwitch
goto MauvilleCity_Gym_EventScript_UpdateBarriers
end
MauvilleCity_Gym_EventScript_Switch4Pressed:: @ 820DED9
MauvilleCity_Gym_EventScript_Switch4Pressed::
setvar VAR_0x8004, 3
special MauvilleGymPressSwitch
goto MauvilleCity_Gym_EventScript_UpdateBarriers
end
MauvilleCity_Gym_EventScript_DeactivatePuzzle:: @ 820DEE7
MauvilleCity_Gym_EventScript_DeactivatePuzzle::
special MauvilleGymDeactivatePuzzle
end
MauvilleCity_Gym_EventScript_Wattson:: @ 820DEEB
MauvilleCity_Gym_EventScript_Wattson::
trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonIntro, MauvilleCity_Gym_Text_WattsonDefeat, MauvilleCity_Gym_EventScript_WattsonDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
@@ -85,7 +85,7 @@ MauvilleCity_Gym_EventScript_Wattson:: @ 820DEEB
release
end
MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B
MauvilleCity_Gym_EventScript_WattsonDefeated::
message MauvilleCity_Gym_Text_ReceivedDynamoBadge
waitmessage
call Common_EventScript_PlayGymBadgeFanfare
@@ -114,7 +114,7 @@ MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B
release
end
MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D
MauvilleCity_Gym_EventScript_GiveShockWave2::
giveitem ITEM_TM34
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
@@ -123,7 +123,7 @@ MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D
release
end
MauvilleCity_Gym_EventScript_GiveShockWave:: @ 820DFB1
MauvilleCity_Gym_EventScript_GiveShockWave::
giveitem ITEM_TM34
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_BagIsFull
@@ -131,17 +131,17 @@ MauvilleCity_Gym_EventScript_GiveShockWave:: @ 820DFB1
setflag FLAG_RECEIVED_TM34
return
MauvilleCity_Gym_EventScript_CompletedNewMauville:: @ 820DFD4
MauvilleCity_Gym_EventScript_CompletedNewMauville::
msgbox MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor, MSGBOX_DEFAULT
release
end
MauvilleCity_Gym_EventScript_WattsonRematch:: @ 820DFDE
MauvilleCity_Gym_EventScript_WattsonRematch::
trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreRematch, MauvilleCity_Gym_Text_WattsonRematchDefeat, MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons
msgbox MauvilleCity_Gym_Text_WattsonPostRematch, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_Switch1:: @ 820DFF9
MauvilleCity_Gym_EventScript_Switch1::
lockall
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
compare VAR_MAUVILLE_GYM_STATE, 1
@@ -151,7 +151,7 @@ MauvilleCity_Gym_EventScript_Switch1:: @ 820DFF9
goto MauvilleCity_Gym_EventScript_PressFloorSwitch
end
MauvilleCity_Gym_EventScript_Switch2:: @ 820E01E
MauvilleCity_Gym_EventScript_Switch2::
lockall
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
compare VAR_MAUVILLE_GYM_STATE, 2
@@ -161,7 +161,7 @@ MauvilleCity_Gym_EventScript_Switch2:: @ 820E01E
goto MauvilleCity_Gym_EventScript_PressFloorSwitch
end
MauvilleCity_Gym_EventScript_Switch3:: @ 820E043
MauvilleCity_Gym_EventScript_Switch3::
lockall
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
compare VAR_MAUVILLE_GYM_STATE, 3
@@ -171,7 +171,7 @@ MauvilleCity_Gym_EventScript_Switch3:: @ 820E043
goto MauvilleCity_Gym_EventScript_PressFloorSwitch
end
MauvilleCity_Gym_EventScript_Switch4:: @ 820E068
MauvilleCity_Gym_EventScript_Switch4::
lockall
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
compare VAR_MAUVILLE_GYM_STATE, 4
@@ -181,7 +181,7 @@ MauvilleCity_Gym_EventScript_Switch4:: @ 820E068
goto MauvilleCity_Gym_EventScript_PressFloorSwitch
end
MauvilleCity_Gym_EventScript_PressFloorSwitch:: @ 820E08D
MauvilleCity_Gym_EventScript_PressFloorSwitch::
special MauvilleGymSetDefaultBarriers
special MauvilleGymPressSwitch
special DrawWholeMapView
@@ -191,46 +191,46 @@ MauvilleCity_Gym_EventScript_PressFloorSwitch:: @ 820E08D
releaseall
end
MauvilleCity_Gym_EventScript_SwitchDoNothing:: @ 820E0AD
MauvilleCity_Gym_EventScript_SwitchDoNothing::
releaseall
end
MauvilleCity_Gym_EventScript_SetBarriersAltState:: @ 820E0AF
MauvilleCity_Gym_EventScript_SetBarriersAltState::
setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
releaseall
end
MauvilleCity_Gym_EventScript_ClearBarriersAltState:: @ 820E0B4
MauvilleCity_Gym_EventScript_ClearBarriersAltState::
clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
releaseall
end
MauvilleCity_Gym_EventScript_Kirk:: @ 820E0B9
MauvilleCity_Gym_EventScript_Kirk::
trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_KirkIntro, MauvilleCity_Gym_Text_KirkDefeat
msgbox MauvilleCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_Shawn:: @ 820E0D0
MauvilleCity_Gym_EventScript_Shawn::
trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_ShawnIntro, MauvilleCity_Gym_Text_ShawnDefeat
msgbox MauvilleCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_Ben:: @ 820E0E7
MauvilleCity_Gym_EventScript_Ben::
trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_BenIntro, MauvilleCity_Gym_Text_BenDefeat
msgbox MauvilleCity_Gym_Text_BenPostBattle, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_Vivian:: @ 820E0FE
MauvilleCity_Gym_EventScript_Vivian::
trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_VivianIntro, MauvilleCity_Gym_Text_VivianDefeat
msgbox MauvilleCity_Gym_Text_VivianPostBattle, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_Angelo:: @ 820E115
MauvilleCity_Gym_EventScript_Angelo::
trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_AngeloIntro, MauvilleCity_Gym_Text_AngeloDefeat
msgbox MauvilleCity_Gym_Text_AngeloPostBattle, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_GymGuide:: @ 820E12C
MauvilleCity_Gym_EventScript_GymGuide::
lock
faceplayer
goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_GymGuidePostVictory
@@ -238,34 +238,34 @@ MauvilleCity_Gym_EventScript_GymGuide:: @ 820E12C
release
end
MauvilleCity_Gym_EventScript_GymGuidePostVictory:: @ 820E141
MauvilleCity_Gym_EventScript_GymGuidePostVictory::
msgbox MauvilleCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
release
end
MauvilleCity_Gym_EventScript_LeftGymStatue:: @ 820E14B
MauvilleCity_Gym_EventScript_LeftGymStatue::
lockall
goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_GymStatueCertified
goto MauvilleCity_Gym_EventScript_GymStatue
end
MauvilleCity_Gym_EventScript_RightGymStatue:: @ 820E15B
MauvilleCity_Gym_EventScript_RightGymStatue::
lockall
goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_GymStatueCertified
goto MauvilleCity_Gym_EventScript_GymStatue
end
MauvilleCity_Gym_EventScript_GymStatueCertified:: @ 820E16B
MauvilleCity_Gym_EventScript_GymStatueCertified::
msgbox MauvilleCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
releaseall
end
MauvilleCity_Gym_EventScript_GymStatue:: @ 820E175
MauvilleCity_Gym_EventScript_GymStatue::
msgbox MauvilleCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
releaseall
end
MauvilleCity_Gym_Text_GymGuideAdvice: @ 820E17F
MauvilleCity_Gym_Text_GymGuideAdvice:
.string "Hey, how's it going, CHAMPION-\n"
.string "bound {PLAYER}?\p"
.string "WATTSON, the LEADER of MAUVILLE\n"
@@ -276,72 +276,72 @@ MauvilleCity_Gym_Text_GymGuideAdvice: @ 820E17F
.string "doors all over his GYM! Eccentric!\p"
.string "Hey, go for it!$"
MauvilleCity_Gym_Text_GymGuidePostVictory: @ 820E283
MauvilleCity_Gym_Text_GymGuidePostVictory:
.string "Whoa, you're electrifying!\n"
.string "You've powered the door open!$"
MauvilleCity_Gym_Text_KirkIntro: @ 820E2BC
MauvilleCity_Gym_Text_KirkIntro:
.string "My electric soul, it'll shatter your\n"
.string "dreams whole, whoa-yeahah!$"
MauvilleCity_Gym_Text_KirkDefeat: @ 820E2FC
MauvilleCity_Gym_Text_KirkDefeat:
.string "That was plugged in, amped up,\n"
.string "over-driven electric, man!$"
MauvilleCity_Gym_Text_KirkPostBattle: @ 820E336
MauvilleCity_Gym_Text_KirkPostBattle:
.string "POKéMON and rock, it's all about heart,\n"
.string "whoa-yeah!$"
MauvilleCity_Gym_Text_ShawnIntro: @ 820E369
MauvilleCity_Gym_Text_ShawnIntro:
.string "I trained under WATTSON!\n"
.string "There ain't no way I'll lose easily!$"
MauvilleCity_Gym_Text_ShawnDefeat: @ 820E3A7
MauvilleCity_Gym_Text_ShawnDefeat:
.string "Unplugged and turned off…$"
MauvilleCity_Gym_Text_ShawnPostBattle: @ 820E3C1
MauvilleCity_Gym_Text_ShawnPostBattle:
.string "WATTSON, our GYM LEADER, has been\n"
.string "around for a long, long time.\p"
.string "He was battling even before your\n"
.string "daddy was born, that tough coot.$"
MauvilleCity_Gym_Text_BenIntro: @ 820E443
MauvilleCity_Gym_Text_BenIntro:
.string "This GYM's got puzzles!\n"
.string "Isn't it fun?$"
MauvilleCity_Gym_Text_BenDefeat: @ 820E469
MauvilleCity_Gym_Text_BenDefeat:
.string "It's no fun to lose…$"
MauvilleCity_Gym_Text_BenPostBattle: @ 820E47E
MauvilleCity_Gym_Text_BenPostBattle:
.string "WATTSON says he likes setting up\n"
.string "little traps with switches.$"
MauvilleCity_Gym_Text_VivianIntro: @ 820E4BB
MauvilleCity_Gym_Text_VivianIntro:
.string "With my charm and my POKéMON's moves,\n"
.string "you'll be shocked!$"
MauvilleCity_Gym_Text_VivianDefeat: @ 820E4F4
MauvilleCity_Gym_Text_VivianDefeat:
.string "I'm shocked by your power!$"
MauvilleCity_Gym_Text_VivianPostBattle: @ 820E50F
MauvilleCity_Gym_Text_VivianPostBattle:
.string "I've heard that MAUVILLE was founded\n"
.string "by WATTSON.\p"
.string "He was a TRAINER long before we\n"
.string "became TRAINERS.\l"
.string "He must know all sorts of things!$"
MauvilleCity_Gym_Text_AngeloIntro: @ 820E593
MauvilleCity_Gym_Text_AngeloIntro:
.string "I love shiny things!$"
MauvilleCity_Gym_Text_AngeloDefeat: @ 820E5A8
MauvilleCity_Gym_Text_AngeloDefeat:
.string "Oh…\n"
.string "My eyes are frazzled…$"
MauvilleCity_Gym_Text_AngeloPostBattle: @ 820E5C2
MauvilleCity_Gym_Text_AngeloPostBattle:
.string "MAUVILLE GYM's WATTSON has a shiny\n"
.string "forehead. It makes me happy!$"
MauvilleCity_Gym_Text_WattsonIntro: @ 820E602
MauvilleCity_Gym_Text_WattsonIntro:
.string "I've given up on my plans to convert\n"
.string "the city, I have.\p"
.string "And so, I put my time into making\n"
@@ -354,17 +354,17 @@ MauvilleCity_Gym_Text_WattsonIntro: @ 820E602
.string "Then, I, WATTSON, the LEADER of\n"
.string "MAUVILLE GYM, shall electrify you!$"
MauvilleCity_Gym_Text_WattsonDefeat: @ 820E734
MauvilleCity_Gym_Text_WattsonDefeat:
.string "Wahahahah!\n"
.string "Fine, I lost!\p"
.string "You ended up giving me a thrill!\n"
.string "Take this BADGE!$"
MauvilleCity_Gym_Text_ReceivedDynamoBadge: @ 820E77F
MauvilleCity_Gym_Text_ReceivedDynamoBadge:
.string "{PLAYER} received the DYNAMO BADGE\n"
.string "from WATTSON.$"
MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis: @ 820E7AA
MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis:
.string "With the DYNAMO BADGE, POKéMON can\n"
.string "use ROCK SMASH out of battle.\p"
.string "And, it will make your POKéMON a little\n"
@@ -372,33 +372,33 @@ MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis: @ 820E7AA
.string "Hmm…\n"
.string "You should take this, too!$"
MauvilleCity_Gym_Text_ExplainShockWave: @ 820E844
MauvilleCity_Gym_Text_ExplainShockWave:
.string "That TM34 there contains SHOCK WAVE.\p"
.string "It's a trustworthy move that never\n"
.string "misses! You can count on it!\p"
.string "… … … … … …$"
MauvilleCity_Gym_Text_RegisteredWattson: @ 820E8B5
MauvilleCity_Gym_Text_RegisteredWattson:
.string "Registered GYM LEADER WATTSON\n"
.string "in the POKéNAV.$"
MauvilleCity_Gym_Text_WattsonPostBattle: @ 820E8E3
MauvilleCity_Gym_Text_WattsonPostBattle:
.string "I swell with optimism, seeing a promising\n"
.string "young TRAINER like you!$"
MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor: @ 820E925
MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor:
.string "Wahahahah!\n"
.string "Go forth and endeavor, youngster!$"
MauvilleCity_Gym_Text_GymStatue: @ 820E952
MauvilleCity_Gym_Text_GymStatue:
.string "MAUVILLE CITY POKéMON GYM$"
MauvilleCity_Gym_Text_GymStatueCertified: @ 820E96C
MauvilleCity_Gym_Text_GymStatueCertified:
.string "MAUVILLE CITY POKéMON GYM\p"
.string "WATTSON'S CERTIFIED TRAINERS:\n"
.string "{PLAYER}$"
MauvilleCity_Gym_Text_WattsonPreRematch: @ 820E9A7
MauvilleCity_Gym_Text_WattsonPreRematch:
.string "WATTSON: Ah-ha! Here at last!\n"
.string "I know what you want.\l"
.string "You want to battle my POKéMON!\p"
@@ -406,11 +406,11 @@ MauvilleCity_Gym_Text_WattsonPreRematch: @ 820E9A7
.string "I'll make sparks fly from you!\n"
.string "Don't say I didn't warn you!$"
MauvilleCity_Gym_Text_WattsonRematchDefeat: @ 820EA42
MauvilleCity_Gym_Text_WattsonRematchDefeat:
.string "Oof…\n"
.string "Our batteries ran dry…$"
MauvilleCity_Gym_Text_WattsonPostRematch: @ 820EA5E
MauvilleCity_Gym_Text_WattsonPostRematch:
.string "WATTSON: We'll have to recharge our\n"
.string "batteries again.\p"
.string "When we're fully charged up, we'll\n"
@@ -418,7 +418,7 @@ MauvilleCity_Gym_Text_WattsonPostRematch: @ 820EA5E
.string "So, come back again sometime,\n"
.string "won't you?$"
MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons: @ 820EAFD
MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons:
.string "WATTSON: Ah-ha! Here at last!\n"
.string "I know what you want.\l"
.string "You want to battle my POKéMON!\p"