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

56
data/maps/AquaHideout_B1F/scripts.inc
View File

@@ -1,33 +1,33 @@
AquaHideout_B1F_MapScripts:: @ 82339A7
AquaHideout_B1F_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition
.byte 0
AquaHideout_B1F_OnResume: @ 82339B2
AquaHideout_B1F_OnResume:
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_TryRemoveElectrode
end
AquaHideout_B1F_EventScript_TryRemoveElectrode:: @ 82339BC
AquaHideout_B1F_EventScript_TryRemoveElectrode::
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return
AquaHideout_B1F_OnTransition: @ 82339D0
AquaHideout_B1F_OnTransition:
call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode1
call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode2
end
AquaHideout_B1F_EventScript_ShowElectrode1:: @ 82339E3
AquaHideout_B1F_EventScript_ShowElectrode1::
clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
return
AquaHideout_B1F_EventScript_ShowElectrode2:: @ 82339E7
AquaHideout_B1F_EventScript_ShowElectrode2::
clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
return
AquaHideout_B1F_EventScript_Electrode1:: @ 82339EB
AquaHideout_B1F_EventScript_Electrode1::
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
@@ -49,12 +49,12 @@ AquaHideout_B1F_EventScript_Electrode1:: @ 82339EB
release
end
AquaHideout_B1F_EventScript_DefeatedElectrode1:: @ 8233A2F
AquaHideout_B1F_EventScript_DefeatedElectrode1::
setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
goto Common_EventScript_RemoveStaticPokemon
end
AquaHideout_B1F_EventScript_Electrode2:: @ 8233A38
AquaHideout_B1F_EventScript_Electrode2::
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
@@ -76,92 +76,92 @@ AquaHideout_B1F_EventScript_Electrode2:: @ 8233A38
release
end
AquaHideout_B1F_EventScript_DefeatedElectrode2:: @ 8233A7C
AquaHideout_B1F_EventScript_DefeatedElectrode2::
setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
goto Common_EventScript_RemoveStaticPokemon
end
AquaHideout_B1F_EventScript_Grunt2:: @ 8233A85
AquaHideout_B1F_EventScript_Grunt2::
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_2, AquaHideout_B1F_Text_Grunt2Intro, AquaHideout_B1F_Text_Grunt2Defeat, AquaHideout_B1F_EventScript_Grunt2Defeated
msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
AquaHideout_B1F_EventScript_Grunt2Defeated:: @ 8233AA0
AquaHideout_B1F_EventScript_Grunt2Defeated::
special PlayerFaceTrainerAfterBattle
waitmovement 0
msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_DEFAULT
release
end
AquaHideout_B1F_EventScript_Grunt3:: @ 8233AB0
AquaHideout_B1F_EventScript_Grunt3::
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_3, AquaHideout_B1F_Text_Grunt3Intro, AquaHideout_B1F_Text_Grunt3Defeat, AquaHideout_B1F_EventScript_Grunt3Defeated
msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
AquaHideout_B1F_EventScript_Grunt3Defeated:: @ 8233ACB
AquaHideout_B1F_EventScript_Grunt3Defeated::
msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_DEFAULT
release
end
AquaHideout_B1F_EventScript_Grunt5:: @ 8233AD5
AquaHideout_B1F_EventScript_Grunt5::
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_5, AquaHideout_B1F_Text_Grunt5Intro, AquaHideout_B1F_Text_Grunt5Defeat
msgbox AquaHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
end
AquaHideout_B1F_EventScript_Grunt7:: @ 8233AEC
AquaHideout_B1F_EventScript_Grunt7::
trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_7, AquaHideout_B1F_Text_Grunt7Intro, AquaHideout_B1F_Text_Grunt7Defeat
msgbox AquaHideout_B1F_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
end
AquaHideout_B1F_Text_Grunt2Intro: @ 8233B03
AquaHideout_B1F_Text_Grunt2Intro:
.string "If you want to know the secret about\n"
.string "our HIDEOUT, you have me to beat!$"
AquaHideout_B1F_Text_Grunt2Defeat: @ 8233B4A
AquaHideout_B1F_Text_Grunt2Defeat:
.string "I can't win at all…$"
AquaHideout_B1F_Text_Grunt2PostBattle: @ 8233B5E
AquaHideout_B1F_Text_Grunt2PostBattle:
.string "Our HIDEOUT's secret?\p"
.string "Well, let's just say…\n"
.string "There's a submarine at the far end!\p"
.string "But, by now…\n"
.string "Kekekeke…$"
AquaHideout_B1F_Text_Grunt3Intro: @ 8233BC5
AquaHideout_B1F_Text_Grunt3Intro:
.string "Fuel supply loaded A-OK!\n"
.string "In-cruise snacks loaded A-OK!\p"
.string "Nothing left to do but KO a pesky\n"
.string "meddler!$"
AquaHideout_B1F_Text_Grunt3Defeat: @ 8233C27
AquaHideout_B1F_Text_Grunt3Defeat:
.string "I took a serious licking!$"
AquaHideout_B1F_Text_Grunt3PostBattle: @ 8233C41
AquaHideout_B1F_Text_Grunt3PostBattle:
.string "Humph!\n"
.string "This was supposed to happen!\p"
.string "My mission was to just hold you up!$"
AquaHideout_B1F_Text_Grunt5Intro: @ 8233C89
AquaHideout_B1F_Text_Grunt5Intro:
.string "Yawn… Keeping watch over the\n"
.string "HIDEOUT bores me. I'll take you on.$"
AquaHideout_B1F_Text_Grunt5Defeat: @ 8233CCA
AquaHideout_B1F_Text_Grunt5Defeat:
.string "Yawn…\n"
.string "Oh, I lost…$"
AquaHideout_B1F_Text_Grunt5PostBattle: @ 8233CDC
AquaHideout_B1F_Text_Grunt5PostBattle:
.string "If you scurry too much, other TEAM\n"
.string "AQUA members might get you.$"
AquaHideout_B1F_Text_Grunt7Intro: @ 8233D1B
AquaHideout_B1F_Text_Grunt7Intro:
.string "Hey!\n"
.string "You there!\p"
.string "Which do you think is cooler?\n"
.string "TEAM AQUA's uniform or TEAM MAGMA's?$"
AquaHideout_B1F_Text_Grunt7Defeat: @ 8233D6E
AquaHideout_B1F_Text_Grunt7Defeat:
.string "I lost in a cool way…$"
AquaHideout_B1F_Text_Grunt7PostBattle: @ 8233D84
AquaHideout_B1F_Text_Grunt7PostBattle:
.string "If you have a cool uniform, you look\n"
.string "good even in a loss, don't you think?$"