From 0c6903588f6941ce44822c8adc39482b6be40886 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 20 May 2023 17:03:59 +0100 Subject: [PATCH] rock tunnel bug fixes Fixes the youngster facing direction Makes the Jr Trainer not walk through walls (hopefully) --- data/maps/objects/RockTunnelB1F.asm | 2 +- scripts/RockTunnel1F.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index 6b01802f..73a136ed 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -18,7 +18,7 @@ RockTunnelB1F_Object: object_event 14, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11 object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5 - object_event 22, 5, SPRITE_YOUNGSTER, STAY, RIGHT, 9 + object_event 22, 5, SPRITE_YOUNGSTER, STAY, DOWN, 9 object_event 7, 23, SPRITE_FOSSIL, STAY, NONE, 10, HELIX_FOSSIL object_event 6, 23, SPRITE_FOSSIL, STAY, NONE, 11, DOME_FOSSIL object_event 8, 24, SPRITE_OLD_AMBER, STAY, NONE, 12, OLD_AMBER diff --git a/scripts/RockTunnel1F.asm b/scripts/RockTunnel1F.asm index cafdbe62..c379038c 100644 --- a/scripts/RockTunnel1F.asm +++ b/scripts/RockTunnel1F.asm @@ -33,7 +33,7 @@ RockTunnel1TrainerHeader2: RockTunnel1TrainerHeader3: trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3, 3, RockTunnel1BattleText4, RockTunnel1EndBattleText4, RockTunnel1AfterBattleText4 RockTunnel1TrainerHeader4: - trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4, 4, RockTunnel1BattleText5, RockTunnel1EndBattleText5, RockTunnel1AfterBattleText5 + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4, 1, RockTunnel1BattleText5, RockTunnel1EndBattleText5, RockTunnel1AfterBattleText5 RockTunnel1TrainerHeader5: trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5, 4, RockTunnel1BattleText6, RockTunnel1EndBattleText6, RockTunnel1AfterBattleText6 RockTunnel1TrainerHeader6: