diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cave_of_origin.inc | 23 | ||||
| -rw-r--r-- | data/scripts/new_game.inc | 2 |
2 files changed, 11 insertions, 14 deletions
diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc index da4a97761..52a1da84f 100644 --- a/data/scripts/cave_of_origin.inc +++ b/data/scripts/cave_of_origin.inc @@ -1,32 +1,32 @@ @ All unused / leftover scripts from RS -EventScript_272274:: @ 8272274 +CaveOfOrigin_EventScript_LegendaryCry:: @ 8272274 lockall waitse - playmoncry SPECIES_KYOGRE, 2 + playmoncry SPECIES_KYOGRE, 2 @ SPECIES_GROUDON in Ruby waitmoncry setvar VAR_TEMP_5, 1 releaseall end -EventScript_272283:: @ 8272283 +CaveOfOrigin_EventScript_Shake1:: @ 8272283 lockall setvar VAR_TEMP_1, 1 - goto EventScript_2722A7 + goto CaveOfOrigin_EventScript_Shake end -EventScript_27228F:: @ 827228F +CaveOfOrigin_EventScript_Shake2:: @ 827228F lockall setvar VAR_TEMP_2, 1 - goto EventScript_2722A7 + goto CaveOfOrigin_EventScript_Shake end -EventScript_27229B:: @ 827229B +CaveOfOrigin_EventScript_Shake3:: @ 827229B lockall setvar VAR_TEMP_3, 1 - goto EventScript_2722A7 + goto CaveOfOrigin_EventScript_Shake end -EventScript_2722A7:: @ 82722A7 +CaveOfOrigin_EventScript_Shake:: @ 82722A7 setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan setvar VAR_0x8006, 8 @ num shakes @@ -36,10 +36,7 @@ EventScript_2722A7:: @ 82722A7 releaseall end -CaveOfOrigin_1F_EventScript_2722C1:: @ 82722C1 -CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1:: @ 82722C1 -CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1:: @ 82722C1 -CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1 +CaveOfOrigin_EventScript_SetTempVars:: @ 82722C1 setvar VAR_TEMP_1, 1 setvar VAR_TEMP_2, 1 setvar VAR_TEMP_3, 1 diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index c88208708..4357199c4 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -240,6 +240,6 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT setflag FLAG_HIDE_SKY_PILLAR_WALLACE - setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT + setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT call EventScript_ResetAllBerries end |