diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-02 11:44:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 11:44:50 -0400 |
| commit | 8c86b656d2fa97fc5eb113e9807d49f48c715f8b (patch) | |
| tree | 01e14b4dec7ef184ca50b9f0815a662590520045 /data | |
| parent | 32693e94d844cb401aed91d066b9f5ad1eb440a7 (diff) | |
| parent | 1bd678656c735bbeb603ccb80367c7a85f820f61 (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'data')
44 files changed, 613 insertions, 2466 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 30cf27d13..bbcbe9818 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -12,6 +12,7 @@ #include "constants/weather.h" #include "constants/heal_locations.h" #include "constants/vars.h" +#include "constants/metatile_labels.h" .include "include/macros.inc" .include "include/macros/event.inc" .include "constants/constants.inc" @@ -2548,18 +2549,18 @@ EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 waitmovement 0 playse SE_DOOR - setmetatile 6, 1, 836, 0 - setmetatile 6, 2, 837, 0 - setmetatile 0, 2, 734, 1 - setmetatile 1, 2, 733, 1 - setmetatile 2, 2, 734, 1 - setmetatile 3, 2, 733, 1 - setmetatile 4, 2, 734, 1 - setmetatile 8, 2, 733, 1 - setmetatile 9, 2, 734, 1 - setmetatile 10, 2, 733, 1 - setmetatile 11, 2, 734, 1 - setmetatile 12, 2, 733, 1 + 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 special DrawWholeMapView return @@ -2570,12 +2571,12 @@ EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 waitmovement 0 playse SE_TRACK_DOOR - setmetatile 5, 12, 518, 1 - setmetatile 6, 12, 518, 1 - setmetatile 7, 12, 518, 1 - setmetatile 5, 13, 526, 1 - setmetatile 6, 13, 526, 1 - setmetatile 7, 13, 526, 1 + 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 special DrawWholeMapView return @@ -2583,36 +2584,36 @@ EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_GlaciasRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_PhoebesRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_SidneysRoom_EventScript_1A0757:: @ 81A0757 - setmetatile 6, 1, 836, 0 - setmetatile 6, 2, 837, 0 - setmetatile 5, 12, 518, 1 - setmetatile 6, 12, 518, 1 - setmetatile 7, 12, 518, 1 - setmetatile 5, 13, 526, 1 - setmetatile 6, 13, 526, 1 - setmetatile 7, 13, 526, 1 - setmetatile 0, 2, 734, 1 - setmetatile 1, 2, 733, 1 - setmetatile 2, 2, 734, 1 - setmetatile 3, 2, 733, 1 - setmetatile 4, 2, 734, 1 - setmetatile 8, 2, 733, 1 - setmetatile 9, 2, 734, 1 - setmetatile 10, 2, 733, 1 - setmetatile 11, 2, 734, 1 - setmetatile 12, 2, 733, 1 + 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 return EverGrandeCity_DrakesRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_GlaciasRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_PhoebesRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA - setmetatile 5, 12, 518, 1 - setmetatile 6, 12, 518, 1 - setmetatile 7, 12, 518, 1 - setmetatile 5, 13, 526, 1 - setmetatile 6, 13, 526, 1 - setmetatile 7, 13, 526, 1 + 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 return SlateportCity_Movement_1A0831:: @ 81A0831 diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index f1b7240db..7b3923a86 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -13,11 +13,11 @@ AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 end AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 - setmetatile 11, 4, 563, 1 + setmetatile 11, 4, METATILE_InsideShip_InTactDoor0_Bottom, 1 return AbandonedShip_Corridors_B1F_EventScript_15E9C0:: @ 815E9C0 - setmetatile 11, 4, 555, 1 + setmetatile 11, 4, METATILE_InsideShip_InTactDoor1_Bottom, 1 return AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index e8e48a6f6..6a71ee049 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -19,35 +19,35 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A end AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 - setmetatile 3, 8, 555, 1 + setmetatile 3, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD:: @ 815EBAD - setmetatile 6, 8, 555, 1 + setmetatile 6, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7:: @ 815EBB7 - setmetatile 3, 3, 538, 0 + setmetatile 3, 3, METATILE_InsideShip_DoorIndent1, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1:: @ 815EBC1 - setmetatile 9, 3, 538, 0 + setmetatile 9, 3, METATILE_InsideShip_DoorIndent1, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB:: @ 815EBCB - setmetatile 3, 8, 563, 1 + setmetatile 3, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5:: @ 815EBD5 - setmetatile 6, 8, 563, 1 + setmetatile 6, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF:: @ 815EBDF - setmetatile 3, 3, 564, 0 + setmetatile 3, 3, METATILE_InsideShip_DoorIndent0, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 - setmetatile 9, 3, 564, 0 + setmetatile 9, 3, METATILE_InsideShip_DoorIndent0, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 8ff39c0a4..c8d5e13b2 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -21,12 +21,12 @@ AncientTomb_MapScript1_15EFE0:: @ 815EFE0 end AncientTomb_EventScript_15EFEA:: @ 815EFEA - setmetatile 7, 19, 553, 1 - setmetatile 8, 19, 553, 1 - setmetatile 9, 19, 553, 1 - setmetatile 7, 20, 565, 1 - setmetatile 8, 20, 565, 1 - setmetatile 9, 20, 565, 1 + 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 return AncientTomb_EventScript_15F021:: @ 815F021 diff --git a/data/maps/BattleTower_Corridor/scripts.inc b/data/maps/BattleTower_Corridor/scripts.inc index d9d73b832..6511d0333 100644 --- a/data/maps/BattleTower_Corridor/scripts.inc +++ b/data/maps/BattleTower_Corridor/scripts.inc @@ -6,13 +6,13 @@ BattleTower_Corridor_MapScripts:: @ 8160845 BattleTower_Corridor_MapScript1_160850:: @ 8160850 compare VAR_SPECIAL_6, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E - setmetatile 12, 0, 519, 0 - setmetatile 12, 1, 527, 0 + setmetatile 12, 0, METATILE_BattleTower_CorridorOpenDoor_Top, 0 + setmetatile 12, 1, METATILE_BattleTower_CorridorOpenDoor_Bottom, 0 end BattleTower_Corridor_EventScript_16086E:: @ 816086E - setmetatile 15, 0, 519, 0 - setmetatile 15, 1, 527, 0 + setmetatile 15, 0, METATILE_BattleTower_CorridorOpenDoor_Top, 0 + setmetatile 15, 1, METATILE_BattleTower_CorridorOpenDoor_Bottom, 0 end BattleTower_Corridor_MapScript2_160881:: @ 8160881 diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 2627a8261..cf1ae8e72 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -17,12 +17,12 @@ DesertRuins_MapScript1_15CB11:: @ 815CB11 end DesertRuins_EventScript_15CB1B:: @ 815CB1B - setmetatile 7, 19, 553, 1 - setmetatile 8, 19, 553, 1 - setmetatile 9, 19, 553, 1 - setmetatile 7, 20, 565, 1 - setmetatile 8, 20, 565, 1 - setmetatile 9, 20, 565, 1 + 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 return DesertRuins_MapScript1_15CB52:: @ 815CB52 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 01b2cc970..55597b1f8 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -46,8 +46,8 @@ EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playse SE_DOOR - setmetatile 6, 1, 838, 0 - setmetatile 6, 2, 839, 0 + setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0 + setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closemessage diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index 5386fec4f..9a82f89e2 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -23,14 +23,14 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 playse SE_HASHI - setmetatile 4, 2, 545, 1 - setmetatile 4, 3, 609, 1 + setmetatile 4, 2, METATILE_Contest_WallShadow, 1 + setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 playse SE_HASHI - setmetatile 4, 2, 721, 1 - setmetatile 4, 3, 729, 1 + setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 + setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView delay 20 applymovement 1, FallarborTown_ContestLobby_Movement_153A8C diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index b2617c8f7..629db8bf5 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -4,9 +4,9 @@ InsideOfTruck_MapScripts:: @ 815FBFF .byte 0 InsideOfTruck_MapScript1_15FC0A:: @ 815FC0A - setmetatile 4, 1, 520, 0 - setmetatile 4, 2, 528, 0 - setmetatile 4, 3, 536, 0 + setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, 0 + setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, 0 + setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, 0 end InsideOfTruck_MapScript1_15FC26:: @ 815FC26 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index d8576e883..41496fcc8 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -17,12 +17,12 @@ IslandCave_MapScript1_15EED4:: @ 815EED4 end IslandCave_EventScript_15EEDE:: @ 815EEDE - setmetatile 7, 19, 553, 1 - setmetatile 8, 19, 553, 1 - setmetatile 9, 19, 553, 1 - setmetatile 7, 20, 565, 1 - setmetatile 8, 20, 565, 1 - setmetatile 9, 20, 565, 1 + 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 return IslandCave_MapScript1_15EF15:: @ 815EF15 @@ -30,12 +30,12 @@ IslandCave_MapScript1_15EF15:: @ 815EF15 end S_OpenRegiceChamber:: @ 815EF19 - setmetatile 7, 19, 554, 1 - setmetatile 8, 19, 555, 1 - setmetatile 9, 19, 556, 1 - setmetatile 7, 20, 562, 1 - setmetatile 8, 20, 563, 0 - setmetatile 9, 20, 564, 1 + 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 special DrawWholeMapView playse SE_BAN setflag FLAG_SYS_BRAILLE_WAIT diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index e32582b24..53b05fad9 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -14,47 +14,47 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 LilycoveCity_MapScript1_14CA3F:: @ 814CA3F .ifndef SAPPHIRE - setmetatile 69, 4, 169, 1 - setmetatile 70, 4, 680, 1 - setmetatile 71, 4, 681, 1 - setmetatile 72, 4, 682, 1 - setmetatile 69, 5, 145, 1 - setmetatile 70, 5, 688, 1 - setmetatile 71, 5, 689, 0 - setmetatile 72, 5, 690, 1 - setmetatile 69, 6, 446, 0 - setmetatile 70, 6, 447, 0 - setmetatile 71, 6, 368, 0 - setmetatile 72, 6, 445, 0 + setmetatile 69, 4, METATILE_General_RockWall_WaterBase, 1 + setmetatile 70, 4, METATILE_Lilycove_AquaHideout_Entrance_TopLeft, 1 + setmetatile 71, 4, METATILE_Lilycove_AquaHideout_Entrance_TopMid, 1 + setmetatile 72, 4, METATILE_Lilycove_AquaHideout_Entrance_TopRight, 1 + setmetatile 69, 5, METATILE_General_RockWall_SandBase, 1 + setmetatile 70, 5, METATILE_Lilycove_AquaHideout_Entrance_BottomLeft, 1 + setmetatile 71, 5, METATILE_Lilycove_AquaHideout_Entrance_BottomMid, 0 + setmetatile 72, 5, METATILE_Lilycove_AquaHideout_Entrance_BottomRight, 1 + setmetatile 69, 6, METATILE_General_Shore_BottomMid, 0 + setmetatile 70, 6, METATILE_General_Shore_BottomRight, 0 + setmetatile 71, 6, METATILE_General_CalmWater, 0 + setmetatile 72, 6, METATILE_General_Shore_BottomLeft, 0 .endif call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B end LilycoveCity_EventScript_14CABE:: @ 814CABE - setmetatile 76, 12, 656, 1 - setmetatile 77, 12, 657, 1 - setmetatile 76, 13, 672, 1 - setmetatile 77, 13, 673, 1 - setmetatile 76, 14, 664, 1 - setmetatile 77, 14, 665, 1 - setmetatile 76, 15, 672, 1 - setmetatile 77, 15, 673, 1 - setmetatile 77, 16, 664, 1 - setmetatile 78, 16, 665, 1 - setmetatile 77, 17, 672, 1 - setmetatile 78, 17, 673, 1 + 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 return LilycoveCity_EventScript_14CB2B:: @ 814CB2B - setmetatile 69, 4, 169, 1 - setmetatile 70, 4, 169, 1 - setmetatile 71, 4, 169, 1 - setmetatile 72, 4, 169, 1 - setmetatile 69, 5, 145, 1 - setmetatile 70, 5, 145, 1 - setmetatile 71, 5, 145, 1 - setmetatile 72, 5, 145, 1 + setmetatile 69, 4, METATILE_General_RockWall_WaterBase, 1 + setmetatile 70, 4, METATILE_General_RockWall_WaterBase, 1 + setmetatile 71, 4, METATILE_General_RockWall_WaterBase, 1 + setmetatile 72, 4, METATILE_General_RockWall_WaterBase, 1 + setmetatile 69, 5, METATILE_General_RockWall_SandBase, 1 + setmetatile 70, 5, METATILE_General_RockWall_SandBase, 1 + setmetatile 71, 5, METATILE_General_RockWall_SandBase, 1 + setmetatile 72, 5, METATILE_General_RockWall_SandBase, 1 return LilycoveCity_EventScript_14CB74:: @ 814CB74 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 8b098ed64..27c19ec39 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -493,14 +493,14 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 playse SE_HASHI - setmetatile 9, 2, 545, 1 - setmetatile 9, 3, 609, 1 + setmetatile 9, 2, METATILE_Contest_WallShadow, 1 + setmetatile 9, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 playse SE_HASHI - setmetatile 9, 2, 721, 1 - setmetatile 9, 3, 729, 1 + setmetatile 9, 2, METATILE_Contest_CounterFlap_Top, 1 + setmetatile 9, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView delay 20 applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE @@ -632,14 +632,14 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 playse SE_HASHI - setmetatile 4, 2, 545, 1 - setmetatile 4, 3, 609, 1 + setmetatile 4, 2, METATILE_Contest_WallShadow, 1 + setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 playse SE_HASHI - setmetatile 4, 2, 721, 1 - setmetatile 4, 3, 729, 1 + setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 + setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView delay 20 applymovement 1, LilycoveCity_ContestLobby_Movement_15901C diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 1643c3a8b..2ef07a1e9 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -28,32 +28,32 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD - setmetatile 10, 6, 606, 1 - setmetatile 11, 6, 607, 1 + setmetatile 10, 6, METATILE_LilycoveMuseum_Painting2_Left, 1 + setmetatile 11, 6, METATILE_LilycoveMuseum_Painting2_Right, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615 - setmetatile 18, 6, 604, 1 - setmetatile 19, 6, 605, 1 + setmetatile 18, 6, METATILE_LilycoveMuseum_Painting1_Left, 1 + setmetatile 19, 6, METATILE_LilycoveMuseum_Painting1_Right, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D - setmetatile 14, 10, 608, 1 - setmetatile 15, 10, 609, 1 + setmetatile 14, 10, METATILE_LilycoveMuseum_Painting3_Left, 1 + setmetatile 15, 10, METATILE_LilycoveMuseum_Painting3_Right, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645 - setmetatile 6, 10, 602, 1 - setmetatile 7, 10, 603, 1 + setmetatile 6, 10, METATILE_LilycoveMuseum_Painting0_Left, 1 + setmetatile 7, 10, METATILE_LilycoveMuseum_Painting0_Right, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D - setmetatile 2, 6, 610, 1 - setmetatile 3, 6, 611, 1 + setmetatile 2, 6, METATILE_LilycoveMuseum_Painting4_Left, 1 + setmetatile 3, 6, METATILE_LilycoveMuseum_Painting4_Right, 1 end LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 340f50894..deaeb6f59 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -11,8 +11,8 @@ LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B end LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 - setmetatile 5, 4, 624, 1 - setmetatile 5, 2, 616, 1 + setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1 + setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1 return LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 @@ -22,7 +22,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 return LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 - setmetatile 3, 7, 659, 1 + setmetatile 3, 7, METATILE_BrendansMaysHouse_BookOnTable, 1 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index ad7257e0b..fa018ca54 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -11,8 +11,8 @@ LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 end LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E - setmetatile 5, 4, 624, 1 - setmetatile 5, 2, 616, 1 + setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1 + setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1 return LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 @@ -22,7 +22,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 return LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE - setmetatile 6, 7, 659, 1 + setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, 1 return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index ae10eadfd..9fb3042f7 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -16,31 +16,31 @@ MauvilleCity_Gym_EventScript_156491:: @ 8156491 end MauvilleCity_Gym_EventScript_15649B:: @ 815649B - setmetatile 4, 7, 560, 0 - setmetatile 4, 8, 568, 0 - setmetatile 5, 7, 561, 0 - setmetatile 5, 8, 569, 0 - setmetatile 3, 8, 578, 1 - setmetatile 3, 9, 538, 0 - setmetatile 3, 10, 593, 0 - setmetatile 1, 10, 546, 0 - setmetatile 1, 11, 554, 1 - setmetatile 2, 10, 547, 0 - setmetatile 2, 11, 555, 1 - setmetatile 4, 10, 546, 0 - setmetatile 4, 11, 554, 1 - setmetatile 5, 10, 547, 0 - setmetatile 5, 11, 555, 1 - setmetatile 6, 11, 578, 1 - setmetatile 6, 12, 538, 0 - setmetatile 6, 13, 593, 0 - setmetatile 3, 11, 577, 1 - setmetatile 3, 12, 585, 1 - setmetatile 3, 13, 592, 1 - setmetatile 4, 13, 560, 0 - setmetatile 4, 14, 568, 0 - setmetatile 5, 13, 561, 0 - setmetatile 5, 14, 569, 0 + setmetatile 4, 7, METATILE_MauvilleGym_GreenBeamH1_Off, 0 + setmetatile 4, 8, METATILE_MauvilleGym_GreenBeamH3_Off, 0 + setmetatile 5, 7, METATILE_MauvilleGym_GreenBeamH2_Off, 0 + setmetatile 5, 8, METATILE_MauvilleGym_GreenBeamH4_Off, 0 + setmetatile 3, 8, METATILE_MauvilleGym_PoleBottom_On, 1 + setmetatile 3, 9, METATILE_MauvilleGym_FloorTile, 0 + setmetatile 3, 10, METATILE_MauvilleGym_PoleTop_Off, 0 + setmetatile 1, 10, METATILE_MauvilleGym_RedBeamH1_On, 0 + setmetatile 1, 11, METATILE_MauvilleGym_RedBeamH3_On, 1 + setmetatile 2, 10, METATILE_MauvilleGym_RedBeamH2_On, 0 + setmetatile 2, 11, METATILE_MauvilleGym_RedBeamH4_On, 1 + setmetatile 4, 10, METATILE_MauvilleGym_RedBeamH1_On, 0 + setmetatile 4, 11, METATILE_MauvilleGym_RedBeamH3_On, 1 + setmetatile 5, 10, METATILE_MauvilleGym_RedBeamH2_On, 0 + setmetatile 5, 11, METATILE_MauvilleGym_RedBeamH4_On, 1 + setmetatile 6, 11, METATILE_MauvilleGym_PoleBottom_On, 1 + setmetatile 6, 12, METATILE_MauvilleGym_FloorTile, 0 + setmetatile 6, 13, METATILE_MauvilleGym_PoleTop_Off, 0 + 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, 13, METATILE_MauvilleGym_GreenBeamH1_Off, 0 + setmetatile 4, 14, METATILE_MauvilleGym_GreenBeamH3_Off, 0 + setmetatile 5, 13, METATILE_MauvilleGym_GreenBeamH2_Off, 0 + setmetatile 5, 14, METATILE_MauvilleGym_GreenBeamH4_Off, 0 end MauvilleCity_Gym_EventScript_15657D:: @ 815657D diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index 4d9989d82..7e147c48f 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -11,8 +11,8 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 end MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 - setmetatile 3, 0, 653, 1 - setmetatile 3, 1, 661, 1 + setmetatile 3, 0, METATILE_GenericBuilding_Doorway_ClosedTop, 1 + setmetatile 3, 1, METATILE_GenericBuilding_Doorway_ClosedBottom, 1 return MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 0fa79a6ec..aabfd73ec 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -22,26 +22,26 @@ MossdeepCity_Gym_EventScript_15A506:: @ 815A506 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 - setmetatile 5, 5, 516, 0 - setmetatile 2, 7, 569, 1 + setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0 + setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A528:: @ 815A528 - setmetatile 8, 14, 516, 0 - setmetatile 8, 10, 569, 1 + setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0 + setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A540:: @ 815A540 - setmetatile 15, 17, 524, 0 - setmetatile 17, 15, 569, 1 + setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0 + setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A558:: @ 815A558 - setmetatile 1, 23, 525, 0 - setmetatile 5, 24, 569, 1 + setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0 + setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B @@ -81,8 +81,8 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 5, 5, 516, 0 - setmetatile 2, 7, 569, 1 + setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0 + setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -96,8 +96,8 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 5, 5, 524, 0 - setmetatile 2, 7, 568, 1 + setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Base, 0 + setmetatile 2, 7, METATILE_MossdeepGym_Empty0, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -107,8 +107,8 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 8, 14, 516, 0 - setmetatile 8, 10, 569, 1 + setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0 + setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -116,8 +116,8 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 8, 14, 517, 0 - setmetatile 8, 10, 568, 1 + setmetatile 8, 14, METATILE_MossdeepGym_OuterWall_RightCorner, 0 + setmetatile 8, 10, METATILE_MossdeepGym_Empty0, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -127,8 +127,8 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 15, 17, 524, 0 - setmetatile 17, 15, 569, 1 + setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0 + setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -136,8 +136,8 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 15, 17, 516, 0 - setmetatile 17, 15, 568, 1 + setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Top, 0 + setmetatile 17, 15, METATILE_MossdeepGym_Empty0, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -147,8 +147,8 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 1, 23, 525, 0 - setmetatile 5, 24, 569, 1 + setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0 + setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -156,8 +156,8 @@ MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 1, 23, 516, 0 - setmetatile 5, 24, 568, 1 + setmetatile 1, 23, METATILE_MossdeepGym_Obelisk_Top, 0 + setmetatile 5, 24, METATILE_MossdeepGym_Empty0, 1 goto MossdeepCity_Gym_EventScript_15A619 end diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index eb719a33a..073416b5a 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -9,7 +9,7 @@ MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 end MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF - setmetatile 6, 4, 753, 1 + setmetatile 6, 4, METATILE_GenericBuilding_TableEdge, 1 return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 1c8bdfb3f..da46a8053 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -9,12 +9,12 @@ NewMauville_Entrance_MapScript1_15E495:: @ 815E495 end NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 - setmetatile 3, 0, 788, 1 - setmetatile 4, 0, 789, 1 - setmetatile 5, 0, 790, 1 - setmetatile 3, 1, 796, 1 - setmetatile 4, 1, 797, 1 - setmetatile 5, 1, 798, 1 + 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 return NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 @@ -33,12 +33,12 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC compare RESULT, NO goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 - setmetatile 3, 0, 707, 0 - setmetatile 4, 0, 708, 0 - setmetatile 5, 0, 709, 0 - setmetatile 3, 1, 715, 1 - setmetatile 4, 1, 716, 0 - setmetatile 5, 1, 717, 1 + 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 special DrawWholeMapView playse SE_BAN setvar VAR_NEW_MAUVILLE_STATE, 1 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index e045cda5d..02d17a3ef 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -47,83 +47,83 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 end NewMauville_Inside_EventScript_15E5DA:: @ 815E5DA - setmetatile 23, 34, 617, 1 - setmetatile 23, 35, 625, 1 - setmetatile 23, 36, 621, 0 - setmetatile 23, 37, 641, 0 - setmetatile 10, 16, 617, 1 - setmetatile 10, 17, 625, 1 - setmetatile 10, 18, 621, 0 - setmetatile 10, 19, 641, 0 - setmetatile 10, 0, 617, 1 - setmetatile 10, 1, 625, 1 - setmetatile 10, 2, 621, 0 - setmetatile 10, 3, 641, 0 - setmetatile 37, 33, 694, 1 - setmetatile 37, 34, 702, 1 - setmetatile 37, 35, 710, 1 - setmetatile 37, 36, 718, 1 - setmetatile 28, 22, 694, 1 - setmetatile 28, 23, 702, 1 - setmetatile 28, 24, 710, 1 - setmetatile 28, 25, 718, 1 - setmetatile 10, 24, 694, 1 - setmetatile 10, 25, 702, 1 - setmetatile 10, 26, 710, 1 - setmetatile 10, 27, 718, 1 - setmetatile 21, 2, 694, 1 - setmetatile 21, 3, 702, 1 - setmetatile 21, 4, 710, 1 - setmetatile 21, 5, 718, 1 - setmetatile 6, 11, 591, 0 - setmetatile 13, 10, 591, 0 - setmetatile 16, 22, 591, 0 - setmetatile 4, 26, 591, 0 - setmetatile 30, 38, 591, 0 - setmetatile 2, 11, 558, 0 - setmetatile 17, 10, 558, 0 - setmetatile 25, 18, 558, 0 - setmetatile 18, 36, 558, 0 + 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 return NewMauville_Inside_EventScript_15E728:: @ 815E728 - setmetatile 23, 34, 695, 1 - setmetatile 23, 35, 703, 1 - setmetatile 23, 36, 711, 1 - setmetatile 23, 37, 719, 1 - setmetatile 10, 16, 695, 1 - setmetatile 10, 17, 703, 1 - setmetatile 10, 18, 711, 1 - setmetatile 10, 19, 719, 1 - setmetatile 10, 0, 695, 1 - setmetatile 10, 1, 703, 1 - setmetatile 10, 2, 711, 1 - setmetatile 10, 3, 719, 1 - setmetatile 37, 33, 617, 1 - setmetatile 37, 34, 625, 1 - setmetatile 37, 35, 621, 0 - setmetatile 37, 36, 641, 0 - setmetatile 28, 22, 617, 1 - setmetatile 28, 23, 625, 1 - setmetatile 28, 24, 621, 0 - setmetatile 28, 25, 641, 0 - setmetatile 10, 24, 617, 1 - setmetatile 10, 25, 625, 1 - setmetatile 10, 26, 621, 0 - setmetatile 10, 27, 641, 0 - setmetatile 21, 2, 617, 1 - setmetatile 21, 3, 625, 1 - setmetatile 21, 4, 621, 0 - setmetatile 21, 5, 641, 0 - setmetatile 2, 11, 591, 0 - setmetatile 17, 10, 591, 0 - setmetatile 25, 18, 591, 0 - setmetatile 18, 36, 591, 0 - setmetatile 6, 11, 566, 0 - setmetatile 13, 10, 566, 0 - setmetatile 16, 22, 566, 0 - setmetatile 4, 26, 566, 0 - setmetatile 30, 38, 566, 0 + 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 return NewMauville_Inside_EventScript_15E876:: @ 815E876 @@ -135,15 +135,15 @@ NewMauville_Inside_EventScript_15E876:: @ 815E876 end NewMauville_Inside_EventScript_15E88B:: @ 815E88B - setmetatile 33, 6, 591, 0 - setmetatile 32, 2, 752, 1 - setmetatile 33, 2, 753, 1 - setmetatile 34, 2, 754, 1 - setmetatile 35, 2, 755, 1 - setmetatile 32, 3, 756, 1 - setmetatile 33, 3, 757, 1 - setmetatile 34, 3, 758, 1 - setmetatile 35, 3, 759, 1 + 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 special DrawWholeMapView return diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 44398e6d5..c7efb49ae 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -935,51 +935,51 @@ PetalburgCity_Gym_EventScript_155081:: @ 8155081 return PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2 - setmetatile 6, 85, 528, 0 - setmetatile 7, 85, 529, 0 - setmetatile 1, 98, 528, 0 - setmetatile 2, 98, 529, 0 + 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 return PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7 - setmetatile 6, 46, 528, 0 - setmetatile 7, 46, 529, 0 - setmetatile 1, 59, 528, 0 - setmetatile 2, 59, 529, 0 + 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 return PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC - setmetatile 6, 59, 528, 0 - setmetatile 7, 59, 529, 0 - setmetatile 1, 72, 528, 0 - setmetatile 2, 72, 529, 0 + 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 return PetalburgCity_Gym_EventScript_155111:: @ 8155111 - setmetatile 1, 20, 528, 0 - setmetatile 2, 20, 529, 0 + setmetatile 1, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0 + setmetatile 2, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0 return PetalburgCity_Gym_EventScript_155124:: @ 8155124 - setmetatile 6, 20, 528, 0 - setmetatile 7, 20, 529, 0 - setmetatile 1, 33, 528, 0 - setmetatile 2, 33, 529, 0 + 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 return PetalburgCity_Gym_EventScript_155149:: @ 8155149 - setmetatile 6, 33, 528, 0 - setmetatile 7, 33, 529, 0 + setmetatile 6, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0 + setmetatile 7, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0 return PetalburgCity_Gym_EventScript_15515C:: @ 815515C - setmetatile 1, 7, 528, 0 - setmetatile 2, 7, 529, 0 + setmetatile 1, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0 + setmetatile 2, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0 return PetalburgCity_Gym_EventScript_15516F:: @ 815516F - setmetatile 6, 7, 528, 0 - setmetatile 7, 7, 529, 0 + setmetatile 6, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0 + setmetatile 7, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0 return PetalburgCity_Gym_EventScript_155182:: @ 8155182 diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index e628c4761..7d0eeb62d 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -7,8 +7,8 @@ Route105_MapScript1_14F29E:: @ 814F29E end Route105_EventScript_14F2A8:: @ 814F2A8 - setmetatile 9, 19, 124, 1 - setmetatile 9, 20, 145, 1 + setmetatile 9, 19, METATILE_General_RockWall_RockBase, 1 + setmetatile 9, 20, METATILE_General_RockWall_SandBase, 1 return Route105_EventScript_14F2BB:: @ 814F2BB diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index ca992427c..4817f3f2e 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -37,7 +37,7 @@ Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 end Route110_TrickHouseEnd_EventScript_161994:: @ 8161994 - setmetatile 10, 1, 539, 1 + setmetatile 10, 1, METATILE_GenericBuilding_TrickHouse_Door_Closed, 1 return Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 79f52f7bf..19d5a606d 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -494,7 +494,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 end Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD - setmetatile 5, 1, 537, 0 + setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0 special DrawWholeMapView delay 20 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856 @@ -600,7 +600,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 msgbox UnknownString_819CAD1, 4 playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 - setmetatile 13, 1, 523, 0 + setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 special DrawWholeMapView releaseall end @@ -611,7 +611,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 msgbox UnknownString_819CCCB, 4 playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2 - setmetatile 13, 1, 523, 0 + setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 special DrawWholeMapView releaseall end @@ -622,7 +622,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 msgbox UnknownString_819CEF9, 4 playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2 - setmetatile 13, 1, 523, 0 + setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 special DrawWholeMapView releaseall end @@ -633,7 +633,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB msgbox UnknownString_819D164, 4 playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2 - setmetatile 13, 1, 523, 0 + setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 special DrawWholeMapView releaseall end @@ -644,7 +644,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 msgbox UnknownString_819D3A5, 4 playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2 - setmetatile 13, 1, 523, 0 + setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 special DrawWholeMapView releaseall end @@ -655,7 +655,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D msgbox UnknownString_819DC0A, 4 playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2 - setmetatile 13, 1, 523, 0 + setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 special DrawWholeMapView releaseall end @@ -666,7 +666,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 msgbox UnknownString_819DE8D, 4 playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2 - setmetatile 13, 1, 523, 0 + setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 special DrawWholeMapView releaseall end @@ -677,7 +677,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F msgbox UnknownString_819E0FF, 4 playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2 - setmetatile 13, 1, 523, 0 + setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 special DrawWholeMapView releaseall end diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index 547160a92..dc66b71f4 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE end Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A - setmetatile 13, 1, 523, 0 + setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 end Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index b8e00f385..f1044e388 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -70,23 +70,23 @@ Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 end Route110_TrickHousePuzzle2_EventScript_161E2C:: @ 8161E2C - setmetatile 14, 21, 601, 0 - setmetatile 1, 12, 618, 0 + setmetatile 14, 21, METATILE_TrickHousePuzzle_Button_Pressed, 0 + setmetatile 1, 12, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return Route110_TrickHousePuzzle2_EventScript_161E3F:: @ 8161E3F - setmetatile 8, 17, 601, 0 - setmetatile 12, 13, 618, 0 + setmetatile 8, 17, METATILE_TrickHousePuzzle_Button_Pressed, 0 + setmetatile 12, 13, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return Route110_TrickHousePuzzle2_EventScript_161E52:: @ 8161E52 - setmetatile 4, 10, 601, 0 - setmetatile 8, 4, 618, 0 + setmetatile 4, 10, METATILE_TrickHousePuzzle_Button_Pressed, 0 + setmetatile 8, 4, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 - setmetatile 5, 2, 601, 0 - setmetatile 12, 5, 618, 0 + setmetatile 5, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0 + setmetatile 12, 5, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 0bb582c5d..b8d8383fc 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -24,13 +24,13 @@ Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 end Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 - setmetatile 5, 20, 600, 0 - setmetatile 4, 12, 600, 0 - setmetatile 11, 10, 600, 0 - setmetatile 3, 8, 600, 0 - setmetatile 13, 7, 600, 0 - setmetatile 1, 3, 600, 0 - setmetatile 10, 2, 600, 0 + setmetatile 5, 20, METATILE_TrickHousePuzzle_Button_Up, 0 + setmetatile 4, 12, METATILE_TrickHousePuzzle_Button_Up, 0 + setmetatile 11, 10, METATILE_TrickHousePuzzle_Button_Up, 0 + setmetatile 3, 8, METATILE_TrickHousePuzzle_Button_Up, 0 + setmetatile 13, 7, METATILE_TrickHousePuzzle_Button_Up, 0 + setmetatile 1, 3, METATILE_TrickHousePuzzle_Button_Up, 0 + setmetatile 10, 2, METATILE_TrickHousePuzzle_Button_Up, 0 compare VAR_TEMP_8, 1 call_if_eq Route110_TrickHousePuzzle3_EventScript_161F9F compare VAR_TEMP_8, 2 @@ -48,201 +48,201 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 return Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F - setmetatile 5, 20, 601, 0 + setmetatile 5, 20, METATILE_TrickHousePuzzle_Button_Pressed, 0 return Route110_TrickHousePuzzle3_EventScript_161FA9:: @ 8161FA9 - setmetatile 4, 12, 601, 0 + setmetatile 4, 12, METATILE_TrickHousePuzzle_Button_Pressed, 0 return Route110_TrickHousePuzzle3_EventScript_161FB3:: @ 8161FB3 - setmetatile 11, 10, 601, 0 + setmetatile 11, 10, METATILE_TrickHousePuzzle_Button_Pressed, 0 return Route110_TrickHousePuzzle3_EventScript_161FBD:: @ 8161FBD - setmetatile 3, 8, 601, 0 + setmetatile 3, 8, METATILE_TrickHousePuzzle_Button_Pressed, 0 return Route110_TrickHousePuzzle3_EventScript_161FC7:: @ 8161FC7 - setmetatile 13, 7, 601, 0 + setmetatile 13, 7, METATILE_TrickHousePuzzle_Button_Pressed, 0 return Route110_TrickHousePuzzle3_EventScript_161FD1:: @ 8161FD1 - setmetatile 1, 3, 601, 0 + setmetatile 1, 3, METATILE_TrickHousePuzzle_Button_Pressed, 0 return Route110_TrickHousePuzzle3_EventScript_161FDB:: @ 8161FDB - setmetatile 10, 2, 601, 0 + setmetatile 10, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0 return Route110_TrickHousePuzzle3_EventScript_161FE5:: @ 8161FE5 - setmetatile 1, 6, 587, 0 - setmetatile 2, 6, 588, 0 - setmetatile 1, 7, 595, 0 - setmetatile 2, 7, 596, 0 - setmetatile 4, 9, 587, 0 - setmetatile 5, 9, 588, 0 - setmetatile 4, 10, 595, 0 - setmetatile 5, 10, 596, 0 - setmetatile 4, 18, 587, 0 - setmetatile 5, 18, 588, 0 - setmetatile 4, 19, 595, 0 - setmetatile 5, 19, 596, 0 - setmetatile 7, 3, 587, 0 - setmetatile 8, 3, 588, 0 - setmetatile 7, 4, 595, 0 - setmetatile 8, 4, 596, 0 - setmetatile 7, 9, 587, 0 - setmetatile 8, 9, 588, 0 - setmetatile 7, 10, 595, 0 - setmetatile 8, 10, 596, 0 - setmetatile 7, 18, 587, 0 - setmetatile 8, 18, 588, 0 - setmetatile 7, 19, 595, 0 - setmetatile 8, 19, 596, 0 - setmetatile 13, 3, 587, 0 - setmetatile 14, 3, 588, 0 - setmetatile 13, 4, 595, 0 - setmetatile 14, 4, 596, 0 - setmetatile 13, 9, 587, 0 - setmetatile 14, 9, 588, 0 - setmetatile 13, 10, 595, 0 - setmetatile 14, 10, 596, 0 - setmetatile 13, 15, 587, 0 - setmetatile 14, 15, 588, 0 - setmetatile 13, 16, 595, 0 - setmetatile 14, 16, 596, 0 - setmetatile 3, 13, 589, 1 - setmetatile 3, 14, 597, 0 - setmetatile 6, 7, 589, 1 - setmetatile 6, 8, 597, 0 - setmetatile 9, 16, 589, 1 - setmetatile 9, 17, 597, 0 - setmetatile 12, 4, 589, 1 - setmetatile 12, 5, 597, 0 - setmetatile 12, 10, 589, 1 - setmetatile 12, 11, 597, 0 - setmetatile 1, 15, 568, 0 - setmetatile 2, 15, 569, 0 - setmetatile 1, 16, 576, 1 - setmetatile 2, 16, 577, 1 - setmetatile 4, 6, 568, 0 - setmetatile 5, 6, 569, 0 - setmetatile 4, 7, 576, 1 - setmetatile 5, 7, 577, 1 - setmetatile 7, 12, 568, 0 - setmetatile 8, 12, 569, 0 - setmetatile 7, 13, 576, 1 - setmetatile 8, 13, 577, 1 - setmetatile 10, 12, 568, 0 - setmetatile 11, 12, 569, 0 - setmetatile 10, 13, 576, 1 - setmetatile 11, 13, 577, 1 - setmetatile 10, 18, 568, 0 - setmetatile 11, 18, 569, 0 - setmetatile 10, 19, 576, 1 - setmetatile 11, 19, 577, 1 - setmetatile 3, 4, 570, 1 - setmetatile 3, 5, 578, 1 - setmetatile 6, 10, 570, 1 - setmetatile 6, 11, 578, 1 - setmetatile 6, 13, 570, 1 - setmetatile 6, 14, 578, 1 - setmetatile 6, 16, 570, 1 - setmetatile 6, 17, 578, 1 - setmetatile 9, 4, 570, 1 - setmetatile 9, 5, 578, 1 - setmetatile 9, 7, 570, 1 - setmetatile 9, 8, 578, 1 - setmetatile 12, 13, 570, 1 - setmetatile 12, 14, 578, 1 - setmetatile 12, 16, 570, 1 - setmetatile 12, 17, 578, 1 + 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 4, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0 + setmetatile 5, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0 + setmetatile 4, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0 + setmetatile 5, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0 + setmetatile 4, 18, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0 + setmetatile 5, 18, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0 + setmetatile 4, 19, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0 + setmetatile 5, 19, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0 + setmetatile 7, 3, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0 + setmetatile 8, 3, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0 + setmetatile 7, 4, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0 + setmetatile 8, 4, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0 + setmetatile 7, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0 + setmetatile 8, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0 + setmetatile 7, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0 + setmetatile 8, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0 + setmetatile 7, 18, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0 + setmetatile 8, 18, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0 + setmetatile 7, 19, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0 + setmetatile 8, 19, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0 + setmetatile 13, 3, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0 + setmetatile 14, 3, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0 + setmetatile 13, 4, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0 + setmetatile 14, 4, 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, 13, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1 + setmetatile 3, 14, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0 + setmetatile 6, 7, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1 + setmetatile 6, 8, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0 + setmetatile 9, 16, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1 + setmetatile 9, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0 + setmetatile 12, 4, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1 + setmetatile 12, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0 + setmetatile 12, 10, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1 + setmetatile 12, 11, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0 + setmetatile 1, 15, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0 + setmetatile 2, 15, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0 + setmetatile 1, 16, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1 + setmetatile 2, 16, 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 7, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0 + setmetatile 8, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0 + setmetatile 7, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1 + setmetatile 8, 13, 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 3, 4, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1 + setmetatile 3, 5, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1 + setmetatile 6, 10, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1 + setmetatile 6, 11, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1 + setmetatile 6, 13, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1 + setmetatile 6, 14, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1 + setmetatile 6, 16, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1 + setmetatile 6, 17, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1 + setmetatile 9, 4, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1 + setmetatile 9, 5, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1 + setmetatile 9, 7, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1 + setmetatile 9, 8, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1 + setmetatile 12, 13, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1 + setmetatile 12, 14, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1 + setmetatile 12, 16, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1 + setmetatile 12, 17, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1 return Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 - setmetatile 1, 6, 571, 0 - setmetatile 2, 6, 572, 0 - setmetatile 1, 7, 579, 1 - setmetatile 2, 7, 580, 1 - setmetatile 4, 9, 571, 0 - setmetatile 5, 9, 572, 0 - setmetatile 4, 10, 579, 1 - setmetatile 5, 10, 580, 1 - setmetatile 4, 18, 571, 0 - setmetatile 5, 18, 572, 0 - setmetatile 4, 19, 579, 1 - setmetatile 5, 19, 580, 1 - setmetatile 7, 3, 571, 0 - setmetatile 8, 3, 572, 0 - setmetatile 7, 4, 579, 1 - setmetatile 8, 4, 580, 1 - setmetatile 7, 9, 571, 0 - setmetatile 8, 9, 572, 0 - setmetatile 7, 10, 579, 1 - setmetatile 8, 10, 580, 1 - setmetatile 7, 18, 571, 0 - setmetatile 8, 18, 572, 0 - setmetatile 7, 19, 579, 1 - setmetatile 8, 19, 580, 1 - setmetatile 13, 3, 571, 0 - setmetatile 14, 3, 572, 0 - setmetatile 13, 4, 579, 1 - setmetatile 14, 4, 580, 1 - setmetatile 13, 9, 571, 0 - setmetatile 14, 9, 572, 0 - setmetatile 13, 10, 579, 1 - setmetatile 14, 10, 580, 1 - setmetatile 13, 15, 571, 0 - setmetatile 14, 15, 572, 0 - setmetatile 13, 16, 579, 1 - setmetatile 14, 16, 580, 1 - setmetatile 3, 13, 573, 1 - setmetatile 3, 14, 581, 1 - setmetatile 6, 7, 573, 1 - setmetatile 6, 8, 581, 1 - setmetatile 9, 16, 573, 1 - setmetatile 9, 17, 581, 1 - setmetatile 12, 4, 573, 1 - setmetatile 12, 5, 581, 1 - setmetatile 12, 10, 573, 1 - setmetatile 12, 11, 581, 1 - setmetatile 1, 15, 584, 0 - setmetatile 2, 15, 585, 0 - setmetatile 1, 16, 592, 0 - setmetatile 2, 16, 593, 0 - setmetatile 4, 6, 584, 0 - setmetatile 5, 6, 585, 0 - setmetatile 4, 7, 592, 0 - setmetatile 5, 7, 593, 0 - setmetatile 7, 12, 584, 0 - setmetatile 8, 12, 585, 0 - setmetatile 7, 13, 592, 0 - setmetatile 8, 13, 593, 0 - setmetatile 10, 12, 584, 0 - setmetatile 11, 12, 585, 0 - setmetatile 10, 13, 592, 0 - setmetatile 11, 13, 593, 0 - setmetatile 10, 18, 584, 0 - setmetatile 11, 18, 585, 0 - setmetatile 10, 19, 592, 0 - setmetatile 11, 19, 593, 0 - setmetatile 3, 4, 586, 1 - setmetatile 3, 5, 594, 0 - setmetatile 6, 10, 586, 1 - setmetatile 6, 11, 594, 0 - setmetatile 6, 13, 586, 1 - setmetatile 6, 14, 594, 0 - setmetatile 6, 16, 586, 1 - setmetatile 6, 17, 594, 0 - setmetatile 9, 4, 586, 1 - setmetatile 9, 5, 594, 0 - setmetatile 9, 7, 586, 1 - setmetatile 9, 8, 594, 0 - setmetatile 12, 13, 586, 1 - setmetatile 12, 14, 594, 0 - setmetatile 12, 16, 586, 1 - setmetatile 12, 17, 594, 0 + 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 4, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0 + setmetatile 5, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0 + setmetatile 4, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1 + setmetatile 5, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1 + setmetatile 4, 18, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0 + setmetatile 5, 18, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0 + setmetatile 4, 19, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1 + setmetatile 5, 19, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1 + setmetatile 7, 3, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0 + setmetatile 8, 3, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0 + setmetatile 7, 4, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1 + setmetatile 8, 4, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1 + setmetatile 7, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0 + setmetatile 8, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0 + setmetatile 7, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1 + setmetatile 8, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1 + setmetatile 7, 18, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0 + setmetatile 8, 18, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0 + setmetatile 7, 19, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1 + setmetatile 8, 19, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1 + setmetatile 13, 3, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0 + setmetatile 14, 3, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0 + setmetatile 13, 4, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1 + setmetatile 14, 4, 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, 13, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1 + setmetatile 3, 14, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1 + setmetatile 6, 7, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1 + setmetatile 6, 8, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1 + setmetatile 9, 16, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1 + setmetatile 9, 17, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1 + setmetatile 12, 4, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1 + setmetatile 12, 5, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1 + setmetatile 12, 10, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1 + setmetatile 12, 11, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1 + setmetatile 1, 15, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0 + setmetatile 2, 15, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0 + setmetatile 1, 16, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0 + setmetatile 2, 16, 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 7, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0 + setmetatile 8, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0 + setmetatile 7, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0 + setmetatile 8, 13, 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 3, 4, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1 + setmetatile 3, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0 + setmetatile 6, 10, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1 + setmetatile 6, 11, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0 + setmetatile 6, 13, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1 + setmetatile 6, 14, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0 + setmetatile 6, 16, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1 + setmetatile 6, 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 9, 7, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1 + setmetatile 9, 8, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0 + setmetatile 12, 13, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1 + setmetatile 12, 14, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0 + setmetatile 12, 16, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1 + setmetatile 12, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0 return Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 43bce5ceb..ac113fe81 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -18,53 +18,53 @@ Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 return Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 - setmetatile 13, 17, 610, 0 - setmetatile 12, 16, 575, 1 + setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0 + setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, 1 return Route110_TrickHousePuzzle7_EventScript_1631A8:: @ 81631A8 - setmetatile 12, 13, 610, 0 - setmetatile 12, 11, 575, 1 + setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0 + setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, 1 return Route110_TrickHousePuzzle7_EventScript_1631BB:: @ 81631BB - setmetatile 7, 12, 610, 0 - setmetatile 5, 10, 575, 1 + setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0 + setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, 1 return Route110_TrickHousePuzzle7_EventScript_1631CE:: @ 81631CE - setmetatile 6, 6, 636, 0 - setmetatile 4, 4, 575, 1 + setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, 0 + setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, 1 return Route110_TrickHousePuzzle7_EventScript_1631E1:: @ 81631E1 - setmetatile 8, 4, 609, 0 - setmetatile 7, 5, 575, 1 + setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0 + setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, 1 return Route110_TrickHousePuzzle7_EventScript_1631F4:: @ 81631F4 - setmetatile 13, 17, 611, 0 - setmetatile 12, 16, 574, 1 + setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0 + setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, 1 return Route110_TrickHousePuzzle7_EventScript_163207:: @ 8163207 - setmetatile 12, 13, 609, 0 - setmetatile 12, 11, 574, 1 + setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0 + setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, 1 return Route110_TrickHousePuzzle7_EventScript_16321A:: @ 816321A - setmetatile 7, 12, 611, 0 - setmetatile 5, 10, 574, 1 + setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0 + setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, 1 return Route110_TrickHousePuzzle7_EventScript_16322D:: @ 816322D - setmetatile 6, 6, 635, 0 - setmetatile 4, 4, 574, 1 + setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, 0 + setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, 1 return Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 - setmetatile 8, 4, 608, 0 - setmetatile 7, 5, 574, 1 + setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, 0 + setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, 1 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 9aa8894f4..4f223e37e 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -8,8 +8,8 @@ Route111_MapScript1_14FF9C:: @ 814FF9C end Route111_EventScript_14FFA6:: @ 814FFA6 - setmetatile 29, 86, 124, 1 - setmetatile 29, 87, 145, 1 + setmetatile 29, 86, METATILE_General_RockWall_RockBase, 1 + setmetatile 29, 87, METATILE_General_RockWall_SandBase, 1 return Route111_MapScript1_14FFB9:: @ 814FFB9 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index f3081fc8c..4d2eca797 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -55,15 +55,15 @@ Route120_MapScript1_151686:: @ 8151686 end Route120_EventScript_1516A2:: @ 81516A2 - setmetatile 7, 54, 124, 1 - setmetatile 7, 55, 145, 1 + setmetatile 7, 54, METATILE_General_RockWall_RockBase, 1 + setmetatile 7, 55, METATILE_General_RockWall_SandBase, 1 return Route120_EventScript_1516B5:: @ 81516B5 - setmetatile 13, 15, 663, 0 - setmetatile 12, 16, 671, 0 - setmetatile 12, 17, 161, 0 - setmetatile 13, 17, 161, 0 + setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0 + setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0 + setmetatile 12, 17, METATILE_General_ReflectiveWater, 0 + setmetatile 13, 17, METATILE_General_ReflectiveWater, 0 return Route120_EventScript_1516DA:: @ 81516DA @@ -244,10 +244,10 @@ Route120_EventScript_151908:: @ 8151908 delay 15 removeobject 31 waitfieldeffect FLDEFF_NPCFLY_OUT - setmetatile 13, 15, 663, 0 - setmetatile 12, 16, 671, 0 - setmetatile 12, 17, 161, 0 - setmetatile 13, 17, 161, 0 + setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0 + setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0 + setmetatile 12, 17, METATILE_General_ReflectiveWater, 0 + setmetatile 13, 17, METATILE_General_ReflectiveWater, 0 special DrawWholeMapView release end diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index 1f2159010..d62a37f6a 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -18,12 +18,12 @@ SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB end SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 - setmetatile 9, 1, 553, 1 - setmetatile 10, 1, 553, 1 - setmetatile 11, 1, 553, 1 - setmetatile 9, 2, 565, 1 - setmetatile 10, 2, 565, 1 - setmetatile 11, 2, 565, 1 + 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 return SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 21997d076..546481765 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -22,38 +22,38 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E1DA goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1DA - setmetatile 31, 8, 856, 1 + setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Large, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E1FB goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1FB - setmetatile 14, 26, 856, 1 + setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Large, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E213 - setmetatile 41, 20, 857, 1 + setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Large, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E22B - setmetatile 41, 10, 857, 1 + setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Large, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E243 - setmetatile 6, 9, 857, 1 + setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Large, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E256 - setmetatile 16, 13, 857, 1 + setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Large, 1 return ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 @@ -65,7 +65,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmetatile 41, 20, 859, 0 + setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 releaseall @@ -82,7 +82,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmetatile 41, 10, 859, 0 + setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 releaseall @@ -94,7 +94,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmetatile 6, 9, 859, 0 + setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 releaseall @@ -106,7 +106,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmetatile 16, 13, 859, 0 + setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 releaseall @@ -118,7 +118,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmetatile 31, 8, 858, 0 + setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_1 releaseall @@ -135,7 +135,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmetatile 14, 26, 858, 0 + setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_2 releaseall diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 5f9726038..f3a629582 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3B6 - setmetatile 11, 11, 856, 1 + setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Large, 1 return ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 @@ -20,7 +20,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B - setmetatile 11, 11, 858, 0 + setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_3 releaseall diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index fd26671dd..356b64518 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -23,14 +23,14 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 playse SE_HASHI - setmetatile 4, 2, 545, 1 - setmetatile 4, 3, 609, 1 + setmetatile 4, 2, METATILE_Contest_WallShadow, 1 + setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 playse SE_HASHI - setmetatile 4, 2, 721, 1 - setmetatile 4, 3, 729, 1 + setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 + setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView delay 20 applymovement 1, SlateportCity_ContestLobby_Movement_1554DC diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index e18eca17c..af4934b2f 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -11,7 +11,7 @@ SootopolisCity_MapScript1_14D08D:: @ 814D08D SootopolisCity_EventScript_14D0A0:: @ 814D0A0 setobjectxyperm 3, 31, 18 - setmetatile 31, 32, 592, 1 + setmetatile 31, 32, METATILE_Sootopolis_GymDoor_Closed, 1 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 @@ -19,15 +19,15 @@ SootopolisCity_EventScript_14D0B1:: @ 814D0B1 return SootopolisCity_EventScript_14D0BB:: @ 814D0BB - setmetatile 9, 6, 584, 1 - setmetatile 9, 17, 584, 1 - setmetatile 9, 26, 584, 1 - setmetatile 44, 17, 584, 1 - setmetatile 8, 35, 584, 1 - setmetatile 53, 28, 584, 1 - setmetatile 45, 6, 584, 1 - setmetatile 48, 25, 584, 1 - setmetatile 31, 32, 592, 1 + 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 31, 32, METATILE_Sootopolis_GymDoor_Closed, 1 return SootopolisCity_MapScript1_14D10D:: @ 814D10D diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index a918c0568..c54dec972 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -25,16 +25,16 @@ SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF73 compare VAR_ICE_STEP_COUNT, 69 goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF61 - setmetatile 8, 4, 519, 0 - setmetatile 8, 5, 519, 0 + setmetatile 8, 4, METATILE_SootopolisGym_Stairs, 0 + setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0 SootopolisCity_Gym_1F_EventScript_15AF61:: @ 815AF61 - setmetatile 8, 10, 519, 0 - setmetatile 8, 11, 519, 0 + setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0 + setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0 SootopolisCity_Gym_1F_EventScript_15AF73:: @ 815AF73 - setmetatile 8, 15, 519, 0 - setmetatile 8, 16, 519, 0 + setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0 + setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0 SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85 return diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index d34558e40..e66631fd6 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -18,18 +18,18 @@ Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF end Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 - setmetatile 5, 3, 542, 1 - setmetatile 6, 3, 542, 1 - setmetatile 7, 3, 542, 1 - setmetatile 8, 3, 542, 1 - setmetatile 5, 4, 552, 0 - setmetatile 6, 4, 552, 0 - setmetatile 7, 4, 552, 0 - setmetatile 8, 4, 552, 0 - setmetatile 5, 5, 552, 0 - setmetatile 6, 5, 552, 0 - setmetatile 7, 5, 552, 0 - setmetatile 8, 5, 552, 0 + 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 return Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index 32661485d..1ee3708ac 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -23,14 +23,14 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 playse SE_HASHI - setmetatile 4, 2, 545, 1 - setmetatile 4, 3, 609, 1 + setmetatile 4, 2, METATILE_Contest_WallShadow, 1 + setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 playse SE_HASHI - setmetatile 4, 2, 721, 1 - setmetatile 4, 3, 729, 1 + setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 + setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView delay 20 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35 diff --git a/data/pokenav.s b/data/pokenav.s deleted file mode 100644 index 15c5ee534..000000000 --- a/data/pokenav.s +++ /dev/null @@ -1,1146 +0,0 @@ - .include "include/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083DFEC8:: @ 83DFEC8 - .4byte gTileBuffer - - .align 1 -gUnknown_083DFECC:: @ 83DFECC - .incbin "graphics/pokenav/83DFECC.gbapal" - - .align 1 -gUnknown_083DFEEC:: @ 83DFEEC - .incbin "graphics/pokenav/83DFEEC.4bpp" - - .align 2 -gUnknown_083DFF8C:: @ 83DFF8C - .incbin "graphics/pokenav/83DFF8C.bin.lz" - - .align 1 -gUnknown_083E003C:: @ 83E003C - .incbin "graphics/pokenav/83E003C.gbapal" - - .align 1 -gUnknown_083E005C:: @ 83E005C - .incbin "graphics/pokenav/83E005C.4bpp" - - .align 2 -gUnknown_083E007C:: @ 83E007C - .incbin "graphics/pokenav/83E007C.bin.lz" - - .align 1 -gUnknown_083E0124:: @ 83E0124 - .incbin "graphics/pokenav/83E0124_pal.bin" - - .align 1 -gUnknown_083E0144:: @ 83E0144 - .incbin "graphics/pokenav/83E0144_pal.bin" - - .align 1 - .incbin "graphics/pokenav/83E0164.bin" - - .align 1 -gUnknown_083E01AC:: @ 83E01AC - .incbin "graphics/pokenav/83E01AC.bin" - - .align 1 -gUnknown_083E01F4:: @ 83E01F4 - .incbin "graphics/pokenav/83E01F4.bin" - - .align 1 -gUnknown_083E0254:: @ 83E0254 - .incbin "graphics/pokenav/83E0254.gbapal" - - .align 1 -gUnknown_083E0274:: @ 83E0274 - .incbin "graphics/pokenav/83E0274.gbapal" - - .align 2 -gPokenavConditionSearch2_Pal:: @ 83E0294 - .incbin "graphics/pokenav/condition_search2.gbapal" - - .align 1 -gUnknown_083E02B4:: @ 83E02B4 - .incbin "graphics/pokenav/83E02B4.gbapal" - - .align 1 - .incbin "graphics/pokenav/83E02D4.bin" - - .align 1 -gUnknown_083E0314:: @ 83E0314 - .incbin "graphics/pokenav/83E0314.gbapal" - - .align 1 -gUnknown_083E0334:: @ 83E0334 - .incbin "graphics/pokenav/trainereyes_misc_pal.bin" @ the original bytes have an "FF FF" instance which is incompatible with gbagfx to produce the bytes needed to match the original ROM, so I am forced to include it as a .bin until the lowest bit is properly handled or a better workaround is produced - - .align 2 -gUnknown_083E0354:: @ 83E0354 - .incbin "graphics/pokenav/trainereyes_misc.4bpp.lz" - - .align 1 -gUnknown_083E039C:: @ 83E039C - .2byte 0x4280, 0x4282 - - .align 1 -gUnknown_083E03A0:: @ 83E03A0 - .2byte 0x4000, 0x4000, 0x4281, 0x4283 - - .align 1 -gUnknown_083E03A8:: @ 83E03A8 - .incbin "graphics/pokenav/83E03A8.gbapal" - - .align 1 - .incbin "graphics/pokenav/83E03C8.bin" - -gUnknown_083E040C:: @ 83E040C - .incbin "graphics/misc/ribbons_half.4bpp.lz" - - .align 2 -gPokenavOutlinePalette:: @ 83E05D4 - .incbin "graphics/pokenav/outline.gbapal" - - .align 2 -gPokenavOutlineTiles:: @ 83E05F4 - .incbin "graphics/pokenav/outline.4bpp.lz" - - .align 2 -gPokenavOutlineTilemap:: @ 83E0804 - .incbin "graphics/pokenav/outline_map.bin.lz" - - .align 2 -gPokenavCityMap_Lavaridge_0:: @ 83E096C - .incbin "graphics/pokenav/city_maps/lavaridge_0.bin.lz" - - .align 2 -gPokenavCityMap_Fallarbor_0:: @ 83E09B0 - .incbin "graphics/pokenav/city_maps/fallarbor_0.bin.lz" - - .align 2 -gPokenavCityMap_Fortree_0:: @ 83E09F8 - .incbin "graphics/pokenav/city_maps/fortree_0.bin.lz" - - .align 2 -gPokenavCityMap_Slateport_0:: @ 83E0A48 - .incbin "graphics/pokenav/city_maps/slateport_0.bin.lz" - - .align 2 -gPokenavCityMap_Slateport_1:: @ 83E0AA8 - .incbin "graphics/pokenav/city_maps/slateport_1.bin.lz" - - .align 2 -gPokenavCityMap_Rustboro_0:: @ 83E0AF4 - .incbin "graphics/pokenav/city_maps/rustboro_0.bin.lz" - - .align 2 -gPokenavCityMap_Rustboro_1:: @ 83E0B48 - .incbin "graphics/pokenav/city_maps/rustboro_1.bin.lz" - - .align 2 -gPokenavCityMap_Pacifidlog_0:: @ 83E0B9C - .incbin "graphics/pokenav/city_maps/pacifidlog_0.bin.lz" - - .align 2 -gPokenavCityMap_Mauville_1:: @ 83E0BDC - .incbin "graphics/pokenav/city_maps/mauville_1.bin.lz" - - .align 2 -gPokenavCityMap_Mauville_0:: @ 83E0C34 - .incbin "graphics/pokenav/city_maps/mauville_0.bin.lz" - - .align 2 -gPokenavCityMap_Oldale_0:: @ 83E0C88 - .incbin "graphics/pokenav/city_maps/oldale_0.bin.lz" - - .align 2 -gPokenavCityMap_Lilycove_1:: @ 83E0CB8 - .incbin "graphics/pokenav/city_maps/lilycove_1.bin.lz" - - .align 2 -gPokenavCityMap_Lilycove_0:: @ 83E0D04 - .incbin "graphics/pokenav/city_maps/lilycove_0.bin.lz" - - .align 2 -gPokenavCityMap_Littleroot_0:: @ 83E0D5C - .incbin "graphics/pokenav/city_maps/littleroot_0.bin.lz" - - .align 2 -gPokenavCityMap_Dewford_0:: @ 83E0D8C - .incbin "graphics/pokenav/city_maps/dewford_0.bin.lz" - - .align 2 -gPokenavCityMap_Sootopolis_0:: @ 83E0DC4 - .incbin "graphics/pokenav/city_maps/sootopolis_0.bin.lz" - - .align 2 -gPokenavCityMap_EverGrande_0:: @ 83E0E04 - .incbin "graphics/pokenav/city_maps/ever_grande_0.bin.lz" - - .align 2 -gPokenavCityMap_EverGrande_1:: @ 83E0E4C - .incbin "graphics/pokenav/city_maps/ever_grande_1.bin.lz" - - .align 2 -gPokenavCityMap_Verdanturf_0:: @ 83E0E90 - .incbin "graphics/pokenav/city_maps/verdanturf_0.bin.lz" - - .align 2 -gPokenavCityMap_Mossdeep_1:: @ 83E0EC8 - .incbin "graphics/pokenav/city_maps/mossdeep_1.bin.lz" - - .align 2 -gPokenavCityMap_Mossdeep_0:: @ 83E0F10 - .incbin "graphics/pokenav/city_maps/mossdeep_0.bin.lz" - - .align 2 -gPokenavCityMap_Petalburg_0:: @ 83E0F6C - .incbin "graphics/pokenav/city_maps/petalburg_0.bin.lz" - -@ 83E0FC8 - .include "data/text/ribbon_descriptions.inc" - -@ 83E1204 - .include "data/text/gift_ribbon_descriptions.inc" - -@ 83E178C - .include "data/text/trainer_eye_descriptions.inc" - - .align 2 -gUnknown_083E31B0:: @ 83E31B0 - .4byte PCText_CheckMap - .4byte PCText_CheckPoke - .4byte PCText_CheckTrainer - .4byte PCText_CheckRibbons - .4byte PCText_PutAwayNav - .4byte PCText_NoRibbonWin - .4byte PCText_NoTrainers - - .align 2 -gUnknown_083E31CC:: @ 83E31CC - .4byte PCText_CheckParty - .4byte PCText_CheckPokeAll - .4byte PCText_ReturnToNav - - .align 2 -gUnknown_083E31D8:: @ 83E31D8 - .4byte PCText_FindCool - .4byte PCText_FindBeauty - .4byte PCText_FindCute - .4byte PCText_FindSmart - .4byte PCText_FindTough - .4byte PCText_ReturnToCondition - - .align 2 -gPokenavCityMaps:: @ 83E31F0 - .4byte gPokenavCityMap_Littleroot_0, NULL - .4byte gPokenavCityMap_Oldale_0, NULL - .4byte gPokenavCityMap_Dewford_0, NULL - .4byte gPokenavCityMap_Lavaridge_0, NULL - .4byte gPokenavCityMap_Fallarbor_0, NULL - .4byte gPokenavCityMap_Verdanturf_0, NULL - .4byte gPokenavCityMap_Pacifidlog_0, NULL - .4byte gPokenavCityMap_Petalburg_0, NULL - .4byte gPokenavCityMap_Slateport_0, gPokenavCityMap_Slateport_1 - .4byte gPokenavCityMap_Mauville_0, gPokenavCityMap_Mauville_1 - .4byte gPokenavCityMap_Rustboro_0, gPokenavCityMap_Rustboro_1 - .4byte gPokenavCityMap_Fortree_0, NULL - .4byte gPokenavCityMap_Lilycove_0, gPokenavCityMap_Lilycove_1 - .4byte gPokenavCityMap_Mossdeep_0, gPokenavCityMap_Mossdeep_1 - .4byte gPokenavCityMap_Sootopolis_0, NULL - .4byte gPokenavCityMap_EverGrande_0, gPokenavCityMap_EverGrande_1 - - .align 2 -gUnknown_083E3270:: @ 83E3270 - .4byte sub_80F0A24 - .4byte sub_80F0A24 - .4byte sub_80F0A74 - - .align 2 -gPokenavIconPalette:: - .incbin "graphics/pokenav/icon.gbapal" - - .align 2 -gUnknown_083E329C:: @ 83E329C - .incbin "graphics/pokenav/icon.4bpp.lz" - - .align 2 -gPokenavPokeballTiles:: - .incbin "graphics/pokenav/pokeball.4bpp" - - .align 2 -gUnknown_083E3780: @ 83E3780 - .incbin "graphics/pokenav/83E3780.4bpp" - - .align 2 -gPokenavSparkle_Pal:: - .incbin "graphics/pokenav/sparkle.gbapal" - - .align 2 -gPokenavSparkle_Gfx:: - .incbin "graphics/pokenav/sparkle.4bpp" - - .align 2 -gPokenavUpDownArrows_Gfx:: - .incbin "graphics/pokenav/arrows.4bpp" - - .align 2 -gUnknown_083E3BC0:: @ 83E3BC0 - .incbin "graphics/pokenav/83E3BC0.bin" - - .align 2 -gTiles_083E3BE0:: - .incbin "graphics/unknown/unknown_3E3BE0.4bpp" - - .align 2 -gUnknown_083E3C60:: @ 83E3C60 - .incbin "graphics/misc/ribbons_cool.gbapal" - .incbin "graphics/misc/ribbons_beauty.gbapal" - .incbin "graphics/misc/ribbons_cute.gbapal" - .incbin "graphics/misc/ribbons_smart.gbapal" - .incbin "graphics/misc/ribbons_tough.gbapal" - - .align 2 -gUnknown_083E3D00:: @ 83E3D00 - .incbin "graphics/misc/ribbons_full.4bpp.lz" - - .align 2 -PokenavBlueLightPalette: - .incbin "graphics/pokenav/blue_light.gbapal" - - .align 2 -PokenavBlueLightTiles: - .incbin "graphics/pokenav/blue_light.4bpp" - - .align 2 -Palette_3E42D8: @ 83E42D8 - .incbin "graphics/pokenav/83E42D8.gbapal" - - .align 1 -gUnknown_083E42F8:: @ 83E42F8 - .2byte 0x408 - .2byte 0x408 - .2byte 0x507 - .2byte 0x507 - .2byte 0x606 - .2byte 0x606 - .2byte 0x805 - .2byte 0x805 - .2byte 0xA04 - .2byte 0xA04 - .2byte 0xC03 - .2byte 0xC03 - .2byte 0xE02 - .2byte 0xE02 - .2byte 0x1000 - .2byte 0x1000 - - .align 2 -gOamData_83E4318:: @ 83E4318 - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83E4320:: @ 83E4320 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4328:: @ 83E4328 - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4330:: @ 83E4330 - obj_image_anim_frame 16, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4338:: @ 83E4338 - obj_image_anim_frame 24, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4340:: @ 83E4340 - obj_image_anim_frame 32, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4348:: @ 83E4348 - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4350:: @ 83E4350 - obj_image_anim_frame 48, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4358:: @ 83E4358 - obj_image_anim_frame 56, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4360:: @ 83E4360 - obj_image_anim_frame 64, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4368:: @ 83E4368 - obj_image_anim_frame 72, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4370:: @ 83E4370 - obj_image_anim_frame 80, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4378:: @ 83E4378 - obj_image_anim_frame 88, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4380:: @ 83E4380 - obj_image_anim_frame 96, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4388:: @ 83E4388 - obj_image_anim_frame 104, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4390:: @ 83E4390 - obj_image_anim_frame 112, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4398:: @ 83E4398 - obj_image_anim_frame 120, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E43A0:: @ 83E43A0 - obj_image_anim_frame 128, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E43A8:: @ 83E43A8 - obj_image_anim_frame 136, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E43B0:: @ 83E43B0 - obj_image_anim_frame 144, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E43B8:: @ 83E43B8 - obj_image_anim_frame 152, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E43C0:: @ 83E43C0 - obj_image_anim_frame 160, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E43C8:: @ 83E43C8 - obj_image_anim_frame 168, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E43D0:: @ 83E43D0 - obj_image_anim_frame 176, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E43D8:: @ 83E43D8 - obj_image_anim_frame 184, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E43E0:: @ 83E43E0 - .4byte gSpriteAnim_83E4320 - .4byte gSpriteAnim_83E4328 - .4byte gSpriteAnim_83E4330 - .4byte gSpriteAnim_83E4338 - .4byte gSpriteAnim_83E4340 - .4byte gSpriteAnim_83E4348 - .4byte gSpriteAnim_83E4350 - .4byte gSpriteAnim_83E4358 - .4byte gSpriteAnim_83E4360 - .4byte gSpriteAnim_83E4368 - .4byte gSpriteAnim_83E4370 - .4byte gSpriteAnim_83E4378 - .4byte gSpriteAnim_83E4380 - .4byte gSpriteAnim_83E4388 - .4byte gSpriteAnim_83E4390 - .4byte gSpriteAnim_83E4398 - .4byte gSpriteAnim_83E43A0 - .4byte gSpriteAnim_83E43A8 - .4byte gSpriteAnim_83E43B0 - .4byte gSpriteAnim_83E43B8 - .4byte gSpriteAnim_83E43C0 - .4byte gSpriteAnim_83E43C8 - .4byte gSpriteAnim_83E43D0 - .4byte gSpriteAnim_83E43D8 - - .align 2 -gSpriteAffineAnim_83E4440:: @ 83E4440 - obj_rot_scal_anim_frame 0x10, 0x10, 0, 16 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83E4450:: @ 83E4450 - .4byte gSpriteAffineAnim_83E4440 - - .align 2 -gSpriteTemplate_83E4454:: @ 83E4454 - spr_template 0, 0, gOamData_83E4318, gSpriteAnimTable_83E43E0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteSheet_PokenavBlueLight:: @ 83E446C - obj_tiles PokenavBlueLightTiles, 0x100, 25 - - .align 2 -gSpritePalette_PokenavBlueLight:: @ 83E4474 - obj_pal PokenavBlueLightPalette, 17 - - .align 2 -gOamData_83E447C:: @ 83E447C - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteTemplate_83E4484:: @ 83E4484 - spr_template 25, 17, gOamData_83E447C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F2654 - -gUnknown_083E449C:: @ 83E449C - obj_pal gPokenavMenuOptions3_Pal, 2 - obj_pal gPokenavCondition5_Pal, 3 - obj_pal 0x0, 0 - - .align 2 -gOamData_83E44B4:: @ 83E44B4 - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83E44BC:: @ 83E44BC - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E44C4:: @ 83E44C4 - obj_image_anim_frame 32, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E44CC:: @ 83E44CC - obj_image_anim_frame 64, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E44D4:: @ 83E44D4 - .4byte gSpriteAnim_83E44BC - .4byte gSpriteAnim_83E44C4 - .4byte gSpriteAnim_83E44CC - - .align 2 -gSpriteTemplate_83E44E0:: @ 83E44E0 - spr_template 1, 2, gOamData_83E44B4, gSpriteAnimTable_83E44D4, NULL, gDummySpriteAffineAnimTable, sub_80F2BBC - - .align 2 -gSpriteTemplate_83E44F8:: @ 83E44F8 - spr_template 1, 3, gOamData_83E44B4, gSpriteAnimTable_83E44D4, NULL, gDummySpriteAffineAnimTable, sub_80F2BBC - - .align 2 -gOamData_83E4510:: @ 83E4510 - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83E4518:: @ 83E4518 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4520:: @ 83E4520 - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E4528:: @ 83E4528 - .4byte gSpriteAnim_83E4518 - .4byte gSpriteAnim_83E4520 - - .align 2 -gSpriteTemplate_83E4530:: @ 83E4530 - spr_template 2, 2, gOamData_83E4510, gSpriteAnimTable_83E4528, NULL, gDummySpriteAffineAnimTable, sub_80F2BBC - - .align 2 -gSpriteTemplate_83E4548:: @ 83E4548 - spr_template 2, 3, gOamData_83E4510, gSpriteAnimTable_83E4528, NULL, gDummySpriteAffineAnimTable, sub_80F2BBC - - .align 2 -gOamData_83E4560:: @ 83E4560 - .2byte 0x0000 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gUnknown_083E4568:: @ 83E4568 - obj_tiles NULL, 0x800, 6 - - .align 2 -gSpriteTemplate_83E4570:: @ 83E4570 - spr_template 6, 6, gOamData_83E4560, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F2E00 - - .align 2 -gUnknown_083E4588:: @ 83E4588 - obj_pal NULL, 6 - - .align 2 -gUnknown_083E4590:: @ 83E4590 - obj_tiles gPokenavArrow_Gfx, 0x40, 9 - obj_tiles gPokenavUpDownArrows_Gfx, 0x80, 10 - null_obj_tiles - - .align 2 -gUnknown_083E45A8:: @ 83E45A8 - obj_pal gPokenavArrowsPalette, 9 - - .align 2 -gOamData_83E45B0:: @ 83E45B0 - .2byte 0x8000 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gSpriteTemplate_83E45B8:: @ 83E45B8 - spr_template 9, 9, gOamData_83E45B0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F3190 - - .align 2 -gSpriteAnim_83E45D0:: @ 83E45D0 - obj_image_anim_frame 0, 3 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E45D8:: @ 83E45D8 - obj_image_anim_frame 2, 3 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E45E0:: @ 83E45E0 - .4byte gSpriteAnim_83E45D0 - .4byte gSpriteAnim_83E45D8 - - .align 2 -gOamData_83E45E8:: @ 83E45E8 - .2byte 0x4000 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gSpriteTemplate_83E45F0:: @ 83E45F0 - spr_template 10, 9, gOamData_83E45E8, gSpriteAnimTable_83E45E0, NULL, gDummySpriteAffineAnimTable, sub_80F31AC - - .align 2 -gOamData_83E4608:: @ 83E4608 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83E4610:: @ 83E4610 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E4618:: @ 83E4618 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E4620:: @ 83E4620 - .4byte gSpriteAnim_83E4610 - .4byte gSpriteAnim_83E4618 - - .align 2 -gUnknown_083E4628:: @ 83E4628 - obj_tiles gPokenavPokeballTiles, 0x100, 3 - obj_tiles gUnknown_083E3780, 0x20, 4 - obj_tiles gPokenavConditionMenuCancel_Gfx, 0x100, 5 - null_obj_tiles - - .align 2 -gUnknown_083E4648:: @ 83E4648 - obj_pal gPokenavConditionPokeball_Pal, 4 - obj_pal gPokenavCondition4_Pal, 5 - .space 8 - - .align 2 -gSpriteTemplate_83E4660:: @ 83E4660 - spr_template 3, 4, gOamData_83E4608, gSpriteAnimTable_83E4620, NULL, gDummySpriteAffineAnimTable, sub_80F3328 - - .align 1 -gUnknown_083E4678:: @ 83E4678 - .incbin "graphics/pokenav/83E4678.gbapal" - - .align 2 -gPokenavRibbonsIconGfx:: @ 83E4698 - .2byte 0, 0 - .2byte 1, 0 - .2byte 2, 0 - .2byte 3, 0 - .2byte 4, 0 - .2byte 1, 1 - .2byte 2, 1 - .2byte 3, 1 - .2byte 4, 1 - .2byte 1, 2 - .2byte 2, 2 - .2byte 3, 2 - .2byte 4, 2 - .2byte 1, 3 - .2byte 2, 3 - .2byte 3, 3 - .2byte 4, 3 - .2byte 1, 4 - .2byte 2, 4 - .2byte 3, 4 - .2byte 4, 4 - .2byte 5, 0 - .2byte 6, 0 - .2byte 7, 1 - .2byte 8, 2 - .2byte 9, 1 - .2byte 9, 3 - .2byte 9, 4 - .2byte 10, 3 - .2byte 10, 4 - .2byte 11, 0 - .2byte 11, 1 - - .align 2 -gOamData_83E4718:: @ 83E4718 - .2byte 0x0100 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 -gSpriteAffineAnim_83E4720:: @ 83E4720 - obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_83E4730:: @ 83E4730 - obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 - obj_rot_scal_anim_frame 0x20, 0x20, 0, 4 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_83E4748:: @ 83E4748 - obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 - obj_rot_scal_anim_frame 0xFFE0, 0xFFE0, 0, 4 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83E4760:: @ 83E4760 - .4byte gSpriteAffineAnim_83E4720 - .4byte gSpriteAffineAnim_83E4730 - .4byte gSpriteAffineAnim_83E4748 - - .align 2 -gSpriteTemplate_83E476C:: @ 83E476C - spr_template 11, 10, gOamData_83E4718, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83E4760, SpriteCallbackDummy - - .align 2 -gUnknown_083E4784:: @ 83E4784 - obj_tiles gPokenavSparkle_Gfx, 896, 0x0017 - - .align 2 -gUnknown_083E478C:: @ 83E478C - obj_pal gPokenavSparkle_Pal, 0x000f - - .align 2 -gUnknown_083E4794:: @ 83E4794 - .2byte 0, -35 - .2byte 20, -28 - .2byte 33, -10 - .2byte 33, 10 - .2byte 20, 28 - .2byte 0, 35 - .2byte -20, 28 - .2byte -33, 10 - .2byte -33, -10 - .2byte -20, -28 - - .align 2 -gOamData_83E47BC:: @ 83E47BC - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83E47C4:: @ 83E47C4 - obj_image_anim_frame 0, 5 - obj_image_anim_frame 4, 5 - obj_image_anim_frame 8, 5 - obj_image_anim_frame 12, 5 - obj_image_anim_frame 16, 5 - obj_image_anim_frame 20, 5 - obj_image_anim_frame 24, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E47E4:: @ 83E47E4 - .4byte gSpriteAnim_83E47C4 - .4byte gSpriteAnim_83E47C4 + 0x8 - .4byte gSpriteAnim_83E47C4 + 0x10 - .4byte gSpriteAnim_83E47C4 + 0x18 - - @ unused? - .4byte gSpriteAnim_83E47C4 + 0x20 - .4byte gSpriteAnim_83E47C4 + 0x28 - .4byte gSpriteAnim_83E47C4 + 0x30 - - .align 2 -gSpriteTemplate_83E4800:: @ 83E4800 - spr_template 23, 15, gOamData_83E47BC, gSpriteAnimTable_83E47E4, NULL, gDummySpriteAffineAnimTable, sub_80F3E9C - - .align 2 -gUnknown_083E4818:: @ 83E4818 - obj_pal gPokenavIconPalette, 16 - - .align 2 -gSpriteAnim_83E4820:: @ 83E4820 - obj_image_anim_frame 0, 12 - obj_image_anim_frame 16, 12 - obj_image_anim_frame 32, 12 - obj_image_anim_frame 48, 12 - obj_image_anim_frame 64, 12 - obj_image_anim_frame 80, 12 - obj_image_anim_frame 96, 12 - obj_image_anim_frame 112, 12 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83E4844:: @ 83E4844 - .4byte gSpriteAnim_83E4820 - - .align 2 -gOamData_83E4848:: @ 83E4848 - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 -gSpriteTemplate_83E4850:: @ 83E4850 - spr_template 24, 16, gOamData_83E4848, gSpriteAnimTable_83E4844, NULL, gDummySpriteAffineAnimTable, sub_80F4138 - - .align 2 -gUnknown_083E4868:: @ 83E4868 - obj_pal Palette_3E42D8, 18 - - .align 2 -gOamData_83E4870:: @ 83E4870 - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0C00 - - .align 2 -gSpriteTemplate_83E4878:: @ 83E4878 - spr_template 26, 18, gOamData_83E4870, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_083E4890:: @ 83E4890 - .byte 4 - .byte 5 - .byte 6 - .byte 7 - .byte 8 - .byte 9 - .byte 9 - .byte 10 - .byte 10 - .byte 11 - .byte 11 - .byte 12 - .byte 12 - .byte 13 - .byte 13 - .byte 13 - .byte 13 - .byte 14 - .byte 14 - .byte 14 - .byte 14 - .byte 15 - .byte 15 - .byte 15 - .byte 15 - .byte 16 - .byte 16 - .byte 16 - .byte 16 - .byte 16 - .byte 16 - .byte 17 - .byte 17 - .byte 17 - .byte 17 - .byte 17 - .byte 17 - .byte 18 - .byte 18 - .byte 18 - .byte 18 - .byte 18 - .byte 18 - .byte 19 - .byte 19 - .byte 19 - .byte 19 - .byte 19 - .byte 19 - .byte 19 - .byte 19 - .byte 20 - .byte 20 - .byte 20 - .byte 20 - .byte 20 - .byte 20 - .byte 20 - .byte 20 - .byte 21 - .byte 21 - .byte 21 - .byte 21 - .byte 21 - .byte 21 - .byte 21 - .byte 21 - .byte 22 - .byte 22 - .byte 22 - .byte 22 - .byte 22 - .byte 22 - .byte 22 - .byte 22 - .byte 22 - .byte 22 - .byte 23 - .byte 23 - .byte 23 - .byte 23 - .byte 23 - .byte 23 - .byte 23 - .byte 23 - .byte 23 - .byte 23 - .byte 24 - .byte 24 - .byte 24 - .byte 24 - .byte 24 - .byte 24 - .byte 24 - .byte 24 - .byte 24 - .byte 24 - .byte 25 - .byte 25 - .byte 25 - .byte 25 - .byte 25 - .byte 25 - .byte 25 - .byte 25 - .byte 25 - .byte 25 - .byte 25 - .byte 25 - .byte 26 - .byte 26 - .byte 26 - .byte 26 - .byte 26 - .byte 26 - .byte 26 - .byte 26 - .byte 26 - .byte 26 - .byte 26 - .byte 26 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 27 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 28 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 29 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 30 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 31 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 32 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 33 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 34 - .byte 35 - - .align 2 -gUnknown_083E4990:: @ 83E4990 - .4byte REG_WIN0H - .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 - .4byte 1 - - .align 1 -gUnknown_083E499C:: @ 83E499C - .2byte 0x43 - .2byte 0x32 - .2byte 0x33 - .2byte 0x34 - .2byte 0x35 - .2byte 0x36 - .2byte 0x44 - .2byte 0x45 - .2byte 0x46 - .2byte 0x47 - .2byte 0x48 - .2byte 0x49 - .2byte 0x4A - .2byte 0x4B - .2byte 0x4C - .2byte 0x4D - .2byte 0x4E diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index a6fa56078..4e29db7c9 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -52,15 +52,15 @@ VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 end OldaleTown_PokemonCenter_2F_EventScript_1A3D6A:: @ 81A3D6A - setmetatile 5, 3, 514, 0 + setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 end OldaleTown_PokemonCenter_2F_EventScript_1A3D74:: @ 81A3D74 - setmetatile 8, 3, 514, 0 + setmetatile 8, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 end OldaleTown_PokemonCenter_2F_EventScript_1A3D7E:: @ 81A3D7E - setmetatile 11, 3, 514, 0 + setmetatile 11, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 end DewfordTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 @@ -119,7 +119,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E0C:: @ 81A3E0C OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 lockall call OldaleTown_PokemonCenter_2F_EventScript_1A3E30 - setmetatile 8, 3, 605, 1 + setmetatile 8, 3, METATILE_PokemonCenter_CounterBarrier, 1 special DrawWholeMapView erasebox 0, 0, 29, 19 releaseall @@ -147,14 +147,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 OldaleTown_PokemonCenter_2F_EventScript_1A3E7B:: @ 81A3E7B call OldaleTown_PokemonCenter_2F_EventScript_1A3DB2 - setmetatile 11, 3, 605, 1 + setmetatile 11, 3, METATILE_PokemonCenter_CounterBarrier, 1 special DrawWholeMapView end OldaleTown_PokemonCenter_2F_EventScript_1A3E8D:: @ 81A3E8D lockall call OldaleTown_PokemonCenter_2F_EventScript_1A3DDA - setmetatile 5, 3, 605, 1 + setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1 special DrawWholeMapView erasebox 0, 0, 29, 19 releaseall @@ -220,7 +220,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmetatile 5, 3, 514, 0 + setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -384,7 +384,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmetatile 8, 3, 514, 0 + setmetatile 8, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -481,7 +481,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmetatile 11, 3, 514, 0 + setmetatile 11, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 diff --git a/data/text/gift_ribbon_descriptions.inc b/data/text/gift_ribbon_descriptions.inc deleted file mode 100644 index 798d291b9..000000000 --- a/data/text/gift_ribbon_descriptions.inc +++ /dev/null @@ -1,207 +0,0 @@ -gGiftRibbonDescriptionPart1_2003RegionalTourney: - .string "2003 REGIONAL TOURNEY$" - -gGiftRibbonDescriptionPart2_Champion: - .string "CHAMPION RIBBON$" - -gGiftRibbonDescriptionPart1_2003NationalTourney: - .string "2003 NATIONAL TOURNEY$" - -gGiftRibbonDescriptionPart1_2003GlobalCup: - .string "2003 GLOBAL CUP$" - -gGiftRibbonDescriptionPart2_RunnerUp: - .string "Runner-up RIBBON$" - -gGiftRibbonDescriptionPart2_Semifinalist: - .string "Semifinalist RIBBON$" - -gGiftRibbonDescriptionPart1_2004RegionalTourney: - .string "2004 REGIONAL TOURNEY$" - -gGiftRibbonDescriptionPart1_2004NationalTourney: - .string "2004 NATIONAL TOURNEY$" - -gGiftRibbonDescriptionPart1_2004GlobalCup: - .string "2004 GLOBAL CUP$" - -gGiftRibbonDescriptionPart1_2005RegionalTourney: - .string "2005 REGIONAL TOURNEY$" - -gGiftRibbonDescriptionPart1_2005NationalTourney: - .string "2005 NATIONAL TOURNEY$" - -gGiftRibbonDescriptionPart1_2005GlobalCup: - .string "2005 GLOBAL CUP$" - -gGiftRibbonDescriptionPart1_PokemonBattleCup: - .string "POKéMON BATTLE CUP$" - -gGiftRibbonDescriptionPart2_Participation: - .string "Participation RIBBON$" - -gGiftRibbonDescriptionPart1_PokemonLeague: - .string "POKéMON LEAGUE$" - -gGiftRibbonDescriptionPart1_AdvanceCup: - .string "ADVANCE CUP$" - -gGiftRibbonDescriptionPart1_PokemonTournament: - .string "POKéMON Tournament$" - -gGiftRibbonDescriptionPart2_Participation2: - .string "Participation RIBBON$" - -gGiftRibbonDescriptionPart1_PokemonEvent: - .string "POKéMON Event$" - -gGiftRibbonDescriptionPart1_PokemonFestival: - .string "POKéMON Festival$" - -gGiftRibbonDescriptionPart1_DifficultyClearing: - .string "Difficulty-clearing$" - -gGiftRibbonDescriptionPart2_Commemorative: - .string "Commemorative RIBBON$" - -gGiftRibbonDescriptionPart1_ClearingAllDifficulties: - .string "RIBBON awarded for$" - -gGiftRibbonDescriptionPart2_ClearingAllDifficulties: - .string "clearing all difficulties.$" - -gGiftRibbonDescriptionPart1_100StraightWin: - .string "100-straight Win$" - -gGiftRibbonDescriptionPart1_DarknessTower: - .string "DARKNESS TOWER Clear$" - -gGiftRibbonDescriptionPart1_RedTower: - .string "RED TOWER Clear$" - -gGiftRibbonDescriptionPart1_BlackironTower: - .string "BLACKIRON TOWER Clear$" - -gGiftRibbonDescriptionPart1_FinalTower: - .string "FINAL TOWER Clear$" - -gGiftRibbonDescriptionPart1_LegendMaking: - .string "Legend-making$" - -gGiftRibbonDescriptionPart1_PokemonCenterTokyo: - .string "POKéMON CENTER TOKYO$" - -gGiftRibbonDescriptionPart1_PokemonCenterOsaka: - .string "POKéMON CENTER OSAKA$" - -gGiftRibbonDescriptionPart1_PokemonCenterNagoya: - .string "POKéMON CENTER NAGOYA$" - -gGiftRibbonDescriptionPart1_PokemonCenterNY: - .string "POKéMON CENTER NY$" - -gGiftRibbonDescriptionPart1_SummerHolidays: - .string "Summer Holidays RIBBON$" - -gGiftRibbonDescriptionPart2_EmptyString: - .string "$" - -gGiftRibbonDescriptionPart1_WinterHolidays: - .string "Winter Holidays RIBBON$" - -gGiftRibbonDescriptionPart1_SpringHolidays: - .string "Spring Holidays RIBBON$" - -gGiftRibbonDescriptionPart1_Evergreen: - .string "Evergreen RIBBON$" - -gGiftRibbonDescriptionPart1_SpecialHoliday: - .string "Special Holiday RIBBON$" - -gGiftRibbonDescriptionPart1_HardWorker: - .string "Hard Worker RIBBON$" - -gGiftRibbonDescriptionPart1_LotsOfFriends: - .string "Lots of Friends RIBBON$" - -gGiftRibbonDescriptionPart1_FullOfEnergy: - .string "Full of Energy RIBBON$" - -gGiftRibbonDescriptionPart1_LovedPokemon: - .string "A commemorative RIBBON$" - -gGiftRibbonDescriptionPart2_LovedPokemon: - .string "for a loved POKéMON.$" - -gGiftRibbonDescriptionPart1_LoveForPokemon: - .string "RIBBON that shows$" - -gGiftRibbonDescriptionPart2_LoveForPokemon: - .string "love for POKéMON.$" - - .align 2 -gGiftRibbonDescriptions:: @ 83E158C - .4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_2003GlobalCup, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_2003GlobalCup, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_2003GlobalCup, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_2004RegionalTourney, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_2004NationalTourney, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_2004GlobalCup, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_2004RegionalTourney, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_2004NationalTourney, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_2004GlobalCup, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_2004RegionalTourney, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_2004NationalTourney, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_2004GlobalCup, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_2005RegionalTourney, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_2005NationalTourney, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_2005GlobalCup, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_2005RegionalTourney, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_2005NationalTourney, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_2005GlobalCup, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_2005RegionalTourney, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_2005NationalTourney, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_2005GlobalCup, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_Participation - .4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_Participation - .4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Champion - .4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_RunnerUp - .4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Semifinalist - .4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Participation - .4byte gGiftRibbonDescriptionPart1_PokemonTournament, gGiftRibbonDescriptionPart2_Participation2 - .4byte gGiftRibbonDescriptionPart1_PokemonEvent, gGiftRibbonDescriptionPart2_Participation2 - .4byte gGiftRibbonDescriptionPart1_PokemonFestival, gGiftRibbonDescriptionPart2_Participation2 - .4byte gGiftRibbonDescriptionPart1_DifficultyClearing, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_ClearingAllDifficulties, gGiftRibbonDescriptionPart2_ClearingAllDifficulties - .4byte gGiftRibbonDescriptionPart1_100StraightWin, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_DarknessTower, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_RedTower, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_BlackironTower, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_FinalTower, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_LegendMaking, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_PokemonCenterTokyo, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_PokemonCenterOsaka, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_PokemonCenterNagoya, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_PokemonCenterNY, gGiftRibbonDescriptionPart2_Commemorative - .4byte gGiftRibbonDescriptionPart1_SummerHolidays, gGiftRibbonDescriptionPart2_EmptyString - .4byte gGiftRibbonDescriptionPart1_WinterHolidays, gGiftRibbonDescriptionPart2_EmptyString - .4byte gGiftRibbonDescriptionPart1_SpringHolidays, gGiftRibbonDescriptionPart2_EmptyString - .4byte gGiftRibbonDescriptionPart1_Evergreen, gGiftRibbonDescriptionPart2_EmptyString - .4byte gGiftRibbonDescriptionPart1_SpecialHoliday, gGiftRibbonDescriptionPart2_EmptyString - .4byte gGiftRibbonDescriptionPart1_HardWorker, gGiftRibbonDescriptionPart2_EmptyString - .4byte gGiftRibbonDescriptionPart1_LotsOfFriends, gGiftRibbonDescriptionPart2_EmptyString - .4byte gGiftRibbonDescriptionPart1_FullOfEnergy, gGiftRibbonDescriptionPart2_EmptyString - .4byte gGiftRibbonDescriptionPart1_LovedPokemon, gGiftRibbonDescriptionPart2_LovedPokemon - .4byte gGiftRibbonDescriptionPart1_LoveForPokemon, gGiftRibbonDescriptionPart2_LoveForPokemon diff --git a/data/text/ribbon_descriptions.inc b/data/text/ribbon_descriptions.inc deleted file mode 100644 index ebbfc34ff..000000000 --- a/data/text/ribbon_descriptions.inc +++ /dev/null @@ -1,84 +0,0 @@ -gRibbonDescriptionPart1_Champion: - .string "CHAMPION-beating, HALL$" - -gRibbonDescriptionPart2_Champion: - .string "OF FAME Member RIBBON$" - -gRibbonDescriptionPart1_CoolContest: - .string "COOL CONTEST$" - -gRibbonDescriptionPart1_BeautyContest: - .string "BEAUTY CONTEST$" - -gRibbonDescriptionPart1_CuteContest: - .string "CUTE CONTEST$" - -gRibbonDescriptionPart1_SmartContest: - .string "SMART CONTEST$" - -gRibbonDescriptionPart1_ToughContest: - .string "TOUGH CONTEST$" - -gRibbonDescriptionPart2_NormalRank: - .string "Normal Rank winner!$" - -gRibbonDescriptionPart2_SuperRank: - .string "Super Rank winner!$" - -gRibbonDescriptionPart2_HyperRank: - .string "Hyper Rank winner!$" - -gRibbonDescriptionPart2_MasterRank: - .string "Master Rank winner!$" - -gRibbonDescriptionPart1_Winning: - .string "RIBBON for clearing LV50$" - -gRibbonDescriptionPart2_Winning: - .string "at the BATTLE TOWER.$" - -gRibbonDescriptionPart1_Victory: - .string "Won for clearing LV100$" - -gRibbonDescriptionPart2_Victory: - .string "at the BATTLE TOWER.$" - -gRibbonDescriptionPart1_Artist: - .string "RIBBON for being chosen$" - -gRibbonDescriptionPart2_Artist: - .string "as a super sketch model.$" - -gRibbonDescriptionPart1_Effort: - .string "RIBBON awarded for$" - -gRibbonDescriptionPart2_Effort: - .string "being a hard worker.$" - - .align 2 -gRibbonDescriptions:: @ 83E113C - .4byte gRibbonDescriptionPart1_Champion, gRibbonDescriptionPart2_Champion - .4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_NormalRank - .4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_SuperRank - .4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_HyperRank - .4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_MasterRank - .4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_NormalRank - .4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_SuperRank - .4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_HyperRank - .4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_MasterRank - .4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_NormalRank - .4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_SuperRank - .4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_HyperRank - .4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_MasterRank - .4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_NormalRank - .4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_SuperRank - .4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_HyperRank - .4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_MasterRank - .4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_NormalRank - .4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_SuperRank - .4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_HyperRank - .4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_MasterRank - .4byte gRibbonDescriptionPart1_Winning, gRibbonDescriptionPart2_Winning - .4byte gRibbonDescriptionPart1_Victory, gRibbonDescriptionPart2_Victory - .4byte gRibbonDescriptionPart1_Artist, gRibbonDescriptionPart2_Artist - .4byte gRibbonDescriptionPart1_Effort, gRibbonDescriptionPart2_Effort diff --git a/data/text/trainer_eye_descriptions.inc b/data/text/trainer_eye_descriptions.inc deleted file mode 100644 index 9e20ea8cc..000000000 --- a/data/text/trainer_eye_descriptions.inc +++ /dev/null @@ -1,417 +0,0 @@ -TrainerEyeDescription_0: - .string "Becalm fighting emotions.$" - .string "Fragrant GRASS POKéMON$" - .string "Soothing aromas make the$" - .string "body and mind healthy.$" -TrainerEyeDescription_1: - .string "Overwhelm with power!$" - .string "Craggy ROCK POKéMON$" - .string "In search of ancient lore,$" - .string "I travel the world.$" -TrainerEyeDescription_2: - .string "I'm going to try hard!$" - .string "Good swimmer POKéMON$" - .string "I wish I could swim without$" - .string "using an inner tube.$" -TrainerEyeDescription_3: - .string "I don't know. I'll try hard.$" - .string "WATER POKéMON are buddies.$" - .string "It's not like I can't swim.$" - .string "I just like my inner tube.$" -TrainerEyeDescription_4: - .string "We split our duties.$" - .string "We like friendly POKéMON.$" - .string "We enjoy POKéMON together$" - .string "as sister and brother.$" -TrainerEyeDescription_5: - .string "Exploit the foe's weakness.$" - .string "Balance is crucial.$" - .string "My goal is to become the$" - .string "POKéMON CHAMPION.$" -TrainerEyeDescription_6: - .string "Upset the opponent.$" - .string "Type doesn't matter.$" - .string "I'm a top student at the$" - .string "TRAINER'S SCHOOL.$" -TrainerEyeDescription_7: - .string "Slow, steady suffering$" - .string "Scary to meet at night.$" - .string "I see things that others$" - .string "can't see...$" -TrainerEyeDescription_8: - .string "Anything to win.$" - .string "Gorgeous type!$" - .string "I have a pool specially for$" - .string "my POKéMON at home.$" -TrainerEyeDescription_9: - .string "I'll lead you astray.$" - .string "Cute, of course.$" - .string "I love the SAFARI ZONE.$" - .string "I seem to end up there.$" -TrainerEyeDescription_10: - .string "Strategy? Who needs it?$" - .string "I spent big money on it!$" - .string "I, being rich, sleep in a$" - .string "custom POKéMON bed.$" -TrainerEyeDescription_11: - .string "Wrestle down with power.$" - .string "Took all night to catch...$" - .string "Big, burly, and buff$" - .string "POKéMON are the best...$" -TrainerEyeDescription_12: - .string "Ram at full speed!$" - .string "Funky WATER type!$" - .string "If I can't be out swimming,$" - .string "I'll be pumping weights.$" -TrainerEyeDescription_13: - .string "Grand slam pummeling!$" - .string "FIGHTING type$" - .string "Not to brag, but I can bust$" - .string "ten roof tiles!$" -TrainerEyeDescription_14: - .string "I'll electrify you!$" - .string "They're ELECTRIC!$" - .string "I want to make people cry$" - .string "with songs from my heart.$" -TrainerEyeDescription_15: - .string "Burn it all down!$" - .string "Burn-inducing POKéMON$" - .string "When you light a campfire,$" - .string "be sure there's some water.$" -TrainerEyeDescription_16: - .string "Hang in and be tenacious!$" - .string "I'll raise any POKéMON.$" - .string "POKéMON raised in the wild$" - .string "grow strong!$" -TrainerEyeDescription_17: - .string "Our love lets us prevail.$" - .string "We've had them for years.$" - .string "Married 50 years, we've$" - .string "devotedly raised POKéMON.$" -TrainerEyeDescription_18: - .string "Attack in waves!$" - .string "BUG POKéMON are cool.$" - .string "I go into the forest every$" - .string "day to catch BUG POKéMON.$" -TrainerEyeDescription_19: - .string "Daze and confuse!$" - .string "Ones with weird powers.$" - .string "I can see through exactly$" - .string "what you're thinking!$" -TrainerEyeDescription_20: - .string "Battle at full power.$" - .string "POKéMON of many mysteries$" - .string "When we spoke, I was really$" - .string "using telepathy.$" -TrainerEyeDescription_21: - .string "Calm and collected.$" - .string "POKéMON of distinction$" - .string "We enjoy a spot of tea$" - .string "every day. It's imported.$" -TrainerEyeDescription_22: - .string "I use my head to battle.$" - .string "I love any kind of POKéMON!$" - .string "My daddy gives me spending$" - .string "money if I ace a test.$" -TrainerEyeDescription_23: - .string "My knowledge rules!$" - .string "Any smart POKéMON!$" - .string "I want to be a POKéMON$" - .string "researcher in the future.$" -TrainerEyeDescription_24: - .string "We talk it over first.$" - .string "POKéMON that we both like.$" - .string "We're senior and junior$" - .string "students into POKéMON!$" -TrainerEyeDescription_25: - .string "Go for it, my dears!$" - .string "I have no likes or dislikes.$" - .string "While out shopping for$" - .string "supper, I battle too.$" -TrainerEyeDescription_26: - .string "I battle with love!$" - .string "A POKéMON raised with love!$" - .string "It's important to build$" - .string "trust with your POKéMON.$" -TrainerEyeDescription_27: - .string "I see through your moves!$" - .string "The essence of FIGHTING.$" - .string "I'm not ready to give way$" - .string "to the young yet!$" -TrainerEyeDescription_28: - .string "Attack while defending$" - .string "The FIGHTING type$" - .string "Being old, I have my own$" - .string "style of battling.$" -TrainerEyeDescription_29: - .string "I do what I can.$" - .string "I use different types.$" - .string "I'm going to keep working$" - .string "until I beat a GYM LEADER.$" -TrainerEyeDescription_30: - .string "I battle patiently.$" - .string "WATER POKéMON to battle!$" - .string "I'm the world's only guy to$" - .string "catch a huge POKéMON!$" -TrainerEyeDescription_31: - .string "Defense is crucial.$" - .string "My POKéMON is solid.$" - .string "I started this for dieting,$" - .string "but I got right into it.$" -TrainerEyeDescription_32: - .string "Push and push again!$" - .string "The strength of STEEL$" - .string "If you're sweating, get$" - .string "fluids into you regularly.$" -TrainerEyeDescription_33: - .string "Exploit the environment!$" - .string "All hail the WATER type!$" - .string "I won't be beaten by some$" - .string "beach bum SWIMMER!$" -TrainerEyeDescription_34: - .string "All-out offensive!$" - .string "WATER POKéMON rule!$" - .string "I must swim over 6 miles$" - .string "every day.$" -TrainerEyeDescription_35: - .string "Speed above all!$" - .string "I use a speedy POKéMON.$" - .string "A marathon is a challenge$" - .string "against your own self.$" -TrainerEyeDescription_36: - .string "Strike before stricken!$" - .string "A fast-running POKéMON!$" - .string "If you ran and ran, you'd$" - .string "become one with the wind.$" -TrainerEyeDescription_37: - .string "It's about POKéMON power!$" - .string "See the power of DRAGONS!$" - .string "I'll become legendary as the$" - .string "strongest one day!$" -TrainerEyeDescription_38: - .string "I'll show you my technique!$" - .string "Elegantly wheeling BIRDS$" - .string "My BIRD POKéMON, deliver my$" - .string "love to that girl!$" -TrainerEyeDescription_39: - .string "You'll suffer from poison!$" - .string "Poisonous POKéMON$" - .string "I undertake training so$" - .string "that I may become a ninja.$" -TrainerEyeDescription_40: - .string "The first strike wins!$" - .string "Speedy FIGHTING type$" - .string "If my POKéMON lose,$" - .string "I'll carry on the fight!$" -TrainerEyeDescription_41: - .string "Go, go, my POKéMON!$" - .string "I'll raise anything.$" - .string "UV rays are your skin's$" - .string "enemy. Get protected.$" -TrainerEyeDescription_42: - .string "No mercy!$" - .string "Cute WATER POKéMON$" - .string "I have too many fans.$" - .string "I was interviewed on TV.$" -TrainerEyeDescription_43: - .string "I think about this & that.$" - .string "I like all POKéMON.$" - .string "What lies beyond that$" - .string "yonder hill?$" -TrainerEyeDescription_44: - .string "We battle together!$" - .string "We train together!$" - .string "We like the same POKéMON,$" - .string "but different desserts.$" -TrainerEyeDescription_45: - .string "I force things with power!$" - .string "WATER and FIGHTING types$" - .string "Seamen are rough spirits!$" - .string "Any complaints?$" -TrainerEyeDescription_46: - .string "Protect POKéMON from harm.$" - .string "I love rare POKéMON.$" - .string "I want to collect all the$" - .string "world's rare POKéMON.$" -TrainerEyeDescription_47: - .string "I count on power.$" - .string "POKéMON are my children.$" - .string "It takes knowledge and$" - .string "love to raise POKéMON.$" -TrainerEyeDescription_48: - .string "Full-on attack!$" - .string "Anything. I'll raise it.$" - .string "I give them {POKEBLOCK}S for$" - .string "going after CONTEST titles.$" -TrainerEyeDescription_49: - .string "I believe in my POKéMON.$" - .string "I like strong POKéMON.$" - .string "I'm training for rescue$" - .string "work with my POKéMON.$" -TrainerEyeDescription_50: - .string "I attack in waves.$" - .string "Different types$" - .string "Those who destroy nature$" - .string "must never be forgiven!$" -TrainerEyeDescription_51: - .string "I'll show you some guts!$" - .string "Cute POKéMON are my faves!$" - .string "After a battle, I always$" - .string "bathe with my POKéMON.$" -TrainerEyeDescription_52: - .string "Lightning-fast attack!$" - .string "BUG POKéMON are number 1!$" - .string "If you want to catch BUG$" - .string "POKéMON, wake up early.$" -TrainerEyeDescription_53: - .string "I battle with power.$" - .string "Hard-bodied POKéMON$" - .string "I've been planning a month$" - .string "for today's hike.$" -TrainerEyeDescription_54: - .string "Lovey-dovey strategy!$" - .string "Lovey-dovey POKéMON!$" - .string "We're lovey-dovey!$" - .string "Forever lovey-dovey!$" -TrainerEyeDescription_55: - .string "We let it all hang out.$" - .string "The 1st POKéMON I caught.$" - .string "POKéMON and I have grown$" - .string "stronger together.$" -TrainerEyeDescription_56: - .string "ROCK-type power attack$" - .string "Rock-solid types are good.$" - .string "Through battling, I want to$" - .string "learn all about POKéMON.$" -TrainerEyeDescription_57: - .string "Direct physical action!$" - .string "FIGHTING POKéMON rule!$" - .string "The world awaits me as the$" - .string "next big wave!$" -TrainerEyeDescription_58: - .string "I choose to electrify.$" - .string "Get shocked by electricity!$" - .string "Wahahahaha! The secret to$" - .string "health is laughter!$" -TrainerEyeDescription_59: - .string "Battle aggressively.$" - .string "Burn with passion!$" - .string "Wash away daily fatigue in$" - .string "hot springs completely!$" -TrainerEyeDescription_60: - .string "I flexibly adapt my style.$" - .string "Grown in a balanced manner.$" - .string "POKéMON are my life.$" - .string "My chosen path is harsh...$" -TrainerEyeDescription_61: - .string "I take advantage of speed.$" - .string "Graceful sky dancers$" - .string "I can see the ebb and flow$" - .string "of the winds.$" -TrainerEyeDescription_62: - .string "We battle in cooperation.$" - .string "Always friendly POKéMON.$" - .string "We understand each other,$" - .string "and we understand others.$" -TrainerEyeDescription_63: - .string "Dignity and respect$" - .string "I prefer POKéMON of grace.$" - .string "Aquatic illusions best suit$" - .string "my distinctive elegance.$" -TrainerEyeDescription_64: - .string "Offense over defense$" - .string "The DARK side's beauties$" - .string "You can talk all you want -$" - .string "might is right!$" -TrainerEyeDescription_65: - .string "Confuse and confound$" - .string "There's nothing definite.$" - .string "I wonder how my grandma at$" - .string "MT. PYRE is doing?$" -TrainerEyeDescription_66: - .string "I use items for help.$" - .string "Flaming passion in icy cold!$" - .string "The ICE type can be better$" - .string "trained in this hot land.$" -TrainerEyeDescription_67: - .string "Harness strong abilities.$" - .string "The raw power of DRAGONS!$" - .string "I live to battle every day$" - .string "to learn about POKéMON.$" -TrainerEyeDescription_68: - .string "Pick on the foe's weakness.$" - .string "The ultimate STEEL POKéMON$" - .string "When it comes down to it,$" - .string "I'm still the strongest!$" - - .align 2 -gTrainerEyeDescriptions:: @ 83E309C - .4byte TrainerEyeDescription_0 - .4byte TrainerEyeDescription_1 - .4byte TrainerEyeDescription_2 - .4byte TrainerEyeDescription_3 - .4byte TrainerEyeDescription_4 - .4byte TrainerEyeDescription_5 - .4byte TrainerEyeDescription_6 - .4byte TrainerEyeDescription_7 - .4byte TrainerEyeDescription_8 - .4byte TrainerEyeDescription_9 - .4byte TrainerEyeDescription_10 - .4byte TrainerEyeDescription_11 - .4byte TrainerEyeDescription_12 - .4byte TrainerEyeDescription_13 - .4byte TrainerEyeDescription_14 - .4byte TrainerEyeDescription_15 - .4byte TrainerEyeDescription_16 - .4byte TrainerEyeDescription_17 - .4byte TrainerEyeDescription_18 - .4byte TrainerEyeDescription_19 - .4byte TrainerEyeDescription_20 - .4byte TrainerEyeDescription_21 - .4byte TrainerEyeDescription_22 - .4byte TrainerEyeDescription_23 - .4byte TrainerEyeDescription_24 - .4byte TrainerEyeDescription_25 - .4byte TrainerEyeDescription_26 - .4byte TrainerEyeDescription_27 - .4byte TrainerEyeDescription_28 - .4byte TrainerEyeDescription_29 - .4byte TrainerEyeDescription_30 - .4byte TrainerEyeDescription_31 - .4byte TrainerEyeDescription_32 - .4byte TrainerEyeDescription_33 - .4byte TrainerEyeDescription_34 - .4byte TrainerEyeDescription_35 - .4byte TrainerEyeDescription_36 - .4byte TrainerEyeDescription_37 - .4byte TrainerEyeDescription_38 - .4byte TrainerEyeDescription_39 - .4byte TrainerEyeDescription_40 - .4byte TrainerEyeDescription_41 - .4byte TrainerEyeDescription_42 - .4byte TrainerEyeDescription_43 - .4byte TrainerEyeDescription_44 - .4byte TrainerEyeDescription_45 - .4byte TrainerEyeDescription_46 - .4byte TrainerEyeDescription_47 - .4byte TrainerEyeDescription_48 - .4byte TrainerEyeDescription_49 - .4byte TrainerEyeDescription_50 - .4byte TrainerEyeDescription_51 - .4byte TrainerEyeDescription_52 - .4byte TrainerEyeDescription_53 - .4byte TrainerEyeDescription_54 - .4byte TrainerEyeDescription_55 - .4byte TrainerEyeDescription_56 - .4byte TrainerEyeDescription_57 - .4byte TrainerEyeDescription_58 - .4byte TrainerEyeDescription_59 - .4byte TrainerEyeDescription_60 - .4byte TrainerEyeDescription_61 - .4byte TrainerEyeDescription_62 - .4byte TrainerEyeDescription_63 - .4byte TrainerEyeDescription_64 - .4byte TrainerEyeDescription_65 - .4byte TrainerEyeDescription_66 - .4byte TrainerEyeDescription_67 - .4byte TrainerEyeDescription_68 |