From 22d1c961eb46dd22ef5b3ff1790fe73189a7078c Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 19 Nov 2023 23:38:34 +0000 Subject: [PATCH] Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) --- pokeblue.map | 4 ++-- pokeblue.sym | 4 ++-- pokeblue_debug.map | 4 ++-- pokeblue_debug.sym | 4 ++-- pokeblue_vc.map | 4 ++-- pokeblue_vc.sym | 4 ++-- pokered.map | 4 ++-- pokered.sym | 4 ++-- pokered_vc.map | 4 ++-- pokered_vc.sym | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pokeblue.map b/pokeblue.map index d475d737a8..60d894bd30 100644 --- 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 index bc1fa424cc..7670e00a1b 100644 --- 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 index 4738b99d47..7d41fbef17 100644 --- 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 index b4c333c6b2..538e603675 100644 --- 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 index 949e3029b0..edf5ef8d17 100644 --- 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 index 3c1154d1fe..514cd0572f 100644 --- 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 index 55abf21785..b88cd0500f 100644 --- 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 index cc11088042..7acda48d5a 100644 --- 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 index 0c149a7a6f..027ddccd44 100644 --- 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 index b8282692e8..22129807da 100644 --- 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