diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 60c24fc579..586de02d62 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -660,11 +660,11 @@ gStdScripts_End:: .include "data/maps/AbandonedShip_Corridors_1F/text.inc" .include "data/maps/AbandonedShip_Rooms_1F/text.inc" .include "data/maps/AbandonedShip_Corridors_B1F/text.inc" - .include "data/maps/AbandonedShip_HiddenFloorCorridors/text.inc" .include "data/maps/AbandonedShip_Rooms_B1F/text.inc" .include "data/maps/AbandonedShip_Rooms2_B1F/text.inc" .include "data/maps/AbandonedShip_Rooms2_1F/text.inc" .include "data/maps/AbandonedShip_CaptainsOffice/text.inc" + .include "data/maps/AbandonedShip_HiddenFloorCorridors/text.inc" .include "data/maps/AbandonedShip_HiddenFloorRooms/text.inc" .include "data/maps/SecretBase_RedCave1/text.inc" .include "data/maps/InsideOfTruck/text.inc" diff --git a/data-de/maps/AbandonedShip_Corridors_B1F/text.inc b/data-de/maps/AbandonedShip_Corridors_B1F/text.inc index 56edc94919..53ce65457f 100644 --- a/data-de/maps/AbandonedShip_Corridors_B1F/text.inc +++ b/data-de/maps/AbandonedShip_Corridors_B1F/text.inc @@ -1,28 +1,31 @@ -AbandonedShip_Corridors_B1F_Text_19856F:: @ 819856F +AbandonedShip_Corridors_B1F_Text_DuncanIntro:: .string "Wenn wir zur See fahren, nehmen wir\n" .string "MATROSEN immer unsere POKéMON mit.\l" .string "Wie wäre es mit einem schnellen Kampf?$" -AbandonedShip_Corridors_B1F_Text_1985C5:: @ 81985C5 +AbandonedShip_Corridors_B1F_Text_DuncanDefeat:: .string "Huups, da bin ich abgesoffen.$" -AbandonedShip_Corridors_B1F_Text_1985D7:: @ 81985D7 +AbandonedShip_Corridors_B1F_Text_DuncanPostBattle:: .string "Der Schiffsrumpf liegt tief unter der\n" .string "Wasserlinie.\p" .string "Wenn ein POKéMON wissen würde, wie\n" .string "man taucht, würden wir Fortschritte\l" .string "machen.$" -AbandonedShip_Corridors_B1F_Text_19864A:: @ 819864A +AbandonedShip_Corridors_B1F_Text_YayItsAShip:: .string "Jahaa!\n" .string "Ein Schiff!$" -AbandonedShip_Corridors_B1F_Text_19865C:: @ 819865C +AbandonedShip_Corridors_B1F_Text_DoorIsLocked:: .string "Die Tür ist verschlossen.\p" .string "“LAGER” steht auf dem Schild.$" -AbandonedShip_Corridors_B1F_Text_198692:: @ 8198692 +AbandonedShip_Corridors_B1F_Text_InsertedStorageKey:: .string "{PLAYER} steckt den SCHLÜSSEL zum\n" .string "LAGER ins Schlüsselloch und dreht ihn.\p" .string "Der SCHLÜSSEL ist schwergängig, aber\n" .string "das Schloss lässt sich öffnen.$" + +AbandonedShip_Text_TheDoorIsOpen:: + .string "Die Tür ist offen.$" diff --git a/data-de/maps/AbandonedShip_HiddenFloorCorridors/text.inc b/data-de/maps/AbandonedShip_HiddenFloorCorridors/text.inc index af957c7111..7811078ac4 100644 --- a/data-de/maps/AbandonedShip_HiddenFloorCorridors/text.inc +++ b/data-de/maps/AbandonedShip_HiddenFloorCorridors/text.inc @@ -1,3 +1,21 @@ -AbandonedShip_Corridors_B1F_Text_1986EC:: @ 81986EC -AbandonedShip_HiddenFloorCorridors_Text_1986EC:: @ 81986EC - .string "Die Tür ist offen.$" +AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked:: + .string "Die Tür ist verschlossen.\p" + .string "“K. 1” steht auf der Tür.$" + +AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked:: + .string "Die Tür ist verschlossen.\p" + .string "“K. 2” steht auf der Tür.$" + +AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked:: + .string "Die Tür ist verschlossen.\p" + .string "“K. 4” steht auf der Tür.$" + +AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked:: + .string "Die Tür ist verschlossen.\p" + .string "“K. 6” steht auf der Tür.$" + +AbandonedShip_HiddenFloorCorridors_Text_InsertedKey:: + .string "{PLAYER} steckt den SCHLÜSSEL ins\n" + .string "Schloss und dreht ihn um.\p" + .string "Der SCHLÜSSEL ist schwergängig, aber\n" + .string "die Tür öffnet sich.$" diff --git a/data-de/maps/AbandonedShip_HiddenFloorRooms/text.inc b/data-de/maps/AbandonedShip_HiddenFloorRooms/text.inc index a2e40f5a51..af8a25fe9d 100644 --- a/data-de/maps/AbandonedShip_HiddenFloorRooms/text.inc +++ b/data-de/maps/AbandonedShip_HiddenFloorRooms/text.inc @@ -1,35 +1,3 @@ -AbandonedShip_HiddenFloorCorridors_Text_198DC0:: @ 8198DC0 - .string "Die Tür ist verschlossen.\p" - .string "“K. 1” steht auf der Tür.$" - -AbandonedShip_HiddenFloorCorridors_Text_198DF4:: @ 8198DF4 - .string "Die Tür ist verschlossen.\p" - .string "“K. 2” steht auf der Tür.$" - -AbandonedShip_HiddenFloorCorridors_Text_198E28:: @ 8198E28 - .string "Die Tür ist verschlossen.\p" - .string "“K. 4” steht auf der Tür.$" - -AbandonedShip_HiddenFloorCorridors_Text_198E5C:: @ 8198E5C - .string "Die Tür ist verschlossen.\p" - .string "“K. 6” steht auf der Tür.$" - -AbandonedShip_HiddenFloorCorridors_Text_198E90:: @ 8198E90 - .string "{PLAYER} steckt den SCHLÜSSEL ins\n" - .string "Schloss und dreht ihn um.\p" - .string "Der SCHLÜSSEL ist schwergängig, aber\n" - .string "die Tür öffnet sich.$" - -AbandonedShip_HiddenFloorRooms_Text_198EE2:: @ 8198EE2 - .string "Es ist hell und glänzend!\n" - .string "Aber es ist trotzdem nur Müll...$" - -UnknownString_8198F10: @ 8198F10 - .string "In der Wand ist eine kleine Einkerbung.$" - -UnknownString_8198F34: @ 8198F34 - .string "In der Wand ist eine kleine Einkerbung.\p" - .string "Möchtest du GEHEIMPOWER einsetzen?$" - -UnknownString_8198F6E: @ 8198F6E - .string "Eine kleine Höhle wird sichtbar.$" +AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash:: + .string "Es ist hell und glänzend!\n" + .string "Aber es ist trotzdem nur Müll...$" diff --git a/data-de/maps/SecretBase_RedCave1/text.inc b/data-de/maps/SecretBase_RedCave1/text.inc index ffe6c4d042..f9cc818770 100644 --- a/data-de/maps/SecretBase_RedCave1/text.inc +++ b/data-de/maps/SecretBase_RedCave1/text.inc @@ -1,3 +1,13 @@ -SecretBase_RedCave1_Text_198F89:: @ 8198F89 +SecretBase_Text_SmallIndentInWall: + .string "In der Wand ist eine kleine Einkerbung.$" + +SecretBase_Text_IndentUseSecretPower: + .string "In der Wand ist eine kleine Einkerbung.\p" + .string "Möchtest du GEHEIMPOWER einsetzen?$" + +SecretBase_Text_DiscoveredSmallCavern: + .string "Eine kleine Höhle wird sichtbar.$" + +SecretBase_Text_WantToMakeYourSecretBaseHere:: .string "Möchtest du hier deine GEHEIMBASIS\n" .string "einrichten?$" diff --git a/data/event_scripts.s b/data/event_scripts.s index f6b62b32cb..02c13b0eec 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -660,11 +660,11 @@ gStdScripts_End:: .include "data/maps/AbandonedShip_Corridors_1F/text.inc" .include "data/maps/AbandonedShip_Rooms_1F/text.inc" .include "data/maps/AbandonedShip_Corridors_B1F/text.inc" - .include "data/maps/AbandonedShip_HiddenFloorCorridors/text.inc" .include "data/maps/AbandonedShip_Rooms_B1F/text.inc" .include "data/maps/AbandonedShip_Rooms2_B1F/text.inc" .include "data/maps/AbandonedShip_Rooms2_1F/text.inc" .include "data/maps/AbandonedShip_CaptainsOffice/text.inc" + .include "data/maps/AbandonedShip_HiddenFloorCorridors/text.inc" .include "data/maps/AbandonedShip_HiddenFloorRooms/text.inc" .include "data/maps/SecretBase_RedCave1/text.inc" .include "data/maps/InsideOfTruck/text.inc" diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index f70dcc20ba..407a55bc58 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Corridors_B1F_EventScript_15E9CA", + "script": "AbandonedShip_Corridors_B1F_EventScript_TuberM", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", - "script": "AbandonedShip_Corridors_B1F_EventScript_15EA1E", + "script": "AbandonedShip_Corridors_B1F_EventScript_Duncan", "flag": "0" } ], @@ -104,7 +104,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_Corridors_B1F_EventScript_15E9D3" + "script": "AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor" } ] } diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index a67a11787f..cb742570d0 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -1,55 +1,55 @@ -AbandonedShip_Corridors_B1F_MapScripts:: @ 815E98F - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_15E99A - map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_15E9A3 +AbandonedShip_Corridors_B1F_MapScripts:: + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_OnResume + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_OnLoad .byte 0 -AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A +AbandonedShip_Corridors_B1F_OnResume:: setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end -AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 - call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9B6 - call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9C0 +AbandonedShip_Corridors_B1F_OnLoad:: + call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom + call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom end -AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 - setmetatile 11, 4, METATILE_InsideShip_InTactDoor0_Bottom, 1 +AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom:: + setmetatile 11, 4, METATILE_Facility_IntactDoor_Bottom_Locked, TRUE return -AbandonedShip_Corridors_B1F_EventScript_15E9C0:: @ 815E9C0 - setmetatile 11, 4, METATILE_InsideShip_InTactDoor1_Bottom, 1 +AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom:: + setmetatile 11, 4, METATILE_Facility_IntactDoor_Bottom_Unlocked, TRUE return -AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA - msgbox AbandonedShip_Corridors_B1F_Text_19864A, MSGBOX_NPC +AbandonedShip_Corridors_B1F_EventScript_TuberM:: + msgbox AbandonedShip_Corridors_B1F_Text_YayItsAShip, MSGBOX_NPC end -AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 +AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: lockall - goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15EA14 + goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked checkitem ITEM_STORAGE_KEY, 1 compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A - msgbox AbandonedShip_Corridors_B1F_Text_198692, MSGBOX_DEFAULT + goto_if_eq AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked + msgbox AbandonedShip_Corridors_B1F_Text_InsertedStorageKey, MSGBOX_DEFAULT playse SE_PIN removeitem ITEM_STORAGE_KEY, 1 setflag FLAG_USED_STORAGE_KEY - call AbandonedShip_Corridors_B1F_EventScript_15E9C0 + call AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom special DrawWholeMapView releaseall end -AbandonedShip_Corridors_B1F_EventScript_15EA0A:: @ 815EA0A - msgbox AbandonedShip_Corridors_B1F_Text_19865C, MSGBOX_DEFAULT +AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked:: + msgbox AbandonedShip_Corridors_B1F_Text_DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_Corridors_B1F_EventScript_15EA14:: @ 815EA14 - msgbox AbandonedShip_Corridors_B1F_Text_1986EC, MSGBOX_DEFAULT +AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked:: + msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT releaseall end -AbandonedShip_Corridors_B1F_EventScript_15EA1E:: @ 815EA1E - trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 - msgbox AbandonedShip_Corridors_B1F_Text_1985D7, MSGBOX_AUTOCLOSE +AbandonedShip_Corridors_B1F_EventScript_Duncan:: + trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_DuncanIntro, AbandonedShip_Corridors_B1F_Text_DuncanDefeat + msgbox AbandonedShip_Corridors_B1F_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AbandonedShip_Corridors_B1F/text.inc b/data/maps/AbandonedShip_Corridors_B1F/text.inc index eedf0d3b4b..649b3841d9 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/text.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/text.inc @@ -1,29 +1,30 @@ -AbandonedShip_Corridors_B1F_Text_19856F:: @ 819856F +AbandonedShip_Corridors_B1F_Text_DuncanIntro:: .string "When we go out to sea, we SAILORS\n" .string "always bring our POKéMON.\l" .string "How about a quick battle?$" -AbandonedShip_Corridors_B1F_Text_1985C5:: @ 81985C5 +AbandonedShip_Corridors_B1F_Text_DuncanDefeat:: .string "Whoops, I'm sunk!$" -AbandonedShip_Corridors_B1F_Text_1985D7:: @ 81985D7 +AbandonedShip_Corridors_B1F_Text_DuncanPostBattle:: .string "The ship's bottom has sunk into the\n" .string "depths.\p" .string "If a POKéMON knew how to go underwater,\n" .string "we might make some progress...$" -AbandonedShip_Corridors_B1F_Text_19864A:: @ 819864A +AbandonedShip_Corridors_B1F_Text_YayItsAShip:: .string "Yay!\n" .string "It's a ship!$" -AbandonedShip_Corridors_B1F_Text_19865C:: @ 819865C +AbandonedShip_Corridors_B1F_Text_DoorIsLocked:: .string "The door is locked.\p" .string "“STORAGE” is painted on the door.$" -AbandonedShip_Corridors_B1F_Text_198692:: @ 8198692 +AbandonedShip_Corridors_B1F_Text_InsertedStorageKey:: .string "{PLAYER} inserted and turned the\n" .string "STORAGE KEY.\p" .string "The inserted KEY stuck fast, but the\n" .string "door opened.$" -AbandonedShip_Corridors_B1F_Text_1986EC:: @ 81986EC +AbandonedShip_Text_TheDoorIsOpen:: + .string "The door is open.$" diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 6aafa2d410..f1951c7705 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -63,7 +63,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door" }, { "type": "sign", @@ -71,7 +71,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door" }, { "type": "sign", @@ -79,7 +79,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EC61" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door" }, { "type": "sign", @@ -87,7 +87,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EC98" + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door" } ] } diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index 09ab6d0591..e4063e6bb8 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -1,136 +1,136 @@ -AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 815EB46 - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51 - map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A +AbandonedShip_HiddenFloorCorridors_MapScripts:: + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_OnResume + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_OnLoad .byte 0 -AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 +AbandonedShip_HiddenFloorCorridors_OnResume:: setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end -AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A - call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB - call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 - call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF - call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 - call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 - call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD - call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 - call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 +AbandonedShip_HiddenFloorCorridors_OnLoad:: + call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1 + call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2 + call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4 + call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6 + call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1 + call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2 + call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4 + call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6 end -AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 - setmetatile 3, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1:: + setmetatile 3, 8, METATILE_Facility_IntactDoor_Bottom_Unlocked, TRUE return -AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD:: @ 815EBAD - setmetatile 6, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2:: + setmetatile 6, 8, METATILE_Facility_IntactDoor_Bottom_Unlocked, TRUE return -AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7:: @ 815EBB7 - setmetatile 3, 3, METATILE_InsideShip_DoorIndent1, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4:: + setmetatile 3, 3, METATILE_Facility_DoorIndent_Unlocked, FALSE return -AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1:: @ 815EBC1 - setmetatile 9, 3, METATILE_InsideShip_DoorIndent1, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6:: + setmetatile 9, 3, METATILE_Facility_DoorIndent_Unlocked, FALSE return -AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB:: @ 815EBCB - setmetatile 3, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1:: + setmetatile 3, 8, METATILE_Facility_IntactDoor_Bottom_Locked, TRUE return -AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5:: @ 815EBD5 - setmetatile 6, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2:: + setmetatile 6, 8, METATILE_Facility_IntactDoor_Bottom_Locked, TRUE return -AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF:: @ 815EBDF - setmetatile 3, 3, METATILE_InsideShip_DoorIndent0, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4:: + setmetatile 3, 3, METATILE_Facility_DoorIndent_Locked, FALSE return -AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 - setmetatile 9, 3, METATILE_InsideShip_DoorIndent0, 0 +AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6:: + setmetatile 9, 3, METATILE_Facility_DoorIndent_Locked, FALSE return -AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 +AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: lockall - goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen checkitem ITEM_ROOM_1_KEY, 1 compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF - msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, MSGBOX_DEFAULT + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN removeitem ITEM_ROOM_1_KEY setflag FLAG_USED_ROOM_1_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A +AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: lockall - goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen checkitem ITEM_ROOM_2_KEY, 1 compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 - msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, MSGBOX_DEFAULT + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN removeitem ITEM_ROOM_2_KEY setflag FLAG_USED_ROOM_2_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 +AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: lockall - goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen checkitem ITEM_ROOM_4_KEY, 1 compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 - msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, MSGBOX_DEFAULT + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN removeitem ITEM_ROOM_4_KEY setflag FLAG_USED_ROOM_4_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 +AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: lockall - goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen checkitem ITEM_ROOM_6_KEY, 1 compare VAR_RESULT, 0 - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED - msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, MSGBOX_DEFAULT + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked + msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN removeitem ITEM_ROOM_6_KEY setflag FLAG_USED_ROOM_6_KEY - call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 + call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6 special DrawWholeMapView releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF:: @ 815ECCF - msgbox AbandonedShip_HiddenFloorCorridors_Text_198DC0, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked:: + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9:: @ 815ECD9 - msgbox AbandonedShip_HiddenFloorCorridors_Text_198DF4, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked:: + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3:: @ 815ECE3 - msgbox AbandonedShip_HiddenFloorCorridors_Text_198E28, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked:: + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_15ECED:: @ 815ECED - msgbox AbandonedShip_HiddenFloorCorridors_Text_198E5C, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked:: + msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked, MSGBOX_DEFAULT releaseall end -AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7:: @ 815ECF7 - msgbox AbandonedShip_HiddenFloorCorridors_Text_1986EC, MSGBOX_DEFAULT +AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen:: + msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc index 4e7c2014f5..348bc6c00b 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc @@ -1,2 +1,21 @@ -AbandonedShip_HiddenFloorCorridors_Text_1986EC:: @ 81986EC - .string "The door is open.$" +AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked:: + .string "The door is locked.\p" + .string "“RM. 1” is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked:: + .string "The door is locked.\p" + .string "“RM. 2” is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked:: + .string "The door is locked.\p" + .string "“RM. 4” is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked:: + .string "The door is locked.\p" + .string "“RM. 6” is painted on the door.$" + +AbandonedShip_HiddenFloorCorridors_Text_InsertedKey:: + .string "{PLAYER} inserted and turned the\n" + .string "KEY.\p" + .string "The inserted KEY stuck fast, but the\n" + .string "door opened.$" diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index d28e80ec81..97c5ebff23 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -138,6 +138,6 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB lockall - msgbox AbandonedShip_HiddenFloorRooms_Text_198EE2, MSGBOX_DEFAULT + msgbox AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/text.inc b/data/maps/AbandonedShip_HiddenFloorRooms/text.inc index 870f304720..38ce8558dd 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/text.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/text.inc @@ -1,35 +1,3 @@ -AbandonedShip_HiddenFloorCorridors_Text_198DC0:: @ 8198DC0 - .string "The door is locked.\p" - .string "“RM. 1” is painted on the door.$" - -AbandonedShip_HiddenFloorCorridors_Text_198DF4:: @ 8198DF4 - .string "The door is locked.\p" - .string "“RM. 2” is painted on the door.$" - -AbandonedShip_HiddenFloorCorridors_Text_198E28:: @ 8198E28 - .string "The door is locked.\p" - .string "“RM. 4” is painted on the door.$" - -AbandonedShip_HiddenFloorCorridors_Text_198E5C:: @ 8198E5C - .string "The door is locked.\p" - .string "“RM. 6” is painted on the door.$" - -AbandonedShip_HiddenFloorCorridors_Text_198E90:: @ 8198E90 - .string "{PLAYER} inserted and turned the\n" - .string "KEY.\p" - .string "The inserted KEY stuck fast, but the\n" - .string "door opened.$" - -AbandonedShip_HiddenFloorRooms_Text_198EE2:: @ 8198EE2 - .string "It's bright and shiny!\n" - .string "But it's just trash...$" - -UnknownString_8198F10: @ 8198F10 - .string "There's a small indent in the wall.$" - -UnknownString_8198F34: @ 8198F34 - .string "There's a small indent in the wall.\p" - .string "Use the SECRET POWER?$" - -UnknownString_8198F6E: @ 8198F6E - .string "Discovered a small cavern!$" +AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash:: + .string "It's bright and shiny!\n" + .string "But it's just trash...$" diff --git a/data/maps/SecretBase_RedCave1/text.inc b/data/maps/SecretBase_RedCave1/text.inc index efb2c8fdb2..107f9f32a7 100644 --- a/data/maps/SecretBase_RedCave1/text.inc +++ b/data/maps/SecretBase_RedCave1/text.inc @@ -1,2 +1,12 @@ -SecretBase_RedCave1_Text_198F89:: @ 8198F89 +SecretBase_Text_SmallIndentInWall: + .string "There's a small indent in the wall.$" + +SecretBase_Text_IndentUseSecretPower: + .string "There's a small indent in the wall.\p" + .string "Use the SECRET POWER?$" + +SecretBase_Text_DiscoveredSmallCavern: + .string "Discovered a small cavern!$" + +SecretBase_Text_WantToMakeYourSecretBaseHere:: .string "Want to make your SECRET BASE here?$" diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index ae361ac7ec..77e6267080 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -25,7 +25,7 @@ EventScript_1A2CB0: compare VAR_RESULT, 6 goto_if_eq EventScript_1A2CF1 bufferpartymonnick 0, VAR_RESULT - msgbox UnknownString_8198F34, MSGBOX_YESNO + msgbox SecretBase_Text_IndentUseSecretPower, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, MSGBOX_DEFAULT @@ -43,11 +43,11 @@ DoSecretBaseCaveFieldEffectScript:: @ 81A2CE6 end EventScript_1A2CF1: - msgbox UnknownString_8198F10, MSGBOX_SIGN + msgbox SecretBase_Text_SmallIndentInWall, MSGBOX_SIGN end EventScript_1A2CFA: - msgbox UnknownString_8198F6E, MSGBOX_DEFAULT + msgbox SecretBase_Text_DiscoveredSmallCavern, MSGBOX_DEFAULT goto EventScript_1A2DB8 end @@ -131,7 +131,7 @@ SecretBase_EventScript_FirstEntrance:: @ 81A2DDE applymovement OBJ_EVENT_ID_PLAYER, SecretBase_RedCave1_Movement_1A2E11 waitmovement 0 setvar VAR_INIT_SECRET_BASE, 1 - msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO + msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closemessage diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index f126d222a8..40f49020fd 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -1,346 +1,344 @@ #ifndef GUARD_METATILE_LABELS_H #define GUARD_METATILE_LABELS_H -// gTileset_General -#define METATILE_General_Grass 0x001 -#define METATILE_General_TallGrass 0x00D -#define METATILE_General_LongGrass 0x015 -#define METATILE_General_TallGrass_TreeUp 0x025 -#define METATILE_General_Grass_TreeUp 0x00E -#define METATILE_General_TallGrass_TreeLeft 0x1C6 -#define METATILE_General_TallGrass_TreeRight 0x1C7 -#define METATILE_General_Grass_TreeLeft 0x1CE -#define METATILE_General_Grass_TreeRight 0x1CF -#define METATILE_General_MuddySlope_Frame0 0x0E8 -#define METATILE_General_MuddySlope_Frame1 0x0E9 -#define METATILE_General_MuddySlope_Frame2 0x0EA -#define METATILE_General_MuddySlope_Frame3 0x0EB -#define METATILE_General_SandPit_Center 0x121 -#define METATILE_General_CaveEntrance_Top 0x09F -#define METATILE_General_CaveEntrance_Bottom 0x0A7 -#define METATILE_General_RockWall_GrassBase 0x079 -#define METATILE_General_RockWall_RockBase 0x07C -#define METATILE_General_RockWall_SandBase 0x091 -#define METATILE_General_RockWall_WaterBase 0x0A9 -#define METATILE_General_CalmWater 0x170 -#define METATILE_General_RoughWater 0x14E -#define METATILE_General_RoughDeepWater 0x14F -#define METATILE_General_ReflectiveWater 0x0A1 -#define METATILE_General_Shore_BottomLeft 0x1BD -#define METATILE_General_Shore_BottomMid 0x1BE -#define METATILE_General_Shore_BottomRight 0x1BF +// gTileset_BattleTower +#define METATILE_BattleTower_CorridorOpenDoor_Bottom 0x20F +#define METATILE_BattleTower_CorridorOpenDoor_Top 0x207 +#define METATILE_BattleTower_Elevator_Bottom0 0x278 +#define METATILE_BattleTower_Elevator_Bottom1 0x279 +#define METATILE_BattleTower_Elevator_Bottom2 0x27A +#define METATILE_BattleTower_Elevator_Mid0 0x270 +#define METATILE_BattleTower_Elevator_Mid1 0x271 +#define METATILE_BattleTower_Elevator_Mid2 0x272 +#define METATILE_BattleTower_Elevator_Top0 0x268 +#define METATILE_BattleTower_Elevator_Top1 0x269 +#define METATILE_BattleTower_Elevator_Top2 0x26A -// gTileset_Fortree -#define METATILE_Fortree_LongGrass_Root 0x208 -#define METATILE_Fortree_BridgeOverGrass_Raised 0x24E -#define METATILE_Fortree_BridgeOverGrass_Lowered 0x24F -#define METATILE_Fortree_BridgeOverTrees_Raised 0x256 -#define METATILE_Fortree_BridgeOverTrees_Lowered 0x257 -#define METATILE_Fortree_SecretBase_LongGrass_TopLeft 0x279 -#define METATILE_Fortree_SecretBase_LongGrass_TopMid 0x27A -#define METATILE_Fortree_SecretBase_LongGrass_TopRight 0x27B -#define METATILE_Fortree_SecretBase_LongGrass_BottomLeft 0x281 -#define METATILE_Fortree_SecretBase_LongGrass_BottomMid 0x282 -#define METATILE_Fortree_SecretBase_LongGrass_BottomRight 0x283 -#define METATILE_Fortree_WoodBridge_Kecleon0 0x297 -#define METATILE_Fortree_WoodBridge_Kecleon1 0x29F +// gTileset_BikeShop +#define METATILE_BikeShop_Barrier_Blue_Bottom 0x2CF +#define METATILE_BikeShop_Barrier_Blue_BottomMid 0x2C7 +#define METATILE_BikeShop_Barrier_Blue_Top 0x2B7 +#define METATILE_BikeShop_Barrier_Blue_TopMid 0x2BF +#define METATILE_BikeShop_Barrier_Green_Bottom 0x2CE +#define METATILE_BikeShop_Barrier_Green_BottomMid 0x2C6 +#define METATILE_BikeShop_Barrier_Green_Top 0x2B6 +#define METATILE_BikeShop_Barrier_Green_TopMid 0x2BE +#define METATILE_BikeShop_Barrier_Hidden_Bottom 0x271 +#define METATILE_BikeShop_Barrier_Hidden_Top 0x269 +#define METATILE_BikeShop_Button_Blue 0x236 +#define METATILE_BikeShop_Button_Green 0x22E +#define METATILE_BikeShop_Button_Pressed 0x24F +#define METATILE_BikeShop_Floor_Shadow_Top 0x26D +#define METATILE_BikeShop_Generator_Off_Tile0 0x2F0 +#define METATILE_BikeShop_Generator_Off_Tile1 0x2F1 +#define METATILE_BikeShop_Generator_Off_Tile2 0x2F2 +#define METATILE_BikeShop_Generator_Off_Tile3 0x2F3 +#define METATILE_BikeShop_Generator_Off_Tile4 0x2F4 +#define METATILE_BikeShop_Generator_Off_Tile5 0x2F5 +#define METATILE_BikeShop_Generator_Off_Tile6 0x2F6 +#define METATILE_BikeShop_Generator_Off_Tile7 0x2F7 +#define METATILE_BikeShop_Wall_Edge_Top 0x281 -// gTileset_Pacifidlog -#define METATILE_Pacifidlog_FloatingLogs_Horizontal0 0x250 -#define METATILE_Pacifidlog_FloatingLogs_Horizontal1 0x251 -#define METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal0 0x252 -#define METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal1 0x253 -#define METATILE_Pacifidlog_SubmergedLogs_Horizontal0 0x254 -#define METATILE_Pacifidlog_SubmergedLogs_Horizontal1 0x255 -#define METATILE_Pacifidlog_FloatingLogs_Vertical0 0x258 -#define METATILE_Pacifidlog_FloatingLogs_Vertical1 0x260 -#define METATILE_Pacifidlog_HalfSubmergedLogs_Vertical0 0x259 -#define METATILE_Pacifidlog_HalfSubmergedLogs_Vertical1 0x261 -#define METATILE_Pacifidlog_SubmergedLogs_Vertical0 0x25A -#define METATILE_Pacifidlog_SubmergedLogs_Vertical1 0x262 +// gTileset_BrendansMaysHouse +#define METATILE_BrendansMaysHouse_BookOnTable 0x293 +#define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A +#define METATILE_BrendansMaysHouse_BrendanPC_On 0x27F +#define METATILE_BrendansMaysHouse_MayPC_Off 0x259 +#define METATILE_BrendansMaysHouse_MayPC_On 0x27E +#define METATILE_BrendansMaysHouse_MovingBox_Closed 0x268 +#define METATILE_BrendansMaysHouse_MovingBox_Open 0x270 -// gTileset_Fallarbor -#define METATILE_Fallarbor_AshGrass 0x20A -#define METATILE_Fallarbor_NormalGrass 0x212 -#define METATILE_Fallarbor_AshField 0x218 +// gTileset_Building +#define METATILE_Building_PC_Off 0x004 +#define METATILE_Building_PC_On 0x005 +#define METATILE_Building_TV_Off 0x002 +#define METATILE_Building_TV_On 0x003 -// gTileset_Lavaridge -#define METATILE_Lavaridge_NormalGrass 0x206 -#define METATILE_Lavaridge_AshGrass 0x207 -#define METATILE_Lavaridge_LavaField 0x271 +// gTileset_Cave +#define METATILE_Cave_EntranceCover 0x229 +#define METATILE_Cave_SealedChamberBraille_Mid 0x235 +#define METATILE_Cave_SealedChamberEntrance_BottomLeft 0x232 +#define METATILE_Cave_SealedChamberEntrance_BottomMid 0x233 +#define METATILE_Cave_SealedChamberEntrance_BottomRight 0x234 +#define METATILE_Cave_SealedChamberEntrance_TopLeft 0x22A +#define METATILE_Cave_SealedChamberEntrance_TopMid 0x22B +#define METATILE_Cave_SealedChamberEntrance_TopRight 0x22C +#define METATILE_Cave_ShoalCave_BlueStone_Large 0x359 +#define METATILE_Cave_ShoalCave_BlueStone_Small 0x35B +#define METATILE_Cave_ShoalCave_DirtPile_Large 0x358 +#define METATILE_Cave_ShoalCave_DirtPile_Small 0x35A + +// gTileset_Contest +#define METATILE_Contest_CounterFlap_Bottom 0x2D9 +#define METATILE_Contest_CounterFlap_Top 0x2D1 +#define METATILE_Contest_FloorShadow 0x261 +#define METATILE_Contest_WallShadow 0x221 // gTileset_EliteFour -#define METATILE_EliteFour_OpenDoor_Frame 0x344 -#define METATILE_EliteFour_OpenDoor_Opening 0x345 -#define METATILE_EliteFour_OpenDoorChampion_Frame 0x346 -#define METATILE_EliteFour_OpenDoorChampion_Opening 0x347 -#define METATILE_EliteFour_LeftSpotlightOff 0x2DD -#define METATILE_EliteFour_RightSpotlightOff 0x2DE -#define METATILE_EliteFour_EntryDoor_ClosedTop 0x206 -#define METATILE_EliteFour_EntryDoor_ClosedBottom 0x20E +#define METATILE_EliteFour_EntryDoor_ClosedBottom 0x20E +#define METATILE_EliteFour_EntryDoor_ClosedTop 0x206 +#define METATILE_EliteFour_LeftSpotlightOff 0x2DD +#define METATILE_EliteFour_OpenDoorChampion_Frame 0x346 +#define METATILE_EliteFour_OpenDoorChampion_Opening 0x347 +#define METATILE_EliteFour_OpenDoor_Frame 0x344 +#define METATILE_EliteFour_OpenDoor_Opening 0x345 +#define METATILE_EliteFour_RightSpotlightOff 0x2DE -// gTileset_InsideShip -#define METATILE_InsideShip_InTactDoor0_Bottom 0x233 -#define METATILE_InsideShip_InTactDoor1_Bottom 0x22B -#define METATILE_InsideShip_DoorIndent1 0x21A -#define METATILE_InsideShip_DoorIndent0 0x234 +// gTileset_Facility +#define METATILE_Facility_DataPad 0x3E4 +#define METATILE_Facility_DoorIndent_Locked 0x234 +#define METATILE_Facility_DoorIndent_Unlocked 0x21A +#define METATILE_Facility_IntactDoor_Bottom_Locked 0x233 +#define METATILE_Facility_IntactDoor_Bottom_Unlocked 0x22B +#define METATILE_Facility_NewMauvilleDoor_Closed_Tile0 0x314 +#define METATILE_Facility_NewMauvilleDoor_Closed_Tile1 0x315 +#define METATILE_Facility_NewMauvilleDoor_Closed_Tile2 0x316 +#define METATILE_Facility_NewMauvilleDoor_Closed_Tile3 0x31C +#define METATILE_Facility_NewMauvilleDoor_Closed_Tile4 0x31D +#define METATILE_Facility_NewMauvilleDoor_Closed_Tile5 0x31E +#define METATILE_Facility_NewMauvilleDoor_Open_Tile0 0x2C3 +#define METATILE_Facility_NewMauvilleDoor_Open_Tile1 0x2C4 +#define METATILE_Facility_NewMauvilleDoor_Open_Tile2 0x2C5 +#define METATILE_Facility_NewMauvilleDoor_Open_Tile3 0x2CB +#define METATILE_Facility_NewMauvilleDoor_Open_Tile4 0x2CC +#define METATILE_Facility_NewMauvilleDoor_Open_Tile5 0x2CD -// gTileset_Cave -#define METATILE_Cave_EntranceCover 0x229 -#define METATILE_Cave_SealedChamberEntrance_TopLeft 0x22A -#define METATILE_Cave_SealedChamberEntrance_TopMid 0x22B -#define METATILE_Cave_SealedChamberEntrance_TopRight 0x22C -#define METATILE_Cave_SealedChamberEntrance_BottomLeft 0x232 -#define METATILE_Cave_SealedChamberEntrance_BottomMid 0x233 -#define METATILE_Cave_SealedChamberEntrance_BottomRight 0x234 -#define METATILE_Cave_SealedChamberBraille_Mid 0x235 -#define METATILE_Cave_ShoalCave_DirtPile_Large 0x358 -#define METATILE_Cave_ShoalCave_DirtPile_Small 0x35A -#define METATILE_Cave_ShoalCave_BlueStone_Large 0x359 -#define METATILE_Cave_ShoalCave_BlueStone_Small 0x35B +// gTileset_Fallarbor +#define METATILE_Fallarbor_AshField 0x218 +#define METATILE_Fallarbor_AshGrass 0x20A +#define METATILE_Fallarbor_NormalGrass 0x212 -// gTileset_BattleTower -#define METATILE_BattleTower_CorridorOpenDoor_Top 0x207 -#define METATILE_BattleTower_CorridorOpenDoor_Bottom 0x20F -#define METATILE_BattleTower_Elevator_Top0 0x268 -#define METATILE_BattleTower_Elevator_Top1 0x269 -#define METATILE_BattleTower_Elevator_Top2 0x26A -#define METATILE_BattleTower_Elevator_Mid0 0x270 -#define METATILE_BattleTower_Elevator_Mid1 0x271 -#define METATILE_BattleTower_Elevator_Mid2 0x272 -#define METATILE_BattleTower_Elevator_Bottom0 0x278 -#define METATILE_BattleTower_Elevator_Bottom1 0x279 -#define METATILE_BattleTower_Elevator_Bottom2 0x27A +// gTileset_Fortree +#define METATILE_Fortree_BridgeOverGrass_Lowered 0x24F +#define METATILE_Fortree_BridgeOverGrass_Raised 0x24E +#define METATILE_Fortree_BridgeOverTrees_Lowered 0x257 +#define METATILE_Fortree_BridgeOverTrees_Raised 0x256 +#define METATILE_Fortree_LongGrass_Root 0x208 +#define METATILE_Fortree_SecretBase_LongGrass_BottomLeft 0x281 +#define METATILE_Fortree_SecretBase_LongGrass_BottomMid 0x282 +#define METATILE_Fortree_SecretBase_LongGrass_BottomRight 0x283 +#define METATILE_Fortree_SecretBase_LongGrass_TopLeft 0x279 +#define METATILE_Fortree_SecretBase_LongGrass_TopMid 0x27A +#define METATILE_Fortree_SecretBase_LongGrass_TopRight 0x27B +#define METATILE_Fortree_WoodBridge_Kecleon0 0x297 +#define METATILE_Fortree_WoodBridge_Kecleon1 0x29F -// gTileset_Contest -#define METATILE_Contest_WallShadow 0x221 -#define METATILE_Contest_FloorShadow 0x261 -#define METATILE_Contest_CounterFlap_Top 0x2D1 -#define METATILE_Contest_CounterFlap_Bottom 0x2D9 +// gTileset_General +#define METATILE_General_CalmWater 0x170 +#define METATILE_General_CaveEntrance_Bottom 0x0A7 +#define METATILE_General_CaveEntrance_Top 0x09F +#define METATILE_General_Grass 0x001 +#define METATILE_General_Grass_TreeLeft 0x1CE +#define METATILE_General_Grass_TreeRight 0x1CF +#define METATILE_General_Grass_TreeUp 0x00E +#define METATILE_General_LongGrass 0x015 +#define METATILE_General_MuddySlope_Frame0 0x0E8 +#define METATILE_General_MuddySlope_Frame1 0x0E9 +#define METATILE_General_MuddySlope_Frame2 0x0EA +#define METATILE_General_MuddySlope_Frame3 0x0EB +#define METATILE_General_ReflectiveWater 0x0A1 +#define METATILE_General_RockWall_GrassBase 0x079 +#define METATILE_General_RockWall_RockBase 0x07C +#define METATILE_General_RockWall_SandBase 0x091 +#define METATILE_General_RockWall_WaterBase 0x0A9 +#define METATILE_General_RoughDeepWater 0x14F +#define METATILE_General_RoughWater 0x14E +#define METATILE_General_SandPit_Center 0x121 +#define METATILE_General_Shore_BottomLeft 0x1BD +#define METATILE_General_Shore_BottomMid 0x1BE +#define METATILE_General_Shore_BottomRight 0x1BF +#define METATILE_General_TallGrass 0x00D +#define METATILE_General_TallGrass_TreeLeft 0x1C6 +#define METATILE_General_TallGrass_TreeRight 0x1C7 +#define METATILE_General_TallGrass_TreeUp 0x025 -// gTileset_LilycoveMuseum -#define METATILE_LilycoveMuseum_Painting0_Left 0x25A -#define METATILE_LilycoveMuseum_Painting0_Right 0x25B -#define METATILE_LilycoveMuseum_Painting1_Left 0x25C -#define METATILE_LilycoveMuseum_Painting1_Right 0x25D -#define METATILE_LilycoveMuseum_Painting2_Left 0x25E -#define METATILE_LilycoveMuseum_Painting2_Right 0x25F -#define METATILE_LilycoveMuseum_Painting3_Left 0x260 -#define METATILE_LilycoveMuseum_Painting3_Right 0x261 -#define METATILE_LilycoveMuseum_Painting4_Left 0x262 -#define METATILE_LilycoveMuseum_Painting4_Right 0x263 +// gTileset_GenericBuilding +#define METATILE_GenericBuilding_Doorway_ClosedBottom 0x295 +#define METATILE_GenericBuilding_Doorway_ClosedTop 0x28D +#define METATILE_GenericBuilding_TableEdge 0x2F1 +#define METATILE_GenericBuilding_TrickHouse_Door_Closed 0x21B +#define METATILE_GenericBuilding_TrickHouse_Stairs_Down 0x219 // gTileset_InsideOfTruck -#define METATILE_InsideOfTruck_ExitLight_Top 0x208 -#define METATILE_InsideOfTruck_ExitLight_Mid 0x210 -#define METATILE_InsideOfTruck_ExitLight_Bottom 0x218 -#define METATILE_InsideOfTruck_DoorClosedFloor_Top 0x20D -#define METATILE_InsideOfTruck_DoorClosedFloor_Mid 0x215 -#define METATILE_InsideOfTruck_DoorClosedFloor_Bottom 0x21D +#define METATILE_InsideOfTruck_DoorClosedFloor_Bottom 0x21D +#define METATILE_InsideOfTruck_DoorClosedFloor_Mid 0x215 +#define METATILE_InsideOfTruck_DoorClosedFloor_Top 0x20D +#define METATILE_InsideOfTruck_ExitLight_Bottom 0x218 +#define METATILE_InsideOfTruck_ExitLight_Mid 0x210 +#define METATILE_InsideOfTruck_ExitLight_Top 0x208 -// gTileset_BrendansMaysHouse -#define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A -#define METATILE_BrendansMaysHouse_BrendanPC_On 0x27F -#define METATILE_BrendansMaysHouse_MayPC_Off 0x259 -#define METATILE_BrendansMaysHouse_MayPC_On 0x27E -#define METATILE_BrendansMaysHouse_MovingBox_Closed 0x268 -#define METATILE_BrendansMaysHouse_MovingBox_Open 0x270 -#define METATILE_BrendansMaysHouse_BookOnTable 0x293 +// gTileset_Lavaridge +#define METATILE_Lavaridge_AshGrass 0x207 +#define METATILE_Lavaridge_LavaField 0x271 +#define METATILE_Lavaridge_NormalGrass 0x206 // gTileset_Lilycove -#define METATILE_Lilycove_AquaHideout_Entrance_TopLeft 0x2A8 -#define METATILE_Lilycove_AquaHideout_Entrance_TopMid 0x2A9 -#define METATILE_Lilycove_AquaHideout_Entrance_TopRight 0x2AA -#define METATILE_Lilycove_AquaHideout_Entrance_BottomLeft 0x2B0 -#define METATILE_Lilycove_AquaHideout_Entrance_BottomMid 0x2B1 -#define METATILE_Lilycove_AquaHideout_Entrance_BottomRight 0x2B2 -#define METATILE_Lilycove_Wailmer0 0x290 -#define METATILE_Lilycove_Wailmer1 0x291 -#define METATILE_Lilycove_Wailmer2 0x2A0 -#define METATILE_Lilycove_Wailmer3 0x2A1 -#define METATILE_Lilycove_Wailmer0_Alt 0x298 -#define METATILE_Lilycove_Wailmer1_Alt 0x299 +#define METATILE_Lilycove_AquaHideout_Entrance_BottomLeft 0x2B0 +#define METATILE_Lilycove_AquaHideout_Entrance_BottomMid 0x2B1 +#define METATILE_Lilycove_AquaHideout_Entrance_BottomRight 0x2B2 +#define METATILE_Lilycove_AquaHideout_Entrance_TopLeft 0x2A8 +#define METATILE_Lilycove_AquaHideout_Entrance_TopMid 0x2A9 +#define METATILE_Lilycove_AquaHideout_Entrance_TopRight 0x2AA +#define METATILE_Lilycove_Wailmer0 0x290 +#define METATILE_Lilycove_Wailmer0_Alt 0x298 +#define METATILE_Lilycove_Wailmer1 0x291 +#define METATILE_Lilycove_Wailmer1_Alt 0x299 +#define METATILE_Lilycove_Wailmer2 0x2A0 +#define METATILE_Lilycove_Wailmer3 0x2A1 + +// gTileset_LilycoveMuseum +#define METATILE_LilycoveMuseum_Painting0_Left 0x25A +#define METATILE_LilycoveMuseum_Painting0_Right 0x25B +#define METATILE_LilycoveMuseum_Painting1_Left 0x25C +#define METATILE_LilycoveMuseum_Painting1_Right 0x25D +#define METATILE_LilycoveMuseum_Painting2_Left 0x25E +#define METATILE_LilycoveMuseum_Painting2_Right 0x25F +#define METATILE_LilycoveMuseum_Painting3_Left 0x260 +#define METATILE_LilycoveMuseum_Painting3_Right 0x261 +#define METATILE_LilycoveMuseum_Painting4_Left 0x262 +#define METATILE_LilycoveMuseum_Painting4_Right 0x263 // gTileset_MauvilleGym -#define METATILE_MauvilleGym_RaisedSwitch 0x205 -#define METATILE_MauvilleGym_PressedSwitch 0x206 -#define METATILE_MauvilleGym_FloorTile 0x21A -#define METATILE_MauvilleGym_GreenBeamH1_On 0x220 -#define METATILE_MauvilleGym_GreenBeamH2_On 0x221 -#define METATILE_MauvilleGym_GreenBeamH3_On 0x228 -#define METATILE_MauvilleGym_GreenBeamH4_On 0x229 -#define METATILE_MauvilleGym_GreenBeamH1_Off 0x230 -#define METATILE_MauvilleGym_GreenBeamH2_Off 0x231 -#define METATILE_MauvilleGym_GreenBeamH3_Off 0x238 -#define METATILE_MauvilleGym_GreenBeamH4_Off 0x239 -#define METATILE_MauvilleGym_RedBeamH1_On 0x222 -#define METATILE_MauvilleGym_RedBeamH2_On 0x223 -#define METATILE_MauvilleGym_RedBeamH3_On 0x22A -#define METATILE_MauvilleGym_RedBeamH4_On 0x22B -#define METATILE_MauvilleGym_RedBeamH1_Off 0x232 -#define METATILE_MauvilleGym_RedBeamH2_Off 0x233 -#define METATILE_MauvilleGym_RedBeamH3_Off 0x23A -#define METATILE_MauvilleGym_RedBeamH4_Off 0x23B -#define METATILE_MauvilleGym_GreenBeamV1_On 0x240 -#define METATILE_MauvilleGym_GreenBeamV2_On 0x248 -#define METATILE_MauvilleGym_RedBeamV1_On 0x241 -#define METATILE_MauvilleGym_RedBeamV2_On 0x249 -#define METATILE_MauvilleGym_PoleTop_On 0x250 -#define METATILE_MauvilleGym_PoleTop_Off 0x251 -#define METATILE_MauvilleGym_PoleBottom_On 0x242 -#define METATILE_MauvilleGym_PoleBottom_Off 0x243 +#define METATILE_MauvilleGym_FloorTile 0x21A +#define METATILE_MauvilleGym_GreenBeamH1_Off 0x230 +#define METATILE_MauvilleGym_GreenBeamH1_On 0x220 +#define METATILE_MauvilleGym_GreenBeamH2_Off 0x231 +#define METATILE_MauvilleGym_GreenBeamH2_On 0x221 +#define METATILE_MauvilleGym_GreenBeamH3_Off 0x238 +#define METATILE_MauvilleGym_GreenBeamH3_On 0x228 +#define METATILE_MauvilleGym_GreenBeamH4_Off 0x239 +#define METATILE_MauvilleGym_GreenBeamH4_On 0x229 +#define METATILE_MauvilleGym_GreenBeamV1_On 0x240 +#define METATILE_MauvilleGym_GreenBeamV2_On 0x248 +#define METATILE_MauvilleGym_PoleBottom_Off 0x243 +#define METATILE_MauvilleGym_PoleBottom_On 0x242 +#define METATILE_MauvilleGym_PoleTop_Off 0x251 +#define METATILE_MauvilleGym_PoleTop_On 0x250 +#define METATILE_MauvilleGym_PressedSwitch 0x206 +#define METATILE_MauvilleGym_RaisedSwitch 0x205 +#define METATILE_MauvilleGym_RedBeamH1_Off 0x232 +#define METATILE_MauvilleGym_RedBeamH1_On 0x222 +#define METATILE_MauvilleGym_RedBeamH2_Off 0x233 +#define METATILE_MauvilleGym_RedBeamH2_On 0x223 +#define METATILE_MauvilleGym_RedBeamH3_Off 0x23A +#define METATILE_MauvilleGym_RedBeamH3_On 0x22A +#define METATILE_MauvilleGym_RedBeamH4_Off 0x23B +#define METATILE_MauvilleGym_RedBeamH4_On 0x22B +#define METATILE_MauvilleGym_RedBeamV1_On 0x241 +#define METATILE_MauvilleGym_RedBeamV2_On 0x249 // gTileset_MossdeepGym -#define METATILE_MossdeepGym_RedArrow_Right 0x204 -#define METATILE_MossdeepGym_RedArrow_Left 0x20C -#define METATILE_MossdeepGym_RedArrow_Up 0x20D -#define METATILE_MossdeepGym_RedArrow_Down 0x205 -#define METATILE_MossdeepGym_Switch_Up 0x238 -#define METATILE_MossdeepGym_Switch_Down 0x239 +#define METATILE_MossdeepGym_RedArrow_Down 0x205 +#define METATILE_MossdeepGym_RedArrow_Left 0x20C +#define METATILE_MossdeepGym_RedArrow_Right 0x204 +#define METATILE_MossdeepGym_RedArrow_Up 0x20D +#define METATILE_MossdeepGym_Switch_Down 0x239 +#define METATILE_MossdeepGym_Switch_Up 0x238 -// gTileset_Building -#define METATILE_Building_TV_Off 0x002 -#define METATILE_Building_TV_On 0x003 -#define METATILE_Building_PC_Off 0x004 -#define METATILE_Building_PC_On 0x005 - -// gTileset_GenericBuilding -#define METATILE_GenericBuilding_Doorway_ClosedTop 0x28D -#define METATILE_GenericBuilding_Doorway_ClosedBottom 0x295 -#define METATILE_GenericBuilding_TableEdge 0x2F1 -#define METATILE_GenericBuilding_TrickHouse_Door_Closed 0x21B -#define METATILE_GenericBuilding_TrickHouse_Stairs_Down 0x219 - -// gTileset_Shop -#define METATILE_Shop_Laptop1_Normal 0x29D -#define METATILE_Shop_Laptop2_Normal 0x2A5 -#define METATILE_Shop_Laptop1_Flash 0x258 -#define METATILE_Shop_Laptop2_Flash 0x260 - -// gTileset_Facility -#define METATILE_Facility_NewMauvilleDoor_Closed_Tile0 0x314 -#define METATILE_Facility_NewMauvilleDoor_Closed_Tile1 0x315 -#define METATILE_Facility_NewMauvilleDoor_Closed_Tile2 0x316 -#define METATILE_Facility_NewMauvilleDoor_Closed_Tile3 0x31C -#define METATILE_Facility_NewMauvilleDoor_Closed_Tile4 0x31D -#define METATILE_Facility_NewMauvilleDoor_Closed_Tile5 0x31E -#define METATILE_Facility_NewMauvilleDoor_Open_Tile0 0x2C3 -#define METATILE_Facility_NewMauvilleDoor_Open_Tile1 0x2C4 -#define METATILE_Facility_NewMauvilleDoor_Open_Tile2 0x2C5 -#define METATILE_Facility_NewMauvilleDoor_Open_Tile3 0x2CB -#define METATILE_Facility_NewMauvilleDoor_Open_Tile4 0x2CC -#define METATILE_Facility_NewMauvilleDoor_Open_Tile5 0x2CD -#define METATILE_Facility_DataPad 0x3E4 +// gTileset_Pacifidlog +#define METATILE_Pacifidlog_FloatingLogs_Horizontal0 0x250 +#define METATILE_Pacifidlog_FloatingLogs_Horizontal1 0x251 +#define METATILE_Pacifidlog_FloatingLogs_Vertical0 0x258 +#define METATILE_Pacifidlog_FloatingLogs_Vertical1 0x260 +#define METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal0 0x252 +#define METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal1 0x253 +#define METATILE_Pacifidlog_HalfSubmergedLogs_Vertical0 0x259 +#define METATILE_Pacifidlog_HalfSubmergedLogs_Vertical1 0x261 +#define METATILE_Pacifidlog_SubmergedLogs_Horizontal0 0x254 +#define METATILE_Pacifidlog_SubmergedLogs_Horizontal1 0x255 +#define METATILE_Pacifidlog_SubmergedLogs_Vertical0 0x25A +#define METATILE_Pacifidlog_SubmergedLogs_Vertical1 0x262 -// gTileset_TrickHousePuzzle -#define METATILE_TrickHousePuzzle_Stairs_Down 0x20B -#define METATILE_TrickHousePuzzle_Lever_Off 0x23E -#define METATILE_TrickHousePuzzle_Lever_On 0x23F -#define METATILE_TrickHousePuzzle_Button_Up 0x258 -#define METATILE_TrickHousePuzzle_Button_Pressed 0x259 -#define METATILE_TrickHousePuzzle_Door_Shuttered 0x26A -#define METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt 0x252 -#define METATILE_TrickHousePuzzle_Floor_ShadowTop 0x255 -#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0 0x24B -#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1 0x24C -#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2 0x253 -#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3 0x254 -#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0 0x23B -#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1 0x23C -#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2 0x243 -#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3 0x244 -#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0 0x248 -#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1 0x249 -#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2 0x250 -#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3 0x251 -#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0 0x238 -#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1 0x239 -#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2 0x240 -#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3 0x241 -#define METATILE_TrickHousePuzzle_BlueDoorV_Retracted 0x24D -#define METATILE_TrickHousePuzzle_RedDoorV_Retracted 0x24A -#define METATILE_TrickHousePuzzle_RedDoorV_Open0 0x23A -#define METATILE_TrickHousePuzzle_RedDoorV_Open1 0x242 -#define METATILE_TrickHousePuzzle_BlueDoorV_Open0 0x23D -#define METATILE_TrickHousePuzzle_BlueDoorV_Open1 0x245 -#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right 0x260 -#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left 0x261 -#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up 0x262 -#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down 0x263 -#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt 0x27B -#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C +// gTileset_PetalburgGym +#define METATILE_PetalburgGym_RoomEntrance_Left 0x210 +#define METATILE_PetalburgGym_RoomEntrance_Right 0x211 +#define METATILE_PetalburgGym_SlidingDoor_Frame0 0x218 +#define METATILE_PetalburgGym_SlidingDoor_Frame1 0x219 +#define METATILE_PetalburgGym_SlidingDoor_Frame2 0x21A +#define METATILE_PetalburgGym_SlidingDoor_Frame3 0x21B +#define METATILE_PetalburgGym_SlidingDoor_Frame4 0x21C -// gTileset_BikeShop -#define METATILE_BikeShop_Barrier_Hidden_Top 0x269 -#define METATILE_BikeShop_Barrier_Hidden_Bottom 0x271 -#define METATILE_BikeShop_Floor_Shadow_Top 0x26D -#define METATILE_BikeShop_Wall_Edge_Top 0x281 -#define METATILE_BikeShop_Button_Pressed 0x24F -#define METATILE_BikeShop_Button_Green 0x22E -#define METATILE_BikeShop_Button_Blue 0x236 -#define METATILE_BikeShop_Barrier_Green_Top 0x2B6 -#define METATILE_BikeShop_Barrier_Green_TopMid 0x2BE -#define METATILE_BikeShop_Barrier_Green_BottomMid 0x2C6 -#define METATILE_BikeShop_Barrier_Green_Bottom 0x2CE -#define METATILE_BikeShop_Barrier_Blue_Top 0x2B7 -#define METATILE_BikeShop_Barrier_Blue_TopMid 0x2BF -#define METATILE_BikeShop_Barrier_Blue_BottomMid 0x2C7 -#define METATILE_BikeShop_Barrier_Blue_Bottom 0x2CF -#define METATILE_BikeShop_Generator_Off_Tile0 0x2F0 -#define METATILE_BikeShop_Generator_Off_Tile1 0x2F1 -#define METATILE_BikeShop_Generator_Off_Tile2 0x2F2 -#define METATILE_BikeShop_Generator_Off_Tile3 0x2F3 -#define METATILE_BikeShop_Generator_Off_Tile4 0x2F4 -#define METATILE_BikeShop_Generator_Off_Tile5 0x2F5 -#define METATILE_BikeShop_Generator_Off_Tile6 0x2F6 -#define METATILE_BikeShop_Generator_Off_Tile7 0x2F7 +// gTileset_PokemonCenter +#define METATILE_PokemonCenter_CounterBarrier 0x25D +#define METATILE_PokemonCenter_Escalator1F_Tile0_Frame0 0x280 +#define METATILE_PokemonCenter_Escalator1F_Tile0_Frame1 0x282 +#define METATILE_PokemonCenter_Escalator1F_Tile0_Frame2 0x284 +#define METATILE_PokemonCenter_Escalator1F_Tile1_Frame0 0x281 +#define METATILE_PokemonCenter_Escalator1F_Tile1_Frame1 0x283 +#define METATILE_PokemonCenter_Escalator1F_Tile1_Frame2 0x285 +#define METATILE_PokemonCenter_Escalator1F_Tile2_Frame0 0x288 +#define METATILE_PokemonCenter_Escalator1F_Tile2_Frame1 0x28A +#define METATILE_PokemonCenter_Escalator1F_Tile2_Frame2 0x28C +#define METATILE_PokemonCenter_Escalator1F_Tile3_Frame0 0x289 +#define METATILE_PokemonCenter_Escalator1F_Tile3_Frame1 0x28B +#define METATILE_PokemonCenter_Escalator1F_Tile3_Frame2 0x28D +#define METATILE_PokemonCenter_Escalator2F_Tile0_Frame0 0x2A0 +#define METATILE_PokemonCenter_Escalator2F_Tile0_Frame1 0x2A2 +#define METATILE_PokemonCenter_Escalator2F_Tile0_Frame2 0x2A4 +#define METATILE_PokemonCenter_Escalator2F_Tile1_Frame0 0x2A1 +#define METATILE_PokemonCenter_Escalator2F_Tile1_Frame1 0x2A3 +#define METATILE_PokemonCenter_Escalator2F_Tile1_Frame2 0x2A5 +#define METATILE_PokemonCenter_Escalator2F_Tile2_Frame0 0x2A8 +#define METATILE_PokemonCenter_Escalator2F_Tile2_Frame1 0x2AA +#define METATILE_PokemonCenter_Escalator2F_Tile2_Frame2 0x2AC +#define METATILE_PokemonCenter_Floor_Plain_Alt 0x202 -// gTileset_PetalburgGym -#define METATILE_PetalburgGym_RoomEntrance_Left 0x210 -#define METATILE_PetalburgGym_RoomEntrance_Right 0x211 -#define METATILE_PetalburgGym_SlidingDoor_Frame0 0x218 -#define METATILE_PetalburgGym_SlidingDoor_Frame1 0x219 -#define METATILE_PetalburgGym_SlidingDoor_Frame2 0x21A -#define METATILE_PetalburgGym_SlidingDoor_Frame3 0x21B -#define METATILE_PetalburgGym_SlidingDoor_Frame4 0x21C +// gTileset_Shop +#define METATILE_Shop_Laptop1_Flash 0x258 +#define METATILE_Shop_Laptop1_Normal 0x29D +#define METATILE_Shop_Laptop2_Flash 0x260 +#define METATILE_Shop_Laptop2_Normal 0x2A5 // gTileset_Sootopolis -#define METATILE_Sootopolis_Door_Closed 0x248 -#define METATILE_Sootopolis_GymDoor_Closed 0x250 -#define METATILE_Sootopolis_RoughWater 0x290 +#define METATILE_Sootopolis_Door_Closed 0x248 +#define METATILE_Sootopolis_GymDoor_Closed 0x250 +#define METATILE_Sootopolis_RoughWater 0x290 // gTileset_SootopolisGym -#define METATILE_SootopolisGym_Ice_Cracked 0x20E -#define METATILE_SootopolisGym_Ice_Broken 0x206 -#define METATILE_SootopolisGym_Stairs 0x207 +#define METATILE_SootopolisGym_Ice_Broken 0x206 +#define METATILE_SootopolisGym_Ice_Cracked 0x20E +#define METATILE_SootopolisGym_Stairs 0x207 -// gTileset_Underwater -#define METATILE_Underwater_RockWall 0x21E -#define METATILE_Underwater_FloorShadow 0x228 +// gTileset_TrickHousePuzzle +#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down 0x263 +#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left 0x261 +#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt 0x27B +#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right 0x260 +#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C +#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up 0x262 +#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0 0x23B +#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1 0x23C +#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2 0x243 +#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3 0x244 +#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0 0x24B +#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1 0x24C +#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2 0x253 +#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3 0x254 +#define METATILE_TrickHousePuzzle_BlueDoorV_Open0 0x23D +#define METATILE_TrickHousePuzzle_BlueDoorV_Open1 0x245 +#define METATILE_TrickHousePuzzle_BlueDoorV_Retracted 0x24D +#define METATILE_TrickHousePuzzle_Button_Pressed 0x259 +#define METATILE_TrickHousePuzzle_Button_Up 0x258 +#define METATILE_TrickHousePuzzle_Door_Shuttered 0x26A +#define METATILE_TrickHousePuzzle_Floor_ShadowTop 0x255 +#define METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt 0x252 +#define METATILE_TrickHousePuzzle_Lever_Off 0x23E +#define METATILE_TrickHousePuzzle_Lever_On 0x23F +#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0 0x238 +#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1 0x239 +#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2 0x240 +#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3 0x241 +#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0 0x248 +#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1 0x249 +#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2 0x250 +#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3 0x251 +#define METATILE_TrickHousePuzzle_RedDoorV_Open0 0x23A +#define METATILE_TrickHousePuzzle_RedDoorV_Open1 0x242 +#define METATILE_TrickHousePuzzle_RedDoorV_Retracted 0x24A +#define METATILE_TrickHousePuzzle_Stairs_Down 0x20B -// gTileset_PokemonCenter -#define METATILE_PokemonCenter_Floor_Plain_Alt 0x202 -#define METATILE_PokemonCenter_CounterBarrier 0x25D -#define METATILE_PokemonCenter_Escalator1F_Tile0_Frame0 0x280 -#define METATILE_PokemonCenter_Escalator1F_Tile0_Frame1 0x282 -#define METATILE_PokemonCenter_Escalator1F_Tile0_Frame2 0x284 -#define METATILE_PokemonCenter_Escalator1F_Tile1_Frame0 0x281 -#define METATILE_PokemonCenter_Escalator1F_Tile1_Frame1 0x283 -#define METATILE_PokemonCenter_Escalator1F_Tile1_Frame2 0x285 -#define METATILE_PokemonCenter_Escalator1F_Tile2_Frame0 0x288 -#define METATILE_PokemonCenter_Escalator1F_Tile2_Frame1 0x28A -#define METATILE_PokemonCenter_Escalator1F_Tile2_Frame2 0x28C -#define METATILE_PokemonCenter_Escalator1F_Tile3_Frame0 0x289 -#define METATILE_PokemonCenter_Escalator1F_Tile3_Frame1 0x28B -#define METATILE_PokemonCenter_Escalator1F_Tile3_Frame2 0x28D -#define METATILE_PokemonCenter_Escalator2F_Tile0_Frame0 0x2A0 -#define METATILE_PokemonCenter_Escalator2F_Tile0_Frame1 0x2A2 -#define METATILE_PokemonCenter_Escalator2F_Tile0_Frame2 0x2A4 -#define METATILE_PokemonCenter_Escalator2F_Tile1_Frame0 0x2A1 -#define METATILE_PokemonCenter_Escalator2F_Tile1_Frame1 0x2A3 -#define METATILE_PokemonCenter_Escalator2F_Tile1_Frame2 0x2A5 -#define METATILE_PokemonCenter_Escalator2F_Tile2_Frame0 0x2A8 -#define METATILE_PokemonCenter_Escalator2F_Tile2_Frame1 0x2AA -#define METATILE_PokemonCenter_Escalator2F_Tile2_Frame2 0x2AC +// gTileset_Underwater +#define METATILE_Underwater_FloorShadow 0x228 +#define METATILE_Underwater_RockWall 0x21E #endif // GUARD_METATILE_LABELS_H