Added Custom Wild Battles

data/event_scripts.s

@@ -1082,3 +1082,5 @@ Common_EventScript_LegendaryFlewAway::
 	.include "data/maps/RustboroCity_LeafsHouse_2F/scripts.inc"
 
 	.include "data/maps/GraniteCave_B3F/scripts.inc"
+
+	.include "data/maps/GraniteCave_B4F/scripts.inc"

data/layouts/GraniteCave_B2F/map.bin

@@ -1,2 +1,2 @@
-2222222222222222222222262222222222S22222222222222'62>22222222222:2>22222222222222222222222222:2 				"222222222222222222>22BR22222226222222222222222222222 $P622												$$								$				666666666666666666666666666666666666666666666S66622 	2	2b6	2	2"22S622222222222222222222222222222222222222>2222222222222222222222222222'22222222222222222222222222222
2
2
2
2
2
222222
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
222222
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
22
2
2
2
2
2
2
2
2
2
2
2				
+2222222222222222222222262222222222S22222222222222'62>22222222222:2>22222222222222222222222222:2 				"222222222222222222>22BR22222226222222222222222222222 $P622												$$								$				666666666666666666666666666666666662?2266622 	2	2b6	2	2"2222222262222222222222222LRRRR22222222222222222>2222222222222222222222222222'22222222222222222222222222222
2
2
2
2
2
222222
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
222222
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
22
2
2
2
2
2
2
2
2
2
2
2				
 
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2'
2
2
2			$
2
2=2
2
2
2
2
2
2
2
2
2
2
2 				"'
2
2
2$												$$				$$																$$						$$																														#

data/layouts/GraniteCave_B3F/map.bin

@@ -1,8 +1,5 @@
-222222222BBBBBBBBBBBB222BBBBň
2
2
2
2
2
2ňBBB22BBBBB
2
2
2
2
2
2
2
2
2
2
2
2
2BBB222BBB
2
2
2
2
2
2
2
2
2
2
2
2
2
2BBB22BBB
2
2
2
2
2!B!B!B!B!B!B!B!B!B!BBBB222BBB
2
2
2
2
2
2B!B!B
-BBBBBBLBRBRBRB222BBB
2
2
2
2
2BBBRBRBRBOBBBBBB222BBB
2
2
2
2
2
2BBBBBBBBBBBB22B
2
2
2
2
2BBň222BBB!B
-
2
2
2
2
2
2BB
2
2
2
2VW
2BBBB
22!2!2!2
-2
2BB
2
2
2
2VW
2BBBBBBB
222222
2BB
2
2
2
2VW
2BBB22222
2BB
2
2
2
2
2BB
2
2
2
2
222222
2BB
2
2
2
2
2
2
2B
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2B2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2!!!
2
2!B!B!B!B!B!B!B!B!B!B!B!B!B!B!B!B
-
2!!!
2
2
2B>BBBBBBBBBBBBBBB
2
2
2
2BBBBBBBBBBBBň
22
2
2
2BBBB
2
2
2
22
2
2
2
2
2
2
2
2BBBňň2
2
2
2
2
2
2
2
2
2BBBB
"
"
"
"
"
"2
2
2
2
2
2
2
2
2
2
2!!!
-
"
"
"
"
"
"2
2
2
2
2
2
2
2
2
2222
"
"
"
"
"
"2
2
2
2
2
2
2
2
2222
"
"
"
"
"
"2!2!2
-
2
2
2
2
22!2
-2
"
"
"
"
"
"22
2
2
2
2
2222
"
"Y#
"
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+222222222BBBBBBBBBBBB222BBBB
2
2
2
2
2BBB22BBBBB
2
2
2
2
2
2
2'
2
2
2
2
2BBB222BBB
2
2
2
2
2
2
2
2
2
2
2
2
2
2BBB22BBB
2
2
2
2
2!B!B!B!B!B!B!B!B!B!BBBB222BBB
2
2
2
2
2
2!!
+BBBBBLRR222BBB
2
2
2
2
2RROBBBBB222BBB
2
2
2
2
2
2BBBBBBBB22B
2
2
2
2
2BB222BBB!B
+
2
2
2
2
2
2BB
2
2
2
2VW
2B?BBB
2!B!B!B
+
2BB
2
2
2
2VW
2BBBBBBB
2B?BB
2BB
2
2
2
2VW
2BBBBBB
2BB
2
2
2
2
2BB
2
2
2
2
2
2BB
2
2
2
2
2
2
2B
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2B
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2!!!
2
2!B!B!B!B!B!B!B!B!B!B!B!B!B!B!B"
2
2!!!
2
2
2B>BBBBBBBBBBB
2
2
2
2
2BBBBBBBBBBBB'
2
2
22
2
2
2
2
22
2
2
2
2
2
2
"2
2
2
2
2
2
2
2
"
"
"
"
"
"
"
"
"
"
"
"
"2
2
2
2
2
2
2
2
2
"
"
"
"
"
"
"
"
"
"
"
"2
2
2
2
2
2
2
2
"
"
"
"
"
"
"
"
"
"
"2
2
2
2
2
2
2
2
"'
"
"
"
"
"
"
"
"
"
"
"2!2!2
+
2
2
2
2
"
"
"
"
"
"
"
"
"
"
"22
2
2
2
2
"
"
"
"
"
"
"Y
"
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

data/layouts/GraniteCave_B4F/border.bin

@@ -0,0 +1 @@
+<

data/layouts/GraniteCave_B4F/map.bin

@@ -0,0 +1 @@
+�����
2<2�����<2
2
2�����
2P<2
2�����
2<2
2>2�����<2
2<2<2�����
2>2
2�����
2
2
2<2�����
2
2<2
�B�B�B�B�B
f
2<�B�B�B�B�B<
2																																							

data/layouts/PetalburgWoods/map.bin

@@ -1 +1 @@
-ΤΥΤΥΤΥΤΥΤΥΤΥάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥάέάέάέάέάέάέΤΥΤΥάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέΤΥΤΥΤΥΤΥΤΥΤΥάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥάέάέάέάέάέάέΤΥΤΥάέάέάέάέάέάέάέδεδεδεδεδεδεάέάέΤΥΤΥΤΥΤΥΤΥΤΥδηζεΤΥΤΥΤΥΤΥΤΥΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥάέάέάέάέάέάέIIIIάέάέάέάέδςσςση
0
0
0
0
0Ζ1Η1Ζ1Η1
0
0
0ζεάέΤΥΤΥΤΥΤΥΤΥΤΥ
0
0
0
0
0
0ΤΥΤΥΤΥΤΥ
0ΤΥΤΥ
0
0
0
0
0
0Φ5Υ5Τ5Χ5
0
0
0
0
0ΤΥζεζεδεδεδεδη
0
0
0
0
0
0άέάέάέδη
0ζεδη
0
0
0
0
0
0άέάέ
0
0
0
0
0άέ
0
0
0
0
0
0
0
0
0
0
04
0
0
0
0
0
0ΤΥΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥΥ‡‡‡ΦΤΥΞ1Ο1Ξ1Ο1
0
0
0
0
0
0
0
0
0
0
0
0
0
0ζεδεδη
0
0
0
0Ξ1Ο1Ζ1Η1Ζ1Η1
0
0
0ζεδη
0
0
0
0
0άέΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0Φ5Υ5Τ5Υ5Τ5Χ5
0
0
0
0
0
0
0
0
0
0
0
0ΤΥάέάέ
0
0
0
0Ζ1Η1Ξ1Ο1Ξ1Ο1
0
0
0
0Ξ1Ο1Ξ1Ο1Ζ1Η1Ζ1Η1Ζ1Η1άέάέάέΖ1Η1Ζ1Η1Ξ1Ο1
0
0
0
0
0
0δεΤΥΤΥ
0
0
0
0Φ5Υ5Τ5Υ5Τ5Χ5
0
0
0
0Φ5Υ5Τ5Υ5Τ5Υ5Τ5Υ5Τ5Υ5ΤΥΤΥΤΥΤΥ5Τ5Υ5Τ5Χ5
0
0
0
0
0
0
0
0άέάέ
0
0
0
0άέάέάέ
0
0
0
0ζςσςσςσςσςσςσςσςσςσςσςΟ1
0
0
0
0
0
0
0ΤΥΤΥΥ‡Φ
0ΤΥΤΥΤΥΥ‡‡‡ΦΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΧ5
0
0
0
0
0
0
0άέάέ
0
0
0
0ζεδεδη
0
0
0
0
0ζεδεδεδεδςσςσςσςσςσςσςΟ1
0
0
0
0Ζ1Η1ΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥΤΥΤΥΤΥΤΥΤΧ5
0
0
0
0ΤΥζεζε
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0άέάέάέάέάέάέάέ
0
0
0
0άέ
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥΤΥΤΥΤΥΤΥΤΥ
0
0
0
0ΤΥΞ1Ο1Ξ1Ο1Ξ1Η1Ζ1Η1Ζ1Η1Ξ1Ο1
0
0
0
0Ζ1Η1Ζ1Η1Ζ1Η1Ζ1Η1Ζ1Η1
0
0άέάέάέδεάέάέάέ
0
0
0
0άέΤΥΤΥΤ5Υ5Τ5Υ5Τ5Υ5Τ5Χ5
0
0
0
0Φ5Υ5Τ5Υ5Τ5Υ5Τ5Υ5Τ5Χ5
0
0ΤΥΤΥΤΥ
0
0ΤΥΤΥΤΥΥ‡‡ΦΤΥάέάέάέάέάέάέ
0
0
0
0άέάέάέάέάέ
0
0άέάέδη
0
0ζεάέάέ
0
0
0
0άέΤΥΤΥΤΥΤΥΤΥΤΥΥ‡‡ΦΤΥΤΥΤΥΤΥΤΥ
0
0ΤΥΤΥ
0
0
0
0
0
0ΤΥΤΥ
0
0
0
0ΤΥάέάέάέδεδεδη
0
0
0
0ζεδεδεδεδη
0
0άέάέ
0
0
0
0
0
0ζεδη
0
0
0
0άέΤΥΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥάέάέδη
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0άέάέ
0
0
0
0Ξ1Ο1
0
0
0
0
0
0
0
0άέΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥ
0
0
0
0Φ5Χ5
0
0
0
0
0
0
0
0ΤΥάέάέ
0
0
0
0
0
0Ζ1Η1Ζ1Η1Ξ1Ο1
0
0
0
0
0
0Ξ1Ο1Ξ1Ο1Ξ1Ο1άέάέ
0
0
0
0άέΞ1Η1
0
0
0
0Ζ1Η1άέΤΥΤΥ
0
0
0
0
0
0Φ5ΥΤΥΤ5Χ5
0
0
0
0
0
0Φ5Υ5Τ5Υ5Τ5Υ5ΤΥΤΥ
0
0
0
0ΤΥΤΧ5
0
0
0
0Φ5ΥΤΥάέάέ
0
0
0
0
0
0άέάέάέ
0
0
0
0
0
0άέάέάέάέάέ
0
0
0
0άέάέΞ1Η1Ζ1Η1άέάέΤΥΤΥ
0
0
0
0
0
0ΤΥΤΥΤΥΥ‡‡‡‡ΦΤΥΤΥΤΥΤΥΤΥ
0
0
0
0ΤΥΤΥΤΥΤΥΤΥΤΥάέάέ
0
0
0
0
0
0ζεδεδη
0
0
0
0
0
0ζεδεάέάέάέ
0
0
0
0άέάέάέάέάέάέΤΥΤΥ
0
0
0
0
0
0
0
0
0
04
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥΤΥΥ‡‡ΦΤΥΤΥΤΥΤΥΤΥΤΥάέάέΞ1Ο1
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ζεδεδη
0
0
0
0ζεδεδεάέάέάέΤΥΤΥΤΧ5
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥΤΥάέάέάέΞ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1
0
0
0
0
0
0Ξ1Η1Ζ1Η1Ζ1Η1Ζ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1
0
0
0
0
0
0
0
0άέάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΧ5
0
0
0
0
0
0Φ5ΥΤΥΤΥΤΥΤΥΤΥΤΧ5
0
0
0
0
0
0
0
0ΤΥΤΥΤΥάέάέάέάέάέάέάέ
0
0
0
0
0
0άέάέάέάέάέάέάέ
0
0
0
0
0
0Ζ1Η1άέάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΥIIIIΤΥΤΥΤΥΤΥΤΥΤΥΤΥIIIIΦ5ΥΤΥΤΥΤΥάέάέάέάέάέάέάέΞΟΞΟάέάέάέάέάέάέάέΞΟΞΟάέάέάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΧΦΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΧΦΥΤΥΤΥΤΥΤΥάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέ
+ΤΥΤΥΤΥΤΥΤΥΤΥάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥάέάέάέάέάέάέΤΥΤΥάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέΤΥΤΥΤΥΤΥΤΥΤΥάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥάέάέάέάέάέάέΤΥΤΥάέάέάέάέάέάέάέδεδεδεδεδεδεάέάέΤΥΤΥΤΥΤΥΤΥΤΥδηζεΤΥΤΥΤΥΤΥΤΥΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥάέάέάέάέάέάέIIIIάέάέάέάέδςσςση
0
0
0
0
0Ζ1Η1Ζ1Η1
0
0
0ζεάέΤΥΤΥΤΥΤΥΤΥΤΥ
0
0
0
0
0
0ΤΥΤΥΤΥΤΥ
0ΤΥΤΥ
0
0
0
0
0
0Φ5Υ5Τ5Χ5
0
0
0
0
0ΤΥζεζεδεδεδεδη
0
0
0
0
0
0άέάέάέδη
0ζεδη
0
0
0
0
0
0άέάέ
0
0
0
0
0άέ
0
0
0
0
0
0
0
0
0
0
04
0
0
0
0
0
0ΤΥΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥΥ‡‡‡ΦΤΥΞ1Ο1Ξ1Ο1
0
0
0
0
0
0
0
0
0
0
0
0
0
0ζεδεδη
0
0
0
0Ξ1Ο1Ζ1Η1Ζ1Η1
0
0
0ζεδη
0
0
0
0
0άέΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0Φ5Υ5Τ5Υ5Τ5Χ5
0
0
0
0
0
0
0
0
0
0
0
0ΤΥάέάέ
0
0
0
0Ζ1Η1Ξ1Ο1Ξ1Ο1
0
0
0
0Ξ1Ο1Ξ1Ο1Ζ1Η1Ζ1Η1Ζ1Η1άέάέάέΖ1Η1Ζ1Η1Ξ1Ο1
0
0
0
0
0
0δεΤΥΤΥ
0
0
0
0Φ5Υ5Τ5Υ5Τ5Χ5
0
0
0
0Φ5Υ5Τ5Υ5Τ5Υ5Τ5Υ5Τ5Υ5ΤΥΤΥΤΥΤΥ5Τ5Υ5Τ5Χ5
0
0
0
0
0
0
0
0άέάέ
0
0
0
0άέάέάέ
0
0
0
0ζςσςσςσςσςσςσςσςσςσςσςΟ1
0
0
0
0
0
0
0ΤΥΤΥΥ‡Φ
0ΤΥΤΥΤΥΥ‡‡‡ΦΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΧ5
0
0
0
0
0
0
0άέάέ
0
0
0
0ζεδεδη
0
0
0
0
0ζεδεδεδεδςσςσςσςσςσςσςΟ1
0
0
0
0Ζ1Η1ΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥΤΥΤΥΤΥΤΥΤΧ5
0
0
0
0ΤΥζεζε
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0άέάέάέάέάέάέάέ
0
0
0
0άέ
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥΤΥΤΥΤΥΤΥΤΥ
0
0
0
0ΤΥΞ1Ο1Ξ1Ο1Ξ1Η1Ζ1Η1Ζ1Η1Ξ1Ο1
0
0
0
0Ζ1Η1Ζ1Η1Ζ1Η1Ζ1Η1Ζ1Η1
0
0άέάέάέδεάέάέάέ
0
0
0
0άέΤΥΤΥΤ5Υ5Τ5Υ5Τ5Υ5Τ5Χ5
0
0
0
0Φ5Υ5Τ5Υ5Τ5Υ5Τ5Υ5Τ5Χ5
0
0ΤΥΤΥΤΥ
0
0ΤΥΤΥΤΥΥ‡‡ΦΤΥάέάέάέάέάέάέ
0
0
0
0άέάέάέάέάέ
0
0άέάέδη
0
0ζεάέάέ
0
0
0
0άέΤΥΤΥΤΥΤΥΤΥΤΥΥ‡‡ΦΤΥΤΥΤΥΤΥΤΥ
0
0ΤΥΤΥ
0
0
0
0
0
0ΤΥΤΥ
0
0
0
0ΤΥάέάέάέδεδεδη
0
0
0
0ζεδεδεδεδη
0
0άέάέ
0
0
0
0
0
0ζεδη
0
0
0
0άέΤΥΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥάέάέδη
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0άέάέ
0
0
0
0Ξ1Ο1
0
0
0
0
0
0
0
0άέΤΥΤΥ
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥ
0
0
0
0Φ5Χ5
0
0
0
0
0
0
0
0ΤΥάέάέ
0
0
0
0
0
0Ζ1Η1Ζ1Η1Ξ1Ο1
0
0
0
0
0
0Ξ1Ο1Ξ1Ο1Ξ1Ο1άέάέ
0
0
0
0άέΞ1Η1
0
0
0
0Ζ1Η1άέΤΥΤΥ
0
0
0
0
0
0Φ5ΥΤΥΤ5Χ5
0
0
0
0
0
0Φ5Υ5Τ5Υ5Τ5Υ5ΤΥΤΥ
0
0
0
0ΤΥΤΧ5
0
0
0
0Φ5ΥΤΥάέάέ
0
0
0
0
0
0άέάέάέ
0
0
0
0
0
0άέάέάέάέάέ
0
0
0
0άέάέΞ1Η1Ζ1Η1άέάέΤΥΤΥ
0
0
0
0
0
0ΤΥΤΥΤΥΥ‡‡‡‡ΦΤΥΤΥΤΥΤΥΤΥ
0
0
0
0ΤΥΤΥΤΥΤΥΤΥΤΥάέάέ
0
0
0
0
0
0ζεδεδη
0
0
0
0
0
0ζεδεάέάέάέ
0
0
0
0άέάέάέάέάέάέΤΥΤΥ
0
0
0
0
0
0
0
0
0
04
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥΤΥΥ‡‡ΦΤΥΤΥΤΥΤΥΤΥΤΥάέάέΞ1Ο1
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ζεδεδη
0
0
0
0ζεδεδεάέάέάέΤΥΤΥΤΧ5
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0ΤΥΤΥΤΥάέάέάέΞ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1
0
0
0
0
0
0Ξ1Η1Ζ1Η1Ζ1Η1Ζ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1
0
0
0
0
0
0
0
0άέάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΧ5
0
0
0
0
0
0Φ5ΥΤΥΤΥΤΥΤΥΤΥΤΧ5
0
0
0
0
0
0
0
0ΤΥΤΥΤΥάέάέάέάέάέάέάέ
0
0
0
0
0
0άέάέάέάέάέάέάέ
0
0
0
0
0
0Ζ1Η1άέάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΥIIIIΤΥΤΥΤΥΤΥΤΥΤΥΤΥIIIIΦ5ΥΤΥΤΥΤΥάέάέάέάέάέάέάέΞΟΞΟάέάέάέάέάέάέάέΞΟΞΟάέάέάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΧΦΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΧΦΥΤΥΤΥΤΥΤΥάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέάέΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥΤΥάέάέάέάέάέάέάέάέΞΟάέάέάέάέάέάέάέάέάέΞΟάέάέάέάέάέ

data/layouts/layouts.json

@@ -4520,6 +4520,16 @@
       "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/GraniteCave_B3F/border.bin",
       "blockdata_filepath": "data/layouts/GraniteCave_B3F/map.bin"
+    },
+    {
+      "id": "LAYOUT_GRANITE_CAVE_B4F",
+      "name": "GraniteCave_B4F_Layout",
+      "width": 15,
+      "height": 15,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/GraniteCave_B4F/border.bin",
+      "blockdata_filepath": "data/layouts/GraniteCave_B4F/map.bin"
     }
   ]
 }

data/maps/AbandonedShip_Corridors_1F/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
@@ -127,6 +127,10 @@
       "dest_warp_id": "2"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/ArtisanCave_B1F/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -44,7 +44,9 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",

data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 13,
@@ -30,6 +32,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 7,
@@ -30,6 +32,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/FieryPath/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -135,6 +135,10 @@
       "dest_warp_id": "5"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/GraniteCave_B2F/map.json

@@ -130,6 +130,19 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "EventScript_RockSmash",
       "flag": "FLAG_TEMP_17"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
+      "x": 25,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EventScript_RockSmash",
+      "flag": "FLAG_TEMP_18"
     }
   ],
   "warp_events": [
@@ -167,6 +180,13 @@
       "elevation": 3,
       "dest_map": "MAP_GRANITE_CAVE_B1F",
       "dest_warp_id": "6"
+    },
+    {
+      "x": 27,
+      "y": 10,
+      "elevation": 0,
+      "dest_map": "MAP_GRANITE_CAVE_B3F",
+      "dest_warp_id": "2"
     }
   ],
   "coord_events": [

data/maps/GraniteCave_B3F/map.json

@@ -19,13 +19,13 @@
       "x": 9,
       "y": 25,
       "elevation": 0,
-      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NULL",
-      "flag": "0"
+      "script": "GraniteCave_B3F_Fell",
+      "flag": "FLAG_STEVENS_CAVE_AGRON"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -55,8 +55,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_AGGRON",
-      "x": 22,
-      "y": 24,
+      "x": 15,
+      "y": 23,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_NONE",
       "movement_range_x": 0,
@@ -91,13 +91,61 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "NULL",
       "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
+      "x": 16,
+      "y": 15,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "EventScript_StrengthBoulder",
+      "flag": "FLAG_TEMP_11"
     }
   ],
   "warp_events": [
-
+    {
+      "x": 13,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_GRANITE_CAVE_B4F",
+      "dest_warp_id": "0"
+    },
+    {
+      "x": 6,
+      "y": 12,
+      "elevation": 0,
+      "dest_map": "MAP_GRANITE_CAVE_B4F",
+      "dest_warp_id": "1"
+    },
+    {
+      "x": 8,
+      "y": 19,
+      "elevation": 0,
+      "dest_map": "MAP_GRANITE_CAVE_B2F",
+      "dest_warp_id": "5"
+    },
+    {
+      "x": 9,
+      "y": 26,
+      "elevation": 0,
+      "dest_map": "MAP_GRANITE_CAVE_B3F",
+      "dest_warp_id": "0"
+    }
   ],
   "coord_events": [
-
+    {
+      "type": "trigger",
+      "x": 24,
+      "y": 23,
+      "elevation": 0,
+      "var": "VAR_GRANITECAVE_AGGRON",
+      "var_value": "1",
+      "script": "GraniteCave_B3F_EventScript_Agron"
+    }
   ],
   "bg_events": [
 

data/maps/GraniteCave_B3F/scripts.inc

@@ -1,2 +1,193 @@
 GraniteCave_B3F_MapScripts::
+	//map_script MAP_SCRIPT_ON_LOAD, GraniteCave_B3F_OnTransition
+	//map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B3F_OnTransition
 	.byte 0
+	
+GraniteCave_B3F_Fell::
+	goto_if_unset FLAG_STEVENS_CAVE_DUGDEEPER, GraniteCave_B3F_EventScript_DugDeeper
+	msgbox GraniteCave_B3F_Text_FindAnything, MSGBOX_NPC
+	end
+
+GraniteCave_B3F_Movement_LookUp:
+	face_up
+	step_end
+
+GraniteCave_B3F_Text_FindAnything:
+	.string "I haven't found anything yet...\n"
+	.string "If I do, I will find you.$"
+
+GraniteCave_B3F_Text_CheckOnPlayer:
+	.string "Are you ok?\n"
+	.string "Here, let me heal your POKéMON.$"
+	
+GraniteCave_B3F_Text_DugDeeper:
+	.string "Well this is unexpected. We've seen to\n"
+	.string	"gone even deeper into this cave.\p"
+	.string "At least there seems to be a path to\n"
+	.string "continue moving on.\p"
+	.string "I am going to explore this section with\n"
+	.string "Baltoy and see if we can find any other\l"
+	.string "path back up.\p"
+	.string "Why don't you continue exploring\n"
+	.string "further as well.$"
+
+GraniteCave_B3F_EventScript_DugDeeper::
+	lock
+	setflag FLAG_STEVENS_CAVE_DUGDEEPER
+	applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B3F_Movement_LookUp
+	msgbox GraniteCave_B3F_Text_CheckOnPlayer, MSGBOX_NPC
+	special HealPlayerParty
+	playse SE_USE_ITEM
+	waitse
+	msgbox GraniteCave_B3F_Text_DugDeeper, MSGBOX_NPC
+	setvar VAR_GRANITECAVE_AGGRON, 1
+	givemon SPECIES_MUDKIP, 25, ITEM_NONE
+	animateflash 1
+	end
+	
+GraniteCave_B3F_Trigger_Agron::
+	goto_if_unset FLAG_STEVENS_CAVE_AGRON, GraniteCave_B3F_Movement_AgronChargePlayer
+	end
+	
+GraniteCave_B3F_Movement_CheckRightLeft:
+	face_right
+	delay_16
+	face_left
+	delay_16
+	step_end
+
+GraniteCave_B3F_Movement_CheckDownLeft:
+	face_down
+	delay_16
+	face_left
+	delay_16
+	face_down
+	delay_16
+	face_left
+	step_end
+
+GraniteCave_B3F_Movement_AgronChargePlayer:
+	face_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	step_end
+	
+GraniteCave_B3F_Movement_KnockBack:
+	jump_2_right
+	delay_16
+	face_left
+	step_end
+
+GraniteCave_B3F_Movement_Larion:
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+GraniteCave_B3F_Movement_StevenRun:
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	face_left
+	delay_16
+	lock_facing_direction
+	walk_right
+	step_end
+
+GraniteCave_B3F_Movement_FaceDown:
+	face_down
+	delay_16
+	step_end
+
+GraniteCave_B3F_Movement_WalkRight:
+	walk_right
+	step_end
+
+GraniteCave_B3F_Text_AggronAttack:
+	.string "STEVEN: I'll deal with this one!$"
+	
+GraniteCave_B3F_Text_LaironAttack:
+	.string "LARION charges$"
+
+GraniteCave_B3F_EventScript_Agron::
+	lock
+	//Setup Scene
+	fadeoutbgm 1
+	animateflash 1
+	//Start Look Around
+	applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B3F_Movement_CheckRightLeft
+	waitmovement 0
+	delay 32
+	playse SE_PIN
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark
+	waitmovement 0
+	delay 16
+	//Sounds
+	playbgm MUS_HELP, TRUE
+	playmoncry SPECIES_AGGRON, CRY_MODE_ENCOUNTER
+	//Move Agron
+	setobjectxyperm 4, 15, 23
+	showobjectat 4, MAP_GRANITE_CAVE_B3F
+	addobject 4
+	//Move Lairon
+	setobjectxyperm 5, 26, 26
+	showobjectat 5, MAP_GRANITE_CAVE_B3F
+	addobject 5
+	delay 16
+	//Charge Scene
+	applymovement 4, GraniteCave_B3F_Movement_AgronChargePlayer
+	waitmovement 0
+	setvar VAR_0x8004, 0  @ vertical pan
+	setvar VAR_0x8005, 2   @ horizontal pan
+	setvar VAR_0x8006, 5  @ num shakes
+	setvar VAR_0x8007, 2   @ shake delay
+	special ShakeCamera
+	applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B3F_Movement_KnockBack
+	fadescreen FADE_TO_BLACK
+	hidefollower
+	waitmovement 0
+	fadescreen FADE_FROM_BLACK
+	playmoncry SPECIES_AGGRON, CRY_MODE_ENCOUNTER
+	delay 32
+	//Move in Larion
+	applymovement 5, GraniteCave_B3F_Movement_Larion
+	waitmovement 0
+	playmoncry SPECIES_LAIRON, CRY_MODE_ENCOUNTER
+	delay 32
+	applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B3F_Movement_CheckDownLeft
+	waitmovement 0
+	//Move in Steven
+	setobjectxyperm 1, 24, 18
+	showobjectat 1, MAP_GRANITE_CAVE_B3F
+	addobject 1
+	applymovement 1, GraniteCave_B3F_Movement_StevenRun
+	waitmovement 0
+	//applymovement 4, GraniteCave_B3F_Movement_WalkRight
+	//waitmovement 0
+	msgbox GraniteCave_B3F_Text_AggronAttack, MSGBOX_NPC
+	applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B3F_Movement_FaceDown
+	waitmovement 0
+	//Start Battle
+	msgbox GraniteCave_B3F_Text_LaironAttack, MSGBOX_NPC
+	special LaironBattle
+	waitstate
+	//setwildbattle SPECIES_LAIRON, 18
+	//dowildbattle
+	//specialvar VAR_RESULT, GetBattleOutcome
+	//goto_if_eq VAR_RESULT, B_OUTCOME_WON, SkyPillar_Top_EventScript_DefeatedRayquaza
+	//goto_if_eq VAR_RESULT, B_OUTCOME_RAN, SkyPillar_Top_EventScript_RanFromRayquaza
+	//goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, SkyPillar_Top_EventScript_RanFromRayquaza
+	release
+	setvar VAR_GRANITECAVE_AGGRON, 0
+	end
+
+
+	

data/maps/GraniteCave_B4F/map.json

@@ -0,0 +1,60 @@
+{
+  "id": "MAP_GRANITE_CAVE_B4F",
+  "name": "GraniteCave_B4F",
+  "layout": "LAYOUT_GRANITE_CAVE_B4F",
+  "music": "MUS_PETALBURG_WOODS",
+  "region_map_section": "MAPSEC_GRANITE_CAVE",
+  "requires_flash": true,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
+      "x": 3,
+      "y": 3,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B4F_EventScript_ItemRareCandy",
+      "flag": "FLAG_ITEM_GRANITE_CAVE_4F_RARECANDY"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_GRANITE_CAVE_B3F",
+      "dest_warp_id": "0"
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_GRANITE_CAVE_B3F",
+      "dest_warp_id": "1"
+    }
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 11,
+      "y": 4,
+      "elevation": 0,
+      "item": "ITEM_NUGGET",
+      "flag": "FLAG_ITEM_GRANITE_CAVE_4F_NUGGET"
+    }
+  ]
+}

data/maps/GraniteCave_B4F/scripts.inc

@@ -0,0 +1,2 @@
+GraniteCave_B4F_MapScripts::
+	.byte 0

data/maps/GraniteCave_StevensRoom/scripts.inc

@@ -156,7 +156,7 @@ GraniteCave_StevensRoom_Text_AfterFall:
 	.string "....................$"
 
 GraniteCave_StevensRoom_Text_UseDig:
-	.string "I have an Idea.\p"
+	.string "I have an idea.\l"
 	.string "Baltoy, use dig!$"
 
 GraniteCave_StevensRoom_Movement_ReleaseBaltoy:
@@ -166,7 +166,7 @@ GraniteCave_StevensRoom_Movement_ReleaseBaltoy:
 	step_end
 
 GraniteCave_StevensRoom_EventScript_Colapse::
-	lock
+	lockall
 	delay 16
 	setvar VAR_0x8004, 0  @ vertical pan
 	setvar VAR_0x8005, 2   @ horizontal pan
@@ -206,8 +206,9 @@ GraniteCave_StevensRoom_EventScript_Colapse::
 	setvar VAR_0x8007, 2   @ shake delay
 	special ShakeCamera
 	waitstate
-	warp MAP_RUSTBORO_CITY, 0, 0, 0
-	release
+	releaseall
+	warp MAP_GRANITE_CAVE_B3F, 3, 0, 0
+	delay 32
 	end
 	
 	

data/maps/LittlerootTown/map.json

@@ -136,19 +136,6 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "LITTLEROOT_EventScript_ItemPokeBall",
       "flag": "FLAG_ITEM_TOWN_LITTLEROOT_POTION"
-    },
-    {
-      "graphics_id": "OBJ_EVENT_GFX_TAILLOW",
-      "x": 7,
-      "y": 11,
-      "elevation": 0,
-      "movement_type": "MOVEMENT_TYPE_NONE",
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "NULL",
-      "flag": "0"
     }
   ],
   "warp_events": [

data/maps/LittlerootTown/scripts.inc

@@ -248,8 +248,14 @@ LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale::
 
 LittlerootTown_EventScript_FatMan::
 	msgbox LittlerootTown_Text_CanUsePCToStoreItems, MSGBOX_NPC
+	//applymovement OBJ_EVENT_ID_PLAYER, Testing_Movment
 	end
 
+Testing_Movment:
+	lock_facing_direction
+	jump_2_right
+	step_end
+
 LittlerootTown_EventScript_Boy::
 	msgbox LittlerootTown_Text_BirchSpendsDaysInLab, MSGBOX_NPC
 	end

data/maps/MagmaHideout_1F/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
@@ -123,6 +123,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/MarineCave_End/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_KYOGRE_FRONT",
@@ -48,5 +48,7 @@
       "script": "MarineCave_End_EventScript_Kyogre"
     }
   ],
-  "bg_events": []
+  "bg_events": [
+
+  ]
 }

data/maps/MarineCave_Entrance/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 14,
@@ -23,6 +25,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/MirageTower_1F/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 10,
@@ -30,6 +32,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/NewMauville_Entrance/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 4,
@@ -41,5 +43,7 @@
       "script": "NewMauville_Entrance_EventScript_Door"
     }
   ],
-  "bg_events": []
+  "bg_events": [
+
+  ]
 }

data/maps/NewMauville_Inside/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/maps/PacifidlogTown/map.json

@@ -109,7 +109,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",

data/maps/Route101ext/map.json

@@ -107,32 +107,6 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "Route101ext_EventScript_LonelyWoman",
       "flag": "0"
-    },
-    {
-      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
-      "x": 5,
-      "y": 24,
-      "elevation": 0,
-      "movement_type": "MOVEMENT_TYPE_NONE",
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "NULL",
-      "flag": "FLAG_STEVENS_CAVE_ROCK"
-    },
-    {
-      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
-      "x": 7,
-      "y": 24,
-      "elevation": 0,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_StevensRoom_EventScript_Colapse",
-      "flag": "0"
     }
   ],
   "warp_events": [

data/maps/RustboroCity_PokemonCenter_1F/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
@@ -90,6 +90,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/ScorchedSlab/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -37,6 +37,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/SealedChamber_InnerRoom/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 10,
@@ -23,7 +25,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",

data/maps/SealedChamber_OuterRoom/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 10,
@@ -23,7 +25,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",

data/maps/ShoalCave_HighTideEntranceRoom/map.json

@@ -12,9 +12,17 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/ShoalCave_HighTideInnerRoom/map.json

@@ -12,9 +12,17 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/ShoalCave_LowTideEntranceRoom/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -71,6 +71,10 @@
       "dest_warp_id": "7"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/ShoalCave_LowTideInnerRoom/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -86,7 +86,9 @@
       "dest_warp_id": "3"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",

data/maps/ShoalCave_LowTideStairsRoom/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -44,7 +44,9 @@
       "dest_warp_id": "2"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",

data/maps/SkyPillar_1F/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 6,
@@ -37,6 +39,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/SkyPillar_3F/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 3,
@@ -37,6 +39,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/SkyPillar_4F/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 11,
@@ -37,6 +39,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/SkyPillar_5F/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 3,
@@ -30,6 +32,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/SkyPillar_Top/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA",
@@ -61,5 +61,7 @@
       "script": "SkyPillar_Top_EventScript_AwakenRayquaza"
     }
   ],
-  "bg_events": []
+  "bg_events": [
+
+  ]
 }

data/maps/TerraCave_End/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_GROUDON_FRONT",
@@ -48,5 +48,7 @@
       "script": "TerraCave_End_EventScript_Groudon"
     }
   ],
-  "bg_events": []
+  "bg_events": [
+
+  ]
 }

data/maps/TerraCave_Entrance/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 8,
@@ -30,6 +32,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/Underwater_MarineCave/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 9,
@@ -23,6 +25,10 @@
       "dest_warp_id": "WARP_ID_DYNAMIC"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/Underwater_SealedChamber/map.json

@@ -12,8 +12,10 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 7,
@@ -23,7 +25,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",

data/maps/VictoryRoad_B2F/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_MAN_3",
@@ -136,7 +136,9 @@
       "dest_warp_id": "6"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",

data/maps/map_groups.json

@@ -440,7 +440,8 @@
     "MeteorFalls_StevensCave",
     "PetalburgWoodsExt",
     "PetalburgWoodsext2",
-    "GraniteCave_B3F"
+    "GraniteCave_B3F",
+    "GraniteCave_B4F"
   ],
   "gMapGroup_IndoorDynamic": [
     "SecretBase_RedCave1",

data/scripts/item_ball_scripts.inc

@@ -390,6 +390,10 @@ GraniteCave_B3F_EventScript_ItemSuperPotion::
 	finditem ITEM_SUPER_POTION
 	end
 
+GraniteCave_B4F_EventScript_ItemRareCandy::
+	finditem ITEM_RARE_CANDY
+	end
+
 JaggedPass_EventScript_ItemBurnHeal::
 	finditem ITEM_BURN_HEAL
 	end

data/specials.inc

@@ -536,3 +536,4 @@ gSpecials::
 	def_special TrySetBattleTowerLinkType
 	def_special SetTotemBoost
 	def_special TrySpecialOverworldEvo
+	def_special LaironBattle

include/constants/flags.h

@@ -1227,10 +1227,10 @@
 #define FLAG_STEVENS_CAVE_ROCK                                      0x499 // Unused Flag
 #define FLAG_ITEM_GRANITE_CAVE_3F_SUPERPOTION                       0x49A // Unused Flag
 #define FLAG_ITEM_GRANITE_CAVE_3F_REVIVE                            0x49B // Unused Flag
-#define FLAG_UNUSED_0x49C                                           0x49C // Unused Flag
-#define FLAG_UNUSED_0x49D                                           0x49D // Unused Flag
-#define FLAG_UNUSED_0x49E                                           0x49E // Unused Flag
-#define FLAG_UNUSED_0x49F                                           0x49F // Unused Flag
+#define FLAG_ITEM_GRANITE_CAVE_4F_NUGGET                            0x49C // Unused Flag
+#define FLAG_ITEM_GRANITE_CAVE_4F_RARECANDY                         0x49D // Unused Flag
+#define FLAG_STEVENS_CAVE_AGRON                                     0x49E // Unused Flag
+#define FLAG_STEVENS_CAVE_DUGDEEPER                                 0x49F // Unused Flag
 #define FLAG_UNUSED_0x4A0                                           0x4A0 // Unused Flag
 #define FLAG_UNUSED_0x4A1                                           0x4A1 // Unused Flag
 #define FLAG_UNUSED_0x4A2                                           0x4A2 // Unused Flag

include/constants/layouts.h

@@ -457,5 +457,6 @@
 #define LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE 450
 #define LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE_2F 451
 #define LAYOUT_GRANITE_CAVE_B3F 452
+#define LAYOUT_GRANITE_CAVE_B4F 453
 
 #endif // GUARD_CONSTANTS_LAYOUTS_H

include/constants/map_groups.h

@@ -411,6 +411,7 @@
 #define MAP_PETALBURG_WOODS_EXT                      (108 | (24 << 8))
 #define MAP_PETALBURG_WOODSEXT2                      (109 | (24 << 8))
 #define MAP_GRANITE_CAVE_B3F                         (110 | (24 << 8))
+#define MAP_GRANITE_CAVE_B4F                         (111 | (24 << 8))
 
 // gMapGroup_IndoorDynamic
 #define MAP_SECRET_BASE_RED_CAVE1    (0 | (25 << 8))

include/constants/vars.h

@@ -263,7 +263,7 @@
 #define VAR_ROXANNE_CALL_STEP_COUNTER                    0x40F4
 #define VAR_SCOTT_BF_CALL_STEP_COUNTER                   0x40F5
 #define VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER             0x40F6
-#define VAR_UNUSED_0x40F7                                0x40F7 // Unused Var
+#define VAR_GRANITECAVE_AGGRON                           0x40F7 // Unused Var
 #define VAR_UNUSED_0x40F8                                0x40F8 // Unused Var
 #define VAR_UNUSED_0x40F9                                0x40F9 // Unused Var
 #define VAR_UNUSED_0x40FA                                0x40FA // Unused Var

src/battle_setup.c

@@ -490,6 +490,22 @@ void StartWallyTutorialBattle(void)
     CreateBattleStartTask(B_TRANSITION_SLICE, 0);
 }
 
+void LaironBattle(void){
+	u16 monData;
+	CreateMaleMon(&gEnemyParty[0], SPECIES_LAIRON, 22);
+	monData = MOVE_METAL_CLAW;
+	SetMonData(&gEnemyParty[0], MON_DATA_MOVE1, &monData);
+	monData = MOVE_MUD_SLAP;
+	SetMonData(&gEnemyParty[0], MON_DATA_MOVE2, &monData);
+	monData = MOVE_SCREECH;
+	SetMonData(&gEnemyParty[0], MON_DATA_MOVE3, &monData);
+	monData = MOVE_NONE;
+	SetMonData(&gEnemyParty[0], MON_DATA_MOVE4, &monData);
+	
+	gMain.savedCallback = CB2_ReturnToFieldContinueScriptPlayMapMusic;
+	CreateBattleStartTask(B_TRANSITION_SLICE, 0);
+}
+
 void BattleSetup_StartScriptedWildBattle(void)
 {
     LockPlayerFieldControls();

src/data/map_group_count.h

@@ -1 +1 @@
-static const u8 MAP_GROUP_COUNT[] = {63, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 111, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};
+static const u8 MAP_GROUP_COUNT[] = {63, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 112, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};

src/data/wild_encounters.json

@@ -17,8 +17,8 @@
             5,
             10,
             10,
-            6,
-            4
+            5,
+            2
           ]
         },
         {
@@ -26,8 +26,8 @@
           "encounter_rates": [
             10,
             10,
-            6,
-            10,
+            15,
+            15,
             10
           ]
         },
@@ -51,9 +51,9 @@
             20,
             20,
             20,
-            15,
-            4,
-            1
+            10,
+            5,
+            5
           ],
           "groups": {
             "old_rod": [
@@ -11907,6 +11907,259 @@
               }
             ]
           }
+        },
+        {
+          "map": "MAP_GRANITE_CAVE_B3F",
+          "base_label": "gGraniteCave_B3F0",
+          "land_mons": {
+            "encounter_rate": 0,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 14,
+                "max_level": 16,
+                "species": "SPECIES_LAIRON"
+              }
+            ]
+          },
+          "rock_smash_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 15,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 10,
+                "max_level": 20,
+                "species": "SPECIES_NOSEPASS"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_GRANITE_CAVE_B4F",
+          "base_label": "gGraniteCave_B4F0",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 14,
+                "max_level": 16,
+                "species": "SPECIES_LAIRON"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 14,
+                "species": "SPECIES_RELICANTH"
+              },
+              {
+                "min_level": 5,
+                "max_level": 17,
+                "species": "SPECIES_RELICANTH"
+              },
+              {
+                "min_level": 5,
+                "max_level": 15,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 18,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 13,
+                "species": "SPECIES_CHINCHOU"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 0,
+            "mons": [
+              {
+                "min_level": 3,
+                "max_level": 8,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 6,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 9,
+                "species": "SPECIES_CHINCHOU"
+              },
+              {
+                "min_level": 7,
+                "max_level": 12,
+                "species": "SPECIES_CHINCHOU"
+              },
+              {
+                "min_level": 17,
+                "max_level": 17,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 11,
+                "max_level": 16,
+                "species": "SPECIES_RELICANTH"
+              },
+              {
+                "min_level": 15,
+                "max_level": 19,
+                "species": "SPECIES_RELICANTH"
+              },
+              {
+                "min_level": 10,
+                "max_level": 16,
+                "species": "SPECIES_CHINCHOU"
+              },
+              {
+                "min_level": 5,
+                "max_level": 15,
+                "species": "SPECIES_CORSOLA"
+              },
+              {
+                "min_level": 10,
+                "max_level": 15,
+                "species": "SPECIES_CORSOLA"
+              }
+            ]
+          }
         }
       ]
     },

src/script.c

@@ -307,6 +307,8 @@ u8 *MapHeaderCheckScriptTable(u8 tag)
     {
         u16 varIndex1;
         u16 varIndex2;
+        bool8 isFlag;
+        bool8 flagSet;
 
         // Read first var (or .2byte terminal value)
         varIndex1 = T1_READ_16(ptr);
@@ -318,9 +320,18 @@ u8 *MapHeaderCheckScriptTable(u8 tag)
         varIndex2 = T1_READ_16(ptr);
         ptr += 2;
 
+        isFlag = varIndex1 < VARS_START;
+        flagSet = isFlag && FlagGet(varIndex1);
+
         // Run map script if vars are equal
-        if (VarGet(varIndex1) == VarGet(varIndex2))
+        if (isFlag
+         && ((VarGet(varIndex2) != 0 && flagSet)
+          || (VarGet(varIndex2) == 0 && !flagSet))) {
             return T2_READ_PTR(ptr);
+        }
+        else if (VarGet(varIndex1) == VarGet(varIndex2)) {
+            return T2_READ_PTR(ptr);
+        }
         ptr += 4;
     }
 }