summaryrefslogtreecommitdiff
path: root/data/maps/AncientTomb/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/AncientTomb/scripts.inc')
-rw-r--r--data/maps/AncientTomb/scripts.inc64
1 files changed, 32 insertions, 32 deletions
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index 9bc404af6..95dd85d28 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -1,34 +1,34 @@
AncientTomb_MapScripts:: @ 8238FB3
- map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3
- map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2
+ map_script MAP_SCRIPT_ON_RESUME, AncientTomb_OnResume
+ map_script MAP_SCRIPT_ON_LOAD, AncientTomb_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition
.byte 0
-AncientTomb_MapScript1_238FC3: @ 8238FC3
- call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_238FCD
+AncientTomb_OnResume: @ 8238FC3
+ call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_TryRemoveRegisteel
end
-AncientTomb_EventScript_238FCD:: @ 8238FCD
+AncientTomb_EventScript_TryRemoveRegisteel:: @ 8238FCD
specialvar VAR_RESULT, GetBattleOutcome
- compare VAR_RESULT, 7
+ compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return
AncientTomb_OnTransition: @ 8238FE1
setflag FLAG_LANDMARK_ANCIENT_TOMB
- call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE
+ call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_ShowRegisteel
end
-AncientTomb_EventScript_238FEE:: @ 8238FEE
+AncientTomb_EventScript_ShowRegisteel:: @ 8238FEE
clearflag FLAG_HIDE_REGISTEEL
return
-AncientTomb_MapScript1_238FF2: @ 8238FF2
- call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_238FFC
+AncientTomb_OnLoad: @ 8238FF2
+ call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_HideRegiEntrance
end
-AncientTomb_EventScript_238FFC:: @ 8238FFC
+AncientTomb_EventScript_HideRegiEntrance:: @ 8238FFC
setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
@@ -37,29 +37,29 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC
setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
return
-AncientTomb_EventScript_239033:: @ 8239033
+AncientTomb_EventScript_CaveEntranceMiddle:: @ 8239033
lockall
- goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_239046
- braillemessage AncientTomb_Braille_2A6D06
+ goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_BigHoleInWall
+ braillemessage AncientTomb_Braille_ShineInTheMiddle
waitbuttonpress
- hidebox2
+ closebraillemessage
releaseall
end
-AncientTomb_EventScript_239046:: @ 8239046
- msgbox gUnknown_0827304E, MSGBOX_DEFAULT
+AncientTomb_EventScript_BigHoleInWall:: @ 8239046
+ msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
releaseall
end
-AncientTomb_EventScript_239050:: @ 8239050
+AncientTomb_EventScript_CaveEntranceSide:: @ 8239050
lockall
- braillemessage AncientTomb_Braille_2A6D06
+ braillemessage AncientTomb_Braille_ShineInTheMiddle
waitbuttonpress
- hidebox2
+ closebraillemessage
releaseall
end
-AncientTomb_EventScript_23905A:: @ 823905A
+AncientTomb_EventScript_Registeel:: @ 823905A
lock
faceplayer
waitse
@@ -72,23 +72,23 @@ AncientTomb_EventScript_23905A:: @ 823905A
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
- compare VAR_RESULT, 1
- goto_if_eq AncientTomb_EventScript_2390A1
- compare VAR_RESULT, 4
- goto_if_eq AncientTomb_EventScript_2390AA
- compare VAR_RESULT, 5
- goto_if_eq AncientTomb_EventScript_2390AA
+ compare VAR_RESULT, B_OUTCOME_WON
+ goto_if_eq AncientTomb_EventScript_DefeatedRegisteel
+ compare VAR_RESULT, B_OUTCOME_RAN
+ goto_if_eq AncientTomb_EventScript_RanFromRegisteel
+ compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
+ goto_if_eq AncientTomb_EventScript_RanFromRegisteel
setflag FLAG_DEFEATED_REGISTEEL
release
end
-AncientTomb_EventScript_2390A1:: @ 82390A1
+AncientTomb_EventScript_DefeatedRegisteel:: @ 82390A1
setflag FLAG_DEFEATED_REGISTEEL
- goto AncientTomb_EventScript_27376D
+ goto Common_EventScript_RemoveStaticPokemon
end
-AncientTomb_EventScript_2390AA:: @ 82390AA
- setvar VAR_0x8004, 403
- goto AncientTomb_EventScript_273776
+AncientTomb_EventScript_RanFromRegisteel:: @ 82390AA
+ setvar VAR_0x8004, SPECIES_REGISTEEL
+ goto Common_EventScript_LegendaryFlewAway
end