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/NewMauville_Inside/scripts.inc
+25 -25
View File
@@ -1,10 +1,10 @@
NewMauville_Inside_MapScripts:: @ 82373D7
NewMauville_Inside_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_OnTransition
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_OnLoad
.byte 0
NewMauville_Inside_OnResume: @ 82373E7
NewMauville_Inside_OnResume:
compare VAR_TEMP_1, 1
call_if_eq NewMauville_Inside_EventScript_SetBarrierStateBlueButton
compare VAR_TEMP_2, 1
@@ -12,14 +12,14 @@ NewMauville_Inside_OnResume: @ 82373E7
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_TryRemoveVoltorb
end
NewMauville_Inside_EventScript_TryRemoveVoltorb:: @ 8237407
NewMauville_Inside_EventScript_TryRemoveVoltorb::
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return
NewMauville_Inside_OnTransition: @ 823741B
NewMauville_Inside_OnTransition:
setvar VAR_TEMP_1, 0
setvar VAR_TEMP_2, 0
call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb1
@@ -27,24 +27,24 @@ NewMauville_Inside_OnTransition: @ 823741B
call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb3
end
NewMauville_Inside_EventScript_ShowVoltorb1:: @ 8237441
NewMauville_Inside_EventScript_ShowVoltorb1::
clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1
return
NewMauville_Inside_EventScript_ShowVoltorb2:: @ 8237445
NewMauville_Inside_EventScript_ShowVoltorb2::
clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2
return
NewMauville_Inside_EventScript_ShowVoltorb3:: @ 8237449
NewMauville_Inside_EventScript_ShowVoltorb3::
clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3
return
NewMauville_Inside_OnLoad: @ 823744D
NewMauville_Inside_OnLoad:
compare VAR_NEW_MAUVILLE_STATE, 2
call_if_eq NewMauville_Inside_EventScript_SetGeneratorOffMetatiles
end
NewMauville_Inside_EventScript_BlueButton:: @ 8237459
NewMauville_Inside_EventScript_BlueButton::
lockall
setvar VAR_TEMP_1, 1
setvar VAR_TEMP_2, 0
@@ -54,7 +54,7 @@ NewMauville_Inside_EventScript_BlueButton:: @ 8237459
releaseall
end
NewMauville_Inside_EventScript_GreenButton:: @ 8237471
NewMauville_Inside_EventScript_GreenButton::
lockall
setvar VAR_TEMP_1, 0
setvar VAR_TEMP_2, 1
@@ -64,7 +64,7 @@ NewMauville_Inside_EventScript_GreenButton:: @ 8237471
releaseall
end
NewMauville_Inside_EventScript_SetBarrierStateBlueButton:: @ 8237489
NewMauville_Inside_EventScript_SetBarrierStateBlueButton::
setmetatile 23, 34, METATILE_BikeShop_Barrier_Hidden_Top, 1
setmetatile 23, 35, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
setmetatile 23, 36, METATILE_BikeShop_Floor_Shadow_Top, 0
@@ -104,7 +104,7 @@ NewMauville_Inside_EventScript_SetBarrierStateBlueButton:: @ 8237489
setmetatile 18, 36, METATILE_BikeShop_Button_Green, 0
return
NewMauville_Inside_EventScript_SetBarrierStateGreenButton:: @ 82375D7
NewMauville_Inside_EventScript_SetBarrierStateGreenButton::
setmetatile 23, 34, METATILE_BikeShop_Barrier_Blue_Top, 1
setmetatile 23, 35, METATILE_BikeShop_Barrier_Blue_TopMid, 1
setmetatile 23, 36, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
@@ -144,7 +144,7 @@ NewMauville_Inside_EventScript_SetBarrierStateGreenButton:: @ 82375D7
setmetatile 30, 38, METATILE_BikeShop_Button_Blue, 0
return
NewMauville_Inside_EventScript_RedButton:: @ 8237725
NewMauville_Inside_EventScript_RedButton::
lockall
msgbox NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped, MSGBOX_DEFAULT
call NewMauville_Inside_EventScript_SetGeneratorOffMetatiles
@@ -152,7 +152,7 @@ NewMauville_Inside_EventScript_RedButton:: @ 8237725
releaseall
end
NewMauville_Inside_EventScript_SetGeneratorOffMetatiles:: @ 823773A
NewMauville_Inside_EventScript_SetGeneratorOffMetatiles::
setmetatile 33, 6, METATILE_BikeShop_Button_Pressed, 0
setmetatile 32, 2, METATILE_BikeShop_Generator_Off_Tile0, 1
setmetatile 33, 2, METATILE_BikeShop_Generator_Off_Tile1, 1
@@ -165,7 +165,7 @@ NewMauville_Inside_EventScript_SetGeneratorOffMetatiles:: @ 823773A
special DrawWholeMapView
return
NewMauville_Inside_EventScript_Generator:: @ 823778F
NewMauville_Inside_EventScript_Generator::
lockall
compare VAR_NEW_MAUVILLE_STATE, 2
goto_if_eq NewMauville_Inside_EventScript_GeneratorOff
@@ -173,12 +173,12 @@ NewMauville_Inside_EventScript_Generator:: @ 823778F
releaseall
end
NewMauville_Inside_EventScript_GeneratorOff:: @ 82377A5
NewMauville_Inside_EventScript_GeneratorOff::
msgbox NewMauville_Inside_Text_GeneratorQuietedDown, MSGBOX_DEFAULT
releaseall
end
NewMauville_Inside_EventScript_Voltorb1:: @ 82377AF
NewMauville_Inside_EventScript_Voltorb1::
lock
faceplayer
setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -200,12 +200,12 @@ NewMauville_Inside_EventScript_Voltorb1:: @ 82377AF
release
end
NewMauville_Inside_EventScript_DefeatedVoltorb1:: @ 82377F3
NewMauville_Inside_EventScript_DefeatedVoltorb1::
setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE
goto Common_EventScript_RemoveStaticPokemon
end
NewMauville_Inside_EventScript_Voltorb2:: @ 82377FC
NewMauville_Inside_EventScript_Voltorb2::
lock
faceplayer
setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -227,12 +227,12 @@ NewMauville_Inside_EventScript_Voltorb2:: @ 82377FC
release
end
NewMauville_Inside_EventScript_DefeatedVoltorb2:: @ 8237840
NewMauville_Inside_EventScript_DefeatedVoltorb2::
setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE
goto Common_EventScript_RemoveStaticPokemon
end
NewMauville_Inside_EventScript_Voltorb3:: @ 8237849
NewMauville_Inside_EventScript_Voltorb3::
lock
faceplayer
setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -254,21 +254,21 @@ NewMauville_Inside_EventScript_Voltorb3:: @ 8237849
release
end
NewMauville_Inside_EventScript_DefeatedVoltorb3:: @ 823788D
NewMauville_Inside_EventScript_DefeatedVoltorb3::
setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE
goto Common_EventScript_RemoveStaticPokemon
end
NewMauville_Inside_Text_GeneratorRadiatingHeat: @ 8237896
NewMauville_Inside_Text_GeneratorRadiatingHeat:
.string "The generator is radiating heat that\n"
.string "can be felt even at a distance.\p"
.string "It looks like it should be turned off\n"
.string "as soon as possible.$"
NewMauville_Inside_Text_GeneratorQuietedDown: @ 8237916
NewMauville_Inside_Text_GeneratorQuietedDown:
.string "The generator quieted down.$"
NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped: @ 8237932
NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped:
.string "{PLAYER} stepped on the switch.\p"
.string "Click…\p"
.string "… … … … … … … …\n"