From 803e5f51cf80ddb82569b98a57a9394e8b9a6529 Mon Sep 17 00:00:00 2001
From: SoupPotato <toomanyluigis11@gmail.com>
Date: Wed, 14 Feb 2024 05:23:49 +0000
Subject: [PATCH] Fixed issue with Pokemon Mansion B1F

---
 data/tilesets/facility_collision.asm | 2 ++
 data/tilesets/facility_metatiles.bin | 2 +-
 maps/PokemonMansionB1F.blk           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/tilesets/facility_collision.asm b/data/tilesets/facility_collision.asm
index a63c98b73..04ec9dfe7 100644
--- a/data/tilesets/facility_collision.asm
+++ b/data/tilesets/facility_collision.asm
@@ -161,3 +161,5 @@
 	tilecoll WALL, FLOOR, WALL, FLOOR ; a0
 	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; a1
 	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; a2
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; a3
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; a4
diff --git a/data/tilesets/facility_metatiles.bin b/data/tilesets/facility_metatiles.bin
index d5440a184..9209c446b 100644
--- a/data/tilesets/facility_metatiles.bin
+++ b/data/tilesets/facility_metatiles.bin
@@ -5,4 +5,4 @@
 
&
&&
&
88889999
&&
 !
&
&&
&

&01&

&
&&
&
@B@B()()()()*+()
&
&&
&

&
&&
&
	&
&
,-""<=""./
&>?&
"",-""<=
&./&
>?








&
&&
&
''''7777,-
&<=&
./
&>?&

&,-&
<=
&./&
>?@AABPQQRPHIRS::T
&&

&@A&
PQ
&&
AAABQQQREEFEUUVU
 K
 [EFEEUVUUK
-[
&PQ&
S:
&&
QQQR:::T
&&
EFE;UVU;JKJ;Z[Z;6666666666666666AAABMMMN88889999""""""""#$$%WXXY""""@B""PRPRPRPRPR""23""CD
&
&&
&
""""""@B
&PR&
PR;;;;;;;;
&
&&
&

&
&&
&
;;;;;;;;""""@B""PR
&PR&
PR
&PR&
PR
&PR&
PR
&PR&
PR@APRLM
&
&&
&

&@A&
LM
&
&&
&
AB
&MN&

&
&&
&
@B@APRLM
&&

&&
	&
&
@AABPHIR	&
&

&
&&
&
@B
&PR&
PR
&PR&
PR
&&
@BPR#$$%WXXY
&
&&
&
PRPRPRPR@B
&PR&
PR
&PR&
















@AAALMMM
&
&&
&
AAABMMMN
&
&&
&

&@B&
PR
&PR&
PR
&
&&
&
AAAAMMMM""""""""
&&
AAAAMMMM
&
&&
&

&PR&
PR
&PR&
PR
&@A&
PQ
&PQ&
S:@AAALMMM88889999
&PR&
PRABPRMNPR""""""\]
&^_&
@B@APRLMPR
&PR&
AB@BMNPR
&PR&
PRPR
&PR&
PR@ALM
&PR&
PRABPRMN­ªªª«¬ºº«¬€€«¬€€ªªª®ºº«¬€€«¬€€«¬«¬€€«¬€€­ªªª»ººº€€«¬€€«¬ªªª®ººº¼€€€€€€€€€€€€€€€€«¬€€«¬€€«¬€€«¬€€€€«¬€€«¬€€«¬€€«¬ªªªªºººº€€€€€€€€€€€€€€€€ªªªªºººº«¬€€«¬€€«¬ªª«¬ºº€€«¬€€«¬ªª«¬ºº«¬«¬€€«¬€€«¬€€»¼€€­®€€«¬€€«¬€€«¬€€€€€€€€€€­ªªª»ººº€€€€€€€€ªªª®ººº¼€€€€€€€€€€­®€€«¬€€€€€€€€­®€€«¬€€‡ˆ‡ˆ—˜—˜‡ˆ‡ˆ—˜—˜‡ˆ‡ˆ—˜—˜€€€€€€€€€€‡ˆ€€—˜€€‡ˆ€€—˜‡ˆ€€—˜€€‡ˆ€€—˜€€«¬‡ˆ«¬—˜«¬‡ˆ«¬—˜‡ˆ«¬—˜«¬‡ˆ«¬—˜«¬ªªª®ººº¼€€€€€€€€€€�‚€€‘’€€€€€€€€�‚€€‘’€€€€€€€€€€‹ŒŒ�¦§§ ¦§§ ›œœ�€€€€‰Š€€™š€€½¾€€§‹ŒŒ‹¦§§¦¦§§¦¦§§ŒŒŒŒ§§§§§§§§§§§§ŒŒ�§§§ �§§  §§  ¦¦§§¦¦§§¦¦§§¦¦§§¦¦§§¦¦§§¦›œœ›œœœ§§§§§§§§œœœœœœœœ§§  §§  œœ� œœœ�§§  §§  §§  §§  Ž�Ž�žŸžŸªªªªºººº‡ˆ‡ˆ—˜—˜Ž�Ž�žŸžŸ§§§§§§§§œ¡§§¡¦§§°±°±±°±°°±°±±°±°«¬°±«¬±°«¬°±«¬±°€€€€€€€€…†…†•–•–€€€€€€€€€€…†€€•–¯Â€€¿Ò€€€€€€€€€€§§§§§§§§§§§§§§§§ªªªªÀÀÀÀ°±°±±°±°Ž�‡ˆžŸ—˜°±°±±°±°°±°±±°±°°±ƒ„±°“”€€«¬€€«¬€€€€€€€€€€€€€€€€ªª€€ºº€€€€€€€€€€‡ˆŽ�—˜žŸ«¬œœ«¬``«¬``«¬``«¬bc«¬rs«¬``«¬```¦�‚`¦‘’`¦€€`¦€€œ¡�‚`¦‘’`¦€€`¦€€¶¶a¶a¶q¶¶¶¶¶¶q¶¶ÃÄÄÄÃÄÄÄÃÄÄÄÃÄÄÄÄÄÄÅÄÄÄÅÄÄÄÅÄÄÄŪªªª¨©¨©ÊËÊËÌÍÌÍ°±°±±°±°ªªªªºººº°±¢£±°²³°±°±±°±°«¬a¶«¬q¶«¬¶¶«¬¶¶«¬a¶«¬q¶­ªªª»ººº¶¶a¶a¶q¶ªªªªºººº¶¶«¬a¶«¬ªª«¬ºº«¬¶¶«¬a¶«¬¶¶«¬¶q«¬¶¶°±a¶±°¶¶°±¶q±°°±«¬±°«¬°±«¬±°«¬ªªªªºººº¶¶¶¶¶q¶¶¶¶°±a¶±°¤¥°±´µ±°¶¶°±a¶±°¶¶¶¶¶q¶¶°±«¬±°«¬ªª«¬ºº«¬‡ˆ°±—˜±°Ž�°±žŸ±°°±°±±°±°¶¶­®¶q«¬°±«¬±°«¬°±«¬±°»¼¶¶a¶a¶q¶°±°±±°±°¶¶‡ˆa¶—˜¶¶‡ˆ¶q—˜¶¶a¶a¶q¶‡ˆ‡ˆ—˜—˜«¬°±«¬±°«¬Ž�«¬žŸ¤¥°±´´±°¶¶¶¶¶q¶¶¶¶¤¥a¶´µ¶¶‡ˆ¶q—˜¶¶a¶a¶q¶Ž�¶¶žŸ¶¶°±‡ˆ±°—˜°±°±±°±°‡ˆ°±—˜±°°±°±±°±°°±a¶±°q¶°±¶¶±°¶¶­ªªª«¬ÀÀ«¬€€«¬€€ªªª®ÀÀ«¬€€«¬€€«¬ªªª®ÀÀÀÑ€€€€€€€€¶¶a¶a¶q¶ªªªªÀÀÀÀ€€€€€€€€­ªªªÐÀÀÀ°±«¬±°«¬ªª«¬ÀÀ«¬Ž�‡ˆžŸ—˜°±°±±°±°°±°±±°±°°±°±±°±°ªªªªºººº°±°±±°±°¶¶a¶a¶q¶¶¶‡ˆ¶q—˜@AABPQQRPQQRÆÁÁǶ¶°±a¶±°¶¶°±¶q±°@AAALMMM
&
&&
&

&PR&
PRABPRMN
\ No newline at end of file
+[
&PQ&
S:
&&
QQQR:::T
&&
EFE;UVU;JKJ;Z[Z;6666666666666666AAABMMMN88889999""""""""#$$%WXXY""""@B""PRPRPRPRPR""23""CD
&
&&
&
""""""@B
&PR&
PR;;;;;;;;
&
&&
&

&
&&
&
;;;;;;;;""""@B""PR
&PR&
PR
&PR&
PR
&PR&
PR
&PR&
PR@APRLM
&
&&
&

&@A&
LM
&
&&
&
AB
&MN&

&
&&
&
@B@APRLM
&&

&&
	&
&
@AABPHIR	&
&

&
&&
&
@B
&PR&
PR
&PR&
PR
&&
@BPR#$$%WXXY
&
&&
&
PRPRPRPR@B
&PR&
PR
&PR&
















@AAALMMM
&
&&
&
AAABMMMN
&
&&
&

&@B&
PR
&PR&
PR
&
&&
&
AAAAMMMM""""""""
&&
AAAAMMMM
&
&&
&

&PR&
PR
&PR&
PR
&@A&
PQ
&PQ&
S:@AAALMMM88889999
&PR&
PRABPRMNPR""""""\]
&^_&
@B@APRLMPR
&PR&
AB@BMNPR
&PR&
PRPR
&PR&
PR@ALM
&PR&
PRABPRMN­ªªª«¬ºº«¬€€«¬€€ªªª®ºº«¬€€«¬€€«¬«¬€€«¬€€­ªªª»ººº€€«¬€€«¬ªªª®ººº¼€€€€€€€€€€€€€€€€«¬€€«¬€€«¬€€«¬€€€€«¬€€«¬€€«¬€€«¬ªªªªºººº€€€€€€€€€€€€€€€€ªªªªºººº«¬€€«¬€€«¬ªª«¬ºº€€«¬€€«¬ªª«¬ºº«¬«¬€€«¬€€«¬€€»¼€€­®€€«¬€€«¬€€«¬€€€€€€€€€€­ªªª»ººº€€€€€€€€ªªª®ººº¼€€€€€€€€€€­®€€«¬€€€€€€€€­®€€«¬€€‡ˆ‡ˆ—˜—˜‡ˆ‡ˆ—˜—˜‡ˆ‡ˆ—˜—˜€€€€€€€€€€‡ˆ€€—˜€€‡ˆ€€—˜‡ˆ€€—˜€€‡ˆ€€—˜€€«¬‡ˆ«¬—˜«¬‡ˆ«¬—˜‡ˆ«¬—˜«¬‡ˆ«¬—˜«¬ªªª®ººº¼€€€€€€€€€€�‚€€‘’€€€€€€€€�‚€€‘’€€€€€€€€€€‹ŒŒ�¦§§ ¦§§ ›œœ�€€€€‰Š€€™š€€½¾€€§‹ŒŒ‹¦§§¦¦§§¦¦§§ŒŒŒŒ§§§§§§§§§§§§ŒŒ�§§§ �§§  §§  ¦¦§§¦¦§§¦¦§§¦¦§§¦¦§§¦¦§§¦›œœ›œœœ§§§§§§§§œœœœœœœœ§§  §§  œœ� œœœ�§§  §§  §§  §§  Ž�Ž�žŸžŸªªªªºººº‡ˆ‡ˆ—˜—˜Ž�Ž�žŸžŸ§§§§§§§§œ¡§§¡¦§§°±°±±°±°°±°±±°±°«¬°±«¬±°«¬°±«¬±°€€€€€€€€…†…†•–•–€€€€€€€€€€…†€€•–¯Â€€¿Ò€€€€€€€€€€§§§§§§§§§§§§§§§§ªªªªÀÀÀÀ°±°±±°±°Ž�‡ˆžŸ—˜°±°±±°±°°±°±±°±°°±ƒ„±°“”€€«¬€€«¬€€€€€€€€€€€€€€€€ªª€€ºº€€€€€€€€€€‡ˆŽ�—˜žŸ«¬œœ«¬``«¬``«¬``«¬bc«¬rs«¬``«¬```¦�‚`¦‘’`¦€€`¦€€œ¡�‚`¦‘’`¦€€`¦€€¶¶a¶a¶q¶¶¶¶¶¶q¶¶ÃÄÄÄÃÄÄÄÃÄÄÄÃÄÄÄÄÄÄÅÄÄÄÅÄÄÄÅÄÄÄŪªªª¨©¨©ÊËÊËÌÍÌÍ°±°±±°±°ªªªªºººº°±¢£±°²³°±°±±°±°«¬a¶«¬q¶«¬¶¶«¬¶¶«¬a¶«¬q¶­ªªª»ººº¶¶a¶a¶q¶ªªªªºººº¶¶«¬a¶«¬ªª«¬ºº«¬¶¶«¬a¶«¬¶¶«¬¶q«¬¶¶°±a¶±°¶¶°±¶q±°°±«¬±°«¬°±«¬±°«¬ªªªªºººº¶¶¶¶¶q¶¶¶¶°±a¶±°¤¥°±´µ±°¶¶°±a¶±°¶¶¶¶¶q¶¶°±«¬±°«¬ªª«¬ºº«¬‡ˆ°±—˜±°Ž�°±žŸ±°°±°±±°±°¶¶­®¶q«¬°±«¬±°«¬°±«¬±°»¼¶¶a¶a¶q¶°±°±±°±°¶¶‡ˆa¶—˜¶¶‡ˆ¶q—˜¶¶a¶a¶q¶‡ˆ‡ˆ—˜—˜«¬°±«¬±°«¬Ž�«¬žŸ¤¥°±´´±°¶¶¶¶¶q¶¶¶¶¤¥a¶´µ¶¶‡ˆ¶q—˜¶¶a¶a¶q¶Ž�¶¶žŸ¶¶°±‡ˆ±°—˜°±°±±°±°‡ˆ°±—˜±°°±°±±°±°°±a¶±°q¶°±¶¶±°¶¶­ªªª«¬ÀÀ«¬€€«¬€€ªªª®ÀÀ«¬€€«¬€€«¬ªªª®ÀÀÀÑ€€€€€€€€¶¶a¶a¶q¶ªªªªÀÀÀÀ€€€€€€€€­ªªªÐÀÀÀ°±«¬±°«¬ªª«¬ÀÀ«¬Ž�‡ˆžŸ—˜°±°±±°±°°±°±±°±°°±°±±°±°ªªªªºººº°±°±±°±°¶¶a¶a¶q¶¶¶‡ˆ¶q—˜@AABPQQRPQQRÆÁÁǶ¶°±a¶±°¶¶°±¶q±°@AAALMMM
&
&&
&

&PR&
PRABPRMN€€Ž�€€žŸ€€€€€€€€‡ˆ€€—˜€€€€€€€€€€
\ No newline at end of file
diff --git a/maps/PokemonMansionB1F.blk b/maps/PokemonMansionB1F.blk
index 596ddac0d..3c1d73d16 100644
--- a/maps/PokemonMansionB1F.blk
+++ b/maps/PokemonMansionB1F.blk
@@ -1 +1 @@
-wwzZ–ZzZz\]^„wwZwDeƒˆZww`ab�nwhnŸwZgnMNwwŒg™šhw”wwRwwwZwŒgDV•—Dm–„wwwmmwZDFZiDjFZnDngnwˆDVwwDDŠDDDrw †‰gFhiDkwˆnSwwww�nƒ~w˜SwwƒzwmZwŠg‡wwD’w‹ƒZwwUwwgwwwgwŒDZe‘whZw VZw QkDDg’�h|›‚ƒwwžœD“\^gnŽnwwƒwwwZHZ`b{H~€
\ No newline at end of file
+wwzZ–ZzZz\]^„wwZwDeƒˆZww`ab�nwhnŸwZgnMNwwŒg™šhw”wwRwwwZwŒgDV•—Dm–„wwwmmwZDFZiDjFZnDngnwˆDVwwDDŠDDDrw †‰gFhiDkwˆnSwwww�nƒ~w˜SwwƒzwmZwŠg‡wwD’w‹ƒZwwUwwgwwwgwŒDZe‘whZw VZw Qk£¤D’�h|›‚ƒwwžœD“\^gnŽnwwƒwwwZHZ`b{H~€
\ No newline at end of file