Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansio…

…n3F (#437)
pret · Nov 19, 2023 · 22d1c96 · 22d1c96
1 parent 43de270
commit 22d1c96
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/pokeblue.map b/pokeblue.map
@@ -8439,7 +8439,7 @@ ROMX bank #17:
 	         $6852 = SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearRightBoulder
 	         $6859 = SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearLeftBoulder
 	         $6860 = SeafoamIslandsB4FObjectMoving2Script
-	         $6872 = SeaFoamIslands5Script_46872
+	         $6872 = SeafoamIslandsB4FObjectMoving2Script.doneForcedSurfMovement
 	         $687c = SeafoamIslandsB4F_TextPointers
 	         $6886 = ArticunoTrainerHeader
 	         $6893 = SeafoamIslandsB4FArticunoText
@@ -9836,7 +9836,7 @@ ROMX bank #20:
 	         $6224 = Mansion3CheckReplaceSwitchDoorBlocks.switchTurnedOn
 	         $6235 = PokemonMansion3F_ScriptPointers
 	         $623b = PokemonMansion3FDefaultScript
-	         $6250 = PokemonMansion3FDefaultScript.asm_52250
+	         $6250 = PokemonMansion3FDefaultScript.fellDownHoleTo1F
 	         $6254 = PokemonMansion3FDefaultScript.holeCoords
 	         $625b = PokemonMansion3FDefaultScript.isPlayerFallingDownHole
 	         $627a = Mansion3Script_Switches

diff --git a/pokeblue.sym b/pokeblue.sym
@@ -8310,7 +8310,7 @@
 11:6852 SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearRightBoulder
 11:6859 SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearLeftBoulder
 11:6860 SeafoamIslandsB4FObjectMoving2Script
-11:6872 SeaFoamIslands5Script_46872
+11:6872 SeafoamIslandsB4FObjectMoving2Script.doneForcedSurfMovement
 11:687c SeafoamIslandsB4F_TextPointers
 11:6886 ArticunoTrainerHeader
 11:6893 SeafoamIslandsB4FArticunoText
@@ -9687,7 +9687,7 @@
 14:6224 Mansion3CheckReplaceSwitchDoorBlocks.switchTurnedOn
 14:6235 PokemonMansion3F_ScriptPointers
 14:623b PokemonMansion3FDefaultScript
-14:6250 PokemonMansion3FDefaultScript.asm_52250
+14:6250 PokemonMansion3FDefaultScript.fellDownHoleTo1F
 14:6254 PokemonMansion3FDefaultScript.holeCoords
 14:625b PokemonMansion3FDefaultScript.isPlayerFallingDownHole
 14:627a Mansion3Script_Switches

diff --git a/pokeblue_debug.map b/pokeblue_debug.map
@@ -8449,7 +8449,7 @@ ROMX bank #17:
 	         $6852 = SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearRightBoulder
 	         $6859 = SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearLeftBoulder
 	         $6860 = SeafoamIslandsB4FObjectMoving2Script
-	         $6872 = SeaFoamIslands5Script_46872
+	         $6872 = SeafoamIslandsB4FObjectMoving2Script.doneForcedSurfMovement
 	         $687c = SeafoamIslandsB4F_TextPointers
 	         $6886 = ArticunoTrainerHeader
 	         $6893 = SeafoamIslandsB4FArticunoText
@@ -9846,7 +9846,7 @@ ROMX bank #20:
 	         $6224 = Mansion3CheckReplaceSwitchDoorBlocks.switchTurnedOn
 	         $6235 = PokemonMansion3F_ScriptPointers
 	         $623b = PokemonMansion3FDefaultScript
-	         $6250 = PokemonMansion3FDefaultScript.asm_52250
+	         $6250 = PokemonMansion3FDefaultScript.fellDownHoleTo1F
 	         $6254 = PokemonMansion3FDefaultScript.holeCoords
 	         $625b = PokemonMansion3FDefaultScript.isPlayerFallingDownHole
 	         $627a = Mansion3Script_Switches

diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym
@@ -8320,7 +8320,7 @@
 11:6852 SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearRightBoulder
 11:6859 SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearLeftBoulder
 11:6860 SeafoamIslandsB4FObjectMoving2Script
-11:6872 SeaFoamIslands5Script_46872
+11:6872 SeafoamIslandsB4FObjectMoving2Script.doneForcedSurfMovement
 11:687c SeafoamIslandsB4F_TextPointers
 11:6886 ArticunoTrainerHeader
 11:6893 SeafoamIslandsB4FArticunoText
@@ -9697,7 +9697,7 @@
 14:6224 Mansion3CheckReplaceSwitchDoorBlocks.switchTurnedOn
 14:6235 PokemonMansion3F_ScriptPointers
 14:623b PokemonMansion3FDefaultScript
-14:6250 PokemonMansion3FDefaultScript.asm_52250
+14:6250 PokemonMansion3FDefaultScript.fellDownHoleTo1F
 14:6254 PokemonMansion3FDefaultScript.holeCoords
 14:625b PokemonMansion3FDefaultScript.isPlayerFallingDownHole
 14:627a Mansion3Script_Switches

diff --git a/pokeblue_vc.map b/pokeblue_vc.map
@@ -8466,7 +8466,7 @@ ROMX bank #17:
 	         $6852 = SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearRightBoulder
 	         $6859 = SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearLeftBoulder
 	         $6860 = SeafoamIslandsB4FObjectMoving2Script
-	         $6872 = SeaFoamIslands5Script_46872
+	         $6872 = SeafoamIslandsB4FObjectMoving2Script.doneForcedSurfMovement
 	         $687c = SeafoamIslandsB4F_TextPointers
 	         $6886 = ArticunoTrainerHeader
 	         $6893 = SeafoamIslandsB4FArticunoText
@@ -9863,7 +9863,7 @@ ROMX bank #20:
 	         $6224 = Mansion3CheckReplaceSwitchDoorBlocks.switchTurnedOn
 	         $6235 = PokemonMansion3F_ScriptPointers
 	         $623b = PokemonMansion3FDefaultScript
-	         $6250 = PokemonMansion3FDefaultScript.asm_52250
+	         $6250 = PokemonMansion3FDefaultScript.fellDownHoleTo1F
 	         $6254 = PokemonMansion3FDefaultScript.holeCoords
 	         $625b = PokemonMansion3FDefaultScript.isPlayerFallingDownHole
 	         $627a = Mansion3Script_Switches

diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym
@@ -8337,7 +8337,7 @@
 11:6852 SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearRightBoulder
 11:6859 SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearLeftBoulder
 11:6860 SeafoamIslandsB4FObjectMoving2Script
-11:6872 SeaFoamIslands5Script_46872
+11:6872 SeafoamIslandsB4FObjectMoving2Script.doneForcedSurfMovement
 11:687c SeafoamIslandsB4F_TextPointers
 11:6886 ArticunoTrainerHeader
 11:6893 SeafoamIslandsB4FArticunoText
@@ -9714,7 +9714,7 @@
 14:6224 Mansion3CheckReplaceSwitchDoorBlocks.switchTurnedOn
 14:6235 PokemonMansion3F_ScriptPointers
 14:623b PokemonMansion3FDefaultScript
-14:6250 PokemonMansion3FDefaultScript.asm_52250
+14:6250 PokemonMansion3FDefaultScript.fellDownHoleTo1F
 14:6254 PokemonMansion3FDefaultScript.holeCoords
 14:625b PokemonMansion3FDefaultScript.isPlayerFallingDownHole
 14:627a Mansion3Script_Switches

diff --git a/pokered.map b/pokered.map
@@ -8439,7 +8439,7 @@ ROMX bank #17:
 	         $6852 = SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearRightBoulder
 	         $6859 = SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearLeftBoulder
 	         $6860 = SeafoamIslandsB4FObjectMoving2Script
-	         $6872 = SeaFoamIslands5Script_46872
+	         $6872 = SeafoamIslandsB4FObjectMoving2Script.doneForcedSurfMovement
 	         $687c = SeafoamIslandsB4F_TextPointers
 	         $6886 = ArticunoTrainerHeader
 	         $6893 = SeafoamIslandsB4FArticunoText
@@ -9836,7 +9836,7 @@ ROMX bank #20:
 	         $6224 = Mansion3CheckReplaceSwitchDoorBlocks.switchTurnedOn
 	         $6235 = PokemonMansion3F_ScriptPointers
 	         $623b = PokemonMansion3FDefaultScript
-	         $6250 = PokemonMansion3FDefaultScript.asm_52250
+	         $6250 = PokemonMansion3FDefaultScript.fellDownHoleTo1F
 	         $6254 = PokemonMansion3FDefaultScript.holeCoords
 	         $625b = PokemonMansion3FDefaultScript.isPlayerFallingDownHole
 	         $627a = Mansion3Script_Switches

diff --git a/pokered.sym b/pokered.sym
@@ -8310,7 +8310,7 @@
 11:6852 SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearRightBoulder
 11:6859 SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearLeftBoulder
 11:6860 SeafoamIslandsB4FObjectMoving2Script
-11:6872 SeaFoamIslands5Script_46872
+11:6872 SeafoamIslandsB4FObjectMoving2Script.doneForcedSurfMovement
 11:687c SeafoamIslandsB4F_TextPointers
 11:6886 ArticunoTrainerHeader
 11:6893 SeafoamIslandsB4FArticunoText
@@ -9687,7 +9687,7 @@
 14:6224 Mansion3CheckReplaceSwitchDoorBlocks.switchTurnedOn
 14:6235 PokemonMansion3F_ScriptPointers
 14:623b PokemonMansion3FDefaultScript
-14:6250 PokemonMansion3FDefaultScript.asm_52250
+14:6250 PokemonMansion3FDefaultScript.fellDownHoleTo1F
 14:6254 PokemonMansion3FDefaultScript.holeCoords
 14:625b PokemonMansion3FDefaultScript.isPlayerFallingDownHole
 14:627a Mansion3Script_Switches

diff --git a/pokered_vc.map b/pokered_vc.map
@@ -8468,7 +8468,7 @@ ROMX bank #17:
 	         $6852 = SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearRightBoulder
 	         $6859 = SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearLeftBoulder
 	         $6860 = SeafoamIslandsB4FObjectMoving2Script
-	         $6872 = SeaFoamIslands5Script_46872
+	         $6872 = SeafoamIslandsB4FObjectMoving2Script.doneForcedSurfMovement
 	         $687c = SeafoamIslandsB4F_TextPointers
 	         $6886 = ArticunoTrainerHeader
 	         $6893 = SeafoamIslandsB4FArticunoText
@@ -9865,7 +9865,7 @@ ROMX bank #20:
 	         $6224 = Mansion3CheckReplaceSwitchDoorBlocks.switchTurnedOn
 	         $6235 = PokemonMansion3F_ScriptPointers
 	         $623b = PokemonMansion3FDefaultScript
-	         $6250 = PokemonMansion3FDefaultScript.asm_52250
+	         $6250 = PokemonMansion3FDefaultScript.fellDownHoleTo1F
 	         $6254 = PokemonMansion3FDefaultScript.holeCoords
 	         $625b = PokemonMansion3FDefaultScript.isPlayerFallingDownHole
 	         $627a = Mansion3Script_Switches

diff --git a/pokered_vc.sym b/pokered_vc.sym
@@ -8339,7 +8339,7 @@
 11:6852 SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearRightBoulder
 11:6859 SeafoamIslandsB4FMoveObjectScript.RLEList_StrongCurrentNearLeftBoulder
 11:6860 SeafoamIslandsB4FObjectMoving2Script
-11:6872 SeaFoamIslands5Script_46872
+11:6872 SeafoamIslandsB4FObjectMoving2Script.doneForcedSurfMovement
 11:687c SeafoamIslandsB4F_TextPointers
 11:6886 ArticunoTrainerHeader
 11:6893 SeafoamIslandsB4FArticunoText
@@ -9716,7 +9716,7 @@
 14:6224 Mansion3CheckReplaceSwitchDoorBlocks.switchTurnedOn
 14:6235 PokemonMansion3F_ScriptPointers
 14:623b PokemonMansion3FDefaultScript
-14:6250 PokemonMansion3FDefaultScript.asm_52250
+14:6250 PokemonMansion3FDefaultScript.fellDownHoleTo1F
 14:6254 PokemonMansion3FDefaultScript.holeCoords
 14:625b PokemonMansion3FDefaultScript.isPlayerFallingDownHole
 14:627a Mansion3Script_Switches