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/Route110_TrickHousePuzzle7/scripts.inc
+66 -66
View File
@@ -1,4 +1,4 @@
Route110_TrickHousePuzzle7_MapScripts:: @ 826E091
Route110_TrickHousePuzzle7_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_OnTransition
map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_OnLoad
@@ -8,11 +8,11 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 826E091
@ Puzzle Room 7 in RSE uses whatever puzzle Mossdeep Gym uses
@ Because Mossdeep Gym was redesigned for Emerald, theres a good deal of leftover script from the old R/S puzzle
Route110_TrickHousePuzzle7_OnResume: @ 826E0A6
Route110_TrickHousePuzzle7_OnResume:
call Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles
end
Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles:: @ 826E0AC
Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles::
call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn
call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn
call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn
@@ -21,57 +21,57 @@ Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles:: @ 826E0AC
return
@ Leftover from R/S, none of the below metatile scripts are ever called
Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn:: @ 826E0DA
Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn::
setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, 1
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn:: @ 826E0ED
Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn::
setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, 1
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn:: @ 826E100
Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn::
setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, 1
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn:: @ 826E113
Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn::
setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, 0
setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, 1
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn:: @ 826E126
Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn::
setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, 1
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff:: @ 826E139
Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff::
setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, 1
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff:: @ 826E14C
Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff::
setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, 1
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff:: @ 826E15F
Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff::
setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, 1
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff:: @ 826E172
Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff::
setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, 0
setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, 1
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff:: @ 826E185
Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff::
setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, 0
setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, 1
return
Route110_TrickHousePuzzle7_OnTransition: @ 826E198
Route110_TrickHousePuzzle7_OnTransition:
compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
goto_if_eq Route110_TrickHousePuzzle7_EventScript_TeleportedTransition
clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
@@ -81,36 +81,36 @@ Route110_TrickHousePuzzle7_OnTransition: @ 826E198
clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
end
Route110_TrickHousePuzzle7_EventScript_TeleportedTransition:: @ 826E1B3
Route110_TrickHousePuzzle7_EventScript_TeleportedTransition::
end
Route110_TrickHousePuzzle7_OnLoad: @ 826E1B4
Route110_TrickHousePuzzle7_OnLoad:
compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
call_if_eq Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles
end
Route110_TrickHousePuzzle7_OnFrame: @ 826E1C0
Route110_TrickHousePuzzle7_OnFrame:
map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_ClearState2
.2byte 0
Route110_TrickHousePuzzle7_EventScript_ClearState2:: @ 826E1CA
Route110_TrickHousePuzzle7_EventScript_ClearState2::
setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0
end
Route110_TrickHousePuzzle7_EventScript_Scroll:: @ 826E1D0
Route110_TrickHousePuzzle7_EventScript_Scroll::
lockall
compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
goto_if_eq Route110_TrickHousePuzzle7_EventScript_FoundScroll
goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
end
Route110_TrickHousePuzzle7_EventScript_FoundScroll:: @ 826E1E2
Route110_TrickHousePuzzle7_EventScript_FoundScroll::
setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1
goto Route110_TrickHousePuzzle_EventScript_FoundScroll
end
@ Unused, leftover from R/S
Route110_TrickHousePuzzle7_EventScript_TeleportPad:: @ 826E1ED
Route110_TrickHousePuzzle7_EventScript_TeleportPad::
lockall
setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19
@@ -119,7 +119,7 @@ Route110_TrickHousePuzzle7_EventScript_TeleportPad:: @ 826E1ED
end
@ All the below switch scripts are unused leftover from R/S
Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 826E1FE
Route110_TrickHousePuzzle7_EventScript_Switch1::
lockall
delay 32
call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn
@@ -130,7 +130,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 826E1FE
goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off
end
Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 826E22D
Route110_TrickHousePuzzle7_EventScript_Switch2::
lockall
delay 32
call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn
@@ -141,7 +141,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 826E22D
goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off
end
Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 826E25C
Route110_TrickHousePuzzle7_EventScript_Switch3::
lockall
delay 32
call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn
@@ -152,7 +152,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 826E25C
goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off
end
Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 826E28B
Route110_TrickHousePuzzle7_EventScript_Switch4::
lockall
delay 32
call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn
@@ -163,7 +163,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 826E28B
goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off
end
Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 826E2BA
Route110_TrickHousePuzzle7_EventScript_Switch5::
lockall
delay 32
call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn
@@ -175,58 +175,58 @@ Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 826E2BA
end
@ All the below switch scripts are unused leftover from R/S
Route110_TrickHousePuzzle7_EventScript_SetSwitch1On:: @ 826E2E9
Route110_TrickHousePuzzle7_EventScript_SetSwitch1On::
setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
releaseall
end
Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off:: @ 826E2EE
Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off::
clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
releaseall
end
Route110_TrickHousePuzzle7_EventScript_SetSwitch2On:: @ 826E2F3
Route110_TrickHousePuzzle7_EventScript_SetSwitch2On::
setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
releaseall
end
Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off:: @ 826E2F8
Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off::
clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
releaseall
end
Route110_TrickHousePuzzle7_EventScript_SetSwitch3On:: @ 826E2FD
Route110_TrickHousePuzzle7_EventScript_SetSwitch3On::
setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
releaseall
end
Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off:: @ 826E302
Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off::
clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
releaseall
end
Route110_TrickHousePuzzle7_EventScript_SetSwitch4On:: @ 826E307
Route110_TrickHousePuzzle7_EventScript_SetSwitch4On::
setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
releaseall
end
Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off:: @ 826E30C
Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off::
clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
releaseall
end
Route110_TrickHousePuzzle7_EventScript_SetSwitch5On:: @ 826E311
Route110_TrickHousePuzzle7_EventScript_SetSwitch5On::
setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
releaseall
end
Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off:: @ 826E316
Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off::
clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
releaseall
end
@ From here is where the new, actually used puzzle scripts begin
Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B
Route110_TrickHousePuzzle7_EventScript_YellowButton::
playse SE_SWITCH
waitse
playse SE_REPEL
@@ -238,7 +238,7 @@ Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B
freerotatingtilepuzzle
end
Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331
Route110_TrickHousePuzzle7_EventScript_BlueButton::
playse SE_SWITCH
waitse
playse SE_REPEL
@@ -250,7 +250,7 @@ Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331
freerotatingtilepuzzle
end
Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347
Route110_TrickHousePuzzle7_EventScript_GreenButton::
playse SE_SWITCH
waitse
playse SE_REPEL
@@ -262,7 +262,7 @@ Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347
freerotatingtilepuzzle
end
Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D
Route110_TrickHousePuzzle7_EventScript_PurpleButton::
playse SE_SWITCH
waitse
playse SE_REPEL
@@ -275,7 +275,7 @@ Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D
end
@ Unused
Route110_TrickHousePuzzle7_EventScript_RedButton:: @ 826E373
Route110_TrickHousePuzzle7_EventScript_RedButton::
playse SE_SWITCH
waitse
playse SE_REPEL
@@ -287,109 +287,109 @@ Route110_TrickHousePuzzle7_EventScript_RedButton:: @ 826E373
freerotatingtilepuzzle
end
Route110_TrickHousePuzzle7_EventScript_Joshua:: @ 826E389
Route110_TrickHousePuzzle7_EventScript_Joshua::
trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_JoshuaIntro, Route110_TrickHousePuzzle7_Text_JoshuaDefeat
msgbox Route110_TrickHousePuzzle7_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle7_EventScript_Patricia:: @ 826E3A0
Route110_TrickHousePuzzle7_EventScript_Patricia::
trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_PatriciaIntro, Route110_TrickHousePuzzle7_Text_PatriciaDefeat
msgbox Route110_TrickHousePuzzle7_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle7_EventScript_Alexis:: @ 826E3B7
Route110_TrickHousePuzzle7_EventScript_Alexis::
trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_AlexisIntro, Route110_TrickHousePuzzle7_Text_AlexisDefeat
msgbox Route110_TrickHousePuzzle7_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle7_EventScript_Mariela:: @ 826E3CE
Route110_TrickHousePuzzle7_EventScript_Mariela::
trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_MarielaIntro, Route110_TrickHousePuzzle7_Text_MarielaDefeat
msgbox Route110_TrickHousePuzzle7_Text_MarielaPostBattle, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle7_EventScript_Alvaro:: @ 826E3E5
Route110_TrickHousePuzzle7_EventScript_Alvaro::
trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_AlvaroIntro, Route110_TrickHousePuzzle7_Text_AlvaroDefeat
msgbox Route110_TrickHousePuzzle7_Text_AlvaroPostBattle, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle7_EventScript_Everett:: @ 826E3FC
Route110_TrickHousePuzzle7_EventScript_Everett::
trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_EverettIntro, Route110_TrickHousePuzzle7_Text_EverettDefeat
msgbox Route110_TrickHousePuzzle7_Text_EverettPostBattle, MSGBOX_AUTOCLOSE
end
Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened:: @ 826E413
Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened::
.string "{PLAYER} wrote down the secret code\n"
.string "on the door.\p"
.string "“TRICK MASTER is huggable.”\n"
.string "… … … … … … … …\p"
.string "The lock clicked open!$"
Route110_TrickHousePuzzle7_Text_JoshuaIntro: @ 826E481
Route110_TrickHousePuzzle7_Text_JoshuaIntro:
.string "The TRICK MASTER always vanishes\n"
.string "like smoke. How does he do it?$"
Route110_TrickHousePuzzle7_Text_JoshuaDefeat: @ 826E4C1
Route110_TrickHousePuzzle7_Text_JoshuaDefeat:
.string "Aiyeeeh! You're much too strong!\n"
.string "How do you do it?$"
Route110_TrickHousePuzzle7_Text_JoshuaPostBattle: @ 826E4F4
Route110_TrickHousePuzzle7_Text_JoshuaPostBattle:
.string "I wish I could appear and disappear as\n"
.string "if I were smoke, too.$"
Route110_TrickHousePuzzle7_Text_PatriciaIntro: @ 826E531
Route110_TrickHousePuzzle7_Text_PatriciaIntro:
.string "Going around the same spot…\n"
.string "It begets ill fortune…$"
Route110_TrickHousePuzzle7_Text_PatriciaDefeat: @ 826E564
Route110_TrickHousePuzzle7_Text_PatriciaDefeat:
.string "Defeated!\n"
.string "It's a bad sign…$"
Route110_TrickHousePuzzle7_Text_PatriciaPostBattle: @ 826E57F
Route110_TrickHousePuzzle7_Text_PatriciaPostBattle:
.string "I've circled the same spot over ten\n"
.string "times now… It's ill fortune…$"
Route110_TrickHousePuzzle7_Text_AlexisIntro: @ 826E5C0
Route110_TrickHousePuzzle7_Text_AlexisIntro:
.string "Whoever wins will get through here\n"
.string "first. That's the feeling I get.$"
Route110_TrickHousePuzzle7_Text_AlexisDefeat: @ 826E604
Route110_TrickHousePuzzle7_Text_AlexisDefeat:
.string "Oh!\n"
.string "Well, go ahead, then!$"
Route110_TrickHousePuzzle7_Text_AlexisPostBattle: @ 826E61E
Route110_TrickHousePuzzle7_Text_AlexisPostBattle:
.string "You're solving all the puzzles in the\n"
.string "TRICK HOUSE. That's the feeling I get.$"
Route110_TrickHousePuzzle7_Text_MarielaIntro: @ 826E66B
Route110_TrickHousePuzzle7_Text_MarielaIntro:
.string "Nufufufu, here at last!\n"
.string "Let's get right with it!$"
Route110_TrickHousePuzzle7_Text_MarielaDefeat: @ 826E69C
Route110_TrickHousePuzzle7_Text_MarielaDefeat:
.string "You're so casual about winning!$"
Route110_TrickHousePuzzle7_Text_MarielaPostBattle: @ 826E6BC
Route110_TrickHousePuzzle7_Text_MarielaPostBattle:
.string "Humph! I'm not upset!\n"
.string "Not me!$"
Route110_TrickHousePuzzle7_Text_AlvaroIntro: @ 826E6DA
Route110_TrickHousePuzzle7_Text_AlvaroIntro:
.string "I ever so closely watched you coming!$"
Route110_TrickHousePuzzle7_Text_AlvaroDefeat: @ 826E700
Route110_TrickHousePuzzle7_Text_AlvaroDefeat:
.string "This outcome I didn't see coming…$"
Route110_TrickHousePuzzle7_Text_AlvaroPostBattle: @ 826E722
Route110_TrickHousePuzzle7_Text_AlvaroPostBattle:
.string "Well, anyway, we both picked a weird\n"
.string "place to get acquainted.\p"
.string "As one weirdo to another,\n"
.string "let's do our best!$"
Route110_TrickHousePuzzle7_Text_EverettIntro: @ 826E78D
Route110_TrickHousePuzzle7_Text_EverettIntro:
.string "It's awfully cramped in here…$"
Route110_TrickHousePuzzle7_Text_EverettDefeat: @ 826E7AB
Route110_TrickHousePuzzle7_Text_EverettDefeat:
.string "Oh, yes, strong you are.$"
Route110_TrickHousePuzzle7_Text_EverettPostBattle: @ 826E7C4
Route110_TrickHousePuzzle7_Text_EverettPostBattle:
.string "I was hoping to switch places with you\n"
.string "when I beat you, but…$"