Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More maps

Browse Source
This commit is contained in:
Suppai_Neko committed 2023-04-19 10:32:56 -07:00
1 parent 49d1c7fa2a
commit ce2baad217
33 files changed
+330 -83
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/event_scripts.s
+2
View File
@@ -1098,3 +1098,5 @@ Common_EventScript_LegendaryFlewAway::
.include "data/maps/Route101West/scripts.inc"
.include "data/maps/Route117North/scripts.inc"
.include "data/maps/Route117South/scripts.inc"
data/layouts/PetalburgWoodsExt/map.bin
+1 -1
View File
@@ -1 +1 @@
жвжвжвжвжвжвжвжвжвжвжвжвжвжв╦║║║╨0жвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвчъчъДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕ╦║║║╨0ДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕчъчъДРСРСРСРСРСЕДЕДЕДЕДРСЕДРСРСРСЕжвжв0╟╠╠╠╠╠╠╡00000 0 0 0 0000000╦║║║╨000000 0 0 0 0 0000000000000жвжв0жвжвжвжвжв00н1о10000жв00жвжвжв0чъчъ0╦║║║║║║б╠╡0 0 0 0 0 000000╟╠ю║║║б╠╠╠╡000000 0 0 00000000н1о10чъчъ0ФРСГФГФГФГ00жв000 0ФГ 0 0ФГФГФГ0жвжв╟ю║║║║║║║║╨000000╟╠╠╠╠ю║║║║║║║║║б╠╠╠╡000000000Ю00жв0жвжв00жв000000000ФГ0000 0 0 0 0 0 0 0 0 0н1о1чъчъ╦║║║║║║║║║б╠╠╠╠╠╠ю║║║║║║║║║║║е║║║║║║б╠╡0022200000ФГ0чъФГ0н1СГх0и0и0й000000000000 0 0 0 0 0 0 0 0 0жвжвжв╦║║║е║║║║е║║║║║║║║║║║║║║║к0л║║║║║║║║║║б╠╠╠╠╠╠╠╡00000жв000жв0ь0ы0я0я0и0и0и0и0и0й00000н1о10 0 0 0 0 0 00чъчъчъ╦║║║║║║║║║║║║║║║║║║║║║║к000╦║║║║║║║║║║║║║║║║║║б╡00╟╡ФГ000ФГ000ь0я0я0е0я0ы0я0р00000жв0 0 0 0 0 000жвжвжв╦║║║║║║║║║║║║║║║║║к000000н1о1╦║║║║кл║║║║║║║║║║║║╨00╦б╡000X2Z200000ь0ы0ы0з00п0я0й0000ФГ 0 0 0 0 00н1о1чъчъчъ╦║║║║║║║║║║║║║║е║║╨000000жв0л║║║╨л║║║║║║║║║║║б╠╠ю║╨000`2a2Y2Y2Y2Y2Y2Y2Y2Z200ь0я0р0000 0 0000000жвжвжвжв╦║║║║║║║║║║║║║║║║к0000000ФГ0╦║║╨л║║║║║е║║║║║║║║║╨0`2a2a2a2a20a2a2a2Y2Y2Z2п0я0й02000000000ФГчъчъчъ╦║║║║║║║║║║║║║║║к00х0и0и0и0и0й00000л║╨╦║║║║║║║║к000л║║╨0&'`2a2a2a2a2a2i2a2a2a2b2ь0я0р0000000000000жвжвжв╦║║║║║║е║║║║║║к0000п0я0е0я0я0р00н1о100лб╠╠╠╠ю║к0000л║╨0000000000h2i2i2i2i2a2b20h2a2a2a2Z2п0р0022000000000чъФГчъ0л║║║║║║║║║║║║╨0000п0я0я0я0ы0з00жв0K0л║║║║║║╨ 0 0 0 0000000000000000000h2j200h2a2a2a2b2п0я0й000000002000жв 0 0жв000л║║║║║║║к0000000ь0ы0ы0з0000ФГ0S0╦║║║║║к0 0 0 0 00п1я1я1я1я1я1я1я1я1я1я1р10000000н1о10h2a2a2b2ь0я0р00020000000чъ 0 0чъ000000000000200X2Y2Z200000000000000л╨0000 0 0п1я1я1я1ы1ы1А1А1А1А1А1А1А1А1ы1ы1я1р100000жв00h2a2b20ь0з0000│2┌2┐22000жв 0 0жвп1р10022222222 000h2a2a20000000Y2Y2Y2п1я1я1р┘B┤Bпя1я1я1я1я1ы1ы1А1А1А1Б100000000Ю1А1ы1ы1я1я1р100ФГ000h2j2000000pqr00000ФГ 0 0ФГь1ы1р100X2Y2Y2i2KKх0й0000h2i22200п1я1я1я1р1Y2Ю1А1А1Б█B▐BЮА1А1А1А1А1А1Б1000000000н1о1000Ю1А1А1ы1ы1я1р100000000000000п1р1н1о100000 0 0 00Ю1ы1ы1я1р1h2i2i2i2SSь0з00000000п1я1ы1ы1А1А1Б1Y2Y2000╦б╡0 0000 0 0000000000жв00н1о100Ю1А1ы1ы1я1я1я1р10000000000Ю1Б1жв00000ф1г1 00 0Ю1А1ы1ы1я1я1я1р10000000 00п1я1ы1ы1А1Б10X2Y2Y2Y2Z2000лб╡0000н1о1220002220ФГ00жв0000Ю1А1А1А1ы1ы1я1я1я1р100н1о1н1о1н1о1ФГ0000 жв 0 0 000Ю1А1А1А1ы1ы1я1я1я1я1я1р1 0п1я1ы1ы1А1Б1K0X2a2a2i2X2b2000╦║╨0000жв000000000 0000ФГX2Y2Y2Z20000Ю1А1А1А1А1Б1н1о1жвжвжв00п1р100 чъф1о100000х0й0Ю1А1А1А1А1А1А1Б1 0Ю1А1А1Б100S0h2i2j20h2j2000╦║╨0 000ФГ╟╠╠╠╡000 0 0 0 0000h2i20a2Z2000000000жвчъчъчъп1я1ы1з1000жвжв00 00х0я0з00000000000000000000х0и0и0й000K╦║б╡ 0 0 0 0 0╦║║║б╡00000000000h2a2a2Y2Z200000ФГжвжвжвЮ1А1А1Б1220чъчъ000х0я0р000000х0й00000 0 0 00X2Y2Z20х0я0я0я0р000S╦║║б╠╡ 0 0╟ю║║║║б╡00╟╠╠╡00000h2i20a2Z2000000чъчъФГ0 0X2Y2Z200жвжв00 0п0я0я0и0и0й000п0я0и0и0й00н1о1X2Y2a20н1о1п0я0я0я0з0000╦║║║║б╠╠ю║║║║║║б╠╠ю║║║╠╡00000h2i2j20н1о1х0и0и0й00жвжв 0 0 0X2a2a2j202чъчъ00х0я0я0ы0ы0ы0з0 00ь0ы0ы0я0я0й0жвh2i2i2j2жвь0ы0ы0з00X2Z200л║║║║║║║║║║║║║║║к0000лб╠╠╠╠╡0000жвп0я0ы0з00чъФГY20000j2000жвжв00ь0ы0з000000 0 0 00ь0ы0з0ФГ0000ФГ00000h2j20000л║║║║║║║║║║к0000 00000000лб╡000ФГь0з0000жвX2a2a2222200п1р1чъчън1г1н1о10000н1о1ф1о1ф1г1 0о1н1о1н1о10000н1о1ф1г1ф1г1ф1г1н1о1н1о10000л║║к00000000000 000000000ф1Line truncated
жвжвжвжвжвжвжвжвжвжвжвжвжвжв╦║║║╨0жвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвжвчъчъДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕ╦║║║╨0ДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕДЕчъчъДРСРСРСРСРСЕДЕДЕДЕДРСЕДРСРСРСЕжвжв0╟╠╠╠╠╠╠╡00000 0 0 0 0000000╦║║║╨000000 0 0 0 0 0000000000000жвжв0жвжвжвжвжв00н1о10000жв00жвжвжв0чъчъ0╦║║║║║║б╠╡0 0 0 0 0 000000╟╠ю║║║б╠╠╠╡000000 0 0 00000000н1о10чъчъ0ФРСГФГФГФГ00жв000 0ФГ 0 0ФГФГФГ0жвжв╟ю║║║║║║║║╨000000╟╠╠╠╠ю║║║║║║║║║б╠╠╠╡000000000Ю00жв0жвжв00жв000000000ФГ0000 0 0 0 0 0 0 0 0 0н1о1чъчъ╦║║║║║║║║║б╠╠╠╠╠╠ю║║║║║║║║║║║е║║║║║║б╠╡0022200000ФГ0ФГФГ0н1СГх0и0и0й000000000000 0 0 0 0 0 0 0 0 0жвжвжв╦║║║е║║║║е║║║║║║║║║║║║║║║к0л║║║║║║║║║║б╠╠╠╠╠╠╠╡0000000000жв0ь0ы0я0я0и0и0и0и0и0й00000н1о10 0 0 0 0 0 00чъчъчъ╦║║║║║║║║║║║║║║║║║║║║║║к000╦║║║║║║║║║║║║║║║║║║б╡00╟╡00000ФГ000ь0я0я0е0я0ы0я0р00000жв0 0 0 0 0 000жвжвжв╦║║║║║║║║║║║║║║║║║к000000н1о1╦║║║║кл║║║║║║║║║║║║╨00╦б╡000X2Z200000ь0ы0ы0з00п0я0й0000ФГ 0 0 0 0 00н1о1чъчъчъ╦║║║║║║║║║║║║║║е║║╨000000жв0л║║║╨л║║║║║║║║║║║б╠╠ю║╨000`2a2Y2Y2Y2Y2Y2Y2Y2Z200ь0я0р0000 0 0000000жвжвжвжв╦║║║║║║║║║║║║║║║║к0000000ФГ0╦║║╨л║║║║║е║║║║║║║║║╨0`2a2a2a2a20a2a2a2Y2Y2Z2п0я0й02000000000ФГчъчъчъ╦║║║║║║║║║║║║║║║к00х0и0и0и0и0й00000л║╨╦║║║║║║║║к000л║║╨0&'`2a2a2a2a2a2i2a2a2a2b2ь0я0р0000000000000жвжвжв╦║║║║║║е║║║║║║к0000п0я0е0я0я0р00н1о100лб╠╠╠╠ю║к0000л║╨0000000000h2i2i2i2i2a2b20h2a2a2a2Z2п0р0022000000000чъФГчъ0л║║║║║║║║║║║║╨0000п0я0я0я0ы0з00жв0K0л║║║║║║╨ 0 0 0 0000000000000000000h2j200h2a2a2a2b2п0я0й000000002000жв 0 0жв000л║║║║║║║к0000000ь0ы0ы0з0000ФГ0S0╦║║║║║к0 0 0 0 00п1я1я1я1я1я1я1я1я1я1я1р10000000н1о10h2a2a2b2ь0я0р00020000000чъ 0 0чъ000000000000200X2Y2Z200000000000000л╨0000 0 0п1я1я1я1ы1ы1А1А1А1А1А1А1А1А1ы1ы1я1р100000жв00h2a2b20ь0з0000│2┌2┐22000жв 0 0жвп1р10022222222 000h2a2a20000000Y2Y2Y2п1я1я1р┘B┤Bпя1я1я1я1я1ы1ы1А1А1А1Б100000000Ю1А1ы1ы1я1я1р100ФГ000h2j2000000pqr00000ФГ 0 0ФГь1ы1р100X2Y2Y2i2KKх0й0000h2i22200п1я1я1я1р1Y2Ю1А1А1Б█B▐BЮА1А1А1А1А1А1Б1000000000н1о1000Ю1А1А1ы1ы1я1р100000000000000п1р1н1о100000 0 0 00Ю1ы1ы1я1р1h2i2i2i2SSь0з00000000п1я1ы1ы1А1А1Б1Y2Y2000╦б╡0 0000 0 0000000000жв00н1о100Ю1А1ы1ы1я1я1я1р10000000000Ю1Б1жв00000ф1г1 00 0Ю1А1ы1ы1я1я1я1р10000000 00п1я1ы1ы1А1Б10X2Y2Y2Y2Z2000лб╡0000н1о1220002220ФГ00жв0000Ю1А1А1А1ы1ы1я1я1я1р100н1о1н1о1н1о1ФГ0000 жв 0 0 000Ю1А1А1А1ы1ы1я1я1я1я1я1р1 0п1я1ы1ы1А1Б1K0X2a2a2i2X2b2000╦║╨0000жв000000000 0000ФГX2Y2Y2Z20000Ю1А1А1А1А1Б1н1о1жвжвжв00п1р100 чъф1о100000х0й0Ю1А1А1А1А1А1А1Б1 0Ю1А1А1Б100S0h2i2j20h2j2000╦║╨0 000ФГ╟╠╠╠╡000 0 0 0 0000h2i20a2Z2000000000жвчъчъчъп1я1ы1з1000жвжв00 00х0я0з00000000000000000000х0и0и0й000K╦║б╡ 0 0 0 0 0╦║║║б╡00000000000h2a2a2Y2Z200000ФГжвжвжвЮ1А1А1Б1220чъчъ000х0я0р000000х0й00000 0 0 00X2Y2Z20х0я0я0я0р000S╦║║б╠╡ 0 0╟ю║║║║б╡00╟╠╠╡00000h2i20a2Z2000000чъчъФГ0 0X2Y2Z200жвжв00 0п0я0я0и0и0й000п0я0и0и0й00н1о1X2Y2a20н1о1п0я0я0я0з0000╦║║║║б╠╠ю║║║║║║б╠╠ю║║║╠╡00000h2i2j20н1о1х0и0и0й00жвжв 0 0 0X2a2a2j202чъчъ00х0я0я0ы0ы0ы0з0 00ь0ы0ы0я0я0й0жвh2i2i2j2жвь0ы0ы0з00X2Z200л║║║║║║║║║║║║║║║к0000лб╠╠╠╠╡0000жвп0я0ы0з00чъФГY20000j2000жвжв00ь0ы0з000000 0 0 00ь0ы0з0ФГ0000ФГ00000h2j20000л║║║║║║║║║║к0000 00000000лб╡000ФГь0з0000жвX2a2a2222200п1р1чъчън1г1н1о10000н1о1ф1о1ф1г1 0о1н1о1н1о10000н1о1ф1г1ф1г1ф1г1н1о1н1о10000л║║к00000000000 000000000ф1Line truncated
data/layouts/Route117/map.bin
+1 -1
View File
@@ -7,4 +7,4 @@
2¸¡¡¡º02000000000000000000000000000IIIIIIIHI0000IJ0111111100000Ì¡º200011111111111111100000000002202020200000000 1!1)1)1)1)1*1000000000011!1!1!1)1x2y2x2y2x2y2x2y2!1!1!111000000002200202011111111!1"1000000000011111!1!1!1!1*10ÖÕÔÕÔÕÔ×(1)1!1!1!11110000022020202 !!!!!!!!1"100°±² 20000(1)1!1!1!1!1!1!1*10Î1óòóòóòóòÏ10(1!1!1!1)1*10000022200000(1)1)1)1)1)1)1)1)1*100¸¡Â²200000(1)1!1!1!1"100ÖÕÔÕÔÕÔÕÔ×00 1!1*1000000020202000000000000000¸¡¡Â±²000000(1!1!1"100ÜÝäåäåäòóç0 1"100000000II@@@@II8II000II:0 0 0¸¡¡¡¡º0200000 1!1!110ÔÕK1L5L5L5M1ÔÕ001!1"1000000ÆÆ00ÆÇÆÆ00@22 22
222B 0 0 0¸¡¡¡¡Â±²0 0 0 00(1!1!1"10æç11111äç00 1!1*1000ÆÆÆÆÆ0ÇÆÆÆÆÆÆ@222 22
22B 0 0 0¸¡¡¡¡¡¡º 0 0 0 0 00 1!1!1100000000001!1"100ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ@2222 22
2B 0 0 0Έ‘‘‘‘‘‘Ί 0 0 0 0 0 0(1!1!1!11111111111!1!1*100ΖΖΖΖΖΖΖΖΖΖH0IIIIIIJ@@@Έ------Ί%0%0 0 0 0 0 0(1)1)1)1)1)1)1)1)1)1)1)1)1)1*100ΖΖΖΖΖΖΖΖΗΗΗ00000000000000ΖΖΖ0ΖΖΖΖΖΖ0ΖΖ%0%0 0 0 00000000000000000ΖΖΖΖΖΖΖΖΖΖΖΖΖ0ΖΖΖΖΖ0ΖΖΖΖΖ0ΖΖΖΖΖΖΖΖΖΖΖΖΖΖΖ%0%0%000ΖΖΖΖΖΖΖΖΖΖΖ00ΖΖΖΖΖΗΗΗΗΗ
2B 0 0 0¸¡¡¡¡¡¡º 0 0 0 0 0 0(1!1!1!11111111111!1!1*100ÆÆÆÆÆÆÆÆÆÆH0IIIIIIJ@@@¸¡¡¡¡¡¡º%0%0 0 0 0 0 0(1)1)1)1)1)1)1)1!1!1)1)1)1)1*100ÆÆÆÆÆÆÆÆÇÇÇ00000000000000ÆÆƸ¡¡¡¡¡¡ºÆÆ%0%0 0 0 000000000 1"1000000ÆÆÆÆÆÆÆÆÆÆÆÆÆ0ÆÆÆÆÆ0ÆÆÆÆÆ0ÆÆƸ¡¡¡¡¡¡ºÆÆÆÆ%0%0%000000000 1"100000ÆÆÆÆÆÇÇÇÇÇ
data/layouts/Route117South/border.bin
BIN
View File
Binary file not shown.
data/layouts/Route117South/map.bin
+1
View File
@@ -0,0 +1 @@
И0Ё0Ё0Ё0Ё0Ё0Ё0К00000Ц0Ц0Ц0Ц0Ц0000000 1"100000000000000000И0Ё0Ё0Ё0Ё0Ё0Ё0Т0Б0Б0Б0В0Ц0Ц0Ц0Ц0Ц0000001!1"100000000000000000И0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К0Ц0Ц0Ц00Ц000000 1!1*100000000000000000И0-0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К0Ц0Ц0Ц00000000 1"10000000000000000000Ц0И0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К00Ц0Ц00000000 1"1000000000000000000Ц0Ц0И0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К00Ц0Ц00000000 1"1000000000000000000Ц0Ц0И0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К000Ц0Ц0Ц000000 1"1000000000000000000Ц0Ц0И0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К000Ц0Ц0Ц000000 1"1000000000000000000Ц00000И0Ё0Ё0Ё0Ё0Ё0К00000000001!1!1100000000000000000Ц0 0 0 00И0Ё0Ё0Ё0Ё0Ё0К0000000001!1!1!1!111111111100000000Ц0 0 0 0 0И0Ё0Ё0Ё0Ё0Ё0К000000000 1!1)1)1)1)1)1)1)1)1)1)1!1!111100000Ц0 0 0 0 0И0Ё0Ё0Ё0Ё0Ё0К000000001!1"10000000000(1)1)1!1!111000Ц0 0 0 0 0И0Ё0Ё0Ё0Ё0Ё0К00000001!1!1*10000000000000(1)1!1!1100Ц000 0 0И0Ё0Ё0Ё0Ё0Ё0К0000011!1!1*10000000000000000(1!1!110Ц0Ц0Ц00000000000011!1!1)1*1000000000000000000(1)1*10Ц0Ц0Ц0Ц00000111111!1!1)1*1000000000000000000000000Ц0Ц0Ц0Ц0Ц0Ц0Ц00(1)1)1)1)1)1)1*100000000000000000000000000Ц0Ц0Ц0Ц0Ц0Ц0Ц0Ц00000000000000000000000000000000000Ц0Ц0Ц0Ц0Ц0Ц0Ц0Ц00000000000000000000000000000000000Ц0Ц0Ц0Ц0Ц0Ц0Ц0Ц00000000000000000000000000000000000
data/layouts/RustboroCityEast/map.bin
+2 -2
View File
@@ -1,5 +1,5 @@
ÔÕÔÕÔÕÔÕÔÕ 0 00 0 00 0Ð1Ñ1Ò10 0Æ1Ç1Ô1ÜÝÜÝÜÝäåäå 0 0 000Ð1Ñ1Ù1Ù1â10 0ÔÕÜÔÕÔÕÔÕ 0 0 0 0 0000Ð1Ù1Ù1á1â1Æ1Ç10ÜÝÔÜÝÜÝäå 0 0Æ1Ï1Î1Ç100Ø1Ù1â1Æ1Ç1Ö× 0ÔÕÜÔÕÔÕ 00 0 0ÔÕÔÕ00Ø1Ú10Ö×äòÇ1ÜÝÔÜÝÜÝ 0 0Æ1Ï1ÜÝÜÝ00à1â10äòÏ1ÔÕÔÕÜÔÕÔÕ 0 0ÔÕÔÕÔÕ000000ÔÕÜÝÜÝÔäåäå 0 0äåäòóòÏ1000Î1Ï1ÜÝÔÕÔÕÜ0Î1Ï1 0 0 0 0 00Ö×Ö×000ÔÕÔÕÜÝÜÝÔ0Ö×0 0 0 000äåäå000ÜÝÜÝÔÕÔÕÜ0äå0 0 0 00Î1Ï1 0 00Ð1Ñ1Ò1ÔÕÔÕÜÝÜÝÔ000 0 00 00Ö× 000Ø1Ù1â1ÜÝÜÝÔÕÔÕÜ00 0 00 0 00äå000Ø1Ú10ÔÕÔÕÜÝÜÝÔ0È0É0Ê000 000000 0Ø1Ú10äåäåÔÕÔÕÜ0Ð0Ñ0Ú00000000Ð1Ñ1Ù1â100000äåÜÝÔ0Ø0Ú00000Ð1Ò100Ø1Ù1â100000000ÔÕÜ0000Ð1Ñ1Ñ1Ù1Ù1Ñ1Ñ1Ù1Ú100È0É0Ê00000äåÔ0000à1á1á1á1á1á1á1á1â100Ø0Ù0Ú0000000Ü000000000000000000000000ÔÎ1Ï108IIIIII11IIIIII:Õ‡‡‡ÖÜÖ×0@00000 1"1000000Bà00Î1Ï1ÔäòÏ1@00000 1"100000B000Ö×Ü0Ö×@000000 1"1000000B000äåÔ0äå@00000 1"100000BÕ‡‡‡ÖÜ0 0 0@000000 1"1000000B00000Ô 0 00@00000 1"100000B0000àÜ 0 0 0@000000 1"1000000B00000Ô0 0 0@00000 1"100000BÕ‡‡‡ÖÜ0 0 0@000000 1"1000000B000Î1Ï1Ô0 0 0@00000 1"100000Bà00Ö1×1Ü 0 0 0@000000 1"1000000B000ä1å1Ô 0 0 0HIIIIII 1"1IIIIIIJÕ‡‡‡ÖÜ 0 00 1"100000ÔÎ1Ï100000000 1"1000000000000ÜÖ×00È0É0É0Ê000 1"1000000000000ÔäòÏ10Ø0Ù0Ñ0Ò000 1"10000000Î1Ï10Ü0Ö×000Ø0Ú000 1"1000&'0000Ö×0Ô0äå0111111!1"1000000000äòÏ1ÜÎ1Ï100 1!1)1)1)1)1)1*10000000000Ö×ÔÖ×00 1"10000=>>>>>>?äåÜäå00 1"10000E0000000000GF00Ô 0 0 00 1!1110000000000000GF00Ü 0 000 1!1!1"10000000000000GF00Ô 0 0 00 1!1)1*10000000000000GF0 0ÜÆ1Ç1 00 1"10000E0000000000GF0 0ÔÖ× 00 1"1à000MNNNNNNOF0 0ÜäòÏ10 1!111100000000000Î1Ï10 0Ô0Ö×0(1)1)1!1"10000000Î1Ï100Ö×Æ1Ç1Ü0äå0000 1"10000000Ö×0Î1óåÖ×Ô±±±±±²0 1"1000È0Ê000Þß 0Ö× 0ÞßÜ  
ÔÕÔÕÔÕÔÕÔÕ 0 00 0 00 0Ð1Ñ1Ò10 0Æ1Ç1Ô1ÜÝÜÝÜÝäåäå 0 0 000Ð1Ñ1Ù1Ù1â10 0ÔÕÜÔÕÔÕÔÕ 0 0 0 0 0000Ð1Ù1Ù1á1â1Æ1Ç10ÜÝÔÜÝÜÝäå 0 0Æ1Ï1Î1Ç100Ø1Ù1â1Æ1Ç1Ö× 0ÔÕÜÔÕÔÕ 00 0 0ÔÕÔÕ00Ø1Ú10Ö×äòÇ1ÜÝÔÜÝÜÝ 0 0Æ1Ï1ÜÝÜÝ00à1â10äòÏ1ÔÕÔÕÜÔÕÔÕ 0 0ÔÕÔÕÔÕ000000ÔÕÜÝÜÝÔäåäå 0 0äåäòóòÏ1000Î1Ï1ÜÝÔÕÔÕÜ0Î1Ï1 0 0 0 0 00Ö×Ö×000ÔÕÔÕÜÝÜÝÔ0Ö×0 0 0 000äåäå000ÜÝÜÝÔÕÔÕÜ0äå0 0 0 00Î1Ï1 0 00Ð1Ñ1Ò1ÔÕÔÕÜÝÜÝÔ000 0 00 00Ö× 000Ø1Ù1â1ÜÝÜÝÔÕÔÕÜ00 0 00 0 00äå000Ø1Ú10ÔÕÔÕÜÝÜÝÔ0È0É0Ê000 000000 0Ø1Ú10äåäåÔÕÔÕÜ0Ð0Ñ0Ú00000000Ð1Ñ1Ù1â100000äåÜÝÔ0Ø0Ú00000Ð1Ò100Ø1Ù1â100000000ÔÕÜ0000Ð1Ñ1Ñ1Ù1Ù1Ñ1Ñ1Ù1Ú100È0É0Ê00000äåÔ0000à1á1á1á1á1á1á1á1â100Ø0Ù0Ú0000000Ü000000000000000000000000ÔÎ1Ï108IIIIII11IIIIII:Õ‡‡‡ÖÜÖ×0@000000 1"1000000Bà00Î1Ï1ÔäòÏ1@00000 1"100000B000Ö×Ü0Ö×@000000 1"1000000B000äåÔ0äå@00000 1"100000BÕ‡‡‡ÖÜ0 0 0@000000 1"1000000B00000Ô 0 00@00000 1"100000B0000àÜ 0 0 0@000000 1"1000000B00000Ô0 0 0@00000 1"100000BÕ‡‡‡ÖÜ0 0 0@000000 1"1000000B000Î1Ï1Ô0 0 0@00000 1"100000Bà00Ö1×1Ü 0 0 0@000000 1"1000000B000ä1å1Ô 0 0 0HIIIIII 1"1IIIIIIJÕ‡‡‡ÖÜ 0 00 1"100000ÔÎ1Ï100000000 1"1000000000000ÜÖ×00È0É0É0Ê000 1"1000000000000ÔäòÏ10Ø0Ù0Ñ0Ò000 1"10000000Î1Ï10Ü0Ö×000Ø0Ú000 1"1000&'0000Ö×0Ô0äå0111111!1"1000000000äòÏ1ÜÎ1Ï100 1!1)1)1)1)1)1*10000000000Ö×ÔÖ×00 1"10000=>>>>>>?äåÜäå00 1"10000E0000000000GF00Ô 0 0 00 1!1110000000000000GF00Ü 0 000 1!1!1"10000000000000GF00Ô 0 0 00 1!1)1*10000000000000GF0 0ÜÆ1Ç1 00 1"10000E0000000000GF0 0ÔÖ× 00 1"1à000MNNNNNNOF0 0ÜäòÏ10 1!111100000000000Î1Ï10 0Ô0Ö×0(1)1)1!1"10000000Î1Ï100Ö×Æ1Ç1Ü0äå0000 1"10000000Ö×0Î1óåÖ×Ô±±±±±²0 1"1000È0Ê000Þß 0Ö× 0ÞßÜ  
 ╨0 1"1000ь0з000жв 0ДЕ 0жвт   
 ╨0 1"100000н1о1чъф1г1 0 0чъэ   
╨0 1"10х0и0й00жвжвжв 0 0жвт   ╨0 1"10п0я0р00чъчъчъф1г1чъэ  ╨0 1"10ь0ы0з00жвжвжвжвжвтD3D3D3D3D3╨Ю 1"1000н1о1чъчъчъчъчъэL3L3L3L3L3╨0 1"1000жвжвжвжвжвжвт 
 V3W3º(1*10Î1Ï1ÞßÞßÞßÞßÞßÞßÜ4440000000Ö×Ö×Ö×Ö×Ö×Ö×Ö×ÔÆ1Ç1Æ1Ç1Î1Ï1Î1Ï1Î1Ï1ÞßÞßÞßÞßÞßÞßÞßÜ
 V3W3º0(1*10Î1Ï1ÞßÞßÞßÞßÞßÞßÜ4440000000Ö×Ö×Ö×Ö×Ö×Ö×Ö×ÔÆ1Ç1Æ1Ç1Î1Ï1Î1Ï1Î1Ï1ÞßÞßÞßÞßÞßÞßÞßÜ
data/layouts/layouts.json
+10
View File
@@ -4600,6 +4600,16 @@
"secondary_tileset": "gTileset_Mauville",
"border_filepath": "data/layouts/Route117North/border.bin",
"blockdata_filepath": "data/layouts/Route117North/map.bin"
},
{
"id": "LAYOUT_ROUTE117SOUTH",
"name": "Route117South_Layout",
"width": 42,
"height": 20,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Mauville",
"border_filepath": "data/layouts/Route117South/border.bin",
"blockdata_filepath": "data/layouts/Route117South/map.bin"
}
]
}
data/maps/DesertUnderpass/map.json
+7 -3
View File
@@ -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_FOSSIL",
@@ -37,6 +37,10 @@
"dest_warp_id": "2"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}
data/maps/OldaleTown/map.json
+2 -2
View File
@@ -42,8 +42,8 @@
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_GIRL_3",
"x": 12,
"y": 14,
"x": 9,
"y": 12,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 0,
data/maps/PetalburfForrestRiver/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_PETALBURG_WOODS",
"region_map_section": "MAPSEC_PETALBURG_WOODS",
"requires_flash": false,
"weather": "WEATHER_NONE",
"weather": "WEATHER_SUNNY_CLOUDS",
"map_type": "MAP_TYPE_ROUTE",
"allow_cycling": true,
"allow_escaping": false,
data/maps/PetalburgWoodsext2/map.json
+1 -1
View File
@@ -57,7 +57,7 @@
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "4",
"script": "PetalburgWoodsext2_EventScript_Coleman",
"flag": "0"
"flag": "FLAG_DEFEATED_RUSTBORO_GYM"
}
],
"warp_events": [
data/maps/Route101/scripts.inc
+1
View File
@@ -21,6 +21,7 @@ Route101_EventScript_HideMapNamePopup::
Route101_EventScript_StartBirchRescue::
lockall
setflag FLAG_DEFEATED_RUSTBORO_GYM_KATECOLE
playbgm MUS_HELP, TRUE
msgbox Route101_Text_HelpMe, MSGBOX_DEFAULT
closemessage
data/maps/Route103/map.json
-39
View File
@@ -294,45 +294,6 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_103_PP_UP"
},
{
"graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
"x": 1,
"y": 8,
"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_CutTree",
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
"x": 1,
"y": 9,
"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_CutTree",
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 2,
"y": 8,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_PicnickerTree",
"flag": "0"
}
],
"warp_events": [
data/maps/Route103ext/map.json
+39 -1
View File
@@ -25,7 +25,45 @@
}
],
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 15,
"y": 15,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_PicnickerTree",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
"x": 14,
"y": 14,
"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_CutTree",
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
"x": 15,
"y": 14,
"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_CutTree",
"flag": "FLAG_TEMP_15"
}
],
"warp_events": [
data/maps/Route104/map.json
+26
View File
@@ -476,6 +476,32 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_Rival",
"flag": "FLAG_HIDE_ROUTE_104_RIVAL"
},
{
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 8,
"y": 27,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "6",
"script": "Route104_EventScript_Coleman",
"flag": "FLAG_DEFEATED_RUSTBORO_GYM_KATECOLE"
},
{
"graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 13,
"y": 27,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "6",
"script": "Route104_EventScript_Kate",
"flag": "FLAG_DEFEATED_RUSTBORO_GYM_KATECOLE"
}
],
"warp_events": [
data/maps/Route104/scripts.inc
+29
View File
@@ -1170,3 +1170,32 @@ Route104_Text_BrendanPostBattle:
.string "making POKéMON battle.\p"
.string "Like MR. BRINEY, it's important to\n"
.string "become friends with your POKéMON.$"
Route104_Text_KateIntro:
.string "Don't believe what he says.$"
Route104_Text_KateDefeated:
.string "I hate losing.$"
Route104_Text_KatePostBattle:
.string "Sometimes getting lost isn't that bad.$"
Route104_EventScript_Kate::
trainerbattle_single TRAINER_KATE_2, Route104_Text_KateIntro, Route104_Text_KateDefeated
msgbox Route104_Text_KatePostBattle, MSGBOX_AUTOCLOSE
end
Route104_Text_ColemanIntro:
.string "See, I told you we wouldn't get lost!$"
Route104_Text_ColemanDefeated:
.string "Maybe I should've stayed in the woods...$"
Route104_Text_ColemanPostBattle:
.string "I think I lost my wallet in there.$"
Route104_EventScript_Coleman::
trainerbattle_single TRAINER_COLEMAN_2, Route104_Text_ColemanIntro, Route104_Text_ColemanDefeated
msgbox Route104_Text_ColemanPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/Route114_FossilManiacsHouse/map.json
+4 -2
View File
@@ -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_NINJA_BOY",
@@ -51,7 +51,9 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",
data/maps/Route114_FossilManiacsTunnel/map.json
+4 -2
View File
@@ -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_MANIAC",
@@ -71,5 +71,7 @@
"script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn"
}
],
"bg_events": []
"bg_events": [
]
}
data/maps/Route116Ext/map.json
+1 -1
View File
@@ -70,7 +70,7 @@
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route116Ext_EventScript_Kate",
"flag": "0"
"flag": "FLAG_DEFEATED_RUSTBORO_GYM"
},
{
"graphics_id": "OBJ_EVENT_GFX_BAYLEEF",
data/maps/Route117/map.json
+5
View File
@@ -27,6 +27,11 @@
"map": "MAP_ROUTE117NORTH",
"offset": 20,
"direction": "up"
},
{
"map": "MAP_ROUTE117SOUTH",
"offset": 20,
"direction": "down"
}
],
"object_events": [
data/maps/Route117North/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_ROUTE118",
"region_map_section": "MAPSEC_ROUTE_117",
"requires_flash": false,
"weather": "WEATHER_NONE",
"weather": "WEATHER_SUNNY",
"map_type": "MAP_TYPE_ROUTE",
"allow_cycling": true,
"allow_escaping": false,
data/maps/Route117South/map.json
+34
View File
@@ -0,0 +1,34 @@
{
"id": "MAP_ROUTE117SOUTH",
"name": "Route117South",
"layout": "LAYOUT_ROUTE117SOUTH",
"music": "MUS_ROUTE110",
"region_map_section": "MAPSEC_ROUTE_117",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
"map_type": "MAP_TYPE_ROUTE",
"allow_cycling": true,
"allow_escaping": false,
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [
{
"map": "MAP_ROUTE117",
"offset": -20,
"direction": "up"
}
],
"object_events": [
],
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}
data/maps/Route117South/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
Route117South_MapScripts::
.byte 0
data/maps/RustboroCityEast/map.json
-16
View File
@@ -155,22 +155,6 @@
],
"bg_events": [
{
"type": "sign",
"x": 6,
"y": 57,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "NULL"
},
{
"type": "sign",
"x": 9,
"y": 20,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "NULL"
},
{
"type": "secret_base",
"x": 15,
data/maps/RustboroCity_Gym/map.json
+4 -2
View File
@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_ROXANNE",
@@ -96,7 +96,9 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",
data/maps/RustboroCity_Gym/scripts.inc
+1
View File
@@ -16,6 +16,7 @@ RustboroCity_Gym_EventScript_RoxanneDefeated::
call Common_EventScript_PlayGymBadgeFanfare
msgbox RustboroCity_Gym_Text_StoneBadgeInfoTakeThis, MSGBOX_DEFAULT
setflag FLAG_DEFEATED_RUSTBORO_GYM
clearflag FLAG_DEFEATED_RUSTBORO_GYM_KATECOLE
setflag FLAG_BADGE01_GET
setvar VAR_RUSTBORO_CITY_STATE, 1
addvar VAR_PETALBURG_GYM_STATE, 1
data/maps/map_groups.json
+2 -1
View File
@@ -103,7 +103,8 @@
"RustboroCityEast",
"Route116Ext",
"Route101West",
"Route117North"
"Route117North",
"Route117South"
],
"gMapGroup_IndoorLittleroot": [
"LittlerootTown_BrendansHouse_1F",
include/constants/flags.h
+1 -1
View File
@@ -1236,7 +1236,7 @@
#define FLAG_ITEM_ROUTE_116Ext_TM 0x4A2 // Unused Flag
#define FLAG_ITEM_ROUTE_116Ext_LEAFSTONE 0x4A3 // Unused Flag
#define FLAG_BAYLEAF_ENCOUNTERED 0x4A4 // Unused Flag
#define FLAG_UNUSED_0x4A5 0x4A5 // Unused Flag
#define FLAG_DEFEATED_RUSTBORO_GYM_KATECOLE 0x4A5 // Unused Flag
#define FLAG_UNUSED_0x4A6 0x4A6 // Unused Flag
#define FLAG_UNUSED_0x4A7 0x4A7 // Unused Flag
#define FLAG_UNUSED_0x4A8 0x4A8 // Unused Flag
include/constants/map_groups.h
+1
View File
@@ -74,6 +74,7 @@
#define MAP_ROUTE116EXT (65 | (0 << 8))
#define MAP_ROUTE101WEST (66 | (0 << 8))
#define MAP_ROUTE117NORTH (67 | (0 << 8))
#define MAP_ROUTE117SOUTH (68 | (0 << 8))
// gMapGroup_IndoorLittleroot
#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8))
include/constants/opponents.h
+2
View File
@@ -864,6 +864,8 @@
#define TRAINER_BERRY 870
#define TRAINER_WILLSON 871
#define TRAINER_KATE 872
#define TRAINER_KATE_2 873
#define TRAINER_COLEMAN_2 874
// NOTE: Because each Trainer uses a flag to determine when they are defeated, there is only space for 9 additional trainers before trainer flag space overflows
// More space can be made by shifting flags around in constants/flags.h or changing how trainer flags are handled
src/data/trainer_parties.h
+49 -1
View File
@@ -71,24 +71,72 @@ static const struct TrainerMonItemDefaultMoves sParty_willson[] = {
}
};
static const struct TrainerMonItemDefaultMoves sParty_kate[] = {
static const struct TrainerMonItemCustomMoves sParty_kate[] = {
{
.iv = 0,
.lvl = 8,
.species = SPECIES_TORCHIC,
.heldItem = ITEM_NONE,
.moves = {MOVE_EMBER, MOVE_QUICK_ATTACK, MOVE_ATTRACT, MOVE_NONE}
},
{
.iv = 0,
.lvl = 13,
.species = SPECIES_KIRLIA,
.heldItem = ITEM_NONE,
.moves = {MOVE_HYPNOSIS, MOVE_DRAINING_KISS, MOVE_DOUBLE_TEAM, MOVE_CONFUSION}
},
{
.iv = 120,
.lvl = 14,
.species = SPECIES_BRELOOM,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_MEGA_DRAIN, MOVE_TOXIC, MOVE_MACH_PUNCH, MOVE_LOW_KICK}
}
};
static const struct TrainerMonItemCustomMoves sParty_kate2[] = {
{
.iv = 0,
.lvl = 10,
.species = SPECIES_TORCHIC,
.heldItem = ITEM_NONE,
.moves = {MOVE_EMBER, MOVE_QUICK_ATTACK, MOVE_ATTRACT, MOVE_NONE}
},
{
.iv = 0,
.lvl = 14,
.species = SPECIES_KIRLIA,
.heldItem = ITEM_NONE,
.moves = {MOVE_HYPNOSIS, MOVE_DRAINING_KISS, MOVE_DOUBLE_TEAM, MOVE_CONFUSION}
},
{
.iv = 120,
.lvl = 15,
.species = SPECIES_BRELOOM,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_MEGA_DRAIN, MOVE_TOXIC, MOVE_MACH_PUNCH, MOVE_LOW_KICK}
}
};
static const struct TrainerMonItemCustomMoves sParty_coleman2[] = {
{
.iv = 125,
.lvl = 14,
.species = SPECIES_WOOPER,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_CURSE, MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ATTRACT}
},
{
.iv = 255,
.lvl = 15,
.species = SPECIES_TOTODILE,
.heldItem = ITEM_NONE,
.moves = {MOVE_BITE, MOVE_MUD_SLAP, MOVE_WATER_GUN, MOVE_HELPING_HAND}
}
};
static const struct TrainerMonItemCustomMoves sParty_coleman[] = {
{
.iv = 255,
src/data/trainers.h
+27 -5
View File
@@ -3190,7 +3190,7 @@ const struct Trainer gTrainers[] = {
.trainerName = _("ROXANNE"),
.items = {ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_SMART_SWITCHING | AI_FLAG_ACE_POKEMON,
.party = ITEM_CUSTOM_MOVES(sParty_Roxanne1),
},
@@ -10288,9 +10288,9 @@ const struct Trainer gTrainers[] = {
[TRAINER_COLEMAN] =
{
.trainerClass = TRAINER_CLASS_CAMPER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_CAMPER,
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
.trainerName = _("COLEMAN"),
.items = {},
.doubleBattle = FALSE,
@@ -10353,6 +10353,28 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
.aiFlags = 0,
.party = ITEM_DEFAULT_MOVES(sParty_kate),
.party = ITEM_CUSTOM_MOVES(sParty_kate),
},
[TRAINER_KATE_2] =
{
.trainerClass = TRAINER_CLASS_LASS,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
.trainerPic = TRAINER_PIC_LASS,
.trainerName = _("KATE"),
.items = {ITEM_SUPER_POTION, ITEM_FULL_RESTORE},
.doubleBattle = FALSE,
.aiFlags = 0,
.party = ITEM_CUSTOM_MOVES(sParty_kate2),
},
[TRAINER_COLEMAN_2] =
{
.trainerClass = TRAINER_CLASS_PKMN_RANGER,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
.trainerName = _("COLEMAN"),
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_coleman2),
},
};
src/data/wild_encounters.json
+69
View File
@@ -12691,6 +12691,75 @@
}
]
}
},
{
"map": "MAP_ROUTE103EXT",
"base_label": "gRoute103ext0",
"land_mons": {
"encounter_rate": 20,
"mons": [
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 4,
"max_level": 4,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_PIDGEY"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_ZIGZAGOON"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_ZIGZAGOON"
},
{
"min_level": 4,
"max_level": 4,
"species": "SPECIES_ZIGZAGOON"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_PIDGEY"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_PIDGEY"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_PIDGEY"
},
{
"min_level": 4,
"max_level": 4,
"species": "SPECIES_PIDGEY"
}
]
}
}
]
},