summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-03-03 22:09:22 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-03-03 22:23:40 -0500
commit4c1d30a832439e9a4b2a0a43f281ca11150a09b5 (patch)
treeef969872c80517c7c2a7487044a4c0f703e070a6 /data/maps
parent9fbe7e14a898aadbef5d8fe4cd44507d02d1a991 (diff)
Add more metatile labels
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/FiveIsland_RocketWarehouse/scripts.inc4
-rw-r--r--data/maps/RocketHideout_B1F/scripts.inc24
-rw-r--r--data/maps/RocketHideout_B4F/scripts.inc24
3 files changed, 26 insertions, 26 deletions
diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
index dfcb6e43f..fec6e0262 100644
--- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc
+++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
@@ -21,8 +21,8 @@ FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D
end
FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry:: @ 8163F47
- setmetatile 26, 20, METATILE_Hideout_Arrow_Up, 0
- setmetatile 27, 20, METATILE_Hideout_Arrow_Up, 0
+ setmetatile 26, 20, METATILE_SilphCo_Arrow_Up, 0
+ setmetatile 27, 20, METATILE_SilphCo_Arrow_Up, 0
return
FiveIsland_RocketWarehouse_EventScript_Cage:: @ 8163F5A
diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc
index ac95862a2..6149ac0c2 100644
--- a/data/maps/RocketHideout_B1F/scripts.inc
+++ b/data/maps/RocketHideout_B1F/scripts.inc
@@ -45,19 +45,19 @@ RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225
end
RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233
- setmetatile 20, 19, METATILE_Hideout_Barrier_TopLeft_Floor, 1
- setmetatile 21, 19, METATILE_Hideout_Barrier_TopRight_Floor, 1
- setmetatile 20, 20, METATILE_Hideout_Barrier_BottomLeft, 1
- setmetatile 21, 20, METATILE_Hideout_Barrier_BottomRight, 1
- setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0
- setmetatile 21, 21, METATILE_Hideout_Floor_ShadeFull, 0
+ setmetatile 20, 19, METATILE_SilphCo_HideoutBarrier_TopLeft_Floor, 1
+ setmetatile 21, 19, METATILE_SilphCo_HideoutBarrier_TopRight_Floor, 1
+ setmetatile 20, 20, METATILE_SilphCo_HideoutBarrier_BottomLeft, 1
+ setmetatile 21, 20, METATILE_SilphCo_HideoutBarrier_BottomRight, 1
+ setmetatile 20, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
+ setmetatile 21, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
return
RocketHideout_B1F_EventScript_RemoveBarrier:: @ 816126A
- setmetatile 20, 19, METATILE_Hideout_Floor_ShadeFull, 0
- setmetatile 21, 19, METATILE_Hideout_Floor, 0
- setmetatile 20, 20, METATILE_Hideout_Floor_ShadeFull, 0
- setmetatile 21, 20, METATILE_Hideout_Floor, 0
- setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0
- setmetatile 21, 21, METATILE_Hideout_Floor, 0
+ setmetatile 20, 19, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
+ setmetatile 21, 19, METATILE_SilphCo_HideoutFloor, 0
+ setmetatile 20, 20, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
+ setmetatile 21, 20, METATILE_SilphCo_HideoutFloor, 0
+ setmetatile 20, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
+ setmetatile 21, 21, METATILE_SilphCo_HideoutFloor, 0
return
diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc
index 63fff7d82..5919b342f 100644
--- a/data/maps/RocketHideout_B4F/scripts.inc
+++ b/data/maps/RocketHideout_B4F/scripts.inc
@@ -114,19 +114,19 @@ RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462
return
RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A
- setmetatile 17, 12, METATILE_Hideout_Barrier_TopLeft_Floor, 1
- setmetatile 18, 12, METATILE_Hideout_Barrier_TopRight_Floor, 1
- setmetatile 17, 13, METATILE_Hideout_Barrier_BottomLeft, 1
- setmetatile 18, 13, METATILE_Hideout_Barrier_BottomRight, 1
- setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0
- setmetatile 18, 14, METATILE_Hideout_Floor_ShadeFull, 0
+ setmetatile 17, 12, METATILE_SilphCo_HideoutBarrier_TopLeft_Floor, 1
+ setmetatile 18, 12, METATILE_SilphCo_HideoutBarrier_TopRight_Floor, 1
+ setmetatile 17, 13, METATILE_SilphCo_HideoutBarrier_BottomLeft, 1
+ setmetatile 18, 13, METATILE_SilphCo_HideoutBarrier_BottomRight, 1
+ setmetatile 17, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
+ setmetatile 18, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
return
RocketHideout_B4F_EventScript_RemoveBarrier:: @ 81614A1
- setmetatile 17, 12, METATILE_Hideout_Floor_ShadeFull, 0
- setmetatile 18, 12, METATILE_Hideout_Floor, 0
- setmetatile 17, 13, METATILE_Hideout_Floor_ShadeFull, 0
- setmetatile 18, 13, METATILE_Hideout_Floor, 0
- setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0
- setmetatile 18, 14, METATILE_Hideout_Floor, 0
+ setmetatile 17, 12, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
+ setmetatile 18, 12, METATILE_SilphCo_HideoutFloor, 0
+ setmetatile 17, 13, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
+ setmetatile 18, 13, METATILE_SilphCo_HideoutFloor, 0
+ setmetatile 17, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
+ setmetatile 18, 14, METATILE_SilphCo_HideoutFloor, 0
return