Merge pull request #867 from GriffinRichards/metatile-labels

Remove non-existent tilesets from label comments and alphabetize

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"

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.$"

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.$"

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...$"

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?$"

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"

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"
     }
   ]
 }

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

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.$"

data/maps/AbandonedShip_HiddenFloorCorridors/map.json

@@ -63,31 +63,31 @@
       "y": 8,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3"
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door"
     },
     {
       "type": "sign",
       "x": 6,
       "y": 8,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A"
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door"
     },
     {
       "type": "sign",
       "x": 3,
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EC61"
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door"
     },
     {
       "type": "sign",
       "x": 9,
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EC98"
+      "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door"
     }
   ]
 }