Add more metatile labels
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1162,27 +1162,27 @@ CableClub_EventScript_AdapterNotConnected:: @ 81BC016
|
||||
end
|
||||
|
||||
CableClub_EventScript_OpenUnionRoomBarrier:: @ 81BC020
|
||||
setmetatile 5, 3, 709, 0
|
||||
setmetatile 5, 3, METATILE_PokemonCenter_Floor_ShadeLeft, 0
|
||||
return
|
||||
|
||||
CableClub_EventScript_CloseUnionRoomBarrier:: @ 81BC02A
|
||||
setmetatile 5, 3, 761, 1
|
||||
setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1
|
||||
return
|
||||
|
||||
CableClub_EventScript_OpenDirectCornerBarrier:: @ 81BC034
|
||||
setmetatile 9, 3, 709, 0
|
||||
setmetatile 9, 3, METATILE_PokemonCenter_Floor_ShadeLeft, 0
|
||||
return
|
||||
|
||||
CableClub_EventScript_CloseDirectCornerBarrier:: @ 81BC03E
|
||||
setmetatile 9, 3, 761, 1
|
||||
setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1
|
||||
return
|
||||
|
||||
CableClub_EventScript_OpenGameCornerBarrier:: @ 81BC048
|
||||
setmetatile 5, 3, 737, 0
|
||||
setmetatile 5, 3, METATILE_GameCorner_CheckeredFloor_ShadeLeft, 0
|
||||
return
|
||||
|
||||
CableClub_EventScript_CloseGameCornerBarrier:: @ 81BC052
|
||||
setmetatile 5, 3, 759, 1
|
||||
setmetatile 5, 3, METATILE_GameCorner_CounterBarrier, 1
|
||||
return
|
||||
|
||||
CableClub_OnResume:: @ 81BC05C
|
||||
|
||||
+239
-239
@@ -9,347 +9,347 @@ EventScript_DoorUnlocked:: @ 81A813F
|
||||
end
|
||||
|
||||
EventScript_Close2FDoor1:: @ 81A8149
|
||||
setmetatile 5, 8, 944, 1
|
||||
setmetatile 6, 8, 945, 1
|
||||
setmetatile 5, 9, 952, 1
|
||||
setmetatile 6, 9, 953, 1
|
||||
setmetatile 6, 10, 821, 0
|
||||
setmetatile 5, 8, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 6, 8, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 5, 9, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 6, 9, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 6, 10, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Close2FDoor2:: @ 81A8177
|
||||
setmetatile 5, 15, 944, 1
|
||||
setmetatile 6, 15, 945, 1
|
||||
setmetatile 5, 16, 952, 1
|
||||
setmetatile 6, 16, 953, 1
|
||||
setmetatile 6, 17, 821, 0
|
||||
setmetatile 5, 15, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 6, 15, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 5, 16, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 6, 16, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 6, 17, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Close3FDoor1:: @ 81A81A5
|
||||
setmetatile 9, 11, 960, 1
|
||||
setmetatile 10, 11, 961, 1
|
||||
setmetatile 9, 12, 962, 1
|
||||
setmetatile 10, 12, 963, 1
|
||||
setmetatile 9, 13, 964, 1
|
||||
setmetatile 10, 13, 965, 1
|
||||
setmetatile 9, 11, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
|
||||
setmetatile 10, 11, METATILE_SilphCo_VerticalBarrier_TopRight, 1
|
||||
setmetatile 9, 12, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
|
||||
setmetatile 10, 12, METATILE_SilphCo_VerticalBarrier_MidRight, 1
|
||||
setmetatile 9, 13, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
|
||||
setmetatile 10, 13, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
|
||||
return
|
||||
|
||||
EventScript_Close3FDoor2:: @ 81A81DC
|
||||
setmetatile 20, 11, 960, 1
|
||||
setmetatile 21, 11, 961, 1
|
||||
setmetatile 20, 12, 962, 1
|
||||
setmetatile 21, 12, 963, 1
|
||||
setmetatile 20, 13, 964, 1
|
||||
setmetatile 21, 13, 965, 1
|
||||
setmetatile 20, 11, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
|
||||
setmetatile 21, 11, METATILE_SilphCo_VerticalBarrier_TopRight, 1
|
||||
setmetatile 20, 12, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
|
||||
setmetatile 21, 12, METATILE_SilphCo_VerticalBarrier_MidRight, 1
|
||||
setmetatile 20, 13, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
|
||||
setmetatile 21, 13, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
|
||||
return
|
||||
|
||||
EventScript_Close4FDoor1:: @ 81A8213
|
||||
setmetatile 3, 16, 944, 1
|
||||
setmetatile 4, 16, 945, 1
|
||||
setmetatile 3, 17, 952, 1
|
||||
setmetatile 4, 17, 953, 1
|
||||
setmetatile 4, 18, 821, 0
|
||||
setmetatile 3, 16, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 4, 16, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 3, 17, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 4, 17, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 4, 18, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Close4FDoor2:: @ 81A8241
|
||||
setmetatile 14, 11, 944, 1
|
||||
setmetatile 15, 11, 945, 1
|
||||
setmetatile 14, 12, 952, 1
|
||||
setmetatile 15, 12, 953, 1
|
||||
setmetatile 15, 13, 821, 0
|
||||
setmetatile 14, 11, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 15, 11, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 14, 12, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 15, 12, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 15, 13, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Close5FDoor1:: @ 81A826F
|
||||
setmetatile 7, 8, 960, 1
|
||||
setmetatile 8, 8, 961, 1
|
||||
setmetatile 7, 9, 962, 1
|
||||
setmetatile 8, 9, 963, 1
|
||||
setmetatile 7, 10, 964, 1
|
||||
setmetatile 8, 10, 965, 1
|
||||
EventScript_Close5FDoor1:: @ 81AMETATILE_SilphCo_Floor_WallRightCornerF
|
||||
setmetatile 7, 8, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
|
||||
setmetatile 8, 8, METATILE_SilphCo_VerticalBarrier_TopRight, 1
|
||||
setmetatile 7, 9, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
|
||||
setmetatile 8, 9, METATILE_SilphCo_VerticalBarrier_MidRight, 1
|
||||
setmetatile 7, 10, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
|
||||
setmetatile 8, 10, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
|
||||
return
|
||||
|
||||
EventScript_Close5FDoor2:: @ 81A82A6
|
||||
setmetatile 7, 17, 960, 1
|
||||
setmetatile 8, 17, 961, 1
|
||||
setmetatile 7, 18, 962, 1
|
||||
setmetatile 8, 18, 963, 1
|
||||
setmetatile 7, 19, 964, 1
|
||||
setmetatile 8, 19, 965, 1
|
||||
setmetatile 7, 17, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
|
||||
setmetatile 8, 17, METATILE_SilphCo_VerticalBarrier_TopRight, 1
|
||||
setmetatile 7, 18, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
|
||||
setmetatile 8, 18, METATILE_SilphCo_VerticalBarrier_MidRight, 1
|
||||
setmetatile 7, 19, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
|
||||
setmetatile 8, 19, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
|
||||
return
|
||||
|
||||
EventScript_Close5FDoor3:: @ 81A82DD
|
||||
setmetatile 18, 12, 960, 1
|
||||
setmetatile 19, 12, 961, 1
|
||||
setmetatile 18, 13, 962, 1
|
||||
setmetatile 19, 13, 963, 1
|
||||
setmetatile 18, 14, 964, 1
|
||||
setmetatile 19, 14, 965, 1
|
||||
setmetatile 18, 12, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
|
||||
setmetatile 19, 12, METATILE_SilphCo_VerticalBarrier_TopRight, 1
|
||||
setmetatile 18, 13, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
|
||||
setmetatile 19, 13, METATILE_SilphCo_VerticalBarrier_MidRight, 1
|
||||
setmetatile 18, 14, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
|
||||
setmetatile 19, 14, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
|
||||
return
|
||||
|
||||
EventScript_Close6FDoor:: @ 81A8314
|
||||
setmetatile 5, 14, 960, 1
|
||||
setmetatile 6, 14, 961, 1
|
||||
setmetatile 5, 15, 962, 1
|
||||
setmetatile 6, 15, 963, 1
|
||||
setmetatile 5, 16, 964, 1
|
||||
setmetatile 6, 16, 965, 1
|
||||
setmetatile 5, 14, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
|
||||
setmetatile 6, 14, METATILE_SilphCo_VerticalBarrier_TopRight, 1
|
||||
setmetatile 5, 15, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
|
||||
setmetatile 6, 15, METATILE_SilphCo_VerticalBarrier_MidRight, 1
|
||||
setmetatile 5, 16, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
|
||||
setmetatile 6, 16, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
|
||||
return
|
||||
|
||||
EventScript_Close7FDoor1:: @ 81A834B
|
||||
setmetatile 11, 8, 944, 1
|
||||
setmetatile 12, 8, 945, 1
|
||||
setmetatile 11, 9, 952, 1
|
||||
setmetatile 12, 9, 953, 1
|
||||
setmetatile 12, 10, 821, 0
|
||||
setmetatile 11, 8, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 12, 8, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 11, 9, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 12, 9, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 12, 10, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Close7FDoor2:: @ 81A8379
|
||||
setmetatile 24, 7, 944, 1
|
||||
setmetatile 25, 7, 945, 1
|
||||
setmetatile 24, 8, 952, 1
|
||||
setmetatile 25, 8, 953, 1
|
||||
setmetatile 25, 9, 821, 0
|
||||
setmetatile 24, 7, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 25, 7, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 24, 8, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 25, 8, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 25, 9, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Close7FDoor3:: @ 81A83A7
|
||||
setmetatile 25, 13, 944, 1
|
||||
setmetatile 26, 13, 945, 1
|
||||
setmetatile 25, 14, 952, 1
|
||||
setmetatile 26, 14, 953, 1
|
||||
setmetatile 26, 15, 821, 0
|
||||
setmetatile 25, 13, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 26, 13, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 25, 14, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 26, 14, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 26, 15, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Close8FDoor:: @ 81A83D5
|
||||
setmetatile 5, 9, 960, 1
|
||||
setmetatile 6, 9, 961, 1
|
||||
setmetatile 5, 10, 962, 1
|
||||
setmetatile 6, 10, 963, 1
|
||||
setmetatile 5, 11, 964, 1
|
||||
setmetatile 6, 11, 965, 1
|
||||
setmetatile 5, 9, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
|
||||
setmetatile 6, 9, METATILE_SilphCo_VerticalBarrier_TopRight, 1
|
||||
setmetatile 5, 10, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
|
||||
setmetatile 6, 10, METATILE_SilphCo_VerticalBarrier_MidRight, 1
|
||||
setmetatile 5, 11, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
|
||||
setmetatile 6, 11, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
|
||||
return
|
||||
|
||||
EventScript_Close9FDoor1:: @ 81A840C
|
||||
setmetatile 2, 9, 960, 1
|
||||
setmetatile 3, 9, 961, 1
|
||||
setmetatile 2, 10, 962, 1
|
||||
setmetatile 3, 10, 963, 1
|
||||
setmetatile 2, 11, 964, 1
|
||||
setmetatile 3, 11, 965, 1
|
||||
setmetatile 2, 9, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
|
||||
setmetatile 3, 9, METATILE_SilphCo_VerticalBarrier_TopRight, 1
|
||||
setmetatile 2, 10, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
|
||||
setmetatile 3, 10, METATILE_SilphCo_VerticalBarrier_MidRight, 1
|
||||
setmetatile 2, 11, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
|
||||
setmetatile 3, 11, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
|
||||
return
|
||||
|
||||
EventScript_Close9FDoor2:: @ 81A8443
|
||||
setmetatile 12, 15, 960, 1
|
||||
setmetatile 13, 15, 961, 1
|
||||
setmetatile 12, 16, 962, 1
|
||||
setmetatile 13, 16, 963, 1
|
||||
setmetatile 12, 17, 964, 1
|
||||
setmetatile 13, 17, 965, 1
|
||||
setmetatile 12, 15, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
|
||||
setmetatile 13, 15, METATILE_SilphCo_VerticalBarrier_TopRight, 1
|
||||
setmetatile 12, 16, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
|
||||
setmetatile 13, 16, METATILE_SilphCo_VerticalBarrier_MidRight, 1
|
||||
setmetatile 12, 17, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
|
||||
setmetatile 13, 17, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
|
||||
return
|
||||
|
||||
EventScript_Close9FDoor3:: @ 81A847A
|
||||
setmetatile 21, 6, 944, 1
|
||||
setmetatile 22, 6, 945, 1
|
||||
setmetatile 21, 7, 952, 1
|
||||
setmetatile 22, 7, 953, 1
|
||||
setmetatile 22, 8, 821, 0
|
||||
setmetatile 21, 6, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 22, 6, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 21, 7, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 22, 7, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 22, 8, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Close9FDoor4:: @ 81A84A8
|
||||
setmetatile 21, 12, 944, 1
|
||||
setmetatile 22, 12, 945, 1
|
||||
setmetatile 21, 13, 952, 1
|
||||
setmetatile 22, 13, 953, 1
|
||||
setmetatile 22, 14, 821, 0
|
||||
setmetatile 21, 12, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 22, 12, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 21, 13, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 22, 13, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 22, 14, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Close10FDoor:: @ 81A84D6
|
||||
setmetatile 12, 11, 944, 1
|
||||
setmetatile 13, 11, 945, 1
|
||||
setmetatile 12, 12, 952, 1
|
||||
setmetatile 13, 12, 953, 1
|
||||
setmetatile 13, 13, 821, 0
|
||||
setmetatile 12, 11, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 13, 11, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 12, 12, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 13, 12, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 13, 13, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Close11FDoor:: @ 81A8504
|
||||
setmetatile 5, 16, 944, 1
|
||||
setmetatile 6, 16, 945, 1
|
||||
setmetatile 5, 17, 952, 1
|
||||
setmetatile 6, 17, 953, 1
|
||||
setmetatile 6, 18, 821, 0
|
||||
setmetatile 5, 16, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
|
||||
setmetatile 6, 16, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
|
||||
setmetatile 5, 17, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
|
||||
setmetatile 6, 17, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
|
||||
setmetatile 6, 18, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
return
|
||||
|
||||
EventScript_Open2FDoor1:: @ 81A8532
|
||||
setmetatile 5, 8, 821, 0
|
||||
setmetatile 6, 8, 820, 0
|
||||
setmetatile 5, 9, 821, 0
|
||||
setmetatile 6, 9, 820, 0
|
||||
setmetatile 6, 10, 820, 0
|
||||
setmetatile 5, 8, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 6, 8, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 5, 9, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 6, 9, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 6, 10, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
EventScript_Open2FDoor2:: @ 81A8560
|
||||
setmetatile 5, 15, 821, 0
|
||||
setmetatile 6, 15, 820, 0
|
||||
setmetatile 5, 16, 821, 0
|
||||
setmetatile 6, 16, 820, 0
|
||||
setmetatile 6, 17, 820, 0
|
||||
setmetatile 5, 15, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 6, 15, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 5, 16, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 6, 16, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 6, 17, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
EventScript_Open3FDoor1:: @ 81A858E
|
||||
setmetatile 9, 11, 839, 1
|
||||
setmetatile 10, 11, 838, 1
|
||||
setmetatile 9, 12, 821, 0
|
||||
setmetatile 10, 12, 821, 0
|
||||
setmetatile 9, 13, 825, 0
|
||||
setmetatile 10, 13, 826, 0
|
||||
setmetatile 9, 11, METATILE_SilphCo_Wall_LeftEdge, 1
|
||||
setmetatile 10, 11, METATILE_SilphCo_Wall_RightEdge, 1
|
||||
setmetatile 9, 12, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 10, 12, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 9, 13, METATILE_SilphCo_Floor_WallLeftCorner, 0
|
||||
setmetatile 10, 13, METATILE_SilphCo_Floor_WallRightCorner, 0
|
||||
return
|
||||
|
||||
EventScript_Open3FDoor2:: @ 81A85C5
|
||||
setmetatile 20, 11, 839, 1
|
||||
setmetatile 21, 11, 838, 1
|
||||
setmetatile 20, 12, 821, 0
|
||||
setmetatile 21, 12, 821, 0
|
||||
setmetatile 20, 13, 825, 0
|
||||
setmetatile 21, 13, 826, 0
|
||||
setmetatile 20, 11, METATILE_SilphCo_Wall_LeftEdge, 1
|
||||
setmetatile 21, 11, METATILE_SilphCo_Wall_RightEdge, 1
|
||||
setmetatile 20, 12, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 21, 12, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 20, 13, METATILE_SilphCo_Floor_WallLeftCorner, 0
|
||||
setmetatile 21, 13, METATILE_SilphCo_Floor_WallRightCorner, 0
|
||||
return
|
||||
|
||||
EventScript_Open4FDoor1:: @ 81A85FC
|
||||
setmetatile 3, 16, 821, 0
|
||||
setmetatile 4, 16, 820, 0
|
||||
setmetatile 3, 17, 821, 0
|
||||
setmetatile 4, 17, 820, 0
|
||||
setmetatile 4, 18, 820, 0
|
||||
setmetatile 3, 16, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 4, 16, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 3, 17, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 4, 17, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 4, 18, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
EventScript_Open4FDoor2:: @ 81A862A
|
||||
setmetatile 14, 11, 821, 0
|
||||
setmetatile 15, 11, 820, 0
|
||||
setmetatile 14, 12, 821, 0
|
||||
setmetatile 15, 12, 820, 0
|
||||
setmetatile 15, 13, 820, 0
|
||||
setmetatile 14, 11, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 15, 11, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 14, 12, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 15, 12, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 15, 13, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
EventScript_Open5FDoor1:: @ 81A8658
|
||||
setmetatile 7, 8, 839, 1
|
||||
setmetatile 8, 8, 838, 1
|
||||
setmetatile 7, 9, 821, 0
|
||||
setmetatile 8, 9, 821, 0
|
||||
setmetatile 7, 10, 825, 0
|
||||
setmetatile 8, 10, 826, 0
|
||||
setmetatile 7, 8, METATILE_SilphCo_Wall_LeftEdge, 1
|
||||
setmetatile 8, 8, METATILE_SilphCo_Wall_RightEdge, 1
|
||||
setmetatile 7, 9, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 8, 9, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 7, 10, METATILE_SilphCo_Floor_WallLeftCorner, 0
|
||||
setmetatile 8, 10, METATILE_SilphCo_Floor_WallRightCorner, 0
|
||||
return
|
||||
|
||||
EventScript_Open5FDoor2:: @ 81A868F
|
||||
setmetatile 7, 17, 839, 1
|
||||
setmetatile 8, 17, 838, 1
|
||||
setmetatile 7, 18, 821, 0
|
||||
setmetatile 8, 18, 821, 0
|
||||
setmetatile 7, 19, 825, 0
|
||||
setmetatile 8, 19, 826, 0
|
||||
setmetatile 7, 17, METATILE_SilphCo_Wall_LeftEdge, 1
|
||||
setmetatile 8, 17, METATILE_SilphCo_Wall_RightEdge, 1
|
||||
setmetatile 7, 18, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 8, 18, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 7, 19, METATILE_SilphCo_Floor_WallLeftCorner, 0
|
||||
setmetatile 8, 19, METATILE_SilphCo_Floor_WallRightCorner, 0
|
||||
return
|
||||
|
||||
EventScript_Open5FDoor3:: @ 81A86C6
|
||||
setmetatile 18, 12, 839, 1
|
||||
setmetatile 19, 12, 838, 1
|
||||
setmetatile 18, 13, 821, 0
|
||||
setmetatile 19, 13, 821, 0
|
||||
setmetatile 18, 14, 825, 0
|
||||
setmetatile 19, 14, 826, 0
|
||||
setmetatile 18, 12, METATILE_SilphCo_Wall_LeftEdge, 1
|
||||
setmetatile 19, 12, METATILE_SilphCo_Wall_RightEdge, 1
|
||||
setmetatile 18, 13, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 19, 13, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 18, 14, METATILE_SilphCo_Floor_WallLeftCorner, 0
|
||||
setmetatile 19, 14, METATILE_SilphCo_Floor_WallRightCorner, 0
|
||||
return
|
||||
|
||||
EventScript_Open6FDoor:: @ 81A86FD
|
||||
setmetatile 5, 14, 839, 1
|
||||
setmetatile 6, 14, 838, 1
|
||||
setmetatile 5, 15, 821, 0
|
||||
setmetatile 6, 15, 821, 0
|
||||
setmetatile 5, 16, 825, 0
|
||||
setmetatile 6, 16, 826, 0
|
||||
setmetatile 5, 14, METATILE_SilphCo_Wall_LeftEdge, 1
|
||||
setmetatile 6, 14, METATILE_SilphCo_Wall_RightEdge, 1
|
||||
setmetatile 5, 15, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 6, 15, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 5, 16, METATILE_SilphCo_Floor_WallLeftCorner, 0
|
||||
setmetatile 6, 16, METATILE_SilphCo_Floor_WallRightCorner, 0
|
||||
return
|
||||
|
||||
EventScript_Open7FDoor1:: @ 81A8734
|
||||
setmetatile 11, 8, 821, 0
|
||||
setmetatile 12, 8, 820, 0
|
||||
setmetatile 11, 9, 821, 0
|
||||
setmetatile 12, 9, 820, 0
|
||||
setmetatile 12, 10, 820, 0
|
||||
setmetatile 11, 8, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 12, 8, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 11, 9, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 12, 9, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 12, 10, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
EventScript_Open7FDoor2:: @ 81A8762
|
||||
setmetatile 24, 7, 821, 0
|
||||
setmetatile 25, 7, 820, 0
|
||||
setmetatile 24, 8, 821, 0
|
||||
setmetatile 25, 8, 820, 0
|
||||
setmetatile 25, 9, 820, 0
|
||||
setmetatile 24, 7, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 25, 7, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 24, 8, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 25, 8, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 25, 9, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
EventScript_Open7FDoor3:: @ 81A8790
|
||||
setmetatile 25, 13, 821, 0
|
||||
setmetatile 26, 13, 820, 0
|
||||
setmetatile 25, 14, 821, 0
|
||||
setmetatile 26, 14, 820, 0
|
||||
setmetatile 26, 15, 820, 0
|
||||
setmetatile 25, 13, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 26, 13, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 25, 14, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 26, 14, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 26, 15, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
EventScript_Open8FDoor:: @ 81A87BE
|
||||
setmetatile 5, 9, 839, 1
|
||||
setmetatile 6, 9, 838, 1
|
||||
setmetatile 5, 10, 821, 0
|
||||
setmetatile 6, 10, 821, 0
|
||||
setmetatile 5, 11, 825, 0
|
||||
setmetatile 6, 11, 826, 0
|
||||
setmetatile 5, 9, METATILE_SilphCo_Wall_LeftEdge, 1
|
||||
setmetatile 6, 9, METATILE_SilphCo_Wall_RightEdge, 1
|
||||
setmetatile 5, 10, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 6, 10, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 5, 11, METATILE_SilphCo_Floor_WallLeftCorner, 0
|
||||
setmetatile 6, 11, METATILE_SilphCo_Floor_WallRightCorner, 0
|
||||
return
|
||||
|
||||
EventScript_Open9FDoor1:: @ 81A87F5
|
||||
setmetatile 2, 9, 839, 1
|
||||
setmetatile 3, 9, 838, 1
|
||||
setmetatile 2, 10, 821, 0
|
||||
setmetatile 3, 10, 821, 0
|
||||
setmetatile 2, 11, 825, 0
|
||||
setmetatile 3, 11, 826, 0
|
||||
setmetatile 2, 9, METATILE_SilphCo_Wall_LeftEdge, 1
|
||||
setmetatile 3, 9, METATILE_SilphCo_Wall_RightEdge, 1
|
||||
setmetatile 2, 10, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 3, 10, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 2, 11, METATILE_SilphCo_Floor_WallLeftCorner, 0
|
||||
setmetatile 3, 11, METATILE_SilphCo_Floor_WallRightCorner, 0
|
||||
return
|
||||
|
||||
EventScript_Open9FDoor2:: @ 81A882C
|
||||
setmetatile 12, 15, 839, 1
|
||||
setmetatile 13, 15, 838, 1
|
||||
setmetatile 12, 16, 821, 0
|
||||
setmetatile 13, 16, 821, 0
|
||||
setmetatile 12, 17, 825, 0
|
||||
setmetatile 13, 17, 826, 0
|
||||
setmetatile 12, 15, METATILE_SilphCo_Wall_LeftEdge, 1
|
||||
setmetatile 13, 15, METATILE_SilphCo_Wall_RightEdge, 1
|
||||
setmetatile 12, 16, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 13, 16, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 12, 17, METATILE_SilphCo_Floor_WallLeftCorner, 0
|
||||
setmetatile 13, 17, METATILE_SilphCo_Floor_WallRightCorner, 0
|
||||
return
|
||||
|
||||
EventScript_Open9FDoor3:: @ 81A8863
|
||||
setmetatile 21, 6, 821, 0
|
||||
setmetatile 22, 6, 820, 0
|
||||
setmetatile 21, 7, 821, 0
|
||||
setmetatile 22, 7, 820, 0
|
||||
setmetatile 22, 8, 820, 0
|
||||
setmetatile 21, 6, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 22, 6, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 21, 7, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 22, 7, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 22, 8, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
EventScript_Open9FDoor4:: @ 81A8891
|
||||
setmetatile 21, 12, 821, 0
|
||||
setmetatile 22, 12, 820, 0
|
||||
setmetatile 21, 13, 821, 0
|
||||
setmetatile 22, 13, 820, 0
|
||||
setmetatile 22, 14, 820, 0
|
||||
setmetatile 21, 12, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 22, 12, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 21, 13, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 22, 13, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 22, 14, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
EventScript_Open10FDoor:: @ 81A88BF
|
||||
setmetatile 12, 11, 821, 0
|
||||
setmetatile 13, 11, 820, 0
|
||||
setmetatile 12, 12, 821, 0
|
||||
setmetatile 13, 12, 820, 0
|
||||
setmetatile 13, 13, 820, 0
|
||||
setmetatile 12, 11, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 13, 11, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 12, 12, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 13, 12, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 13, 13, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
EventScript_Open11FDoor:: @ 81A88ED
|
||||
setmetatile 5, 16, 821, 0
|
||||
setmetatile 6, 16, 820, 0
|
||||
setmetatile 5, 17, 821, 0
|
||||
setmetatile 6, 17, 820, 0
|
||||
setmetatile 6, 18, 820, 0
|
||||
setmetatile 5, 16, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 6, 16, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 5, 17, METATILE_SilphCo_Floor_ShadeFull, 0
|
||||
setmetatile 6, 17, METATILE_SilphCo_Floor, 0
|
||||
setmetatile 6, 18, METATILE_SilphCo_Floor, 0
|
||||
return
|
||||
|
||||
SilphCo_2F_EventScript_Door1:: @ 81A891B
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 1
|
||||
setvar VAR_0x8004, 634
|
||||
setvar VAR_0x8004, FLAG_SILPH_2F_DOOR_1
|
||||
goto_if_set FLAG_SILPH_2F_DOOR_1, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -357,7 +357,7 @@ SilphCo_2F_EventScript_Door1:: @ 81A891B
|
||||
SilphCo_2F_EventScript_Door2:: @ 81A8935
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 2
|
||||
setvar VAR_0x8004, 635
|
||||
setvar VAR_0x8004, FLAG_SILPH_2F_DOOR_2
|
||||
goto_if_set FLAG_SILPH_2F_DOOR_2, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -365,7 +365,7 @@ SilphCo_2F_EventScript_Door2:: @ 81A8935
|
||||
SilphCo_3F_EventScript_Door1:: @ 81A894F
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 3
|
||||
setvar VAR_0x8004, 636
|
||||
setvar VAR_0x8004, FLAG_SILPH_3F_DOOR_1
|
||||
goto_if_set FLAG_SILPH_3F_DOOR_1, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -373,7 +373,7 @@ SilphCo_3F_EventScript_Door1:: @ 81A894F
|
||||
SilphCo_3F_EventScript_Door2:: @ 81A8969
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 4
|
||||
setvar VAR_0x8004, 637
|
||||
setvar VAR_0x8004, FLAG_SILPH_3F_DOOR_2
|
||||
goto_if_set FLAG_SILPH_3F_DOOR_2, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -381,7 +381,7 @@ SilphCo_3F_EventScript_Door2:: @ 81A8969
|
||||
SilphCo_4F_EventScript_Door1:: @ 81A8983
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 5
|
||||
setvar VAR_0x8004, 638
|
||||
setvar VAR_0x8004, FLAG_SILPH_4F_DOOR_1
|
||||
goto_if_set FLAG_SILPH_4F_DOOR_1, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -389,7 +389,7 @@ SilphCo_4F_EventScript_Door1:: @ 81A8983
|
||||
SilphCo_4F_EventScript_Door2:: @ 81A899D
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 6
|
||||
setvar VAR_0x8004, 639
|
||||
setvar VAR_0x8004, FLAG_SILPH_4F_DOOR_2
|
||||
goto_if_set FLAG_SILPH_4F_DOOR_2, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -397,7 +397,7 @@ SilphCo_4F_EventScript_Door2:: @ 81A899D
|
||||
SilphCo_5F_EventScript_Door1:: @ 81A89B7
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 7
|
||||
setvar VAR_0x8004, 640
|
||||
setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_1
|
||||
goto_if_set FLAG_SILPH_5F_DOOR_1, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -405,7 +405,7 @@ SilphCo_5F_EventScript_Door1:: @ 81A89B7
|
||||
SilphCo_5F_EventScript_Door2:: @ 81A89D1
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 8
|
||||
setvar VAR_0x8004, 641
|
||||
setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_2
|
||||
goto_if_set FLAG_SILPH_5F_DOOR_2, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -413,7 +413,7 @@ SilphCo_5F_EventScript_Door2:: @ 81A89D1
|
||||
SilphCo_5F_EventScript_Door3:: @ 81A89EB
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 9
|
||||
setvar VAR_0x8004, 642
|
||||
setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_3
|
||||
goto_if_set FLAG_SILPH_5F_DOOR_3, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -421,7 +421,7 @@ SilphCo_5F_EventScript_Door3:: @ 81A89EB
|
||||
SilphCo_6F_EventScript_Door:: @ 81A8A05
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 10
|
||||
setvar VAR_0x8004, 643
|
||||
setvar VAR_0x8004, FLAG_SILPH_6F_DOOR
|
||||
goto_if_set FLAG_SILPH_6F_DOOR, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -429,7 +429,7 @@ SilphCo_6F_EventScript_Door:: @ 81A8A05
|
||||
SilphCo_7F_EventScript_Door1:: @ 81A8A1F
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 11
|
||||
setvar VAR_0x8004, 644
|
||||
setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_1
|
||||
goto_if_set FLAG_SILPH_7F_DOOR_1, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -437,7 +437,7 @@ SilphCo_7F_EventScript_Door1:: @ 81A8A1F
|
||||
SilphCo_7F_EventScript_Door2:: @ 81A8A39
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 12
|
||||
setvar VAR_0x8004, 645
|
||||
setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_2
|
||||
goto_if_set FLAG_SILPH_7F_DOOR_2, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -445,7 +445,7 @@ SilphCo_7F_EventScript_Door2:: @ 81A8A39
|
||||
SilphCo_7F_EventScript_Door3:: @ 81A8A53
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 13
|
||||
setvar VAR_0x8004, 646
|
||||
setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_3
|
||||
goto_if_set FLAG_SILPH_7F_DOOR_3, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -453,7 +453,7 @@ SilphCo_7F_EventScript_Door3:: @ 81A8A53
|
||||
SilphCo_8F_EventScript_Door:: @ 81A8A6D
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 14
|
||||
setvar VAR_0x8004, 647
|
||||
setvar VAR_0x8004, FLAG_SILPH_8F_DOOR
|
||||
goto_if_set FLAG_SILPH_8F_DOOR, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -461,7 +461,7 @@ SilphCo_8F_EventScript_Door:: @ 81A8A6D
|
||||
SilphCo_9F_EventScript_Door1:: @ 81A8A87
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 15
|
||||
setvar VAR_0x8004, 648
|
||||
setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_1
|
||||
goto_if_set FLAG_SILPH_9F_DOOR_1, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -469,7 +469,7 @@ SilphCo_9F_EventScript_Door1:: @ 81A8A87
|
||||
SilphCo_9F_EventScript_Door2:: @ 81A8AA1
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 16
|
||||
setvar VAR_0x8004, 649
|
||||
setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_2
|
||||
goto_if_set FLAG_SILPH_9F_DOOR_2, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -477,7 +477,7 @@ SilphCo_9F_EventScript_Door2:: @ 81A8AA1
|
||||
SilphCo_9F_EventScript_Door3:: @ 81A8ABB
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 17
|
||||
setvar VAR_0x8004, 650
|
||||
setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_3
|
||||
goto_if_set FLAG_SILPH_9F_DOOR_3, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -485,7 +485,7 @@ SilphCo_9F_EventScript_Door3:: @ 81A8ABB
|
||||
SilphCo_9F_EventScript_Door4:: @ 81A8AD5
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 18
|
||||
setvar VAR_0x8004, 651
|
||||
setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_4
|
||||
goto_if_set FLAG_SILPH_9F_DOOR_4, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -493,7 +493,7 @@ SilphCo_9F_EventScript_Door4:: @ 81A8AD5
|
||||
SilphCo_10F_EventScript_Door:: @ 81A8AEF
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 19
|
||||
setvar VAR_0x8004, 652
|
||||
setvar VAR_0x8004, FLAG_SILPH_10F_DOOR
|
||||
goto_if_set FLAG_SILPH_10F_DOOR, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
@@ -501,7 +501,7 @@ SilphCo_10F_EventScript_Door:: @ 81A8AEF
|
||||
SilphCo_11F_EventScript_Door:: @ 81A8B09
|
||||
lockall
|
||||
setvar VAR_TEMP_1, 20
|
||||
setvar VAR_0x8004, 653
|
||||
setvar VAR_0x8004, FLAG_SILPH_11F_DOOR
|
||||
goto_if_set FLAG_SILPH_11F_DOOR, EventScript_DoorUnlocked
|
||||
goto EventScript_TryUnlockDoor
|
||||
end
|
||||
|
||||
@@ -12,11 +12,21 @@
|
||||
#define METATILE_General_ThinTreeTop_Mowed 0x013
|
||||
#define METATILE_General_CalmWater 0x12B
|
||||
|
||||
// gTileset_Building
|
||||
#define METATILE_Building_PCOff 0x062
|
||||
#define METATILE_Building_PCOn 0x063
|
||||
|
||||
// gTileset_GenericBuilding1
|
||||
#define METATILE_GenericBuilding1_PlayersPCOn 0x28A
|
||||
#define METATILE_GenericBuilding1_PlayersPCOff 0x28F
|
||||
|
||||
// gTileset_Mart
|
||||
#define METATILE_Mart_CounterMid_Top 0x2BF
|
||||
#define METATILE_Mart_CounterMid_Bottom 0x2C0
|
||||
|
||||
// gTileset_PokemonCenter
|
||||
#define METATILE_PokemonCenter_Floor_ShadeLeft 0x2C5
|
||||
#define METATILE_PokemonCenter_CounterBarrier 0x2F9
|
||||
#define METATILE_PokemonCenter_NetworkMachine_ScreenLeft_On 0x35A
|
||||
#define METATILE_PokemonCenter_NetworkMachine_ScreenRight_On 0x35B
|
||||
#define METATILE_PokemonCenter_NetworkMachine_Ruby 0x35D
|
||||
@@ -94,6 +104,8 @@
|
||||
#define METATILE_GameCorner_PurpleWall_Floor 0x2CF
|
||||
#define METATILE_GameCorner_PurpleWall_StairsTop 0x2A6
|
||||
#define METATILE_GameCorner_PurpleWall_stairsBottom 0x2A7
|
||||
#define METATILE_GameCorner_CheckeredFloor_ShadeLeft 0x2E1
|
||||
#define METATILE_GameCorner_CounterBarrier 0x2F7
|
||||
|
||||
// gTileset_PokemonMansion
|
||||
#define METATILE_PokemonMansion_Floor 0x284
|
||||
@@ -128,17 +140,44 @@
|
||||
#define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E
|
||||
#define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F
|
||||
|
||||
// gTileset_SilphCo TODO: Bring below metatile labels in line with new tileset name
|
||||
#define METATILE_Hideout_Arrow_Up 0x2A0
|
||||
#define METATILE_Hideout_Arrow_Left 0x2A1
|
||||
#define METATILE_Hideout_Arrow_Down 0x2A8
|
||||
#define METATILE_Hideout_Arrow_RIght 0x2A9
|
||||
#define METATILE_Hideout_Barrier_TopLeft_Floor 0x2CE
|
||||
#define METATILE_Hideout_Barrier_TopRight_Floor 0x2CF
|
||||
#define METATILE_Hideout_Barrier_BottomLeft 0x2D6
|
||||
#define METATILE_Hideout_Barrier_BottomRight 0x2D7
|
||||
#define METATILE_Hideout_Floor 0x281
|
||||
#define METATILE_Hideout_Floor_ShadeFull 0x282
|
||||
// gTileset_SilphCo Includes Silph Co, Rocket Hideout/Warehouse, and all Elevators
|
||||
#define METATILE_SilphCo_HideoutFloor 0x281
|
||||
#define METATILE_SilphCo_HideoutFloor_ShadeFull 0x282
|
||||
#define METATILE_SilphCo_Arrow_Up 0x2A0
|
||||
#define METATILE_SilphCo_Arrow_Left 0x2A1
|
||||
#define METATILE_SilphCo_Arrow_Down 0x2A8
|
||||
#define METATILE_SilphCo_Arrow_Right 0x2A9
|
||||
#define METATILE_SilphCo_HideoutBarrier_TopLeft_Wall 0x2C6
|
||||
#define METATILE_SilphCo_HideoutBarrier_TopRight_Wall 0x2C7
|
||||
#define METATILE_SilphCo_HideoutBarrier_TopLeft_Floor 0x2CE
|
||||
#define METATILE_SilphCo_HideoutBarrier_TopRight_Floor 0x2CF
|
||||
#define METATILE_SilphCo_HideoutBarrier_BottomLeft 0x2D6
|
||||
#define METATILE_SilphCo_HideoutBarrier_BottomRight 0x2D7
|
||||
#define METATILE_SilphCo_ElevatorWindow_Top0 0x2E8
|
||||
#define METATILE_SilphCo_ElevatorWindow_Top1 0x2E9
|
||||
#define METATILE_SilphCo_ElevatorWindow_Top2 0x2EA
|
||||
#define METATILE_SilphCo_ElevatorWindow_Mid0 0x2F0
|
||||
#define METATILE_SilphCo_ElevatorWindow_Mid1 0x2F1
|
||||
#define METATILE_SilphCo_ElevatorWindow_Mid2 0x2F2
|
||||
#define METATILE_SilphCo_ElevatorWindow_Bottom0 0x2F8
|
||||
#define METATILE_SilphCo_ElevatorWindow_Bottom1 0x2F9
|
||||
#define METATILE_SilphCo_ElevatorWindow_Bottom2 0x2FA
|
||||
#define METATILE_SilphCo_Floor 0x334
|
||||
#define METATILE_SilphCo_Floor_ShadeFull 0x335
|
||||
#define METATILE_SilphCo_Floor_WallLeftCorner 0x339
|
||||
#define METATILE_SilphCo_Floor_WallRightCorner 0x33A
|
||||
#define METATILE_SilphCo_Wall_RightEdge 0x346
|
||||
#define METATILE_SilphCo_Wall_LeftEdge 0x347
|
||||
#define METATILE_SilphCo_HorizontalBarrier_TopLeft 0x3B0
|
||||
#define METATILE_SilphCo_HorizontalBarrier_TopRight 0x3B1
|
||||
#define METATILE_SilphCo_HorizontalBarrier_BottomLeft 0x3B8
|
||||
#define METATILE_SilphCo_HorizontalBarrier_BottomRight 0x3B9
|
||||
#define METATILE_SilphCo_VerticalBarrier_TopLeft 0x3C0
|
||||
#define METATILE_SilphCo_VerticalBarrier_TopRight 0x3C1
|
||||
#define METATILE_SilphCo_VerticalBarrier_MidLeft 0x3C2
|
||||
#define METATILE_SilphCo_VerticalBarrier_MidRight 0x3C3
|
||||
#define METATILE_SilphCo_VerticalBarrier_BottomLeft 0x3C4
|
||||
#define METATILE_SilphCo_VerticalBarrier_BottomRight 0x3C5
|
||||
|
||||
// gTileset_CinnabarGym
|
||||
#define METATILE_CinnabarGym_Floor 0x281
|
||||
@@ -170,6 +209,12 @@
|
||||
#define METATILE_Cave_RockBarrier_Top 0x307
|
||||
#define METATILE_Cave_RockBarrier_Bottom 0x317
|
||||
|
||||
// gTileset_SeafoamIslands
|
||||
#define METATILE_SeafoamIslands_SlidingIce 0x34B
|
||||
#define METATILE_SeafoamIslands_UncrackedIce 0x359
|
||||
#define METATILE_SeafoamIslands_CrackedIce 0x35A
|
||||
#define METATILE_SeafoamIslands_IceHole 0x35B
|
||||
|
||||
// gTileset_TrainerTower
|
||||
#define METATILE_TrainerTower_Floor_ShadeBottomLeft 0x287
|
||||
#define METATILE_TrainerTower_CounterBarrier 0x2B4
|
||||
|
||||
+62
-30
@@ -46,6 +46,7 @@
|
||||
#include "constants/moves.h"
|
||||
#include "constants/menu.h"
|
||||
#include "constants/event_objects.h"
|
||||
#include "constants/metatile_labels.h"
|
||||
|
||||
static EWRAM_DATA u8 sElevatorCurrentFloorWindowId = 0;
|
||||
static EWRAM_DATA u16 sElevatorScroll = 0;
|
||||
@@ -211,6 +212,9 @@ bool8 PlayerHasGrassPokemonInParty(void)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#define tState data[0]
|
||||
#define tTimer data[1]
|
||||
|
||||
void AnimatePcTurnOn(void)
|
||||
{
|
||||
u8 taskId;
|
||||
@@ -218,27 +222,31 @@ void AnimatePcTurnOn(void)
|
||||
if (FuncIsActiveTask(Task_AnimatePcTurnOn) != TRUE)
|
||||
{
|
||||
taskId = CreateTask(Task_AnimatePcTurnOn, 8);
|
||||
gTasks[taskId].data[0] = 0;
|
||||
gTasks[taskId].data[1] = 0;
|
||||
gTasks[taskId].tState = 0;
|
||||
gTasks[taskId].tTimer = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// PC flickers on and off while turning on
|
||||
static void Task_AnimatePcTurnOn(u8 taskId)
|
||||
{
|
||||
s16 *data = gTasks[taskId].data;
|
||||
if (data[1] == 6)
|
||||
if (tTimer == 6)
|
||||
{
|
||||
PcTurnOnUpdateMetatileId(data[0] & 1);
|
||||
PcTurnOnUpdateMetatileId(tState & 1);
|
||||
DrawWholeMapView();
|
||||
data[1] = 0;
|
||||
data[0]++;
|
||||
if (data[0] == 5)
|
||||
tTimer = 0;
|
||||
tState++;
|
||||
if (tState == 5)
|
||||
DestroyTask(taskId);
|
||||
}
|
||||
data[1]++;
|
||||
tTimer++;
|
||||
}
|
||||
|
||||
static void PcTurnOnUpdateMetatileId(bool16 a0)
|
||||
#undef tState
|
||||
#undef tTimer
|
||||
|
||||
static void PcTurnOnUpdateMetatileId(bool16 flickerOff)
|
||||
{
|
||||
u16 metatileId = 0;
|
||||
s8 deltaX = 0;
|
||||
@@ -260,25 +268,25 @@ static void PcTurnOnUpdateMetatileId(bool16 a0)
|
||||
deltaY = -1;
|
||||
break;
|
||||
}
|
||||
if (a0)
|
||||
if (flickerOff)
|
||||
{
|
||||
if (gSpecialVar_0x8004 == 0)
|
||||
metatileId = 0x62;
|
||||
metatileId = METATILE_Building_PCOff;
|
||||
else if (gSpecialVar_0x8004 == 1)
|
||||
metatileId = 0x28F;
|
||||
metatileId = METATILE_GenericBuilding1_PlayersPCOff;
|
||||
else if (gSpecialVar_0x8004 == 2)
|
||||
metatileId = 0x28F;
|
||||
metatileId = METATILE_GenericBuilding1_PlayersPCOff;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (gSpecialVar_0x8004 == 0)
|
||||
metatileId = 0x63;
|
||||
metatileId = METATILE_Building_PCOn;
|
||||
else if (gSpecialVar_0x8004 == 1)
|
||||
metatileId = 0x28A;
|
||||
metatileId = METATILE_GenericBuilding1_PlayersPCOn;
|
||||
else if (gSpecialVar_0x8004 == 2)
|
||||
metatileId = 0x28A;
|
||||
metatileId = METATILE_GenericBuilding1_PlayersPCOn;
|
||||
}
|
||||
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | 0xC00);
|
||||
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | METATILE_COLLISION_MASK);
|
||||
}
|
||||
|
||||
void AnimatePcTurnOff()
|
||||
@@ -304,12 +312,12 @@ void AnimatePcTurnOff()
|
||||
break;
|
||||
}
|
||||
if (gSpecialVar_0x8004 == 0)
|
||||
metatileId = 0x62;
|
||||
metatileId = METATILE_Building_PCOff;
|
||||
else if (gSpecialVar_0x8004 == 1)
|
||||
metatileId = 0x28F;
|
||||
metatileId = METATILE_GenericBuilding1_PlayersPCOff;
|
||||
else if (gSpecialVar_0x8004 == 2)
|
||||
metatileId = 0x28F;
|
||||
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | 0xC00);
|
||||
metatileId = METATILE_GenericBuilding1_PlayersPCOff;
|
||||
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | METATILE_COLLISION_MASK);
|
||||
DrawWholeMapView();
|
||||
}
|
||||
|
||||
@@ -770,15 +778,39 @@ static const u8 sUnused_83F5B84[] = {
|
||||
};
|
||||
|
||||
static const u16 sElevatorWindowMetatilesGoingUp[][3] = {
|
||||
{0x2e8, 0x2e9, 0x2ea},
|
||||
{0x2f0, 0x2f1, 0x2f2},
|
||||
{0x2f8, 0x2f9, 0x2fa}
|
||||
{
|
||||
METATILE_SilphCo_ElevatorWindow_Top0,
|
||||
METATILE_SilphCo_ElevatorWindow_Top1,
|
||||
METATILE_SilphCo_ElevatorWindow_Top2
|
||||
},
|
||||
{
|
||||
METATILE_SilphCo_ElevatorWindow_Mid0,
|
||||
METATILE_SilphCo_ElevatorWindow_Mid1,
|
||||
METATILE_SilphCo_ElevatorWindow_Mid2
|
||||
},
|
||||
{
|
||||
METATILE_SilphCo_ElevatorWindow_Bottom0,
|
||||
METATILE_SilphCo_ElevatorWindow_Bottom1,
|
||||
METATILE_SilphCo_ElevatorWindow_Bottom2
|
||||
}
|
||||
};
|
||||
|
||||
static const u16 sElevatorWindowMetatilesGoingDown[][3] = {
|
||||
{0x2e8, 0x2ea, 0x2e9},
|
||||
{0x2f0, 0x2f2, 0x2f1},
|
||||
{0x2f8, 0x2fa, 0x2f9}
|
||||
{
|
||||
METATILE_SilphCo_ElevatorWindow_Top0,
|
||||
METATILE_SilphCo_ElevatorWindow_Top2,
|
||||
METATILE_SilphCo_ElevatorWindow_Top1
|
||||
},
|
||||
{
|
||||
METATILE_SilphCo_ElevatorWindow_Mid0,
|
||||
METATILE_SilphCo_ElevatorWindow_Mid2,
|
||||
METATILE_SilphCo_ElevatorWindow_Mid1
|
||||
},
|
||||
{
|
||||
METATILE_SilphCo_ElevatorWindow_Bottom0,
|
||||
METATILE_SilphCo_ElevatorWindow_Bottom2,
|
||||
METATILE_SilphCo_ElevatorWindow_Bottom1
|
||||
}
|
||||
};
|
||||
|
||||
static const u8 sElevatorAnimationDuration[] = {
|
||||
@@ -1114,7 +1146,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId)
|
||||
{
|
||||
for (j = 0; j < 3; j++)
|
||||
{
|
||||
MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingUp[i][data[0] % 3] | 0xC00);
|
||||
MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingUp[i][data[0] % 3] | METATILE_COLLISION_MASK);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1124,7 +1156,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId)
|
||||
{
|
||||
for (j = 0; j < 3; j++)
|
||||
{
|
||||
MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingDown[i][data[0] % 3] | 0xC00);
|
||||
MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingDown[i][data[0] % 3] | METATILE_COLLISION_MASK);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2277,7 +2309,7 @@ bool8 CutMoveRuinValleyCheck(void)
|
||||
|
||||
void CutMoveOpenDottedHoleDoor(void)
|
||||
{
|
||||
MapGridSetMetatileIdAt(31, 31, 0x358);
|
||||
MapGridSetMetatileIdAt(31, 31, METATILE_SeviiIslands67_DottedHoleDoor_Open);
|
||||
DrawWholeMapView();
|
||||
PlaySE(SE_BAN);
|
||||
FlagSet(FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE);
|
||||
|
||||
+13
-12
@@ -13,6 +13,7 @@
|
||||
#include "task.h"
|
||||
#include "constants/field_tasks.h"
|
||||
#include "constants/flags.h"
|
||||
#include "constants/metatile_labels.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/vars.h"
|
||||
|
||||
@@ -37,15 +38,15 @@ static const TaskFunc sPerStepCallbacks[] =
|
||||
|
||||
static const u8 sIcefallCaveIceTileCoords[][2] =
|
||||
{
|
||||
{ 0x08, 0x03 },
|
||||
{ 0x0a, 0x05 },
|
||||
{ 0x0f, 0x05 },
|
||||
{ 0x08, 0x09 },
|
||||
{ 0x09, 0x09 },
|
||||
{ 0x10, 0x09 },
|
||||
{ 0x08, 0x0a },
|
||||
{ 0x09, 0x0a },
|
||||
{ 0x08, 0x0e }
|
||||
{ 8, 3 },
|
||||
{ 10, 5 },
|
||||
{ 15, 5 },
|
||||
{ 8, 9 },
|
||||
{ 9, 9 },
|
||||
{ 16, 9 },
|
||||
{ 8, 10 },
|
||||
{ 9, 10 },
|
||||
{ 8, 14 }
|
||||
};
|
||||
|
||||
static void Task_RunPerStepCallback(u8 taskId)
|
||||
@@ -146,7 +147,7 @@ void SetIcefallCaveCrackedIceMetatiles(void)
|
||||
{
|
||||
int x = sIcefallCaveIceTileCoords[i][0] + 7;
|
||||
int y = sIcefallCaveIceTileCoords[i][1] + 7;
|
||||
MapGridSetMetatileIdAt(x, y, 0x35a);
|
||||
MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_CrackedIce);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -199,7 +200,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId)
|
||||
x = data[4];
|
||||
y = data[5];
|
||||
PlaySE(SE_RU_BARI);
|
||||
MapGridSetMetatileIdAt(x, y, 0x35a);
|
||||
MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_CrackedIce);
|
||||
CurrentMapDrawMetatileAt(x, y);
|
||||
data[1] = 1;
|
||||
}
|
||||
@@ -214,7 +215,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId)
|
||||
x = data[4];
|
||||
y = data[5];
|
||||
PlaySE(SE_RU_GASYAN);
|
||||
MapGridSetMetatileIdAt(x, y, 0x35b);
|
||||
MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_IceHole);
|
||||
CurrentMapDrawMetatileAt(x, y);
|
||||
VarSet(VAR_TEMP_1, 1);
|
||||
data[1] = 1;
|
||||
|
||||
+1
-1
@@ -2111,7 +2111,7 @@ bool8 ScrCmd_setmetatile(struct ScriptContext *ctx)
|
||||
if (!v8)
|
||||
MapGridSetMetatileIdAt(x, y, tileId);
|
||||
else
|
||||
MapGridSetMetatileIdAt(x, y, tileId | 0xC00);
|
||||
MapGridSetMetatileIdAt(x, y, tileId | METATILE_COLLISION_MASK);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user