summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-16 17:12:16 -0500
committerGriffinR <griffin.g.richards@gmail.com>2021-11-16 17:46:34 -0500
commit61aa9c3ba983462ab3420920ce8b5de5601f54f8 (patch)
tree6ff3ddca2523fbf8255a9e3954c2b2f012bc72f5
parentd4147879320c563254059a92eb7a07b5cfcc2143 (diff)
More updating event macro comments
-rw-r--r--asm/macros/event.inc64
-rw-r--r--data/maps/AbandonedShip_Corridors_B1F/scripts.inc4
-rw-r--r--data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc16
-rw-r--r--data/maps/AncientTomb/scripts.inc12
-rw-r--r--data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc56
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc8
-rw-r--r--data/maps/DesertRuins/scripts.inc12
-rw-r--r--data/maps/DewfordTown_Gym/scripts.inc64
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/scripts.inc4
-rw-r--r--data/maps/InsideOfTruck/scripts.inc6
-rw-r--r--data/maps/IslandCave/scripts.inc24
-rw-r--r--data/maps/JaggedPass/scripts.inc8
-rw-r--r--data/maps/LilycoveCity/scripts.inc24
-rw-r--r--data/maps/LilycoveCity_ContestLobby/scripts.inc16
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc20
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc6
-rw-r--r--data/maps/LittlerootTown_MaysHouse_1F/scripts.inc6
-rw-r--r--data/maps/MauvilleCity_Gym/scripts.inc52
-rw-r--r--data/maps/MeteorFalls_1F_1R/scripts.inc8
-rw-r--r--data/maps/MossdeepCity_Gym/scripts.inc48
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc2
-rw-r--r--data/maps/MossdeepCity_StevensHouse/scripts.inc2
-rw-r--r--data/maps/NewMauville_Entrance/scripts.inc24
-rw-r--r--data/maps/NewMauville_Inside/scripts.inc166
-rw-r--r--data/maps/PetalburgCity_Gym/scripts.inc48
-rw-r--r--data/maps/Route103/scripts.inc4
-rw-r--r--data/maps/Route105/scripts.inc4
-rw-r--r--data/maps/Route110_TrickHouseEnd/scripts.inc2
-rw-r--r--data/maps/Route110_TrickHouseEntrance/scripts.inc18
-rw-r--r--data/maps/Route110_TrickHousePuzzle1/scripts.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle2/scripts.inc16
-rw-r--r--data/maps/Route110_TrickHousePuzzle3/scripts.inc312
-rw-r--r--data/maps/Route110_TrickHousePuzzle7/scripts.inc40
-rw-r--r--data/maps/Route111/scripts.inc40
-rw-r--r--data/maps/Route114_FossilManiacsTunnel/scripts.inc4
-rw-r--r--data/maps/Route120/scripts.inc20
-rw-r--r--data/maps/SealedChamber_OuterRoom/scripts.inc12
-rw-r--r--data/maps/ShoalCave_LowTideInnerRoom/scripts.inc24
-rw-r--r--data/maps/ShoalCave_LowTideLowerRoom/scripts.inc4
-rw-r--r--data/maps/ShoalCave_LowTideStairsRoom/scripts.inc4
-rw-r--r--data/maps/SkyPillar_Outside/scripts.inc4
-rw-r--r--data/maps/SootopolisCity/scripts.inc68
-rw-r--r--data/maps/SootopolisCity_Gym_1F/scripts.inc12
-rw-r--r--data/maps/TrainerHill_Entrance/scripts.inc4
-rw-r--r--data/maps/Underwater_SeafloorCavern/scripts.inc24
-rw-r--r--data/script_cmd_table.inc4
-rw-r--r--data/scripts/abnormal_weather.inc448
-rw-r--r--data/scripts/cable_club.inc24
-rw-r--r--data/scripts/elite_four.inc84
-rw-r--r--data/scripts/flash.inc2
-rw-r--r--include/field_screen_effect.h2
-rw-r--r--include/field_weather.h6
-rw-r--r--src/battle_setup.c2
-rw-r--r--src/field_screen_effect.c17
-rw-r--r--src/field_specials.c8
-rw-r--r--src/field_weather_effect.c18
-rw-r--r--src/overworld.c10
-rw-r--r--src/scrcmd.c8
58 files changed, 979 insertions, 972 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 58b3b8329..d077103dc 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1113,12 +1113,13 @@
.2byte \id
.endm
- @ Sets a berry tree's specific berry and growth stage.
- .macro setberrytree tree_id:req, berry:req, growth_stage:req
+ @ Sets a berry tree's berry and growth stage. treeId is any BERRY_TREE_* constant (an index into berryTrees in SaveBlock1),
+ @ berry is any ITEM_TO_BERRY(ITEM_BERRY_NAME) value, and growthStage is any BERRY_STAGE_* constant.
+ .macro setberrytree treeId:req, berry:req, growthStage:req
.byte 0x8a
- .byte \tree_id
+ .byte \treeId
.byte \berry
- .byte \growth_stage
+ .byte \growthStage
.endm
@ This allows you to choose a Pokemon to use in a contest
@@ -1126,17 +1127,17 @@
.byte 0x8b
.endm
- @ Starts a contest.
+ @ Starts the appeals round of a contest.
.macro startcontest
.byte 0x8c
.endm
- @ Shows the results of a contest.
+ @ Shows the results screen of a contest.
.macro showcontestresults
.byte 0x8d
.endm
- @ Starts a contest over a link connection.
+ @ Starts communication to initialize a link contest.
.macro contestlinktransfer
.byte 0x8e
.endm
@@ -1171,7 +1172,7 @@
.byte \disable
.endm
- @ Spawns a secondary box showing how much money the player has.
+ @ Creates a window showing how much money the player has.
@ If 'disable' is set to anything but 0 then this command does nothing.
.macro showmoneybox x:req, y:req, disable=0
.byte 0x93
@@ -1180,14 +1181,14 @@
.byte \disable
.endm
- @ Hides the secondary box spawned by showmoney. Consumption of the x and y arguments was dummied out.
+ @ Destroys the window created by showmoneybox. Consumption of the x and y arguments was dummied out.
.macro hidemoneybox
.byte 0x94
.byte 0 @ \x
.byte 0 @ \y
.endm
- @ Updates the secondary box spawned by showmoney. Consumption of the x and y arguments was dummied out.
+ @ Updates the window created by showmoneybox. Consumption of the x and y arguments was dummied out.
@ If 'disable' is set to anything but 0 then this command does nothing.
.macro updatemoneybox disable=0
.byte 0x95
@@ -1196,10 +1197,10 @@
.byte \disable
.endm
- @ Gets the price reduction for the index given.
- .macro getpokenewsactive index:req
+ @ Gets whether the effects of the specified PokeNews program are active. newsKind is a POKENEWS_* constant.
+ .macro getpokenewsactive newsKind:req
.byte 0x96
- .2byte \index
+ .2byte \newsKind
.endm
@ Fades the screen to and from black and white. Modes are FADE_(TO/FROM)_(WHITE/BLACK)
@@ -1215,14 +1216,18 @@
.byte \speed
.endm
- .macro setflashradius word:req
+ @ Sets the flash level. A level of 0 is fully bright, a level of 1 is the largest flash radius, a level
+ @ of 7 is the smallest flash radius, a level of 8 is fully black.
+ .macro setflashlevel level:req
.byte 0x99
- .2byte \word
+ .2byte \level
.endm
- .macro animateflash byte:req
+ @ Animates the flash radius from its current size to the size it would be at the specified level.
+ @ Note that this does not actually change the current flash level. It's typically used just before a setflashlevel.
+ .macro animateflash level:req
.byte 0x9a
- .byte \byte
+ .byte \level
.endm
.macro messageautoscroll pointer:req
@@ -1230,20 +1235,20 @@
.4byte \pointer
.endm
- @ Executes the specified field effect animation.
+ @ Executes the specified field effect animation (FLDEFF_*).
.macro dofieldeffect animation:req
.byte 0x9c
.2byte \animation
.endm
- @ Sets up the field effect argument argument with the value value.
- .macro setfieldeffectargument argument:req, param:req
+ @ Sets the field effect argument at index 'argNum' to 'value.'
+ .macro setfieldeffectargument argNum:req, value:req
.byte 0x9d
- .byte \argument
- .2byte \param
+ .byte \argNum
+ .2byte \value
.endm
- @ Blocks script execution until all playing field move animations complete.
+ @ Blocks script execution until all playing field effect animations complete.
.macro waitfieldeffect animation:req
.byte 0x9e
.2byte \animation
@@ -1260,20 +1265,21 @@
.byte 0xa0
.endm
- @ Plays the specified (species) Pokemon's cry. You can use waitmoncry to block script execution until the sound finishes.
+ @ Plays the cry of the given species. Mode is any CRY_MODE_* constant.
+ @ You can use waitmoncry to block script execution until the cry finishes.
.macro playmoncry species:req, mode:req
.byte 0xa1
.2byte \species
.2byte \mode
.endm
- @ Changes the metatile at (x, y) on the current map.
- .macro setmetatile x:req, y:req, metatile_number:req, has_collision:req
+ @ Set the metatile at (x, y) on the current map to the given metatile and impassability.
+ .macro setmetatile x:req, y:req, metatileId:req, impassable:req
.byte 0xa2
.2byte \x
.2byte \y
- .2byte \metatile_number
- .2byte \has_collision
+ .2byte \metatileId
+ .2byte \impassable
.endm
@ Queues a weather change to the default weather for the map.
@@ -1292,7 +1298,7 @@
.byte 0xa5
.endm
- @ This command manages cases in which maps have tiles that change state when stepped on (specifically, cracked/breakable floors).
+ @ Enables a function that gets called every step by Task_RunPerStepCallback.
.macro setstepcallback subroutine:req
.byte 0xa6
.byte \subroutine
diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
index 7f0288e0c..09d758495 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
@@ -13,11 +13,11 @@ AbandonedShip_Corridors_B1F_OnLoad:
end
AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom::
- setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
+ setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Locked, TRUE
return
AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom::
- setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
+ setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, TRUE
return
AbandonedShip_Corridors_B1F_EventScript_TuberM::
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
index cdc350f3e..3a7bc7731 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
@@ -19,35 +19,35 @@ AbandonedShip_HiddenFloorCorridors_OnLoad:
end
AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1::
- setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
+ setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, TRUE
return
AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2::
- setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
+ setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, TRUE
return
AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4::
- setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0
+ setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Unlocked, FALSE
return
AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6::
- setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0
+ setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Unlocked, FALSE
return
AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1::
- setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
+ setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, TRUE
return
AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2::
- setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
+ setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, TRUE
return
AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4::
- setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Locked, 0
+ setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Locked, FALSE
return
AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6::
- setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Locked, 0
+ setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Locked, FALSE
return
AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door::
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index f2e242bbd..03070a731 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -29,12 +29,12 @@ AncientTomb_OnLoad:
end
AncientTomb_EventScript_HideRegiEntrance::
- setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
- setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
- setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
- setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
- setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
- setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
+ setmetatile 7, 19, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 8, 19, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 9, 19, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
+ setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
+ setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
return
AncientTomb_EventScript_CaveEntranceMiddle::
diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
index 2023d44f5..5888c140d 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
@@ -608,46 +608,46 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon::
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed::
- setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1
- setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1
- setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1
- setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage1_Tile3, 1
- setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage1_Tile4, 1
- setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage1_Tile5, 0
- setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage1_Tile6, 1
+ setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, TRUE
+ setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, TRUE
+ setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, TRUE
+ setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage1_Tile3, TRUE
+ setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage1_Tile4, TRUE
+ setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage1_Tile5, FALSE
+ setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage1_Tile6, TRUE
special DrawWholeMapView
return
BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed::
- setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1
- setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1
- setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1
- setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage2_Tile3, 1
- setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage2_Tile4, 1
- setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage2_Tile5, 0
- setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage2_Tile6, 1
+ setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, TRUE
+ setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, TRUE
+ setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, TRUE
+ setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage2_Tile3, TRUE
+ setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage2_Tile4, TRUE
+ setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage2_Tile5, FALSE
+ setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage2_Tile6, TRUE
special DrawWholeMapView
return
BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen::
- setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1
- setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1
- setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1
- setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage3_Tile3, 1
- setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage3_Tile4, 1
- setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage3_Tile5, 0
- setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage3_Tile6, 1
+ setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, TRUE
+ setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, TRUE
+ setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, TRUE
+ setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage3_Tile3, TRUE
+ setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage3_Tile4, TRUE
+ setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage3_Tile5, FALSE
+ setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage3_Tile6, TRUE
special DrawWholeMapView
return
BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed::
- setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1
- setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1
- setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1
- setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage0_Tile3, 1
- setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage0_Tile4, 1
- setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage0_Tile5, 0
- setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage0_Tile6, 1
+ setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, TRUE
+ setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, TRUE
+ setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, TRUE
+ setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage0_Tile3, TRUE
+ setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage0_Tile4, TRUE
+ setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage0_Tile5, FALSE
+ setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage0_Tile6, TRUE
special DrawWholeMapView
return
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
index 13abf7027..b4ddb0788 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
@@ -8,13 +8,13 @@ BattleFrontier_BattleTowerCorridor_MapScripts::
BattleFrontier_BattleTowerCorridor_OnLoad:
compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor
- setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
- setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
+ setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, FALSE
+ setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, FALSE
end
BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor::
- setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
- setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
+ setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, FALSE
+ setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, FALSE
end
BattleFrontier_BattleTowerCorridor_OnFrame:
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index 443915d7e..0e7a3c281 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -20,12 +20,12 @@ DesertRuins_OnLoad:
end
DesertRuins_EventScript_HideRegiEntrance::
- setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
- setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
- setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
- setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
- setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
- setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
+ setmetatile 7, 19, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 8, 19, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 9, 19, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
+ setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
+ setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
return
DesertRuins_OnTransition:
diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc
index d2b51766a..355ca15f4 100644
--- a/data/maps/DewfordTown_Gym/scripts.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
@@ -3,57 +3,59 @@ DewfordTown_Gym_MapScripts::
.byte 0
DewfordTown_Gym_OnTransition:
- call DewfordTown_Gym_EventScript_SetFlashRadius
+ call DewfordTown_Gym_EventScript_SetFlashLevel
end
-DewfordTown_Gym_EventScript_SetFlashRadius::
+DewfordTown_Gym_EventScript_SetFlashLevel::
goto_if_defeated TRAINER_BRAWLY_1, DewfordTown_Gym_EventScript_SetLightsOn
call DewfordTown_Gym_EventScript_CountTrainersDefeated
copyvar VAR_0x8001, VAR_0x8000
compare VAR_0x8000, 0
- goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius7
+ goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel7
compare VAR_0x8000, 1
- goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius6
+ goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel6
compare VAR_0x8000, 2
- goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius5
+ goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel5
compare VAR_0x8000, 3
- goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius4
+ goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel4
compare VAR_0x8000, 4
- goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius3
+ goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel3
compare VAR_0x8000, 5
- goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius2
- goto DewfordTown_Gym_EventScript_SetFlashRadius1
+ goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel2
+ goto DewfordTown_Gym_EventScript_SetFlashLevel1
DewfordTown_Gym_EventScript_SetLightsOn::
- setflashradius 0
+ setflashlevel 0
return
-DewfordTown_Gym_EventScript_SetFlashRadius1::
- setflashradius 1
+@ Brightest
+DewfordTown_Gym_EventScript_SetFlashLevel1::
+ setflashlevel 1
return
-DewfordTown_Gym_EventScript_SetFlashRadius2::
- setflashradius 2
+DewfordTown_Gym_EventScript_SetFlashLevel2::
+ setflashlevel 2
return
-DewfordTown_Gym_EventScript_SetFlashRadius3::
- setflashradius 3
+DewfordTown_Gym_EventScript_SetFlashLevel3::
+ setflashlevel 3
return
-DewfordTown_Gym_EventScript_SetFlashRadius4::
- setflashradius 4
+DewfordTown_Gym_EventScript_SetFlashLevel4::
+ setflashlevel 4
return
-DewfordTown_Gym_EventScript_SetFlashRadius5::
- setflashradius 5
+DewfordTown_Gym_EventScript_SetFlashLevel5::
+ setflashlevel 5
return
-DewfordTown_Gym_EventScript_SetFlashRadius6::
- setflashradius 6
+DewfordTown_Gym_EventScript_SetFlashLevel6::
+ setflashlevel 6
return
-DewfordTown_Gym_EventScript_SetFlashRadius7::
- setflashradius 7
+@ Darkest
+DewfordTown_Gym_EventScript_SetFlashLevel7::
+ setflashlevel 7
return
DewfordTown_Gym_EventScript_BrightenRoom::
@@ -82,43 +84,43 @@ DewfordTown_Gym_EventScript_NoLightChange::
DewfordTown_Gym_EventScript_AnimateFlash1Trainer::
playse SE_SWITCH
animateflash 6
- call DewfordTown_Gym_EventScript_SetFlashRadius
+ call DewfordTown_Gym_EventScript_SetFlashLevel
return
DewfordTown_Gym_EventScript_AnimateFlash2Trainers::
playse SE_SWITCH
animateflash 5
- call DewfordTown_Gym_EventScript_SetFlashRadius
+ call DewfordTown_Gym_EventScript_SetFlashLevel
return
DewfordTown_Gym_EventScript_AnimateFlash3Trainers::
playse SE_SWITCH
animateflash 4
- call DewfordTown_Gym_EventScript_SetFlashRadius
+ call DewfordTown_Gym_EventScript_SetFlashLevel
return
DewfordTown_Gym_EventScript_AnimateFlash4Trainers::
playse SE_SWITCH
animateflash 3
- call DewfordTown_Gym_EventScript_SetFlashRadius
+ call DewfordTown_Gym_EventScript_SetFlashLevel
return
DewfordTown_Gym_EventScript_AnimateFlash5Trainers::
playse SE_SWITCH
animateflash 2
- call DewfordTown_Gym_EventScript_SetFlashRadius
+ call DewfordTown_Gym_EventScript_SetFlashLevel
return
DewfordTown_Gym_EventScript_AnimateFlash6Trainers::
playse SE_SWITCH
animateflash 1
- call DewfordTown_Gym_EventScript_SetFlashRadius
+ call DewfordTown_Gym_EventScript_SetFlashLevel
return
DewfordTown_Gym_EventScript_AnimateFlashFullBrightness::
playse SE_SWITCH
animateflash 0
- call DewfordTown_Gym_EventScript_SetFlashRadius
+ call DewfordTown_Gym_EventScript_SetFlashLevel
return
DewfordTown_Gym_EventScript_CountTrainersDefeated::
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index d16937151..d33c57df8 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -50,8 +50,8 @@ EverGrandeCity_ChampionsRoom_EventScript_Wallace::
EverGrandeCity_ChampionsRoom_EventScript_Defeated::
playse SE_DOOR
- setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0
- setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0
+ setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, FALSE
+ setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, FALSE
special DrawWholeMapView
msgbox EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
closemessage
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index 472e27e36..515279449 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -4,9 +4,9 @@ InsideOfTruck_MapScripts::
.byte 0
InsideOfTruck_OnLoad:
- setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, 0
- setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, 0
- setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, 0
+ setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, FALSE
+ setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, FALSE
+ setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, FALSE
end
InsideOfTruck_OnResume:
diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index d660aadf0..83e4d015a 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -20,12 +20,12 @@ IslandCave_OnLoad:
end
IslandCave_EventScript_HideRegiEntrance::
- setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
- setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
- setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
- setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
- setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
- setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
+ setmetatile 7, 19, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 8, 19, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 9, 19, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
+ setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
+ setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
return
IslandCave_OnTransition:
@@ -39,12 +39,12 @@ IslandCave_EventScript_ShowRegice::
return
IslandCave_EventScript_OpenRegiEntrance::
- setmetatile 7, 19, METATILE_Cave_SealedChamberEntrance_TopLeft, 1
- setmetatile 8, 19, METATILE_Cave_SealedChamberEntrance_TopMid, 1
- setmetatile 9, 19, METATILE_Cave_SealedChamberEntrance_TopRight, 1
- setmetatile 7, 20, METATILE_Cave_SealedChamberEntrance_BottomLeft, 1
- setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, 0
- setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, 1
+ setmetatile 7, 19, METATILE_Cave_SealedChamberEntrance_TopLeft, TRUE
+ setmetatile 8, 19, METATILE_Cave_SealedChamberEntrance_TopMid, TRUE
+ setmetatile 9, 19, METATILE_Cave_SealedChamberEntrance_TopRight, TRUE
+ setmetatile 7, 20, METATILE_Cave_SealedChamberEntrance_BottomLeft, TRUE
+ setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, FALSE
+ setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, TRUE
special DrawWholeMapView
playse SE_BANG
setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc
index 3ab896913..18a8c2999 100644
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -38,8 +38,8 @@ JaggedPass_OnLoad:
end
JaggedPass_EventScript_ConcealHideoutEntrance::
- setmetatile 16, 17, METATILE_Lavaridge_RockWall, 1
- setmetatile 16, 18, METATILE_Lavaridge_RockWall, 1
+ setmetatile 16, 17, METATILE_Lavaridge_RockWall, TRUE
+ setmetatile 16, 18, METATILE_Lavaridge_RockWall, TRUE
end
JaggedPass_EventScript_OpenMagmaHideout::
@@ -59,8 +59,8 @@ JaggedPass_EventScript_OpenMagmaHideout::
special ShakeCamera
waitstate
playse SE_EFFECTIVE
- setmetatile 16, 17, METATILE_Lavaridge_CaveEntrance_Top, 1
- setmetatile 16, 18, METATILE_Lavaridge_CaveEntrance_Bottom, 0
+ setmetatile 16, 17, METATILE_Lavaridge_CaveEntrance_Top, TRUE
+ setmetatile 16, 18, METATILE_Lavaridge_CaveEntrance_Bottom, FALSE
special DrawWholeMapView
delay 30
setvar VAR_JAGGED_PASS_STATE, 2
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index eb3f140a8..648aae564 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -19,18 +19,18 @@ LilycoveCity_OnLoad:
end
LilycoveCity_EventScript_SetWailmerMetatiles::
- setmetatile 76, 12, METATILE_Lilycove_Wailmer0, 1
- setmetatile 77, 12, METATILE_Lilycove_Wailmer1, 1
- setmetatile 76, 13, METATILE_Lilycove_Wailmer2, 1
- setmetatile 77, 13, METATILE_Lilycove_Wailmer3, 1
- setmetatile 76, 14, METATILE_Lilycove_Wailmer0_Alt, 1
- setmetatile 77, 14, METATILE_Lilycove_Wailmer1_Alt, 1
- setmetatile 76, 15, METATILE_Lilycove_Wailmer2, 1
- setmetatile 77, 15, METATILE_Lilycove_Wailmer3, 1
- setmetatile 77, 16, METATILE_Lilycove_Wailmer0_Alt, 1
- setmetatile 78, 16, METATILE_Lilycove_Wailmer1_Alt, 1
- setmetatile 77, 17, METATILE_Lilycove_Wailmer2, 1
- setmetatile 78, 17, METATILE_Lilycove_Wailmer3, 1
+ setmetatile 76, 12, METATILE_Lilycove_Wailmer0, TRUE
+ setmetatile 77, 12, METATILE_Lilycove_Wailmer1, TRUE
+ setmetatile 76, 13, METATILE_Lilycove_Wailmer2, TRUE
+ setmetatile 77, 13, METATILE_Lilycove_Wailmer3, TRUE
+ setmetatile 76, 14, METATILE_Lilycove_Wailmer0_Alt, TRUE
+ setmetatile 77, 14, METATILE_Lilycove_Wailmer1_Alt, TRUE
+ setmetatile 76, 15, METATILE_Lilycove_Wailmer2, TRUE
+ setmetatile 77, 15, METATILE_Lilycove_Wailmer3, TRUE
+ setmetatile 77, 16, METATILE_Lilycove_Wailmer0_Alt, TRUE
+ setmetatile 78, 16, METATILE_Lilycove_Wailmer1_Alt, TRUE
+ setmetatile 77, 17, METATILE_Lilycove_Wailmer2, TRUE
+ setmetatile 78, 17, METATILE_Lilycove_Wailmer3, TRUE
return
LilycoveCity_EventScript_BerryGentleman::
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 6dbd1eb84..fc5ea1d7a 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -418,14 +418,14 @@ LilycoveCity_ContestLobby_EventScript_LeadToContestHall::
applymovement LOCALID_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter
waitmovement 0
playse SE_BRIDGE_WALK
- setmetatile 12, 2, METATILE_Contest_WallShadow, 1
- setmetatile 12, 3, METATILE_Contest_FloorShadow, 1
+ setmetatile 12, 2, METATILE_Contest_WallShadow, TRUE
+ setmetatile 12, 3, METATILE_Contest_FloorShadow, TRUE
special DrawWholeMapView
applymovement LOCALID_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter
waitmovement 0
playse SE_BRIDGE_WALK
- setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, 1
- setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, 1
+ setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, TRUE
+ setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, TRUE
special DrawWholeMapView
delay 20
applymovement LOCALID_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer
@@ -939,14 +939,14 @@ LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall::
applymovement LOCALID_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter
waitmovement 0
playse SE_BRIDGE_WALK
- setmetatile 17, 2, METATILE_Contest_WallShadow, 1
- setmetatile 17, 3, METATILE_Contest_FloorShadow, 1
+ setmetatile 17, 2, METATILE_Contest_WallShadow, TRUE
+ setmetatile 17, 3, METATILE_Contest_FloorShadow, TRUE
special DrawWholeMapView
applymovement LOCALID_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter
waitmovement 0
playse SE_BRIDGE_WALK
- setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, 1
- setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, 1
+ setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, TRUE
+ setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, TRUE
special DrawWholeMapView
delay 20
applymovement LOCALID_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 929bba3e1..bf220b04f 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -30,32 +30,32 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting::
end
LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting::
- setmetatile 10, 6, METATILE_LilycoveMuseum_Painting2_Left, 1
- setmetatile 11, 6, METATILE_LilycoveMuseum_Painting2_Right, 1
+ setmetatile 10, 6, METATILE_LilycoveMuseum_Painting2_Left, TRUE
+ setmetatile 11, 6, METATILE_LilycoveMuseum_Painting2_Right, TRUE
goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting
end
LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting::
- setmetatile 18, 6, METATILE_LilycoveMuseum_Painting1_Left, 1
- setmetatile 19, 6, METATILE_LilycoveMuseum_Painting1_Right, 1
+ setmetatile 18, 6, METATILE_LilycoveMuseum_Painting1_Left, TRUE
+ setmetatile 19, 6, METATILE_LilycoveMuseum_Painting1_Right, TRUE
goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting
end
LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting::
- setmetatile 14, 10, METATILE_LilycoveMuseum_Painting3_Left, 1
- setmetatile 15, 10, METATILE_LilycoveMuseum_Painting3_Right, 1
+ setmetatile 14, 10, METATILE_LilycoveMuseum_Painting3_Left, TRUE
+ setmetatile 15, 10, METATILE_LilycoveMuseum_Painting3_Right, TRUE
goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting
end
LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting::
- setmetatile 6, 10, METATILE_LilycoveMuseum_Painting0_Left, 1
- setmetatile 7, 10, METATILE_LilycoveMuseum_Painting0_Right, 1
+ setmetatile 6, 10, METATILE_LilycoveMuseum_Painting0_Left, TRUE
+ setmetatile 7, 10, METATILE_LilycoveMuseum_Painting0_Right, TRUE
goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting
end
LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting::
- setmetatile 2, 6, METATILE_LilycoveMuseum_Painting4_Left, 1
- setmetatile 3, 6, METATILE_LilycoveMuseum_Painting4_Right, 1
+ setmetatile 2, 6, METATILE_LilycoveMuseum_Painting4_Left, TRUE
+ setmetatile 3, 6, METATILE_LilycoveMuseum_Painting4_Right, TRUE
end
LilycoveCity_LilycoveMuseum_2F_OnFrame:
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index 95399eaea..15bd96f25 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -15,8 +15,8 @@ LittlerootTown_BrendansHouse_1F_OnLoad:
end
LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes::
- setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
- setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
+ setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, TRUE
+ setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, TRUE
return
LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual::
@@ -26,7 +26,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual::
return
LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual::
- setmetatile 3, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
+ setmetatile 3, 7, METATILE_BrendansMaysHouse_BookOnTable, TRUE
return
LittlerootTown_BrendansHouse_1F_OnTransition:
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index 2a73a94c8..b022402d0 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -15,8 +15,8 @@ LittlerootTown_MaysHouse_1F_OnLoad:
end
LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes::
- setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
- setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
+ setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, TRUE
+ setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, TRUE
return
LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual::
@@ -26,7 +26,7 @@ LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual::
return
LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual::
- setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
+ setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, TRUE
return
LittlerootTown_MaysHouse_1F_OnTransition:
diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index 3c09ecfa2..d446e44b9 100644
--- a/data/maps/MauvilleCity_Gym/scripts.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
@@ -17,32 +17,32 @@ MauvilleCity_Gym_EventScript_UpdateBarriers::
end
MauvilleCity_Gym_EventScript_SetAltBarriers::
- setmetatile 3, 11, METATILE_MauvilleGym_RedBeamV1_On, 1
- setmetatile 3, 12, METATILE_MauvilleGym_RedBeamV2_On, 1
- setmetatile 3, 13, METATILE_MauvilleGym_PoleTop_On, 1
- setmetatile 4, 10, METATILE_MauvilleGym_RedBeamH1_On, 0
- setmetatile 5, 10, METATILE_MauvilleGym_RedBeamH2_On, 0
- setmetatile 4, 11, METATILE_MauvilleGym_RedBeamH3_On, 1
- setmetatile 5, 11, METATILE_MauvilleGym_RedBeamH4_On, 1
- setmetatile 7, 10, METATILE_MauvilleGym_RedBeamH1_On, 0
- setmetatile 8, 10, METATILE_MauvilleGym_RedBeamH2_On, 0
- setmetatile 7, 11, METATILE_MauvilleGym_RedBeamH3_On, 1
- setmetatile 8, 11, METATILE_MauvilleGym_RedBeamH4_On, 1
- setmetatile 4, 13, METATILE_MauvilleGym_GreenBeamH1_Off, 0
- setmetatile 5, 13, METATILE_MauvilleGym_GreenBeamH2_Off, 0
- setmetatile 4, 14, METATILE_MauvilleGym_GreenBeamH3_Off, 0
- setmetatile 5, 14, METATILE_MauvilleGym_GreenBeamH4_Off, 0
- setmetatile 1, 10, METATILE_MauvilleGym_GreenBeamH1_Off, 0
- setmetatile 2, 10, METATILE_MauvilleGym_GreenBeamH2_Off, 0
- setmetatile 1, 11, METATILE_MauvilleGym_GreenBeamH3_Off, 0
- setmetatile 2, 11, METATILE_MauvilleGym_GreenBeamH4_Off, 0
- setmetatile 6, 8, METATILE_MauvilleGym_PoleBottom_On, 1
- setmetatile 6, 9, METATILE_MauvilleGym_FloorTile, 0
- setmetatile 6, 10, METATILE_MauvilleGym_PoleTop_Off, 0
- setmetatile 4, 6, METATILE_MauvilleGym_GreenBeamH1_Off, 0
- setmetatile 5, 6, METATILE_MauvilleGym_GreenBeamH2_Off, 0
- setmetatile 4, 7, METATILE_MauvilleGym_GreenBeamH3_Off, 0
- setmetatile 5, 7, METATILE_MauvilleGym_GreenBeamH4_Off, 0
+ setmetatile 3, 11, METATILE_MauvilleGym_RedBeamV1_On, TRUE
+ setmetatile 3, 12, METATILE_MauvilleGym_RedBeamV2_On, TRUE
+ setmetatile 3, 13, METATILE_MauvilleGym_PoleTop_On, TRUE
+ setmetatile 4, 10, METATILE_MauvilleGym_RedBeamH1_On, FALSE
+ setmetatile 5, 10, METATILE_MauvilleGym_RedBeamH2_On, FALSE
+ setmetatile 4, 11, METATILE_MauvilleGym_RedBeamH3_On, TRUE
+ setmetatile 5, 11, METATILE_MauvilleGym_RedBeamH4_On, TRUE
+ setmetatile 7, 10, METATILE_MauvilleGym_RedBeamH1_On, FALSE
+ setmetatile 8, 10, METATILE_MauvilleGym_RedBeamH2_On, FALSE
+ setmetatile 7, 11, METATILE_MauvilleGym_RedBeamH3_On, TRUE
+ setmetatile 8, 11, METATILE_MauvilleGym_RedBeamH4_On, TRUE
+ setmetatile 4, 13, METATILE_MauvilleGym_GreenBeamH1_Off, FALSE
+ setmetatile 5, 13, METATILE_MauvilleGym_GreenBeamH2_Off, FALSE
+ setmetatile 4, 14, METATILE_MauvilleGym_GreenBeamH3_Off, FALSE
+ setmetatile 5, 14, METATILE_MauvilleGym_GreenBeamH4_Off, FALSE
+ setmetatile 1, 10, METATILE_MauvilleGym_GreenBeamH1_Off, FALSE
+ setmetatile 2, 10, METATILE_MauvilleGym_GreenBeamH2_Off, FALSE
+ setmetatile 1, 11, METATILE_MauvilleGym_GreenBeamH3_Off, FALSE
+ setmetatile 2, 11, METATILE_MauvilleGym_GreenBeamH4_Off, FALSE
+ setmetatile 6, 8, METATILE_MauvilleGym_PoleBottom_On, TRUE
+ setmetatile 6, 9, METATILE_MauvilleGym_FloorTile, FALSE
+ setmetatile 6, 10, METATILE_MauvilleGym_PoleTop_Off, FALSE
+ setmetatile 4, 6, METATILE_MauvilleGym_GreenBeamH1_Off, FALSE
+ setmetatile 5, 6, METATILE_MauvilleGym_GreenBeamH2_Off, FALSE
+ setmetatile 4, 7, METATILE_MauvilleGym_GreenBeamH3_Off, FALSE
+ setmetatile 5, 7, METATILE_MauvilleGym_GreenBeamH4_Off, FALSE
end
MauvilleCity_Gym_EventScript_Switch1Pressed::
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index 23ae9728d..b81f5de26 100644
--- a/data/maps/MeteorFalls_1F_1R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -13,10 +13,10 @@ MeteorFalls_1F_1R_OnLoad:
end
MeteorFalls_1F_1R_EventScript_OpenStevensCave::
- setmetatile 4, 1, METATILE_MeteorFalls_CaveEntrance_Top, 1
- setmetatile 3, 2, METATILE_MeteorFalls_CaveEntrance_Left, 1
- setmetatile 4, 2, METATILE_MeteorFalls_CaveEntrance_Bottom, 0
- setmetatile 5, 2, METATILE_MeteorFalls_CaveEntrance_Right, 1
+ setmetatile 4, 1, METATILE_MeteorFalls_CaveEntrance_Top, TRUE
+ setmetatile 3, 2, METATILE_MeteorFalls_CaveEntrance_Left, TRUE
+ setmetatile 4, 2, METATILE_MeteorFalls_CaveEntrance_Bottom, FALSE
+ setmetatile 5, 2, METATILE_MeteorFalls_CaveEntrance_Right, TRUE
return
MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene::
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index d6df2b380..7b63de2e7 100644
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -26,26 +26,26 @@ MossdeepCity_Gym_EventScript_CheckSwitch4::
@ All the below set metatile scripts are leftover from RS and are functionally unused
MossdeepCity_Gym_EventScript_SetSwitch1Metatiles::
- setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0
- setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1
+ setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+ setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, TRUE
goto MossdeepCity_Gym_EventScript_CheckSwitch2
end
MossdeepCity_Gym_EventScript_SetSwitch2Metatiles::
- setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0
- setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1
+ setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+ setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, TRUE
goto MossdeepCity_Gym_EventScript_CheckSwitch3
end
MossdeepCity_Gym_EventScript_SetSwitch3Metatiles::
- setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0
- setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1
+ setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, FALSE
+ setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, TRUE
goto MossdeepCity_Gym_EventScript_CheckSwitch4
end
MossdeepCity_Gym_EventScript_SetSwitch4Metatiles::
- setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0
- setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1
+ setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, FALSE
+ setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, TRUE
end
MossdeepCity_Gym_EventScript_TateAndLiza::
@@ -119,8 +119,8 @@ MossdeepCity_Gym_EventScript_Switch1::
setflag FLAG_MOSSDEEP_GYM_SWITCH_1
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
- setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0
- setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1
+ setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+ setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, TRUE
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
@@ -134,8 +134,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch1::
clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
- setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Left, 0
- setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Up, 1
+ setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Left, FALSE
+ setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Up, TRUE
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
@@ -145,8 +145,8 @@ MossdeepCity_Gym_EventScript_Switch2::
setflag FLAG_MOSSDEEP_GYM_SWITCH_2
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
- setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0
- setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1
+ setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+ setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, TRUE
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
@@ -154,8 +154,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch2::
clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
- setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Down, 0
- setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Up, 1
+ setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Down, FALSE
+ setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Up, TRUE
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
@@ -165,8 +165,8 @@ MossdeepCity_Gym_EventScript_Switch3::
setflag FLAG_MOSSDEEP_GYM_SWITCH_3
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
- setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0
- setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1
+ setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, FALSE
+ setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, TRUE
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
@@ -174,8 +174,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch3::
clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
- setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Right, 0
- setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Up, 1
+ setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+ setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Up, TRUE
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
@@ -185,8 +185,8 @@ MossdeepCity_Gym_EventScript_Switch4::
setflag FLAG_MOSSDEEP_GYM_SWITCH_4
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
- setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0
- setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1
+ setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, FALSE
+ setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, TRUE
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
@@ -194,8 +194,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch4::
clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
- setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Right, 0
- setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Up, 1
+ setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+ setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Up, TRUE
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index b44b343a6..b7c08839e 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -52,7 +52,7 @@ MossdeepCity_SpaceCenter_1F_OnLoad:
end
MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote::
- setmetatile 2, 5, METATILE_Facility_DataPad, 1
+ setmetatile 2, 5, METATILE_Facility_DataPad, TRUE
return
MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter::
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 22b26f392..af7c601e0 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -12,7 +12,7 @@ MossdeepCity_StevensHouse_OnLoad:
end
MossdeepCity_StevensHouse_EventScript_HideStevensNote::
- setmetatile 6, 4, METATILE_GenericBuilding_TableEdge, 1
+ setmetatile 6, 4, METATILE_GenericBuilding_TableEdge, TRUE
return
MossdeepCity_StevensHouse_OnTransition:
diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc
index 1304db337..50582ce38 100644
--- a/data/maps/NewMauville_Entrance/scripts.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
@@ -9,12 +9,12 @@ NewMauville_Entrance_OnLoad:
end
NewMauville_Entrance_EventScript_CloseDoor::
- setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile0, 1
- setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile1, 1
- setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile2, 1
- setmetatile 3, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile3, 1
- setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile4, 1
- setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile5, 1
+ setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile0, TRUE
+ setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile1, TRUE
+ setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile2, TRUE
+ setmetatile 3, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile3, TRUE
+ setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile4, TRUE
+ setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile5, TRUE
return
NewMauville_Entrance_OnTransition:
@@ -33,12 +33,12 @@ NewMauville_Entrance_EventScript_Door::
compare VAR_RESULT, NO
goto_if_eq NewMauville_Entrance_EventScript_DontOpenDoor
msgbox NewMauville_Entrance_Text_UsedBasementKey, MSGBOX_DEFAULT
- setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, 0
- setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile1, 0
- setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile2, 0
- setmetatile 3, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile3, 1
- setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile4, 0
- setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile5, 1
+ setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, FALSE
+ setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile1, FALSE
+ setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile2, FALSE
+ setmetatile 3, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile3, TRUE
+ setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile4, FALSE
+ setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile5, TRUE
special DrawWholeMapView
playse SE_BANG
setvar VAR_NEW_MAUVILLE_STATE, 1
diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc
index d924651ce..543b030e1 100644
--- a/data/maps/NewMauville_Inside/scripts.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
@@ -65,83 +65,83 @@ NewMauville_Inside_EventScript_GreenButton::
end
NewMauville_Inside_EventScript_SetBarrierStateBlueButton::
- setmetatile 23, 34, METATILE_BikeShop_Barrier_Hidden_Top, 1
- setmetatile 23, 35, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
- setmetatile 23, 36, METATILE_BikeShop_Floor_Shadow_Top, 0
- setmetatile 23, 37, METATILE_BikeShop_Wall_Edge_Top, 0
- setmetatile 10, 16, METATILE_BikeShop_Barrier_Hidden_Top, 1
- setmetatile 10, 17, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
- setmetatile 10, 18, METATILE_BikeShop_Floor_Shadow_Top, 0
- setmetatile 10, 19, METATILE_BikeShop_Wall_Edge_Top, 0
- setmetatile 10, 0, METATILE_BikeShop_Barrier_Hidden_Top, 1
- setmetatile 10, 1, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
- setmetatile 10, 2, METATILE_BikeShop_Floor_Shadow_Top, 0
- setmetatile 10, 3, METATILE_BikeShop_Wall_Edge_Top, 0
- setmetatile 37, 33, METATILE_BikeShop_Barrier_Green_Top, 1
- setmetatile 37, 34, METATILE_BikeShop_Barrier_Green_TopMid, 1
- setmetatile 37, 35, METATILE_BikeShop_Barrier_Green_BottomMid, 1
- setmetatile 37, 36, METATILE_BikeShop_Barrier_Green_Bottom, 1
- setmetatile 28, 22, METATILE_BikeShop_Barrier_Green_Top, 1
- setmetatile 28, 23, METATILE_BikeShop_Barrier_Green_TopMid, 1
- setmetatile 28, 24, METATILE_BikeShop_Barrier_Green_BottomMid, 1
- setmetatile 28, 25, METATILE_BikeShop_Barrier_Green_Bottom, 1
- setmetatile 10, 24, METATILE_BikeShop_Barrier_Green_Top, 1
- setmetatile 10, 25, METATILE_BikeShop_Barrier_Green_TopMid, 1
- setmetatile 10, 26, METATILE_BikeShop_Barrier_Green_BottomMid, 1
- setmetatile 10, 27, METATILE_BikeShop_Barrier_Green_Bottom, 1
- setmetatile 21, 2, METATILE_BikeShop_Barrier_Green_Top, 1
- setmetatile 21, 3, METATILE_BikeShop_Barrier_Green_TopMid, 1
- setmetatile 21, 4, METATILE_BikeShop_Barrier_Green_BottomMid, 1
- setmetatile 21, 5, METATILE_BikeShop_Barrier_Green_Bottom, 1
- setmetatile 6, 11, METATILE_BikeShop_Button_Pressed, 0
- setmetatile 13, 10, METATILE_BikeShop_Button_Pressed, 0
- setmetatile 16, 22, METATILE_BikeShop_Button_Pressed, 0
- setmetatile 4, 26, METATILE_BikeShop_Button_Pressed, 0
- setmetatile 30, 38, METATILE_BikeShop_Button_Pressed, 0
- setmetatile 2, 11, METATILE_BikeShop_Button_Green, 0
- setmetatile 17, 10, METATILE_BikeShop_Button_Green, 0
- setmetatile 25, 18, METATILE_BikeShop_Button_Green, 0
- setmetatile 18, 36, METATILE_BikeShop_Button_Green, 0
+ setmetatile 23, 34, METATILE_BikeShop_Barrier_Hidden_Top, TRUE
+ setmetatile 23, 35, METATILE_BikeShop_Barrier_Hidden_Bottom, TRUE
+ setmetatile 23, 36, METATILE_BikeShop_Floor_Shadow_Top, FALSE
+ setmetatile 23, 37, METATILE_BikeShop_Wall_Edge_Top, FALSE
+ setmetatile 10, 16, METATILE_BikeShop_Barrier_Hidden_Top, TRUE
+ setmetatile 10, 17, METATILE_BikeShop_Barrier_Hidden_Bottom, TRUE
+ setmetatile 10, 18, METATILE_BikeShop_Floor_Shadow_Top, FALSE
+ setmetatile 10, 19, METATILE_BikeShop_Wall_Edge_Top, FALSE
+ setmetatile 10, 0, METATILE_BikeShop_Barrier_Hidden_Top, TRUE
+ setmetatile 10, 1, METATILE_BikeShop_Barrier_Hidden_Bottom, TRUE
+ setmetatile 10, 2, METATILE_BikeShop_Floor_Shadow_Top, FALSE
+ setmetatile 10, 3, METATILE_BikeShop_Wall_Edge_Top, FALSE
+ setmetatile 37, 33, METATILE_BikeShop_Barrier_Green_Top, TRUE
+ setmetatile 37, 34, METATILE_BikeShop_Barrier_Green_TopMid, TRUE
+ setmetatile 37, 35, METATILE_BikeShop_Barrier_Green_BottomMid, TRUE
+ setmetatile 37, 36, METATILE_BikeShop_Barrier_Green_Bottom, TRUE
+ setmetatile 28, 22, METATILE_BikeShop_Barrier_Green_Top, TRUE
+ setmetatile 28, 23, METATILE_BikeShop_Barrier_Green_TopMid, TRUE
+ setmetatile 28, 24, METATILE_BikeShop_Barrier_Green_BottomMid, TRUE
+ setmetatile 28, 25, METATILE_BikeShop_Barrier_Green_Bottom, TRUE
+ setmetatile 10, 24, METATILE_BikeShop_Barrier_Green_Top, TRUE
+ setmetatile 10, 25, METATILE_BikeShop_Barrier_Green_TopMid, TRUE
+ setmetatile 10, 26, METATILE_BikeShop_Barrier_Green_BottomMid, TRUE
+ setmetatile 10, 27, METATILE_BikeShop_Barrier_Green_Bottom, TRUE
+ setmetatile 21, 2, METATILE_BikeShop_Barrier_Green_Top, TRUE
+ setmetatile 21, 3, METATILE_BikeShop_Barrier_Green_TopMid, TRUE
+ setmetatile 21, 4, METATILE_BikeShop_Barrier_Green_BottomMid, TRUE
+ setmetatile 21, 5, METATILE_BikeShop_Barrier_Green_Bottom, TRUE
+ setmetatile 6, 11, METATILE_BikeShop_Button_Pressed, FALSE
+ setmetatile 13, 10, METATILE_BikeShop_Button_Pressed, FALSE
+ setmetatile 16, 22, METATILE_BikeShop_Button_Pressed, FALSE
+ setmetatile 4, 26, METATILE_BikeShop_Button_Pressed, FALSE
+ setmetatile 30, 38, METATILE_BikeShop_Button_Pressed, FALSE
+ setmetatile 2, 11, METATILE_BikeShop_Button_Green, FALSE
+ setmetatile 17, 10, METATILE_BikeShop_Button_Green, FALSE
+ setmetatile 25, 18, METATILE_BikeShop_Button_Green, FALSE
+ setmetatile 18, 36, METATILE_BikeShop_Button_Green, FALSE
return
NewMauville_Inside_EventScript_SetBarrierStateGreenButton::
- setmetatile 23, 34, METATILE_BikeShop_Barrier_Blue_Top, 1
- setmetatile 23, 35, METATILE_BikeShop_Barrier_Blue_TopMid, 1
- setmetatile 23, 36, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
- setmetatile 23, 37, METATILE_BikeShop_Barrier_Blue_Bottom, 1
- setmetatile 10, 16, METATILE_BikeShop_Barrier_Blue_Top, 1
- setmetatile 10, 17, METATILE_BikeShop_Barrier_Blue_TopMid, 1
- setmetatile 10, 18, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
- setmetatile 10, 19, METATILE_BikeShop_Barrier_Blue_Bottom, 1
- setmetatile 10, 0, METATILE_BikeShop_Barrier_Blue_Top, 1
- setmetatile 10, 1, METATILE_BikeShop_Barrier_Blue_TopMid, 1
- setmetatile 10, 2, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
- setmetatile 10, 3, METATILE_BikeShop_Barrier_Blue_Bottom, 1
- setmetatile 37, 33, METATILE_BikeShop_Barrier_Hidden_Top, 1
- setmetatile 37, 34, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
- setmetatile 37, 35, METATILE_BikeShop_Floor_Shadow_Top, 0
- setmetatile 37, 36, METATILE_BikeShop_Wall_Edge_Top, 0
- setmetatile 28, 22, METATILE_BikeShop_Barrier_Hidden_Top, 1
- setmetatile 28, 23, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
- setmetatile 28, 24, METATILE_BikeShop_Floor_Shadow_Top, 0
- setmetatile 28, 25, METATILE_BikeShop_Wall_Edge_Top, 0
- setmetatile 10, 24, METATILE_BikeShop_Barrier_Hidden_Top, 1
- setmetatile 10, 25, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
- setmetatile 10, 26, METATILE_BikeShop_Floor_Shadow_Top, 0
- setmetatile 10, 27, METATILE_BikeShop_Wall_Edge_Top, 0
- setmetatile 21, 2, METATILE_BikeShop_Barrier_Hidden_Top, 1
- setmetatile 21, 3, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
- setmetatile 21, 4, METATILE_BikeShop_Floor_Shadow_Top, 0
- setmetatile 21, 5, METATILE_BikeShop_Wall_Edge_Top, 0
- setmetatile 2, 11, METATILE_BikeShop_Button_Pressed, 0
- setmetatile 17, 10, METATILE_BikeShop_Button_Pressed, 0
- setmetatile 25, 18, METATILE_BikeShop_Button_Pressed, 0
- setmetatile 18, 36, METATILE_BikeShop_Button_Pressed, 0
- setmetatile 6, 11, METATILE_BikeShop_Button_Blue, 0
- setmetatile 13, 10, METATILE_BikeShop_Button_Blue, 0
- setmetatile 16, 22, METATILE_BikeShop_Button_Blue, 0
- setmetatile 4, 26, METATILE_BikeShop_Button_Blue, 0
- setmetatile 30, 38, METATILE_BikeShop_Button_Blue, 0
+ setmetatile 23, 34, METATILE_BikeShop_Barrier_Blue_Top, TRUE
+ setmetatile 23, 35, METATILE_BikeShop_Barrier_Blue_TopMid, TRUE
+ setmetatile 23, 36, METATILE_BikeShop_Barrier_Blue_BottomMid, TRUE
+ setmetatile 23, 37, METATILE_BikeShop_Barrier_Blue_Bottom, TRUE
+ setmetatile 10, 16, METATILE_BikeShop_Barrier_Blue_Top, TRUE
+ setmetatile 10, 17, METATILE_BikeShop_Barrier_Blue_TopMid, TRUE
+ setmetatile 10, 18, METATILE_BikeShop_Barrier_Blue_BottomMid, TRUE
+ setmetatile 10, 19, METATILE_BikeShop_Barrier_Blue_Bottom, TRUE
+ setmetatile 10, 0, METATILE_BikeShop_Barrier_Blue_Top, TRUE
+ setmetatile 10, 1, METATILE_BikeShop_Barrier_Blue_TopMid, TRUE
+ setmetatile 10, 2, METATILE_BikeShop_Barrier_Blue_BottomMid, TRUE
+ setmetatile 10, 3, METATILE_BikeShop_Barrier_Blue_Bottom, TRUE
+ setmetatile 37, 33, METATILE_BikeShop_Barrier_Hidden_Top, TRUE
+ setmetatile 37, 34, METATILE_BikeShop_Barrier_Hidden_Bottom, TRUE
+ setmetatile 37, 35, METATILE_BikeShop_Floor_Shadow_Top, FALSE
+ setmetatile 37, 36, METATILE_BikeShop_Wall_Edge_Top, FALSE
+ setmetatile 28, 22, METATILE_BikeShop_Barrier_Hidden_Top, TRUE
+ setmetatile 28, 23, METATILE_BikeShop_Barrier_Hidden_Bottom, TRUE
+ setmetatile 28, 24, METATILE_BikeShop_Floor_Shadow_Top, FALSE
+ setmetatile 28, 25, METATILE_BikeShop_Wall_Edge_Top, FALSE
+ setmetatile 10, 24, METATILE_BikeShop_Barrier_Hidden_Top, TRUE
+ setmetatile 10, 25, METATILE_BikeShop_Barrier_Hidden_Bottom, TRUE
+ setmetatile 10, 26, METATILE_BikeShop_Floor_Shadow_Top, FALSE
+ setmetatile 10, 27, METATILE_BikeShop_Wall_Edge_Top, FALSE
+ setmetatile 21, 2, METATILE_BikeShop_Barrier_Hidden_Top, TRUE
+ setmetatile 21, 3, METATILE_BikeShop_Barrier_Hidden_Bottom, TRUE
+ setmetatile 21, 4, METATILE_BikeShop_Floor_Shadow_Top, FALSE
+ setmetatile 21, 5, METATILE_BikeShop_Wall_Edge_Top, FALSE
+ setmetatile 2, 11, METATILE_BikeShop_Button_Pressed, FALSE
+ setmetatile 17, 10, METATILE_BikeShop_Button_Pressed, FALSE
+ setmetatile 25, 18, METATILE_BikeShop_Button_Pressed, FALSE
+ setmetatile 18, 36, METATILE_BikeShop_Button_Pressed, FALSE
+ setmetatile 6, 11, METATILE_BikeShop_Button_Blue, FALSE
+ setmetatile 13, 10, METATILE_BikeShop_Button_Blue, FALSE
+ setmetatile 16, 22, METATILE_BikeShop_Button_Blue, FALSE
+ setmetatile 4, 26, METATILE_BikeShop_Button_Blue, FALSE
+ setmetatile 30, 38, METATILE_BikeShop_Button_Blue, FALSE
return
NewMauville_Inside_EventScript_RedButton::
@@ -153,15 +153,15 @@ NewMauville_Inside_EventScript_RedButton::
end
NewMauville_Inside_EventScript_SetGeneratorOffMetatiles::
- setmetatile 33, 6, METATILE_BikeShop_Button_Pressed, 0
- setmetatile 32, 2, METATILE_BikeShop_Generator_Off_Tile0, 1
- setmetatile 33, 2, METATILE_BikeShop_Generator_Off_Tile1, 1
- setmetatile 34, 2, METATILE_BikeShop_Generator_Off_Tile2, 1
- setmetatile 35, 2, METATILE_BikeShop_Generator_Off_Tile3, 1
- setmetatile 32, 3, METATILE_BikeShop_Generator_Off_Tile4, 1
- setmetatile 33, 3, METATILE_BikeShop_Generator_Off_Tile5, 1
- setmetatile 34, 3, METATILE_BikeShop_Generator_Off_Tile6, 1
- setmetatile 35, 3, METATILE_BikeShop_Generator_Off_Tile7, 1
+ setmetatile 33, 6, METATILE_BikeShop_Button_Pressed, FALSE
+ setmetatile 32, 2, METATILE_BikeShop_Generator_Off_Tile0, TRUE
+ setmetatile 33, 2, METATILE_BikeShop_Generator_Off_Tile1, TRUE
+ setmetatile 34, 2, METATILE_BikeShop_Generator_Off_Tile2, TRUE
+ setmetatile 35, 2, METATILE_BikeShop_Generator_Off_Tile3, TRUE
+ setmetatile 32, 3, METATILE_BikeShop_Generator_Off_Tile4, TRUE
+ setmetatile 33, 3, METATILE_BikeShop_Generator_Off_Tile5, TRUE
+ setmetatile 34, 3, METATILE_BikeShop_Generator_Off_Tile6, TRUE
+ setmetatile 35, 3, METATILE_BikeShop_Generator_Off_Tile7, TRUE
special DrawWholeMapView
return
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index 6c8da5847..251f24aa6 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -1138,51 +1138,51 @@ PetalburgCity_Gym_EventScript_OpenOHKORoomDoors::
return
PetalburgCity_Gym_EventScript_SetEntranceRoomDoorMetatiles::
- setmetatile 6, 85, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 7, 85, METATILE_PetalburgGym_RoomEntrance_Right, 0
- setmetatile 1, 98, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 2, 98, METATILE_PetalburgGym_RoomEntrance_Right, 0
+ setmetatile 6, 85, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 7, 85, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
+ setmetatile 1, 98, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 2, 98, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
return
PetalburgCity_Gym_EventScript_SetSpeedRoomDoorMetatiles::
- setmetatile 6, 46, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 7, 46, METATILE_PetalburgGym_RoomEntrance_Right, 0
- setmetatile 1, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 2, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0
+ setmetatile 6, 46, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 7, 46, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
+ setmetatile 1, 59, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 2, 59, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
return
PetalburgCity_Gym_EventScript_SetAccuracyRoomDoorMetatiles::
- setmetatile 6, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 7, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0
- setmetatile 1, 72, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 2, 72, METATILE_PetalburgGym_RoomEntrance_Right, 0
+ setmetatile 6, 59, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 7, 59, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
+ setmetatile 1, 72, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 2, 72, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
return
PetalburgCity_Gym_EventScript_SetConfusionRoomDoorMetatiles::
- setmetatile 1, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 2, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0
+ setmetatile 1, 20, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 2, 20, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
return
PetalburgCity_Gym_EventScript_SetDefenseRoomDoorMetatiles::
- setmetatile 6, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 7, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0
- setmetatile 1, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 2, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0
+ setmetatile 6, 20, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 7, 20, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
+ setmetatile 1, 33, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 2, 33, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
return
PetalburgCity_Gym_EventScript_SetRecoveryRoomDoorMetatiles::
- setmetatile 6, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 7, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0
+ setmetatile 6, 33, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 7, 33, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
return
PetalburgCity_Gym_EventScript_SetStrengthRoomDoorMetatiles::
- setmetatile 1, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 2, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0
+ setmetatile 1, 7, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 2, 7, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
return
PetalburgCity_Gym_EventScript_SetOHKORoomDoorMetatiles::
- setmetatile 6, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0
- setmetatile 7, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0
+ setmetatile 6, 7, METATILE_PetalburgGym_RoomEntrance_Left, FALSE
+ setmetatile 7, 7, METATILE_PetalburgGym_RoomEntrance_Right, FALSE
return
PetalburgCity_Gym_EventScript_SlideOpenRoomDoors::
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index 4553f431c..cf7bc72b5 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -15,8 +15,8 @@ Route103_OnLoad:
end
Route103_EventScript_OpenAlteringCave::
- setmetatile 45, 5, METATILE_General_CaveEntrance_Top, 1
- setmetatile 45, 6, METATILE_General_CaveEntrance_Bottom, 0
+ setmetatile 45, 5, METATILE_General_CaveEntrance_Top, TRUE
+ setmetatile 45, 6, METATILE_General_CaveEntrance_Bottom, FALSE
return
Route103_EventScript_Rival::
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index b60cd181f..2184edf5a 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -13,8 +13,8 @@ Route105_OnLoad:
end
Route105_CloseRegiEntrance::
- setmetatile 9, 19, METATILE_General_RockWall_RockBase, 1
- setmetatile 9, 20, METATILE_General_RockWall_SandBase, 1
+ setmetatile 9, 19, METATILE_General_RockWall_RockBase, TRUE
+ setmetatile 9, 20, METATILE_General_RockWall_SandBase, TRUE
return
Route105_OnTransition:
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index f30d74f01..116c3a4fe 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -39,7 +39,7 @@ Route110_TrickHouseEnd_EventScript_CloseDoor::
end
Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile::
- setmetatile 10, 1, METATILE_GenericBuilding_TrickHouse_Door_Closed, 1
+ setmetatile 10, 1, METATILE_GenericBuilding_TrickHouse_Door_Closed, TRUE
return
Route110_TrickHouseEnd_EventScript_TrickMaster::
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index ef8e45b45..a0250c44c 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -512,7 +512,7 @@ Route110_TrickHouseEntrance_EventScript_GoInHolePrompt::
end
Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom::
- setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0
+ setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, FALSE
special DrawWholeMapView
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp
@@ -618,7 +618,7 @@ Route110_TrickHousePuzzle1_EventScript_Door::
msgbox Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
- setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
+ setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, FALSE
special DrawWholeMapView
releaseall
end
@@ -629,7 +629,7 @@ Route110_TrickHousePuzzle2_EventScript_Door::
msgbox Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
- setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
+ setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, FALSE
special DrawWholeMapView
releaseall
end
@@ -640,7 +640,7 @@ Route110_TrickHousePuzzle3_EventScript_Door::
msgbox Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
- setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
+ setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, FALSE
special DrawWholeMapView
releaseall
end
@@ -651,7 +651,7 @@ Route110_TrickHousePuzzle4_EventScript_Door::
msgbox Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
- setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
+ setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, FALSE
special DrawWholeMapView
releaseall
end
@@ -662,7 +662,7 @@ Route110_TrickHousePuzzle5_EventScript_Door::
msgbox Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
- setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
+ setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, FALSE
special DrawWholeMapView
releaseall
end
@@ -673,7 +673,7 @@ Route110_TrickHousePuzzle6_EventScript_Door::
msgbox Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
- setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
+ setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, FALSE
special DrawWholeMapView
releaseall
end
@@ -684,7 +684,7 @@ Route110_TrickHousePuzzle7_EventScript_Door::
msgbox Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
- setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
+ setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, FALSE
special DrawWholeMapView
releaseall
end
@@ -695,7 +695,7 @@ Route110_TrickHousePuzzle8_EventScript_Door::
msgbox Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
playse SE_PIN
setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
- setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
+ setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, FALSE
special DrawWholeMapView
releaseall
end
diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index 6fc6adcd5..920a43819 100644
--- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
@@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1_OnLoad:
end
Route110_TrickHousePuzzle1_EventScript_OpenDoor::
- setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
+ setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, FALSE
end
Route110_TrickHousePuzzle1_EventScript_Scroll::
diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index a0222733a..4e8c52cf4 100644
--- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
@@ -70,23 +70,23 @@ Route110_TrickHousePuzzle2_EventScript_Button4::
end
Route110_TrickHousePuzzle2_EventScript_PressButton1::
- setmetatile 11, 12, METATILE_TrickHousePuzzle_Button_Pressed, 0
- setmetatile 1, 13, METATILE_TrickHousePuzzle_Door_Shuttered, 0
+ setmetatile 11, 12, METATILE_TrickHousePuzzle_Button_Pressed, FALSE
+ setmetatile 1, 13, METATILE_TrickHousePuzzle_Door_Shuttered, FALSE
return
Route110_TrickHousePuzzle2_EventScript_PressButton2::
- setmetatile 0, 4, METATILE_TrickHousePuzzle_Button_Pressed, 0
- setmetatile 5, 6, METATILE_TrickHousePuzzle_Door_Shuttered, 0
+ setmetatile 0, 4, METATILE_TrickHousePuzzle_Button_Pressed, FALSE
+ setmetatile 5, 6, METATILE_TrickHousePuzzle_Door_Shuttered, FALSE
return
Route110_TrickHousePuzzle2_EventScript_PressButton3::
- setmetatile 14, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
- setmetatile 7, 15, METATILE_TrickHousePuzzle_Door_Shuttered, 0
+ setmetatile 14, 5, METATILE_TrickHousePuzzle_Button_Pressed, FALSE
+ setmetatile 7, 15, METATILE_TrickHousePuzzle_Door_Shuttered, FALSE
return
Route110_TrickHousePuzzle2_EventScript_PressButton4::
- setmetatile 7, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
- setmetatile 14, 12, METATILE_TrickHousePuzzle_Door_Shuttered, 0
+ setmetatile 7, 11, METATILE_TrickHousePuzzle_Button_Pressed, FALSE
+ setmetatile 14, 12, METATILE_TrickHousePuzzle_Door_Shuttered, FALSE
return
Route110_TrickHousePuzzle2_EventScript_Ted::
diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index 4e706268c..2b732124f 100644
--- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
@@ -21,10 +21,10 @@ Route110_TrickHousePuzzle3_OnTransition:
end
Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles::
- setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Up, 0
- setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Up, 0
- setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Up, 0
- setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Up, 0
+ setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Up, FALSE
+ setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Up, FALSE
+ setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Up, FALSE
+ setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Up, FALSE
compare VAR_TEMP_8, 1
call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile
compare VAR_TEMP_8, 2
@@ -36,173 +36,173 @@ Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles::
return
Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile::
- setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Pressed, 0
+ setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Pressed, FALSE
return
Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile::
- setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
+ setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Pressed, FALSE
return
Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile::
- setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
+ setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Pressed, FALSE
return
Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile::
- setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0
+ setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Pressed, FALSE
return
Route110_TrickHousePuzzle3_EventScript_SetDoorsState0::
- setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
- setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
- setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
- setmetatile 2, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
- setmetatile 1, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
- setmetatile 2, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
- setmetatile 1, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
- setmetatile 2, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
- setmetatile 4, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
- setmetatile 5, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
- setmetatile 4, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
- setmetatile 5, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
- setmetatile 13, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
- setmetatile 14, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
- setmetatile 13, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
- setmetatile 14, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
- setmetatile 13, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
- setmetatile 14, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
- setmetatile 13, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
- setmetatile 14, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
- setmetatile 3, 7, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
- setmetatile 3, 8, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
- setmetatile 3, 13, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
- setmetatile 3, 14, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
- setmetatile 6, 4, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
- setmetatile 6, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
- setmetatile 9, 16, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
- setmetatile 9, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
- setmetatile 12, 7, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
- setmetatile 12, 8, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
- setmetatile 1, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
- setmetatile 2, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
- setmetatile 1, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
- setmetatile 2, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
- setmetatile 1, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
- setmetatile 2, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
- setmetatile 1, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
- setmetatile 2, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
- setmetatile 4, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
- setmetatile 5, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
- setmetatile 4, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
- setmetatile 5, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
- setmetatile 4, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
- setmetatile 5, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
- setmetatile 4, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
- setmetatile 5, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
- setmetatile 4, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
- setmetatile 5, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
- setmetatile 4, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
- setmetatile 5, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
- setmetatile 7, 9, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
- setmetatile 8, 9, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
- setmetatile 7, 10, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
- setmetatile 8, 10, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
- setmetatile 10, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
- setmetatile 11, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
- setmetatile 10, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
- setmetatile 11, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
- setmetatile 10, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
- setmetatile 11, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
- setmetatile 10, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
- setmetatile 11, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
- setmetatile 10, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
- setmetatile 11, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
- setmetatile 10, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
- setmetatile 11, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
- setmetatile 13, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
- setmetatile 14, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
- setmetatile 13, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
- setmetatile 14, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
- setmetatile 3, 16, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1
- setmetatile 3, 17, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1
- setmetatile 9, 4, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1
- setmetatile 9, 5, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1
+ setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, FALSE
+ setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, FALSE
+ setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, FALSE
+ setmetatile 2, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, FALSE
+ setmetatile 1, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, FALSE
+ setmetatile 2, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, FALSE
+ setmetatile 1, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, FALSE
+ setmetatile 2, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, FALSE
+ setmetatile 4, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, FALSE
+ setmetatile 5, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, FALSE
+ setmetatile 4, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, FALSE
+ setmetatile 5, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, FALSE
+ setmetatile 13, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, FALSE
+ setmetatile 14, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, FALSE
+ setmetatile 13, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, FALSE
+ setmetatile 14, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, FALSE
+ setmetatile 13, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, FALSE
+ setmetatile 14, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, FALSE
+ setmetatile 13, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, FALSE
+ setmetatile 14, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, FALSE
+ setmetatile 3, 7, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, TRUE
+ setmetatile 3, 8, METATILE_TrickHousePuzzle_Floor_ShadowTop, FALSE
+ setmetatile 3, 13, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, TRUE
+ setmetatile 3, 14, METATILE_TrickHousePuzzle_Floor_ShadowTop, FALSE
+ setmetatile 6, 4, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, TRUE
+ setmetatile 6, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop, FALSE
+ setmetatile 9, 16, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, TRUE
+ setmetatile 9, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop, FALSE
+ setmetatile 12, 7, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, TRUE
+ setmetatile 12, 8, METATILE_TrickHousePuzzle_Floor_ShadowTop, FALSE
+ setmetatile 1, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, FALSE
+ setmetatile 2, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, FALSE
+ setmetatile 1, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, TRUE
+ setmetatile 2, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, TRUE
+ setmetatile 1, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, FALSE
+ setmetatile 2, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, FALSE
+ setmetatile 1, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, TRUE
+ setmetatile 2, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, TRUE
+ setmetatile 4, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, FALSE
+ setmetatile 5, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, FALSE
+ setmetatile 4, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, TRUE
+ setmetatile 5, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, TRUE
+ setmetatile 4, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, FALSE
+ setmetatile 5, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, FALSE
+ setmetatile 4, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, TRUE
+ setmetatile 5, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, TRUE
+ setmetatile 4, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, FALSE
+ setmetatile 5, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, FALSE
+ setmetatile 4, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, TRUE
+ setmetatile 5, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, TRUE
+ setmetatile 7, 9, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, FALSE
+ setmetatile 8, 9, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, FALSE
+ setmetatile 7, 10, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, TRUE
+ setmetatile 8, 10, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, TRUE
+ setmetatile 10, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, FALSE
+ setmetatile 11, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, FALSE
+ setmetatile 10, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, TRUE
+ setmetatile 11, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, TRUE
+ setmetatile 10, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, FALSE
+ setmetatile 11, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, FALSE
+ setmetatile 10, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, TRUE
+ setmetatile 11, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, TRUE
+ setmetatile 10, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, FALSE
+ setmetatile 11, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, FALSE
+ setmetatile 10, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, TRUE
+ setmetatile 11, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, TRUE
+ setmetatile 13, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, FALSE
+ setmetatile 14, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, FALSE
+ setmetatile 13, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, TRUE
+ setmetatile 14, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, TRUE
+ setmetatile 3, 16, METATILE_TrickHousePuzzle_RedDoorV_Open0, TRUE
+ setmetatile 3, 17, METATILE_TrickHousePuzzle_RedDoorV_Open1, TRUE
+ setmetatile 9, 4, METATILE_TrickHousePuzzle_RedDoorV_Open0, TRUE
+ setmetatile 9, 5, METATILE_TrickHousePuzzle_RedDoorV_Open1, TRUE
return
Route110_TrickHousePuzzle3_EventScript_SetDoorsState1::
- setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
- setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
- setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
- setmetatile 2, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
- setmetatile 1, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
- setmetatile 2, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
- setmetatile 1, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
- setmetatile 2, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
- setmetatile 4, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
- setmetatile 5, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
- setmetatile 4, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
- setmetatile 5, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
- setmetatile 13, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
- setmetatile 14, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
- setmetatile 13, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
- setmetatile 14, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
- setmetatile 13, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
- setmetatile 14, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
- setmetatile 13, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
- setmetatile 14, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
- setmetatile 3, 7, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
- setmetatile 3, 8, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
- setmetatile 3, 13, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
- setmetatile 3, 14, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
- setmetatile 6, 4, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
- setmetatile 6, 5, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
- setmetatile 9, 16, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
- setmetatile 9, 17, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
- setmetatile 12, 7, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
- setmetatile 12, 8, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
- setmetatile 1, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
- setmetatile 2, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
- setmetatile 1, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
- setmetatile 2, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
- setmetatile 1, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
- setmetatile 2, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
- setmetatile 1, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
- setmetatile 2, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
- setmetatile 4, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
- setmetatile 5, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
- setmetatile 4, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
- setmetatile 5, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
- setmetatile 4, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
- setmetatile 5, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
- setmetatile 4, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
- setmetatile 5, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
- setmetatile 4, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
- setmetatile 5, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
- setmetatile 4, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
- setmetatile 5, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
- setmetatile 7, 9, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
- setmetatile 8, 9, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
- setmetatile 7, 10, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
- setmetatile 8, 10, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
- setmetatile 10, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
- setmetatile 11, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
- setmetatile 10, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
- setmetatile 11, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
- setmetatile 10, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
- setmetatile 11, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
- setmetatile 10, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
- setmetatile 11, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
- setmetatile 10, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
- setmetatile 11, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
- setmetatile 10, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
- setmetatile 11, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
- setmetatile 13, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
- setmetatile 14, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
- setmetatile 13, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
- setmetatile 14, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
- setmetatile 3, 16, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1
- setmetatile 3, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0
- setmetatile 9, 4, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1
- setmetatile 9, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0
+ setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, FALSE
+ setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, FALSE
+ setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, TRUE
+ setmetatile 2, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, TRUE
+ setmetatile 1, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, FALSE
+ setmetatile 2, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, FALSE
+ setmetatile 1, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, TRUE
+ setmetatile 2, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, TRUE
+ setmetatile 4, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, FALSE
+ setmetatile 5, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, FALSE
+ setmetatile 4, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, TRUE
+ setmetatile 5, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, TRUE
+ setmetatile 13, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, FALSE
+ setmetatile 14, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, FALSE
+ setmetatile 13, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, TRUE
+ setmetatile 14, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, TRUE
+ setmetatile 13, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, FALSE
+ setmetatile 14, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, FALSE
+ setmetatile 13, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, TRUE
+ setmetatile 14, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, TRUE
+ setmetatile 3, 7, METATILE_TrickHousePuzzle_BlueDoorV_Open0, TRUE
+ setmetatile 3, 8, METATILE_TrickHousePuzzle_BlueDoorV_Open1, TRUE
+ setmetatile 3, 13, METATILE_TrickHousePuzzle_BlueDoorV_Open0, TRUE
+ setmetatile 3, 14, METATILE_TrickHousePuzzle_BlueDoorV_Open1, TRUE
+ setmetatile 6, 4, METATILE_TrickHousePuzzle_BlueDoorV_Open0, TRUE
+ setmetatile 6, 5, METATILE_TrickHousePuzzle_BlueDoorV_Open1, TRUE
+ setmetatile 9, 16, METATILE_TrickHousePuzzle_BlueDoorV_Open0, TRUE
+ setmetatile 9, 17, METATILE_TrickHousePuzzle_BlueDoorV_Open1, TRUE
+ setmetatile 12, 7, METATILE_TrickHousePuzzle_BlueDoorV_Open0, TRUE
+ setmetatile 12, 8, METATILE_TrickHousePuzzle_BlueDoorV_Open1, TRUE
+ setmetatile 1, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, FALSE
+ setmetatile 2, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, FALSE
+ setmetatile 1, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, FALSE
+ setmetatile 2, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, FALSE
+ setmetatile 1, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, FALSE
+ setmetatile 2, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, FALSE
+ setmetatile 1, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, FALSE
+ setmetatile 2, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, FALSE
+ setmetatile 4, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, FALSE
+ setmetatile 5, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, FALSE
+ setmetatile 4, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, FALSE
+ setmetatile 5, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, FALSE
+ setmetatile 4, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, FALSE
+ setmetatile 5, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, FALSE
+ setmetatile 4, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, FALSE
+ setmetatile 5, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, FALSE
+ setmetatile 4, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, FALSE
+ setmetatile 5, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, FALSE
+ setmetatile 4, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, FALSE
+ setmetatile 5, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, FALSE
+ setmetatile 7, 9, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, FALSE
+ setmetatile 8, 9, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, FALSE
+ setmetatile 7, 10, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, FALSE
+ setmetatile 8, 10, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, FALSE
+ setmetatile 10, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, FALSE
+ setmetatile 11, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, FALSE
+ setmetatile 10, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, FALSE
+ setmetatile 11, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, FALSE
+ setmetatile 10, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, FALSE
+ setmetatile 11, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, FALSE
+ setmetatile 10, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, FALSE
+ setmetatile 11, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, FALSE
+ setmetatile 10, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, FALSE
+ setmetatile 11, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, FALSE
+ setmetatile 10, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, FALSE
+ setmetatile 11, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, FALSE
+ setmetatile 13, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, FALSE
+ setmetatile 14, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, FALSE
+ setmetatile 13, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, FALSE
+ setmetatile 14, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, FALSE
+ setmetatile 3, 16, METATILE_TrickHousePuzzle_RedDoorV_Retracted, TRUE
+ setmetatile 3, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, FALSE
+ setmetatile 9, 4, METATILE_TrickHousePuzzle_RedDoorV_Retracted, TRUE
+ setmetatile 9, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, FALSE
return
Route110_TrickHousePuzzle3_EventScript_Button1::
diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index 1890eb2c4..473c39992 100644
--- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
@@ -22,53 +22,53 @@ Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles::
@ Leftover from R/S, none of the below metatile scripts are ever called
Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn::
- setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
- setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, 1
+ setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, FALSE
+ setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, TRUE
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn::
- setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
- setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, 1
+ setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, FALSE
+ setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, TRUE
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn::
- setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
- setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, 1
+ setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, FALSE
+ setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, TRUE
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn::
- setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, 0
- setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, 1
+ setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, FALSE
+ setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, TRUE
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn::
- setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
- setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, 1
+ setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, FALSE
+ setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, TRUE
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff::
- setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
- setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, 1
+ setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, FALSE
+ setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, TRUE
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff::
- setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
- setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, 1
+ setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, FALSE
+ setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, TRUE
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff::
- setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
- setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, 1
+ setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, FALSE
+ setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, TRUE
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff::
- setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, 0
- setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, 1
+ setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, FALSE
+ setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, TRUE
return
Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff::
- setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, 0
- setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, 1
+ setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, FALSE
+ setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, TRUE
return
Route110_TrickHousePuzzle7_OnTransition:
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index 8b0ee51c4..2007c89f6 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -20,30 +20,30 @@ Route111_OnLoad:
end
Route111_EventScript_CloseDesertRuins::
- setmetatile 29, 86, METATILE_General_RockWall_RockBase, 1
- setmetatile 29, 87, METATILE_General_RockWall_SandBase, 1
+ setmetatile 29, 86, METATILE_General_RockWall_RockBase, TRUE
+ setmetatile 29, 87, METATILE_General_RockWall_SandBase, TRUE
return
@ Show Mirage Tower just prior to disintegration. Mirage Tower is otherwise handled by the map layout
Route111_EventScript_ShowTemporaryMirageTower::
- setmetatile 18, 53, METATILE_Mauville_MirageTower_Tile0, 0
- setmetatile 19, 53, METATILE_Mauville_MirageTower_Tile1, 0
- setmetatile 20, 53, METATILE_Mauville_MirageTower_Tile2, 0
- setmetatile 18, 54, METATILE_Mauville_MirageTower_Tile3, 0
- setmetatile 19, 54, METATILE_Mauville_MirageTower_Tile4, 0
- setmetatile 20, 54, METATILE_Mauville_MirageTower_Tile5, 0
- setmetatile 18, 55, METATILE_Mauville_MirageTower_Tile6, 0
- setmetatile 19, 55, METATILE_Mauville_MirageTower_Tile7, 0
- setmetatile 20, 55, METATILE_Mauville_MirageTower_Tile8, 0
- setmetatile 18, 56, METATILE_Mauville_MirageTower_Tile9, 0
- setmetatile 19, 56, METATILE_Mauville_MirageTower_TileA, 0
- setmetatile 20, 56, METATILE_Mauville_MirageTower_TileB, 0
- setmetatile 18, 57, METATILE_Mauville_MirageTower_TileC, 0
- setmetatile 19, 57, METATILE_Mauville_MirageTower_TileD, 0
- setmetatile 20, 57, METATILE_Mauville_MirageTower_TileE, 0
- setmetatile 18, 58, METATILE_Mauville_MirageTower_TileF, 0
- setmetatile 19, 58, METATILE_Mauville_MirageTower_Tile10, 0
- setmetatile 20, 58, METATILE_Mauville_MirageTower_Tile11, 0
+ setmetatile 18, 53, METATILE_Mauville_MirageTower_Tile0, FALSE
+ setmetatile 19, 53, METATILE_Mauville_MirageTower_Tile1, FALSE
+ setmetatile 20, 53, METATILE_Mauville_MirageTower_Tile2, FALSE
+ setmetatile 18, 54, METATILE_Mauville_MirageTower_Tile3, FALSE
+ setmetatile 19, 54, METATILE_Mauville_MirageTower_Tile4, FALSE
+ setmetatile 20, 54, METATILE_Mauville_MirageTower_Tile5, FALSE
+ setmetatile 18, 55, METATILE_Mauville_MirageTower_Tile6, FALSE
+ setmetatile 19, 55, METATILE_Mauville_MirageTower_Tile7, FALSE
+ setmetatile 20, 55, METATILE_Mauville_MirageTower_Tile8, FALSE
+ setmetatile 18, 56, METATILE_Mauville_MirageTower_Tile9, FALSE
+ setmetatile 19, 56, METATILE_Mauville_MirageTower_TileA, FALSE
+ setmetatile 20, 56, METATILE_Mauville_MirageTower_TileB, FALSE
+ setmetatile 18, 57, METATILE_Mauville_MirageTower_TileC, FALSE
+ setmetatile 19, 57, METATILE_Mauville_MirageTower_TileD, FALSE
+ setmetatile 20, 57, METATILE_Mauville_MirageTower_TileE, FALSE
+ setmetatile 18, 58, METATILE_Mauville_MirageTower_TileF, FALSE
+ setmetatile 19, 58, METATILE_Mauville_MirageTower_Tile10, FALSE
+ setmetatile 20, 58, METATILE_Mauville_MirageTower_Tile11, FALSE
return
Route111_OnTransition:
diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
index a9bfc39b8..500e12bee 100644
--- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
@@ -19,8 +19,8 @@ Route114_FossilManiacsTunnel_OnLoad:
end
Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass::
- setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, 1
- setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, 1
+ setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, TRUE
+ setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, TRUE
return
Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn::
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 588fa17a0..e28637592 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -49,15 +49,15 @@ Route120_OnLoad:
end
Route120_EventScript_CloseAncientTomb::
- setmetatile 7, 54, METATILE_General_RockWall_RockBase, 1
- setmetatile 7, 55, METATILE_General_RockWall_SandBase, 1
+ setmetatile 7, 54, METATILE_General_RockWall_RockBase, TRUE
+ setmetatile 7, 55, METATILE_General_RockWall_SandBase, TRUE
return
Route120_EventScript_SetBridgeClearMetatiles::
- setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, 0
- setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, 0
- setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
- setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
+ setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, FALSE
+ setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, FALSE
+ setmetatile 12, 17, METATILE_General_ReflectiveWater, FALSE
+ setmetatile 13, 17, METATILE_General_ReflectiveWater, FALSE
return
Route120_EventScript_SetBridgeKecleonMovement::
@@ -253,10 +253,10 @@ Route120_EventScript_StevenGiveDeconScope::
delay 15
removeobject LOCALID_STEVEN
waitfieldeffect FLDEFF_NPCFLY_OUT
- setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, 0
- setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, 0
- setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
- setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
+ setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, FALSE
+ setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, FALSE
+ setmetatile 12, 17, METATILE_General_ReflectiveWater, FALSE
+ setmetatile 13, 17, METATILE_General_ReflectiveWater, FALSE
special DrawWholeMapView
release
end
diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index 0a8c3aa4a..bf02c7fe3 100644
--- a/data/maps/SealedChamber_OuterRoom/scripts.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
@@ -18,12 +18,12 @@ SealedChamber_OuterRoom_OnLoad:
end
SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance::
- setmetatile 9, 1, METATILE_Cave_EntranceCover, 1
- setmetatile 10, 1, METATILE_Cave_EntranceCover, 1
- setmetatile 11, 1, METATILE_Cave_EntranceCover, 1
- setmetatile 9, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
- setmetatile 10, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
- setmetatile 11, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
+ setmetatile 9, 1, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 10, 1, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 11, 1, METATILE_Cave_EntranceCover, TRUE
+ setmetatile 9, 2, METATILE_Cave_SealedChamberBraille_Mid, TRUE
+ setmetatile 10, 2, METATILE_Cave_SealedChamberBraille_Mid, TRUE
+ setmetatile 11, 2, METATILE_Cave_SealedChamberBraille_Mid, TRUE
return
SealedChamber_OuterRoom_EventScript_BrailleABC::
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 9692d2f69..37b7beb04 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
@@ -22,38 +22,38 @@ ShoalCave_LowTideInnerRoom_OnLoad:
ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles::
goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
- setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Large, 1
+ setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Large, TRUE
goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
end
ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2::
goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
- setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Large, 1
+ setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Large, TRUE
goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
end
ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3::
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4
- setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Large, 1
+ setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Large, TRUE
goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4
end
ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4::
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5
- setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Large, 1
+ setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Large, TRUE
goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5
end
ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5::
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6
- setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Large, 1
+ setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Large, TRUE
goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6
end
ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6::
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd
- setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Large, 1
+ setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Large, TRUE
return
ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd::
@@ -65,7 +65,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1::
giveitem ITEM_SHOAL_SHELL
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
- setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0
+ setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_1
releaseall
@@ -82,7 +82,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2::
giveitem ITEM_SHOAL_SHELL
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
- setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0
+ setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_2
releaseall
@@ -94,7 +94,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3::
giveitem ITEM_SHOAL_SHELL
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
- setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0
+ setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_3
releaseall
@@ -106,7 +106,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4::
giveitem ITEM_SHOAL_SHELL
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
- setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0
+ setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_4
releaseall
@@ -118,7 +118,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1::
giveitem ITEM_SHOAL_SALT
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
- setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0
+ setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SALT_1
releaseall
@@ -135,7 +135,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2::
giveitem ITEM_SHOAL_SALT
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
- setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0
+ setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SALT_2
releaseall
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
index d7937998e..15dcd326d 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
@@ -8,7 +8,7 @@ ShoalCave_LowTideLowerRoom_OnLoad:
ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles::
goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd
- setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Large, 1
+ setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Large, TRUE
return
ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd::
@@ -20,7 +20,7 @@ ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4::
giveitem ITEM_SHOAL_SALT
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
- setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Small, 0
+ setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SALT_4
releaseall
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
index a778a18e1..f1a5b030b 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
@@ -8,7 +8,7 @@ ShoalCave_LowTideStairsRoom_OnLoad:
ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles::
goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd
- setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Large, 1
+ setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Large, TRUE
return
ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd::
@@ -20,7 +20,7 @@ ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3::
giveitem ITEM_SHOAL_SALT
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
- setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0
+ setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SALT_3
releaseall
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
index 9ffcd2de7..89e71a1ce 100644
--- a/data/maps/SkyPillar_Outside/scripts.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -26,8 +26,8 @@ SkyPillar_Outside_OnLoad:
end
SkyPillar_Outside_EventScript_OpenDoor::
- setmetatile 14, 4, METATILE_Pacifidlog_SkyPillar_DoorOpen_Top, 0
- setmetatile 14, 5, METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom, 0
+ setmetatile 14, 4, METATILE_Pacifidlog_SkyPillar_DoorOpen_Top, FALSE
+ setmetatile 14, 5, METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom, FALSE
return
SkyPillar_Outside_OnFrame:
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 0a2d4b447..6ef5b7790 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -34,19 +34,19 @@ SootopolisCity_EventScript_LegendariesNotArrived::
end
SootopolisCity_EventScript_LockHouseDoors::
- setmetatile 9, 6, METATILE_Sootopolis_Door_Closed, 1
- setmetatile 9, 17, METATILE_Sootopolis_Door_Closed, 1
- setmetatile 9, 26, METATILE_Sootopolis_Door_Closed, 1
- setmetatile 44, 17, METATILE_Sootopolis_Door_Closed, 1
- setmetatile 8, 35, METATILE_Sootopolis_Door_Closed, 1
- setmetatile 53, 28, METATILE_Sootopolis_Door_Closed, 1
- setmetatile 45, 6, METATILE_Sootopolis_Door_Closed, 1
- setmetatile 48, 25, METATILE_Sootopolis_Door_Closed, 1
- setmetatile 51, 36, METATILE_Sootopolis_Door_Closed, 1
+ setmetatile 9, 6, METATILE_Sootopolis_Door_Closed, TRUE
+ setmetatile 9, 17, METATILE_Sootopolis_Door_Closed, TRUE
+ setmetatile 9, 26, METATILE_Sootopolis_Door_Closed, TRUE
+ setmetatile 44, 17, METATILE_Sootopolis_Door_Closed, TRUE
+ setmetatile 8, 35, METATILE_Sootopolis_Door_Closed, TRUE
+ setmetatile 53, 28, METATILE_Sootopolis_Door_Closed, TRUE
+ setmetatile 45, 6, METATILE_Sootopolis_Door_Closed, TRUE
+ setmetatile 48, 25, METATILE_Sootopolis_Door_Closed, TRUE
+ setmetatile 51, 36, METATILE_Sootopolis_Door_Closed, TRUE
return
SootopolisCity_EventScript_LockGymDoor::
- setmetatile 31, 32, METATILE_Sootopolis_GymDoor_Closed, 1
+ setmetatile 31, 32, METATILE_Sootopolis_GymDoor_Closed, TRUE
return
SootopolisCity_OnTransition:
@@ -623,30 +623,30 @@ SootopolisCity_EventScript_RayquazaSceneFromDive::
end
SootopolisCity_EventScript_SetRoughWater::
- setmetatile 27, 43, METATILE_Sootopolis_RoughWater, 0
- setmetatile 28, 43, METATILE_Sootopolis_RoughWater, 0
- setmetatile 29, 43, METATILE_Sootopolis_RoughWater, 0
- setmetatile 30, 43, METATILE_Sootopolis_RoughWater, 0
- setmetatile 27, 44, METATILE_Sootopolis_RoughWater, 0
- setmetatile 28, 44, METATILE_Sootopolis_RoughWater, 0
- setmetatile 29, 44, METATILE_Sootopolis_RoughWater, 0
- setmetatile 30, 44, METATILE_Sootopolis_RoughWater, 0
- setmetatile 27, 45, METATILE_Sootopolis_RoughWater, 0
- setmetatile 28, 45, METATILE_Sootopolis_RoughWater, 0
- setmetatile 29, 45, METATILE_Sootopolis_RoughWater, 0
- setmetatile 30, 45, METATILE_Sootopolis_RoughWater, 0
- setmetatile 32, 43, METATILE_Sootopolis_RoughWater, 0
- setmetatile 33, 43, METATILE_Sootopolis_RoughWater, 0
- setmetatile 34, 43, METATILE_Sootopolis_RoughWater, 0
- setmetatile 35, 43, METATILE_Sootopolis_RoughWater, 0
- setmetatile 32, 44, METATILE_Sootopolis_RoughWater, 0
- setmetatile 33, 44, METATILE_Sootopolis_RoughWater, 0
- setmetatile 34, 44, METATILE_Sootopolis_RoughWater, 0
- setmetatile 35, 44, METATILE_Sootopolis_RoughWater, 0
- setmetatile 32, 45, METATILE_Sootopolis_RoughWater, 0
- setmetatile 33, 45, METATILE_Sootopolis_RoughWater, 0
- setmetatile 34, 45, METATILE_Sootopolis_RoughWater, 0
- setmetatile 35, 45, METATILE_Sootopolis_RoughWater, 0
+ setmetatile 27, 43, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 28, 43, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 29, 43, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 30, 43, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 27, 44, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 28, 44, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 29, 44, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 30, 44, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 27, 45, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 28, 45, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 29, 45, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 30, 45, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 32, 43, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 33, 43, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 34, 43, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 35, 43, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 32, 44, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 33, 44, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 34, 44, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 35, 44, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 32, 45, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 33, 45, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 34, 45, METATILE_Sootopolis_RoughWater, FALSE
+ setmetatile 35, 45, METATILE_Sootopolis_RoughWater, FALSE
return
SootopolisCity_Movement_RayquazaFlyOff:
diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
index b20cf7888..4a21dcdcd 100644
--- a/data/maps/SootopolisCity_Gym_1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -25,14 +25,14 @@ SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles::
goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstStairs
compare VAR_ICE_STEP_COUNT, 67
goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs
- setmetatile 8, 4, METATILE_SootopolisGym_Stairs, 0
- setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0
+ setmetatile 8, 4, METATILE_SootopolisGym_Stairs, FALSE
+ setmetatile 8, 5, METATILE_SootopolisGym_Stairs, FALSE
SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs::
- setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0
- setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0
+ setmetatile 8, 10, METATILE_SootopolisGym_Stairs, FALSE
+ setmetatile 8, 11, METATILE_SootopolisGym_Stairs, FALSE
SootopolisCity_Gym_1F_EventScript_OpenFirstStairs::
- setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0
- setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0
+ setmetatile 8, 15, METATILE_SootopolisGym_Stairs, FALSE
+ setmetatile 8, 16, METATILE_SootopolisGym_Stairs, FALSE
SootopolisCity_Gym_1F_EventScript_StopCheckingStairs::
return
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index af4a4c123..4c76ccb52 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -53,7 +53,7 @@ TrainerHill_Entrance_OnLoad:
end
TrainerHill_Entrance_EventScript_OpenCounterDoor::
- setmetatile 17, 10, METATILE_TrainerHill_GreenFloorTile, 0
+ setmetatile 17, 10, METATILE_TrainerHill_GreenFloorTile, FALSE
return
TrainerHill_Entrance_OnFrame:
@@ -67,7 +67,7 @@ TrainerHill_Entrance_EventScript_ExitElevator::
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator
waitmovement 0
- setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1
+ setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, TRUE
special DrawWholeMapView
playse SE_CLICK
waitse
diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
index c4931c1ad..7f1231fef 100644
--- a/data/maps/Underwater_SeafloorCavern/scripts.inc
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
@@ -18,18 +18,18 @@ Underwater_SeafloorCavern_OnLoad:
end
Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles::
- setmetatile 5, 3, METATILE_Underwater_RockWall, 1
- setmetatile 6, 3, METATILE_Underwater_RockWall, 1
- setmetatile 7, 3, METATILE_Underwater_RockWall, 1
- setmetatile 8, 3, METATILE_Underwater_RockWall, 1
- setmetatile 5, 4, METATILE_Underwater_FloorShadow, 0
- setmetatile 6, 4, METATILE_Underwater_FloorShadow, 0
- setmetatile 7, 4, METATILE_Underwater_FloorShadow, 0
- setmetatile 8, 4, METATILE_Underwater_FloorShadow, 0
- setmetatile 5, 5, METATILE_Underwater_FloorShadow, 0
- setmetatile 6, 5, METATILE_Underwater_FloorShadow, 0
- setmetatile 7, 5, METATILE_Underwater_FloorShadow, 0
- setmetatile 8, 5, METATILE_Underwater_FloorShadow, 0
+ setmetatile 5, 3, METATILE_Underwater_RockWall, TRUE
+ setmetatile 6, 3, METATILE_Underwater_RockWall, TRUE
+ setmetatile 7, 3, METATILE_Underwater_RockWall, TRUE
+ setmetatile 8, 3, METATILE_Underwater_RockWall, TRUE
+ setmetatile 5, 4, METATILE_Underwater_FloorShadow, FALSE
+ setmetatile 6, 4, METATILE_Underwater_FloorShadow, FALSE
+ setmetatile 7, 4, METATILE_Underwater_FloorShadow, FALSE
+ setmetatile 8, 4, METATILE_Underwater_FloorShadow, FALSE
+ setmetatile 5, 5, METATILE_Underwater_FloorShadow, FALSE
+ setmetatile 6, 5, METATILE_Underwater_FloorShadow, FALSE
+ setmetatile 7, 5, METATILE_Underwater_FloorShadow, FALSE
+ setmetatile 8, 5, METATILE_Underwater_FloorShadow, FALSE
return
Underwater_SeafloorCavern_OnResume:
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 322ac0bac..f3afb2e43 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -153,11 +153,11 @@ gScriptCmdTable::
.4byte ScrCmd_getpokenewsactive @ 0x96
.4byte ScrCmd_fadescreen @ 0x97
.4byte ScrCmd_fadescreenspeed @ 0x98
- .4byte ScrCmd_setflashradius @ 0x99
+ .4byte ScrCmd_setflashlevel @ 0x99
.4byte ScrCmd_animateflash @ 0x9a
.4byte ScrCmd_messageautoscroll @ 0x9b
.4byte ScrCmd_dofieldeffect @ 0x9c
- .4byte ScrCmd_setfieldeffectarg @ 0x9d
+ .4byte ScrCmd_setfieldeffectargument @ 0x9d
.4byte ScrCmd_waitfieldeffect @ 0x9e
.4byte ScrCmd_setrespawn @ 0x9f
.4byte ScrCmd_checkplayergender @ 0xa0
diff --git a/data/scripts/abnormal_weather.inc b/data/scripts/abnormal_weather.inc
index bc4a867e3..c38982da8 100644
--- a/data/scripts/abnormal_weather.inc
+++ b/data/scripts/abnormal_weather.inc
@@ -1,161 +1,161 @@
AbnormalWeather_EventScript_PlaceTilesRoute114North::
- setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1
- setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0
+ setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, TRUE
+ setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute114South::
- setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
- setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
+ setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, TRUE
+ setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute115West::
- setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
- setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
+ setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, TRUE
+ setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute115East::
- setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
- setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
+ setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, TRUE
+ setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute116North::
- setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1
- setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0
+ setmetatile 59, 12, METATILE_General_CaveEntrance_Top, TRUE
+ setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute116South::
- setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1
- setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0
+ setmetatile 79, 5, METATILE_General_CaveEntrance_Top, TRUE
+ setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute118East::
- setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1
- setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0
+ setmetatile 42, 5, METATILE_General_CaveEntrance_Top, TRUE
+ setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute118West::
- setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1
- setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0
+ setmetatile 9, 5, METATILE_General_CaveEntrance_Top, TRUE
+ setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute105North::
- setmetatile 10, 28, METATILE_General_RoughWater, 0
- setmetatile 11, 28, METATILE_General_RoughWater, 0
- setmetatile 9, 29, METATILE_General_RoughWater, 0
- setmetatile 10, 29, METATILE_General_RoughDeepWater, 0
- setmetatile 11, 29, METATILE_General_RoughDeepWater, 0
- setmetatile 12, 29, METATILE_General_RoughWater, 0
- setmetatile 9, 30, METATILE_General_RoughWater, 0
- setmetatile 10, 30, METATILE_General_RoughDeepWater, 0
- setmetatile 11, 30, METATILE_General_RoughDeepWater, 0
- setmetatile 12, 30, METATILE_General_RoughWater, 0
- setmetatile 10, 31, METATILE_General_RoughWater, 0
- setmetatile 11, 31, METATILE_General_RoughWater, 0
+ setmetatile 10, 28, METATILE_General_RoughWater, FALSE
+ setmetatile 11, 28, METATILE_General_RoughWater, FALSE
+ setmetatile 9, 29, METATILE_General_RoughWater, FALSE
+ setmetatile 10, 29, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 11, 29, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 12, 29, METATILE_General_RoughWater, FALSE
+ setmetatile 9, 30, METATILE_General_RoughWater, FALSE
+ setmetatile 10, 30, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 11, 30, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 12, 30, METATILE_General_RoughWater, FALSE
+ setmetatile 10, 31, METATILE_General_RoughWater, FALSE
+ setmetatile 11, 31, METATILE_General_RoughWater, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute105South::
- setmetatile 20, 53, METATILE_General_RoughWater, 0
- setmetatile 21, 53, METATILE_General_RoughWater, 0
- setmetatile 19, 54, METATILE_General_RoughWater, 0
- setmetatile 20, 54, METATILE_General_RoughDeepWater, 0
- setmetatile 21, 54, METATILE_General_RoughDeepWater, 0
- setmetatile 22, 54, METATILE_General_RoughWater, 0
- setmetatile 19, 55, METATILE_General_RoughWater, 0
- setmetatile 20, 55, METATILE_General_RoughDeepWater, 0
- setmetatile 21, 55, METATILE_General_RoughDeepWater, 0
- setmetatile 22, 55, METATILE_General_RoughWater, 0
- setmetatile 20, 56, METATILE_General_RoughWater, 0
- setmetatile 21, 56, METATILE_General_RoughWater, 0
+ setmetatile 20, 53, METATILE_General_RoughWater, FALSE
+ setmetatile 21, 53, METATILE_General_RoughWater, FALSE
+ setmetatile 19, 54, METATILE_General_RoughWater, FALSE
+ setmetatile 20, 54, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 21, 54, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 22, 54, METATILE_General_RoughWater, FALSE
+ setmetatile 19, 55, METATILE_General_RoughWater, FALSE
+ setmetatile 20, 55, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 21, 55, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 22, 55, METATILE_General_RoughWater, FALSE
+ setmetatile 20, 56, METATILE_General_RoughWater, FALSE
+ setmetatile 21, 56, METATILE_General_RoughWater, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute125West::
- setmetatile 8, 16, METATILE_General_RoughWater, 0
- setmetatile 9, 16, METATILE_General_RoughWater, 0
- setmetatile 7, 17, METATILE_General_RoughWater, 0
- setmetatile 8, 17, METATILE_General_RoughDeepWater, 0
- setmetatile 9, 17, METATILE_General_RoughDeepWater, 0
- setmetatile 10, 17, METATILE_General_RoughWater, 0
- setmetatile 7, 18, METATILE_General_RoughWater, 0
- setmetatile 8, 18, METATILE_General_RoughDeepWater, 0
- setmetatile 9, 18, METATILE_General_RoughDeepWater, 0
- setmetatile 10, 18, METATILE_General_RoughWater, 0
- setmetatile 8, 19, METATILE_General_RoughWater, 0
- setmetatile 9, 19, METATILE_General_RoughWater, 0
+ setmetatile 8, 16, METATILE_General_RoughWater, FALSE
+ setmetatile 9, 16, METATILE_General_RoughWater, FALSE
+ setmetatile 7, 17, METATILE_General_RoughWater, FALSE
+ setmetatile 8, 17, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 9, 17, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 10, 17, METATILE_General_RoughWater, FALSE
+ setmetatile 7, 18, METATILE_General_RoughWater, FALSE
+ setmetatile 8, 18, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 9, 18, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 10, 18, METATILE_General_RoughWater, FALSE
+ setmetatile 8, 19, METATILE_General_RoughWater, FALSE
+ setmetatile 9, 19, METATILE_General_RoughWater, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute125East::
- setmetatile 53, 18, METATILE_General_RoughWater, 0
- setmetatile 54, 18, METATILE_General_RoughWater, 0
- setmetatile 52, 19, METATILE_General_RoughWater, 0
- setmetatile 53, 19, METATILE_General_RoughDeepWater, 0
- setmetatile 54, 19, METATILE_General_RoughDeepWater, 0
- setmetatile 55, 19, METATILE_General_RoughWater, 0
- setmetatile 52, 20, METATILE_General_RoughWater, 0
- setmetatile 53, 20, METATILE_General_RoughDeepWater, 0
- setmetatile 54, 20, METATILE_General_RoughDeepWater, 0
- setmetatile 55, 20, METATILE_General_RoughWater, 0
- setmetatile 53, 21, METATILE_General_RoughWater, 0
- setmetatile 54, 21, METATILE_General_RoughWater, 0
+ setmetatile 53, 18, METATILE_General_RoughWater, FALSE
+ setmetatile 54, 18, METATILE_General_RoughWater, FALSE
+ setmetatile 52, 19, METATILE_General_RoughWater, FALSE
+ setmetatile 53, 19, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 54, 19, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 55, 19, METATILE_General_RoughWater, FALSE
+ setmetatile 52, 20, METATILE_General_RoughWater, FALSE
+ setmetatile 53, 20, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 54, 20, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 55, 20, METATILE_General_RoughWater, FALSE
+ setmetatile 53, 21, METATILE_General_RoughWater, FALSE
+ setmetatile 54, 21, METATILE_General_RoughWater, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute127North::
- setmetatile 57, 9, METATILE_General_RoughWater, 0
- setmetatile 58, 9, METATILE_General_RoughWater, 0
- setmetatile 56, 10, METATILE_General_RoughWater, 0
- setmetatile 57, 10, METATILE_General_RoughDeepWater, 0
- setmetatile 58, 10, METATILE_General_RoughDeepWater, 0
- setmetatile 59, 10, METATILE_General_RoughWater, 0
- setmetatile 56, 11, METATILE_General_RoughWater, 0
- setmetatile 57, 11, METATILE_General_RoughDeepWater, 0
- setmetatile 58, 11, METATILE_General_RoughDeepWater, 0
- setmetatile 59, 11, METATILE_General_RoughWater, 0
- setmetatile 57, 12, METATILE_General_RoughWater, 0
- setmetatile 58, 12, METATILE_General_RoughWater, 0
+ setmetatile 57, 9, METATILE_General_RoughWater, FALSE
+ setmetatile 58, 9, METATILE_General_RoughWater, FALSE
+ setmetatile 56, 10, METATILE_General_RoughWater, FALSE
+ setmetatile 57, 10, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 58, 10, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 59, 10, METATILE_General_RoughWater, FALSE
+ setmetatile 56, 11, METATILE_General_RoughWater, FALSE
+ setmetatile 57, 11, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 58, 11, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 59, 11, METATILE_General_RoughWater, FALSE
+ setmetatile 57, 12, METATILE_General_RoughWater, FALSE
+ setmetatile 58, 12, METATILE_General_RoughWater, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute127South::
- setmetatile 61, 30, METATILE_General_RoughWater, 0
- setmetatile 62, 30, METATILE_General_RoughWater, 0
- setmetatile 60, 31, METATILE_General_RoughWater, 0
- setmetatile 61, 31, METATILE_General_RoughDeepWater, 0
- setmetatile 62, 31, METATILE_General_RoughDeepWater, 0
- setmetatile 63, 31, METATILE_General_RoughWater, 0
- setmetatile 60, 32, METATILE_General_RoughWater, 0
- setmetatile 61, 32, METATILE_General_RoughDeepWater, 0
- setmetatile 62, 32, METATILE_General_RoughDeepWater, 0
- setmetatile 63, 32, METATILE_General_RoughWater, 0
- setmetatile 61, 33, METATILE_General_RoughWater, 0
- setmetatile 62, 33, METATILE_General_RoughWater, 0
+ setmetatile 61, 30, METATILE_General_RoughWater, FALSE
+ setmetatile 62, 30, METATILE_General_RoughWater, FALSE
+ setmetatile 60, 31, METATILE_General_RoughWater, FALSE
+ setmetatile 61, 31, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 62, 31, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 63, 31, METATILE_General_RoughWater, FALSE
+ setmetatile 60, 32, METATILE_General_RoughWater, FALSE
+ setmetatile 61, 32, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 62, 32, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 63, 32, METATILE_General_RoughWater, FALSE
+ setmetatile 61, 33, METATILE_General_RoughWater, FALSE
+ setmetatile 62, 33, METATILE_General_RoughWater, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute129West::
- setmetatile 16, 14, METATILE_General_RoughWater, 0
- setmetatile 17, 14, METATILE_General_RoughWater, 0
- setmetatile 15, 15, METATILE_General_RoughWater, 0
- setmetatile 16, 15, METATILE_General_RoughDeepWater, 0
- setmetatile 17, 15, METATILE_General_RoughDeepWater, 0
- setmetatile 18, 15, METATILE_General_RoughWater, 0
- setmetatile 15, 16, METATILE_General_RoughWater, 0
- setmetatile 16, 16, METATILE_General_RoughDeepWater, 0
- setmetatile 17, 16, METATILE_General_RoughDeepWater, 0
- setmetatile 18, 16, METATILE_General_RoughWater, 0
- setmetatile 16, 17, METATILE_General_RoughWater, 0
- setmetatile 17, 17, METATILE_General_RoughWater, 0
+ setmetatile 16, 14, METATILE_General_RoughWater, FALSE
+ setmetatile 17, 14, METATILE_General_RoughWater, FALSE
+ setmetatile 15, 15, METATILE_General_RoughWater, FALSE
+ setmetatile 16, 15, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 17, 15, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 18, 15, METATILE_General_RoughWater, FALSE
+ setmetatile 15, 16, METATILE_General_RoughWater, FALSE
+ setmetatile 16, 16, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 17, 16, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 18, 16, METATILE_General_RoughWater, FALSE
+ setmetatile 16, 17, METATILE_General_RoughWater, FALSE
+ setmetatile 17, 17, METATILE_General_RoughWater, FALSE
return
AbnormalWeather_EventScript_PlaceTilesRoute129East::
- setmetatile 42, 19, METATILE_General_RoughWater, 0
- setmetatile 43, 19, METATILE_General_RoughWater, 0
- setmetatile 41, 20, METATILE_General_RoughWater, 0
- setmetatile 42, 20, METATILE_General_RoughDeepWater, 0
- setmetatile 43, 20, METATILE_General_RoughDeepWater, 0
- setmetatile 44, 20, METATILE_General_RoughWater, 0
- setmetatile 41, 21, METATILE_General_RoughWater, 0
- setmetatile 42, 21, METATILE_General_RoughDeepWater, 0
- setmetatile 43, 21, METATILE_General_RoughDeepWater, 0
- setmetatile 44, 21, METATILE_General_RoughWater, 0
- setmetatile 42, 22, METATILE_General_RoughWater, 0
- setmetatile 43, 22, METATILE_General_RoughWater, 0
+ setmetatile 42, 19, METATILE_General_RoughWater, FALSE
+ setmetatile 43, 19, METATILE_General_RoughWater, FALSE
+ setmetatile 41, 20, METATILE_General_RoughWater, FALSE
+ setmetatile 42, 20, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 43, 20, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 44, 20, METATILE_General_RoughWater, FALSE
+ setmetatile 41, 21, METATILE_General_RoughWater, FALSE
+ setmetatile 42, 21, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 43, 21, METATILE_General_RoughDeepWater, FALSE
+ setmetatile 44, 21, METATILE_General_RoughWater, FALSE
+ setmetatile 42, 22, METATILE_General_RoughWater, FALSE
+ setmetatile 43, 22, METATILE_General_RoughWater, FALSE
return
AbnormalWeather_EventScript_HideMapNamePopup::
@@ -222,163 +222,163 @@ AbnormalWeather_EventScript_CleanupMapTiles::
return
AbnormalWeather_EventScript_CleanupRoute114North::
- setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1
- setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1
+ setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, TRUE
+ setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, TRUE
return
AbnormalWeather_EventScript_CleanupRoute114South::
- setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1
- setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1
+ setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, TRUE
+ setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, TRUE
return
AbnormalWeather_EventScript_CleanupRoute115West::
- setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1
- setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1
+ setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, TRUE
+ setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, TRUE
return
AbnormalWeather_EventScript_CleanupRoute115East::
- setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1
- setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1
+ setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, TRUE
+ setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, TRUE
return
AbnormalWeather_EventScript_CleanupRoute116North::
- setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1
- setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1
+ setmetatile 59, 12, METATILE_General_RockWall_RockBase, TRUE
+ setmetatile 59, 13, METATILE_General_RockWall_RockBase, TRUE
return
AbnormalWeather_EventScript_CleanupRoute116South::
- setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1
- setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1
+ setmetatile 79, 5, METATILE_General_RockWall_RockBase, TRUE
+ setmetatile 79, 6, METATILE_General_RockWall_RockBase, TRUE
return
AbnormalWeather_EventScript_CleanupRoute118East::
- setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1
- setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1
+ setmetatile 42, 5, METATILE_General_RockWall_RockBase, TRUE
+ setmetatile 42, 6, METATILE_General_RockWall_GrassBase, TRUE
return
AbnormalWeather_EventScript_CleanupRoute118West::
- setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1
- setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1
+ setmetatile 9, 5, METATILE_General_RockWall_RockBase, TRUE
+ setmetatile 9, 6, METATILE_General_RockWall_GrassBase, TRUE
return
AbnormalWeather_EventScript_CleanupRoute105North::
- setmetatile 10, 28, METATILE_General_CalmWater, 0
- setmetatile 11, 28, METATILE_General_CalmWater, 0
- setmetatile 9, 29, METATILE_General_CalmWater, 0
- setmetatile 10, 29, METATILE_General_CalmWater, 0
- setmetatile 11, 29, METATILE_General_CalmWater, 0
- setmetatile 12, 29, METATILE_General_CalmWater, 0
- setmetatile 9, 30, METATILE_General_CalmWater, 0
- setmetatile 10, 30, METATILE_General_CalmWater, 0
- setmetatile 11, 30, METATILE_General_CalmWater, 0
- setmetatile 12, 30, METATILE_General_CalmWater, 0
- setmetatile 10, 31, METATILE_General_CalmWater, 0
- setmetatile 11, 31, METATILE_General_CalmWater, 0
+ setmetatile 10, 28, METATILE_General_CalmWater, FALSE
+ setmetatile 11, 28, METATILE_General_CalmWater, FALSE
+ setmetatile 9, 29, METATILE_General_CalmWater, FALSE
+ setmetatile 10, 29, METATILE_General_CalmWater, FALSE
+ setmetatile 11, 29, METATILE_General_CalmWater, FALSE
+ setmetatile 12, 29, METATILE_General_CalmWater, FALSE
+ setmetatile 9, 30, METATILE_General_CalmWater, FALSE
+ setmetatile 10, 30, METATILE_General_CalmWater, FALSE
+ setmetatile 11, 30, METATILE_General_CalmWater, FALSE
+ setmetatile 12, 30, METATILE_General_CalmWater, FALSE
+ setmetatile 10, 31, METATILE_General_CalmWater, FALSE
+ setmetatile 11, 31, METATILE_General_CalmWater, FALSE
return
AbnormalWeather_EventScript_CleanupRoute105South::
- setmetatile 20, 53, METATILE_General_CalmWater, 0
- setmetatile 21, 53, METATILE_General_CalmWater, 0
- setmetatile 19, 54, METATILE_General_CalmWater, 0
- setmetatile 20, 54, METATILE_General_CalmWater, 0
- setmetatile 21, 54, METATILE_General_CalmWater, 0
- setmetatile 22, 54, METATILE_General_CalmWater, 0
- setmetatile 19, 55, METATILE_General_CalmWater, 0
- setmetatile 20, 55, METATILE_General_CalmWater, 0
- setmetatile 21, 55, METATILE_General_CalmWater, 0
- setmetatile 22, 55, METATILE_General_CalmWater, 0
- setmetatile 20, 56, METATILE_General_CalmWater, 0
- setmetatile 21, 56, METATILE_General_CalmWater, 0
+ setmetatile 20, 53, METATILE_General_CalmWater, FALSE
+ setmetatile 21, 53, METATILE_General_CalmWater, FALSE
+ setmetatile 19, 54, METATILE_General_CalmWater, FALSE
+ setmetatile 20, 54, METATILE_General_CalmWater, FALSE
+ setmetatile 21, 54, METATILE_General_CalmWater, FALSE
+ setmetatile 22, 54, METATILE_General_CalmWater, FALSE
+ setmetatile 19, 55, METATILE_General_CalmWater, FALSE
+ setmetatile 20, 55, METATILE_General_CalmWater, FALSE
+ setmetatile 21, 55, METATILE_General_CalmWater, FALSE
+ setmetatile 22, 55, METATILE_General_CalmWater, FALSE
+ setmetatile 20, 56, METATILE_General_CalmWater, FALSE
+ setmetatile 21, 56, METATILE_General_CalmWater, FALSE
return
AbnormalWeather_EventScript_CleanupRoute125West::
- setmetatile 8, 16, METATILE_General_CalmWater, 0
- setmetatile 9, 16, METATILE_General_CalmWater, 0
- setmetatile 7, 17, METATILE_General_CalmWater, 0
- setmetatile 8, 17, METATILE_General_CalmWater, 0
- setmetatile 9, 17, METATILE_General_CalmWater, 0
- setmetatile 10, 17, METATILE_General_CalmWater, 0
- setmetatile 7, 18, METATILE_General_CalmWater, 0
- setmetatile 8, 18, METATILE_General_CalmWater, 0
- setmetatile 9, 18, METATILE_General_CalmWater, 0
- setmetatile 10, 18, METATILE_General_CalmWater, 0
- setmetatile 8, 19, METATILE_General_CalmWater, 0
- setmetatile 9, 19, METATILE_General_CalmWater, 0
+ setmetatile 8, 16, METATILE_General_CalmWater, FALSE
+ setmetatile 9, 16, METATILE_General_CalmWater, FALSE
+ setmetatile 7, 17, METATILE_General_CalmWater, FALSE
+ setmetatile 8, 17, METATILE_General_CalmWater, FALSE
+ setmetatile 9, 17, METATILE_General_CalmWater, FALSE
+ setmetatile 10, 17, METATILE_General_CalmWater, FALSE
+ setmetatile 7, 18, METATILE_General_CalmWater, FALSE
+ setmetatile 8, 18, METATILE_General_CalmWater, FALSE
+ setmetatile 9, 18, METATILE_General_CalmWater, FALSE
+ setmetatile 10, 18, METATILE_General_CalmWater, FALSE
+ setmetatile 8, 19, METATILE_General_CalmWater, FALSE
+ setmetatile 9, 19, METATILE_General_CalmWater, FALSE
return
AbnormalWeather_EventScript_CleanupRoute125East::
- setmetatile 53, 18, METATILE_General_CalmWater, 0
- setmetatile 54, 18, METATILE_General_CalmWater, 0
- setmetatile 52, 19, METATILE_General_CalmWater, 0
- setmetatile 53, 19, METATILE_General_CalmWater, 0
- setmetatile 54, 19, METATILE_General_CalmWater, 0
- setmetatile 55, 19, METATILE_General_CalmWater, 0
- setmetatile 52, 20, METATILE_General_CalmWater, 0
- setmetatile 53, 20, METATILE_General_CalmWater, 0
- setmetatile 54, 20, METATILE_General_CalmWater, 0
- setmetatile 55, 20, METATILE_General_CalmWater, 0
- setmetatile 53, 21, METATILE_General_CalmWater, 0
- setmetatile 54, 21, METATILE_General_CalmWater, 0
+ setmetatile 53, 18, METATILE_General_CalmWater, FALSE
+ setmetatile 54, 18, METATILE_General_CalmWater, FALSE
+ setmetatile 52, 19, METATILE_General_CalmWater, FALSE
+ setmetatile 53, 19, METATILE_General_CalmWater, FALSE
+ setmetatile 54, 19, METATILE_General_CalmWater, FALSE
+ setmetatile 55, 19, METATILE_General_CalmWater, FALSE
+ setmetatile 52, 20, METATILE_General_CalmWater, FALSE
+ setmetatile 53, 20, METATILE_General_CalmWater, FALSE
+ setmetatile 54, 20, METATILE_General_CalmWater, FALSE
+ setmetatile 55, 20, METATILE_General_CalmWater, FALSE
+ setmetatile 53, 21, METATILE_General_CalmWater, FALSE
+ setmetatile 54, 21, METATILE_General_CalmWater, FALSE
return
AbnormalWeather_EventScript_CleanupRoute127North::
- setmetatile 57, 9, METATILE_General_CalmWater, 0
- setmetatile 58, 9, METATILE_General_CalmWater, 0
- setmetatile 56, 10, METATILE_General_CalmWater, 0
- setmetatile 57, 10, METATILE_General_CalmWater, 0
- setmetatile 58, 10, METATILE_General_CalmWater, 0
- setmetatile 59, 10, METATILE_General_CalmWater, 0
- setmetatile 56, 11, METATILE_General_CalmWater, 0
- setmetatile 57, 11, METATILE_General_CalmWater, 0
- setmetatile 58, 11, METATILE_General_CalmWater, 0
- setmetatile 59, 11, METATILE_General_CalmWater, 0
- setmetatile 57, 12, METATILE_General_CalmWater, 0
- setmetatile 58, 12, METATILE_General_CalmWater, 0
+ setmetatile 57, 9, METATILE_General_CalmWater, FALSE
+ setmetatile 58, 9, METATILE_General_CalmWater, FALSE
+ setmetatile 56, 10, METATILE_General_CalmWater, FALSE
+ setmetatile 57, 10, METATILE_General_CalmWater, FALSE
+ setmetatile 58, 10, METATILE_General_CalmWater, FALSE
+ setmetatile 59, 10, METATILE_General_CalmWater, FALSE
+ setmetatile 56, 11, METATILE_General_CalmWater, FALSE
+ setmetatile 57, 11, METATILE_General_CalmWater, FALSE
+ setmetatile 58, 11, METATILE_General_CalmWater, FALSE
+ setmetatile 59, 11, METATILE_General_CalmWater, FALSE
+ setmetatile 57, 12, METATILE_General_CalmWater, FALSE
+ setmetatile 58, 12, METATILE_General_CalmWater, FALSE
return
AbnormalWeather_EventScript_CleanupRoute127South::
- setmetatile 61, 30, METATILE_General_CalmWater, 0
- setmetatile 62, 30, METATILE_General_CalmWater, 0
- setmetatile 60, 31, METATILE_General_CalmWater, 0
- setmetatile 61, 31, METATILE_General_CalmWater, 0
- setmetatile 62, 31, METATILE_General_CalmWater, 0
- setmetatile 63, 31, METATILE_General_CalmWater, 0
- setmetatile 60, 32, METATILE_General_CalmWater, 0
- setmetatile 61, 32, METATILE_General_CalmWater, 0
- setmetatile 62, 32, METATILE_General_CalmWater, 0
- setmetatile 63, 32, METATILE_General_CalmWater, 0
- setmetatile 61, 33, METATILE_General_CalmWater, 0
- setmetatile 62, 33, METATILE_General_CalmWater, 0
+ setmetatile 61, 30, METATILE_General_CalmWater, FALSE
+ setmetatile 62, 30, METATILE_General_CalmWater, FALSE
+ setmetatile 60, 31, METATILE_General_CalmWater, FALSE
+ setmetatile 61, 31, METATILE_General_CalmWater, FALSE
+ setmetatile 62, 31, METATILE_General_CalmWater, FALSE
+ setmetatile 63, 31, METATILE_General_CalmWater, FALSE
+ setmetatile 60, 32, METATILE_General_CalmWater, FALSE
+ setmetatile 61, 32, METATILE_General_CalmWater, FALSE
+ setmetatile 62, 32, METATILE_General_CalmWater, FALSE
+ setmetatile 63, 32, METATILE_General_CalmWater, FALSE
+ setmetatile 61, 33, METATILE_General_CalmWater, FALSE
+ setmetatile 62, 33, METATILE_General_CalmWater, FALSE
return
AbnormalWeather_EventScript_CleanupRoute129West::
- setmetatile 16, 14, METATILE_General_CalmWater, 0
- setmetatile 17, 14, METATILE_General_CalmWater, 0
- setmetatile 15, 15, METATILE_General_CalmWater, 0
- setmetatile 16, 15, METATILE_General_CalmWater, 0
- setmetatile 17, 15, METATILE_General_CalmWater, 0
- setmetatile 18, 15, METATILE_General_CalmWater, 0
- setmetatile 15, 16, METATILE_General_CalmWater, 0
- setmetatile 16, 16, METATILE_General_CalmWater, 0
- setmetatile 17, 16, METATILE_General_CalmWater, 0
- setmetatile 18, 16, METATILE_General_CalmWater, 0
- setmetatile 16, 17, METATILE_General_CalmWater, 0
- setmetatile 17, 17, METATILE_General_CalmWater, 0
+ setmetatile 16, 14, METATILE_General_CalmWater, FALSE
+ setmetatile 17, 14, METATILE_General_CalmWater, FALSE
+ setmetatile 15, 15, METATILE_General_CalmWater, FALSE
+ setmetatile 16, 15, METATILE_General_CalmWater, FALSE
+ setmetatile 17, 15, METATILE_General_CalmWater, FALSE
+ setmetatile 18, 15, METATILE_General_CalmWater, FALSE
+ setmetatile 15, 16, METATILE_General_CalmWater, FALSE
+ setmetatile 16, 16, METATILE_General_CalmWater, FALSE
+ setmetatile 17, 16, METATILE_General_CalmWater, FALSE
+ setmetatile 18, 16, METATILE_General_CalmWater, FALSE
+ setmetatile 16, 17, METATILE_General_CalmWater, FALSE
+ setmetatile 17, 17, METATILE_General_CalmWater, FALSE
return
AbnormalWeather_EventScript_CleanupRoute129East::
- setmetatile 42, 19, METATILE_General_CalmWater, 0
- setmetatile 43, 19, METATILE_General_CalmWater, 0
- setmetatile 41, 20, METATILE_General_CalmWater, 0
- setmetatile 42, 20, METATILE_General_CalmWater, 0
- setmetatile 43, 20, METATILE_General_CalmWater, 0
- setmetatile 44, 20, METATILE_General_CalmWater, 0
- setmetatile 41, 21, METATILE_General_CalmWater, 0
- setmetatile 42, 21, METATILE_General_CalmWater, 0
- setmetatile 43, 21, METATILE_General_CalmWater, 0
- setmetatile 44, 21, METATILE_General_CalmWater, 0
- setmetatile 42, 22, METATILE_General_CalmWater, 0
- setmetatile 43, 22, METATILE_General_CalmWater, 0
+ setmetatile 42, 19, METATILE_General_CalmWater, FALSE
+ setmetatile 43, 19, METATILE_General_CalmWater, FALSE
+ setmetatile 41, 20, METATILE_General_CalmWater, FALSE
+ setmetatile 42, 20, METATILE_General_CalmWater, FALSE
+ setmetatile 43, 20, METATILE_General_CalmWater, FALSE
+ setmetatile 44, 20, METATILE_General_CalmWater, FALSE
+ setmetatile 41, 21, METATILE_General_CalmWater, FALSE
+ setmetatile 42, 21, METATILE_General_CalmWater, FALSE
+ setmetatile 43, 21, METATILE_General_CalmWater, FALSE
+ setmetatile 44, 21, METATILE_General_CalmWater, FALSE
+ setmetatile 42, 22, METATILE_General_CalmWater, FALSE
+ setmetatile 43, 22, METATILE_General_CalmWater, FALSE
return
AbnormalWeather_Underwater_SetupEscapeWarp::
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 714792fc6..2022c5c8f 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1320,33 +1320,33 @@ CableClub_EventScript_AdapterNotConnected::
end
CableClub_EventScript_OpenUnionRoomBarrier::
- setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0
- setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0
+ setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, FALSE
+ setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, FALSE
return
CableClub_EventScript_CloseUnionRoomBarrier::
- setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1
- setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1
+ setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop, TRUE
+ setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, TRUE
return
CableClub_EventScript_OpenDirectCornerBarrier::
- setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0
- setmetatile 9, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0
+ setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, FALSE
+ setmetatile 9, 3, METATILE_PokemonCenter_Floor_Plain_Alt, FALSE
return
CableClub_EventScript_CloseDirectCornerBarrier::
- setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1
- setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1
+ setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop, TRUE
+ setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, TRUE
return
EventScript_OpenMossdeepGameCornerBarrier::
- setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterOpen_Top, 0
- setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterOpen_Bottom, 0
+ setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterOpen_Top, FALSE
+ setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterOpen_Bottom, FALSE
return
EventScript_CloseMossdeepGameCornerBarrier::
- setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterClosed_Top, 1
- setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1
+ setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterClosed_Top, TRUE
+ setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, TRUE
return
CableClub_OnResume:
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
index 0ae319061..97d7f4131 100644
--- a/data/scripts/elite_four.inc
+++ b/data/scripts/elite_four.inc
@@ -2,18 +2,18 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_DOOR
- setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
- setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
- setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
- setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
- setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
- setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
- setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
- setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
- setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
- setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
- setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
- setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+ setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, FALSE
+ setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, FALSE
+ setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, TRUE
+ setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, TRUE
+ setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, TRUE
+ setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, TRUE
+ setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, TRUE
+ setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, TRUE
+ setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, TRUE
+ setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, TRUE
+ setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, TRUE
+ setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, TRUE
special DrawWholeMapView
return
@@ -21,42 +21,42 @@ PokemonLeague_EliteFour_EventScript_WalkInCloseDoor::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRUCK_DOOR
- setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
- setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
- setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
- setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
- setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
- setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+ setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE
+ setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE
+ setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE
+ setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, TRUE
+ setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, TRUE
+ setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, TRUE
special DrawWholeMapView
return
@ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible
PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom::
- setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
- setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
- setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
- setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
- setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
- setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
- setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
- setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
- setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
- setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
- setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
- setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
- setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
- setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
- setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
- setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
- setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
- setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+ setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, FALSE
+ setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, FALSE
+ setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE
+ setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE
+ setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE
+ setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, TRUE
+ setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, TRUE
+ setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, TRUE
+ setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, TRUE
+ setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, TRUE
+ setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, TRUE
+ setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, TRUE
+ setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, TRUE
+ setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, TRUE
+ setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, TRUE
+ setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, TRUE
+ setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, TRUE
+ setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, TRUE
return
PokemonLeague_EliteFour_EventScript_CloseDoor::
- setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
- setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
- setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
- setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
- setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
- setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+ setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE
+ setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE
+ setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE
+ setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, TRUE
+ setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, TRUE
+ setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, TRUE
return
diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc
index a69975a16..dbfec2314 100644
--- a/data/scripts/flash.inc
+++ b/data/scripts/flash.inc
@@ -1,4 +1,4 @@
EventScript_UseFlash::
animateflash 1
- setflashradius 1
+ setflashlevel 1
end
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index 4e4725041..5a2e42478 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -33,7 +33,7 @@ void DoMossdeepGymWarp(void);
void DoPortholeWarp(void);
void DoCableClubWarp(void);
void DoContestHallWarp(void);
-void AnimateFlash(u8 flashLevel);
+void AnimateFlash(u8 newFlashLevel);
void WriteBattlePyramidViewScanlineEffectBuffer(void);
void DoSpinEnterWarp(void);
void DoSpinExitWarp(void);
diff --git a/include/field_weather.h b/include/field_weather.h
index 72a56ab6e..1d8cfe422 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -221,9 +221,9 @@ void Bubbles_Main(void);
void Bubbles_InitAll(void);
bool8 Bubbles_Finish(void);
-u8 GetSav1Weather(void);
-void SetSav1Weather(u32 weather);
-void SetSav1WeatherFromCurrMapHeader(void);
+u8 GetSavedWeather(void);
+void SetSavedWeather(u32 weather);
+void SetSavedWeatherFromCurrMapHeader(void);
void SetWeather(u32 weather);
void DoCurrentWeather(void);
void UpdateWeatherPerDay(u16 increment);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 0e8d697ba..f928cf3f9 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -686,7 +686,7 @@ u8 BattleSetup_GetTerrainId(void)
}
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE113) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE113))
return BATTLE_TERRAIN_SAND;
- if (GetSav1Weather() == WEATHER_SANDSTORM)
+ if (GetSavedWeather() == WEATHER_SANDSTORM)
return BATTLE_TERRAIN_SAND;
return BATTLE_TERRAIN_PLAIN;
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index b17617eff..5a7351bf2 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -35,7 +35,6 @@
#include "trainer_hill.h"
#include "fldeff.h"
-// This file's functions.
static void Task_ExitNonAnimDoor(u8);
static void Task_ExitNonDoor(u8);
static void Task_DoContestHallWarp(u8);
@@ -50,9 +49,9 @@ static void Task_EnableScriptAfterMusicFade(u8 taskId);
// data[0] is used universally by tasks in this file as a state for switches
#define tState data[0]
-// const
-static const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 };
-const s32 gMaxFlashLevel = ARRAY_COUNT(sFlashLevelPixelRadii) - 1;
+// Smaller flash level -> larger flash radius
+static const u16 sFlashLevelToRadius[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 };
+const s32 gMaxFlashLevel = ARRAY_COUNT(sFlashLevelToRadius) - 1;
const struct ScanlineEffectParams sFlashEffectParams =
{
@@ -971,14 +970,14 @@ static u8 StartUpdateOrbFlashEffect(s32 centerX, s32 centerY, s32 initialFlashRa
#undef tFlashRadiusDelta
#undef tClearScanlineEffect
-// A higher flashLevel value is a smaller flash radius (more darkness). 0 is full brightness
-void AnimateFlash(u8 flashLevel)
+// A higher flash level is a smaller flash radius (more darkness). 0 is full brightness
+void AnimateFlash(u8 newFlashLevel)
{
u8 curFlashLevel = GetFlashLevel();
bool8 fullBrightness = FALSE;
- if (!flashLevel)
+ if (newFlashLevel == 0)
fullBrightness = TRUE;
- StartUpdateFlashLevelEffect(DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], fullBrightness, 1);
+ StartUpdateFlashLevelEffect(DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelToRadius[curFlashLevel], sFlashLevelToRadius[newFlashLevel], fullBrightness, 1);
StartWaitForFlashUpdate();
ScriptContext2_Enable();
}
@@ -987,7 +986,7 @@ void WriteFlashScanlineEffectBuffer(u8 flashLevel)
{
if (flashLevel)
{
- SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelPixelRadii[flashLevel]);
+ SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelToRadius[flashLevel]);
CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480);
}
}
diff --git a/src/field_specials.c b/src/field_specials.c
index 22467cfee..96eb949e5 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1570,17 +1570,13 @@ bool8 FoundBlackGlasses(void)
void SetRoute119Weather(void)
{
if (IsMapTypeOutdoors(GetLastUsedWarpMapType()) != TRUE)
- {
- SetSav1Weather(WEATHER_ROUTE119_CYCLE);
- }
+ SetSavedWeather(WEATHER_ROUTE119_CYCLE);
}
void SetRoute123Weather(void)
{
if (IsMapTypeOutdoors(GetLastUsedWarpMapType()) != TRUE)
- {
- SetSav1Weather(WEATHER_ROUTE123_CYCLE);
- }
+ SetSavedWeather(WEATHER_ROUTE123_CYCLE);
}
u8 GetLeadMonIndex(void)
diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c
index 5720363c2..2b87557c2 100644
--- a/src/field_weather_effect.c
+++ b/src/field_weather_effect.c
@@ -2487,19 +2487,19 @@ static void CreateAbnormalWeatherTask(void)
static u8 TranslateWeatherNum(u8);
static void UpdateRainCounter(u8, u8);
-void SetSav1Weather(u32 weather)
+void SetSavedWeather(u32 weather)
{
u8 oldWeather = gSaveBlock1Ptr->weather;
gSaveBlock1Ptr->weather = TranslateWeatherNum(weather);
UpdateRainCounter(gSaveBlock1Ptr->weather, oldWeather);
}
-u8 GetSav1Weather(void)
+u8 GetSavedWeather(void)
{
return gSaveBlock1Ptr->weather;
}
-void SetSav1WeatherFromCurrMapHeader(void)
+void SetSavedWeatherFromCurrMapHeader(void)
{
u8 oldWeather = gSaveBlock1Ptr->weather;
gSaveBlock1Ptr->weather = TranslateWeatherNum(gMapHeader.weather);
@@ -2508,19 +2508,19 @@ void SetSav1WeatherFromCurrMapHeader(void)
void SetWeather(u32 weather)
{
- SetSav1Weather(weather);
- SetNextWeather(GetSav1Weather());
+ SetSavedWeather(weather);
+ SetNextWeather(GetSavedWeather());
}
void SetWeather_Unused(u32 weather)
{
- SetSav1Weather(weather);
- SetCurrentAndNextWeather(GetSav1Weather());
+ SetSavedWeather(weather);
+ SetCurrentAndNextWeather(GetSavedWeather());
}
void DoCurrentWeather(void)
{
- u8 weather = GetSav1Weather();
+ u8 weather = GetSavedWeather();
if (weather == WEATHER_ABNORMAL)
{
@@ -2539,7 +2539,7 @@ void DoCurrentWeather(void)
void ResumePausedWeather(void)
{
- u8 weather = GetSav1Weather();
+ u8 weather = GetSavedWeather();
if (weather == WEATHER_ABNORMAL)
{
diff --git a/src/overworld.c b/src/overworld.c
index b53de3ebc..a0fd7dbb3 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -803,7 +803,7 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
RestartWildEncounterImmunitySteps();
TryUpdateRandomTrainerRematches(mapGroup, mapNum);
DoTimeBasedEvents();
- SetSav1WeatherFromCurrMapHeader();
+ SetSavedWeatherFromCurrMapHeader();
ChooseAmbientCrySpecies();
SetDefaultFlashLevel();
Overworld_ClearSavedMusic();
@@ -854,7 +854,7 @@ static void LoadMapFromWarp(bool32 a1)
TryUpdateRandomTrainerRematches(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
if (a1 != TRUE)
DoTimeBasedEvents();
- SetSav1WeatherFromCurrMapHeader();
+ SetSavedWeatherFromCurrMapHeader();
ChooseAmbientCrySpecies();
if (isOutdoors)
FlagClear(FLAG_SYS_USE_FLASH);
@@ -967,6 +967,10 @@ bool32 Overworld_IsBikingAllowed(void)
return TRUE;
}
+// Flash level of 0 is fully bright
+// Flash level of 1 is the largest flash radius
+// Flash level of 7 is the smallest flash radius
+// Flash level of 8 is fully black
void SetDefaultFlashLevel(void)
{
if (!gMapHeader.cave)
@@ -1099,7 +1103,7 @@ u16 GetCurrLocationDefaultMusic(void)
// Play the desert music only when the sandstorm is active on Route 111.
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE111)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE111)
- && GetSav1Weather() == WEATHER_SANDSTORM)
+ && GetSavedWeather() == WEATHER_SANDSTORM)
return MUS_ROUTE111;
music = GetLocationMusic(&gSaveBlock1Ptr->location);
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 04dff470b..1dad3575c 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -609,7 +609,7 @@ bool8 ScrCmd_animateflash(struct ScriptContext *ctx)
return TRUE;
}
-bool8 ScrCmd_setflashradius(struct ScriptContext *ctx)
+bool8 ScrCmd_setflashlevel(struct ScriptContext *ctx)
{
SetFlashLevel(VarGet(ScriptReadHalfword(ctx)));
return FALSE;
@@ -706,13 +706,13 @@ bool8 ScrCmd_setweather(struct ScriptContext *ctx)
{
u16 weather = VarGet(ScriptReadHalfword(ctx));
- SetSav1Weather(weather);
+ SetSavedWeather(weather);
return FALSE;
}
bool8 ScrCmd_resetweather(struct ScriptContext *ctx)
{
- SetSav1WeatherFromCurrMapHeader();
+ SetSavedWeatherFromCurrMapHeader();
return FALSE;
}
@@ -1982,7 +1982,7 @@ bool8 ScrCmd_dofieldeffect(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_setfieldeffectarg(struct ScriptContext *ctx)
+bool8 ScrCmd_setfieldeffectargument(struct ScriptContext *ctx)
{
u8 argNum = ScriptReadByte(ctx);