diff --git a/pokeblue.map b/pokeblue.map index 90f2525d..07593969 100644 --- a/pokeblue.map +++ b/pokeblue.map @@ -4357,9 +4357,9 @@ ROMX bank #6: $6581 = PewterMovementScript_WalkToGym $65cd = RLEList_PewterGymPlayer $65da = RLEList_PewterGymGuy - $65e7 = FreezeEnemyTrainerSprite - $65f4 = FreezeEnemyTrainerSprite.loop - $65fd = FreezeEnemyTrainerSprite.notRival + $65e7 = SetEnemyTrainerToStayAndFaceAnyDirection + $65f4 = SetEnemyTrainerToStayAndFaceAnyDirection.loop + $65fd = SetEnemyTrainerToStayAndFaceAnyDirection.notRival $6605 = RivalIDs $6609 = IsPlayerStandingOnDoorTile $6621 = IsPlayerStandingOnDoorTile.loop diff --git a/pokeblue.sym b/pokeblue.sym index 89bc5b52..31b80e0b 100644 --- a/pokeblue.sym +++ b/pokeblue.sym @@ -4292,9 +4292,9 @@ 06:6581 PewterMovementScript_WalkToGym 06:65cd RLEList_PewterGymPlayer 06:65da RLEList_PewterGymGuy -06:65e7 FreezeEnemyTrainerSprite -06:65f4 FreezeEnemyTrainerSprite.loop -06:65fd FreezeEnemyTrainerSprite.notRival +06:65e7 SetEnemyTrainerToStayAndFaceAnyDirection +06:65f4 SetEnemyTrainerToStayAndFaceAnyDirection.loop +06:65fd SetEnemyTrainerToStayAndFaceAnyDirection.notRival 06:6605 RivalIDs 06:6609 IsPlayerStandingOnDoorTile 06:6621 IsPlayerStandingOnDoorTile.loop diff --git a/pokeblue_debug.map b/pokeblue_debug.map index 7e9f365d..4767e091 100644 --- a/pokeblue_debug.map +++ b/pokeblue_debug.map @@ -4367,9 +4367,9 @@ ROMX bank #6: $6589 = PewterMovementScript_WalkToGym $65d5 = RLEList_PewterGymPlayer $65e2 = RLEList_PewterGymGuy - $65ef = FreezeEnemyTrainerSprite - $65fc = FreezeEnemyTrainerSprite.loop - $6605 = FreezeEnemyTrainerSprite.notRival + $65ef = SetEnemyTrainerToStayAndFaceAnyDirection + $65fc = SetEnemyTrainerToStayAndFaceAnyDirection.loop + $6605 = SetEnemyTrainerToStayAndFaceAnyDirection.notRival $660d = RivalIDs $6611 = IsPlayerStandingOnDoorTile $6629 = IsPlayerStandingOnDoorTile.loop diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym index 5964f3a9..d2ba741a 100644 --- a/pokeblue_debug.sym +++ b/pokeblue_debug.sym @@ -4302,9 +4302,9 @@ 06:6589 PewterMovementScript_WalkToGym 06:65d5 RLEList_PewterGymPlayer 06:65e2 RLEList_PewterGymGuy -06:65ef FreezeEnemyTrainerSprite -06:65fc FreezeEnemyTrainerSprite.loop -06:6605 FreezeEnemyTrainerSprite.notRival +06:65ef SetEnemyTrainerToStayAndFaceAnyDirection +06:65fc SetEnemyTrainerToStayAndFaceAnyDirection.loop +06:6605 SetEnemyTrainerToStayAndFaceAnyDirection.notRival 06:660d RivalIDs 06:6611 IsPlayerStandingOnDoorTile 06:6629 IsPlayerStandingOnDoorTile.loop diff --git a/pokeblue_vc.map b/pokeblue_vc.map index 9df7458e..ad791bcf 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -4373,9 +4373,9 @@ ROMX bank #6: $6581 = PewterMovementScript_WalkToGym $65cd = RLEList_PewterGymPlayer $65da = RLEList_PewterGymGuy - $65e7 = FreezeEnemyTrainerSprite - $65f4 = FreezeEnemyTrainerSprite.loop - $65fd = FreezeEnemyTrainerSprite.notRival + $65e7 = SetEnemyTrainerToStayAndFaceAnyDirection + $65f4 = SetEnemyTrainerToStayAndFaceAnyDirection.loop + $65fd = SetEnemyTrainerToStayAndFaceAnyDirection.notRival $6605 = RivalIDs $6609 = IsPlayerStandingOnDoorTile $6621 = IsPlayerStandingOnDoorTile.loop diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym index eca3897d..314d2f30 100644 --- a/pokeblue_vc.sym +++ b/pokeblue_vc.sym @@ -4308,9 +4308,9 @@ 06:6581 PewterMovementScript_WalkToGym 06:65cd RLEList_PewterGymPlayer 06:65da RLEList_PewterGymGuy -06:65e7 FreezeEnemyTrainerSprite -06:65f4 FreezeEnemyTrainerSprite.loop -06:65fd FreezeEnemyTrainerSprite.notRival +06:65e7 SetEnemyTrainerToStayAndFaceAnyDirection +06:65f4 SetEnemyTrainerToStayAndFaceAnyDirection.loop +06:65fd SetEnemyTrainerToStayAndFaceAnyDirection.notRival 06:6605 RivalIDs 06:6609 IsPlayerStandingOnDoorTile 06:6621 IsPlayerStandingOnDoorTile.loop diff --git a/pokered.map b/pokered.map index 872975ab..bcbb4611 100644 --- a/pokered.map +++ b/pokered.map @@ -4357,9 +4357,9 @@ ROMX bank #6: $6581 = PewterMovementScript_WalkToGym $65cd = RLEList_PewterGymPlayer $65da = RLEList_PewterGymGuy - $65e7 = FreezeEnemyTrainerSprite - $65f4 = FreezeEnemyTrainerSprite.loop - $65fd = FreezeEnemyTrainerSprite.notRival + $65e7 = SetEnemyTrainerToStayAndFaceAnyDirection + $65f4 = SetEnemyTrainerToStayAndFaceAnyDirection.loop + $65fd = SetEnemyTrainerToStayAndFaceAnyDirection.notRival $6605 = RivalIDs $6609 = IsPlayerStandingOnDoorTile $6621 = IsPlayerStandingOnDoorTile.loop diff --git a/pokered.sym b/pokered.sym index ffac4a26..31749727 100644 --- a/pokered.sym +++ b/pokered.sym @@ -4292,9 +4292,9 @@ 06:6581 PewterMovementScript_WalkToGym 06:65cd RLEList_PewterGymPlayer 06:65da RLEList_PewterGymGuy -06:65e7 FreezeEnemyTrainerSprite -06:65f4 FreezeEnemyTrainerSprite.loop -06:65fd FreezeEnemyTrainerSprite.notRival +06:65e7 SetEnemyTrainerToStayAndFaceAnyDirection +06:65f4 SetEnemyTrainerToStayAndFaceAnyDirection.loop +06:65fd SetEnemyTrainerToStayAndFaceAnyDirection.notRival 06:6605 RivalIDs 06:6609 IsPlayerStandingOnDoorTile 06:6621 IsPlayerStandingOnDoorTile.loop diff --git a/pokered_vc.map b/pokered_vc.map index 8cd132e3..00cd7236 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -4373,9 +4373,9 @@ ROMX bank #6: $6581 = PewterMovementScript_WalkToGym $65cd = RLEList_PewterGymPlayer $65da = RLEList_PewterGymGuy - $65e7 = FreezeEnemyTrainerSprite - $65f4 = FreezeEnemyTrainerSprite.loop - $65fd = FreezeEnemyTrainerSprite.notRival + $65e7 = SetEnemyTrainerToStayAndFaceAnyDirection + $65f4 = SetEnemyTrainerToStayAndFaceAnyDirection.loop + $65fd = SetEnemyTrainerToStayAndFaceAnyDirection.notRival $6605 = RivalIDs $6609 = IsPlayerStandingOnDoorTile $6621 = IsPlayerStandingOnDoorTile.loop diff --git a/pokered_vc.sym b/pokered_vc.sym index fc5a938e..4fdd286e 100644 --- a/pokered_vc.sym +++ b/pokered_vc.sym @@ -4308,9 +4308,9 @@ 06:6581 PewterMovementScript_WalkToGym 06:65cd RLEList_PewterGymPlayer 06:65da RLEList_PewterGymGuy -06:65e7 FreezeEnemyTrainerSprite -06:65f4 FreezeEnemyTrainerSprite.loop -06:65fd FreezeEnemyTrainerSprite.notRival +06:65e7 SetEnemyTrainerToStayAndFaceAnyDirection +06:65f4 SetEnemyTrainerToStayAndFaceAnyDirection.loop +06:65fd SetEnemyTrainerToStayAndFaceAnyDirection.notRival 06:6605 RivalIDs 06:6609 IsPlayerStandingOnDoorTile 06:6621 IsPlayerStandingOnDoorTile.loop