From 01ca89452c27e290990cfbfb909873641abc8852 Mon Sep 17 00:00:00 2001 From: SoupPotato Date: Fri, 6 Sep 2024 18:37:30 +0100 Subject: [PATCH] Fixed Collisions --- data/tilesets/game_corner_collision.asm | 2 +- maps/VermilionGym.asm | 2 +- maps/VermilionGym.blk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/tilesets/game_corner_collision.asm b/data/tilesets/game_corner_collision.asm index 595ce5499..c04c68140 100644 --- a/data/tilesets/game_corner_collision.asm +++ b/data/tilesets/game_corner_collision.asm @@ -48,7 +48,7 @@ tilecoll WALL, WALL, FLOOR, WALL ; 2f tilecoll WALL, WALL, WALL, FLOOR ; 30 tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 31 - tilecoll WALL, WALL, FLOOR, FLOOR ; 32 + tilecoll WALL, WALL, WALL, WALL ; 32 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index b8bf7575c..0cb9d2b7a 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -500,7 +500,7 @@ VermilionGym_MapEvents: def_object_events object_event 5, 1, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VermilionGymSurgeScript, -1 - object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 + object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerGentlemanGregory, -1 object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 object_event 7, 14, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuideScript, -1 diff --git a/maps/VermilionGym.blk b/maps/VermilionGym.blk index 7ace47b0f..5bc7ee113 100644 --- a/maps/VermilionGym.blk +++ b/maps/VermilionGym.blk @@ -1 +1 @@ -"&&2$#% ! !  \ No newline at end of file +#&&2%#% ! !  \ No newline at end of file